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:781c61de19a721ea9e13bf995f3a677eeec1fa15
Branches Tags
bradbqc:master
bradbqc:release-7
M-Labs:release-8
M-Labs:master
M-Labs:release-7
..
compare: bradbqc:88701b10bce641ead170637e3cb942f3adfbcc9a
Branches Tags
bradbqc:master
bradbqc:release-7
M-Labs:release-8
M-Labs:master
M-Labs:release-7

No commits in common. "781c61de19a721ea9e13bf995f3a677eeec1fa15" and "88701b10bce641ead170637e3cb942f3adfbcc9a" have entirely different histories.
781c61de19 ... 88701b10bc

2 changed files with 4 additions and 6 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": 1659431458, "lastModified": 1657275623,
"narHash": "sha256-+CZVEohTMBLVbBf6W81H309rxrF7fOzAKkEJ7QVIu14=", "narHash": "sha256-FtVLsJtUsK7Yul2Ma4x8qzFsbqPla/w+IBaotcK/jDI=",
"ref": "release-7", "ref": "release-7",
"rev": "eba143a47530adbd9d402a9736d0fdc06dcf836f", "rev": "59dfb9e902183bd76cb39ff550495e5fdd17c65d",
"revCount": 8116, "revCount": 8111,
"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,7 +112,6 @@
}; };
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";
@ -289,7 +288,6 @@
"llvmlite" "llvmlite"
"llvm-tools" "llvm-tools"
"lld" "lld"
"tqdm"
"artiq-comtools" "artiq-comtools"
]; ];
} }