bradbqc
/
artiq-extrapkg
forked from M-Labs/artiq-extrapkg
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: bradbqc:56946170c6e4c03f3db8102d570fc88de25c8800
Branches Tags
bradbqc:master
bradbqc:release-7
M-Labs:master
M-Labs:release-7
...
compare: bradbqc:acd2ea9457e006acdee2385518104f5f3e69765a
Branches Tags
bradbqc:master
bradbqc:release-7
M-Labs:master
M-Labs:release-7

3 Commits
56946170c6 ... acd2ea9457

Author SHA1 Message Date
Sebastien Bourdeauducq acd2ea9457 update ARTIQ 2022-08-10 07:01:37 +08:00
Sebastien Bourdeauducq 3d41ed4fef add missing tqdm conda dep 2022-08-10 07:01:11 +08:00
Brad Bondurant e680efcd6a flake: expose `makeCondaChannel` in outputs 2022-07-11 17:12:40 -04:00
2 changed files with 6 additions and 4 deletions
Show Stats Expand all files Collapse all files

8
flake.lock
View File

@ -11,11 +11,11 @@
"src-pythonparser": "src-pythonparser" "src-pythonparser": "src-pythonparser"
}, },
"locked": { "locked": {
"lastModified": 1657277380, "lastModified": 1659431396,
"narHash": "sha256-6r8uqecGQvdM6oIoTEAPLoABp+h9p2Ji7C05DoK3aso=", "narHash": "sha256-STVcApCWaQ4lu5zOgUOrWeoiVpcXaTfdB5h+GUgKovY=",
"ref": "master", "ref": "master",
"rev": "db4bccda7ed7724f7641b169f1d1c9425a15e8a3", "rev": "f31279411ef7f198ee697290efe957544896ebdb",
"revCount": 8102, "revCount": 8137,
"type": "git", "type": "git",
"url": "https://github.com/m-labs/artiq.git" "url": "https://github.com/m-labs/artiq.git"
}, },

2
flake.nix
View File

@ -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";
@ -288,6 +289,7 @@
"llvmlite" "llvmlite"
"llvm-tools" "llvm-tools"
"lld" "lld"
"tqdm"
"artiq-comtools" "artiq-comtools"
]; ];
} }