M-Labs
/
artiq-extrapkg
2
0
Fork 4
Code Issues 2 Pull Requests 1 Projects Releases Wiki Activity

Compare commits

merge into: M-Labs:master
Branches Tags
M-Labs:master
M-Labs:release-8
M-Labs:release-7
wlph17:bug_fix_#2007
wlph17:release-7
wlph17:master
...
pull from: wlph17:release-7
Branches Tags
wlph17:bug_fix_#2007
wlph17:release-7
wlph17:master
M-Labs:master
M-Labs:release-8
M-Labs:release-7

13 Commits
master ... release-7

Author SHA1 Message Date
Sebastien Bourdeauducq 16a3e79163 Revert "use flake for dax" 
This reverts commit 9cd19ede46.
 2022-12-21 09:21:16 +08:00
Sebastien Bourdeauducq 368d159b15 Revert "dax: reenable tests" 
This reverts commit 16af931d0c.
 2022-12-21 09:21:15 +08:00
Sebastien Bourdeauducq 16af931d0c dax: reenable tests 2022-12-17 14:56:24 +08:00
Brad Bondurant 9cd19ede46 use flake for dax 2022-12-17 14:55:46 +08:00
Sebastien Bourdeauducq 153ac853e9 flake: update dependencies 2022-11-25 09:51:29 +08:00
Sebastien Bourdeauducq 5f87f3a59d artiq: update 2022-09-08 17:19:59 +08:00
Sebastien Bourdeauducq 5c51937450 lda: update 2022-09-08 17:19:50 +08:00
Sebastien Bourdeauducq 89880b6fcc Revert "dax: bump version, add new dependency" 
This reverts commit 521b5ef7b7.
 2022-08-12 09:32:22 +08:00
Brad Bondurant 521b5ef7b7 dax: bump version, add new dependency 2022-08-12 09:31:31 +08:00
Sebastien Bourdeauducq 781c61de19 update ARTIQ 2022-08-10 07:02:11 +08:00
Sebastien Bourdeauducq a131ed2e09 add missing tqdm conda dep 2022-08-10 07:02:02 +08:00
Brad Bondurant 213d90e576 flake: expose `makeCondaChannel` in outputs 2022-07-12 09:49:37 +08:00
Sebastien Bourdeauducq 88701b10bc flake: switch to ARTIQ release 7 2022-07-08 18:21:28 +08:00
2 changed files with 46 additions and 27 deletions
Show Stats Expand all files Collapse all files

65
flake.lock
View File

@ -11,21 +11,23 @@
"src-pythonparser": "src-pythonparser" "src-pythonparser": "src-pythonparser"
}, },
"locked": { "locked": {
"lastModified": 1654087576, "lastModified": 1669341018,
"narHash": "sha256-d+LCvCXikhhEjsf4qBZakx3Sda85p+4vVZVwE1YuS90=", "narHash": "sha256-6tO/7AyiFfRdRLvA4p+lCQt9bRVN3n/dNWyGdKg43GM=",
"ref": "master", "ref": "release-7",
"rev": "68ef0073ea66fe9c7f7c178979ecb8c681c47caa", "rev": "75d75cc13c15ab57948dbaeb0467fa9c021e84c2",
"revCount": 8068, "revCount": 8143,
"type": "git", "type": "git",
"url": "https://github.com/m-labs/artiq.git" "url": "https://github.com/m-labs/artiq.git"
}, },
"original": { "original": {
"ref": "release-7",
"type": "git", "type": "git",
"url": "https://github.com/m-labs/artiq.git" "url": "https://github.com/m-labs/artiq.git"
} }
}, },
"artiq-comtools": { "artiq-comtools": {
"inputs": { "inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [ "nixpkgs": [
"artiq", "artiq",
"nixpkgs" "nixpkgs"
@ -36,11 +38,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1654007592, "lastModified": 1664405593,
"narHash": "sha256-vaDFhE1ItjqtIcinC/6RAJGbj44pxxMUEeQUa3FtgEE=", "narHash": "sha256-yP441NerlLGig7n+9xHsx8yCtZ+Ggd0VqfBSzc20E04=",
"owner": "m-labs", "owner": "m-labs",
"repo": "artiq-comtools", "repo": "artiq-comtools",
"rev": "cb73281154656ee8f74db1866859e31bf42755cd", "rev": "15ddac62813ef623a076ccf982b3bc63d314e651",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -49,14 +51,29 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils": {
"locked": {
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"mozilla-overlay": { "mozilla-overlay": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1650459918, "lastModified": 1664789696,
"narHash": "sha256-sroCK+QJTmoXtcRkwZyKOP9iAYOPID2Bwdxn4GkG16w=", "narHash": "sha256-UGWJHQShiwLCr4/DysMVFrYdYYHcOqAOVsWNUu+l6YU=",
"owner": "mozilla", "owner": "mozilla",
"repo": "nixpkgs-mozilla", "repo": "nixpkgs-mozilla",
"rev": "e1f7540fc0a8b989fb8cf701dc4fd7fc76bcf168", "rev": "80627b282705101e7b38e19ca6e8df105031b072",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -67,11 +84,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1653920503, "lastModified": 1666056570,
"narHash": "sha256-BBeCZwZImtjP3oYy4WogkQYy5OxNyfNciVSc1AfZgLQ=", "narHash": "sha256-e7EkIY68Tp7NKyp9JSHh6CgPPdsKYYWxiL4wZQN8Cwg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a634c8f6c1fbf9b9730e01764999666f3436f10a", "rev": "47edaa313fc3767ce3026037a5b62352f22f3602",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -94,11 +111,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1654006751, "lastModified": 1664319253,
"narHash": "sha256-OWAnoTCutvTQcYdtdtLQuL6uRtG+7Jz7sbRhcScv8bo=", "narHash": "sha256-hycJAgy+NFF9f5I6++7yo8KdhMSyKCPKJazRPxeedI4=",
"owner": "m-labs", "owner": "m-labs",
"repo": "sipyco", "repo": "sipyco",
"rev": "b3d03a94c751a24769c54a61a0dbe9d6af52dade", "rev": "d58ded7280e0f020be2446d4fee70f4393e6045f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -110,11 +127,11 @@
"src-migen": { "src-migen": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1650337393, "lastModified": 1662111470,
"narHash": "sha256-rm1SlFmF2ASz0vIy2nDEzGlyRw2oYNeJRr8Kh8Mg2Qc=", "narHash": "sha256-IPyhoFZLhY8d3jHB8jyvGdbey7V+X5eCzBZYSrJ18ec=",
"owner": "m-labs", "owner": "m-labs",
"repo": "migen", "repo": "migen",
"rev": "d4e3f34177c32f09904397179e6ed9c83175e528", "rev": "639e66f4f453438e83d86dc13491b9403bbd8ec6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -126,11 +143,11 @@
"src-misoc": { "src-misoc": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1649324486, "lastModified": 1665395741,
"narHash": "sha256-Mw/fQS3lHFvCm7L1k63joRkz5uyijQfywcOq+X2+o2s=", "narHash": "sha256-7ULMGBPPn5NxZX6rdxU5GheoSNBiJklHQEVf04jU9tI=",
"ref": "master", "ref": "master",
"rev": "f1dc58d2b8c222ba41c25cee4301626625f46e43", "rev": "4fb0730db4c5de7e86f82fa3bd204e6c4608af85",
"revCount": 2420, "revCount": 2427,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/m-labs/misoc.git" "url": "https://github.com/m-labs/misoc.git"

8
flake.nix
View File

@ -1,7 +1,7 @@
{ {
description = "Additional packages for ARTIQ"; description = "Additional packages for ARTIQ";
inputs.artiq.url = git+https://github.com/m-labs/artiq.git; inputs.artiq.url = git+https://github.com/m-labs/artiq.git?ref=release-7;
outputs = { self, artiq }: outputs = { self, artiq }:
let let
@ -112,6 +112,7 @@
}; };
in rec { in rec {
inherit makeCondaChannel;
packages.x86_64-linux = rec { packages.x86_64-linux = rec {
korad_ka3005p = pkgs.python3Packages.buildPythonPackage { korad_ka3005p = pkgs.python3Packages.buildPythonPackage {
pname = "korad_ka3005p"; pname = "korad_ka3005p";
@ -141,8 +142,8 @@
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "m-labs"; owner = "m-labs";
repo = "lda"; repo = "lda";
rev = "e6bf828b6dfd7fbf59b61b691712736c98c95970"; rev = "2d8af1e9080a4c1ab4a32370b3f926bfba8c00b2";
sha256 = "1w4ykzsl3386bz4ggpd6i60b6a3k7rnc6qjw59xm3hk0vs3w2vyn"; sha256 = "sha256-bImAsQiGmMauasltUrlkCRU3+p40d41DTlJvOjCfrP0=";
}; };
propagatedBuildInputs = [ artiq.inputs.sipyco.packages.x86_64-linux.sipyco ]; propagatedBuildInputs = [ artiq.inputs.sipyco.packages.x86_64-linux.sipyco ];
postPatch = '' postPatch = ''
@ -288,6 +289,7 @@
"llvmlite" "llvmlite"
"llvm-tools" "llvm-tools"
"lld" "lld"
"tqdm"
"artiq-comtools" "artiq-comtools"
]; ];
} }