M-Labs
/
nix-scripts
9
0
Fork 9
Code Issues 6 Pull Requests Releases Wiki Activity

Compare commits

base: M-Labs:b43deb1d8f21eb809af20767453596100dc08ec8
Branches Tags
M-Labs:master
..
compare: M-Labs:88232632f212b1cba93431eb29b8af78cc987d0c
Branches Tags
M-Labs:master

2 Commits
b43deb1d8f ... 88232632f2

Author SHA1 Message Date
Sebastien Bourdeauducq 88232632f2 artiq-extras: update newfocus8742, do a simple smoke test 2019-04-19 22:11:59 +08:00
Sebastien Bourdeauducq ba483545c5 artiq-extras: fix dependencies 2019-04-19 22:11:38 +08:00
1 changed files with 9 additions and 5 deletions
Show Stats Expand all files Collapse all files

14
artiq/artiq-extras.nix
View File

@ -26,7 +26,7 @@ in
rev = "e0adec6c577d7d1b832a2b1bf20e89ac393ca27e"; rev = "e0adec6c577d7d1b832a2b1bf20e89ac393ca27e";
sha256 = "18092zgjh63qrg6lg9mzsbr2yri7k7wb97mip5xq3zrcabmmpbk3"; sha256 = "18092zgjh63qrg6lg9mzsbr2yri7k7wb97mip5xq3zrcabmmpbk3";
}; };
pythonOptions = { buildInputs = [ asyncserial artiq ]; }; pythonOptions = { propagatedBuildInputs = [ asyncserial artiq ]; };
condaOptions = { dependencies = [ "asyncserial" ]; }; condaOptions = { dependencies = [ "asyncserial" ]; };
}) // (dualPackage { }) // (dualPackage {
name = "novatech409b"; name = "novatech409b";
@ -37,7 +37,7 @@ in
rev = "c95c52ea3fdcc8459d84bd72bb54c3dc77883968"; rev = "c95c52ea3fdcc8459d84bd72bb54c3dc77883968";
sha256 = "1lkdf1wwngwpmm4byaz1jbjpc9gnq3q8ig6hq305dn73cja99zn9"; sha256 = "1lkdf1wwngwpmm4byaz1jbjpc9gnq3q8ig6hq305dn73cja99zn9";
}; };
pythonOptions = { buildInputs = [ asyncserial artiq ]; }; pythonOptions = { propagatedBuildInputs = [ asyncserial artiq ]; };
condaOptions = { dependencies = [ "asyncserial" ]; }; condaOptions = { dependencies = [ "asyncserial" ]; };
}) // (dualPackage { }) // (dualPackage {
name = "newfocus8742"; name = "newfocus8742";
@ -45,8 +45,12 @@ in
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "quartiq"; owner = "quartiq";
repo = "newfocus8742"; repo = "newfocus8742";
rev = "8224f69fe16e407a1e0e74d2923eca4ab707a60c"; rev = "2d97eb741f43bd5cb9eec92635101b70ad9c129c";
sha256 = "0hahk2hfc9xxrxkqz8ghkh9b35hppdxdlkb55fz9z9s686caki02"; sha256 = "0xzx1p6qn24ckbc8pyxzq8wxn64pvrbwm2l94mblij6dblksdgmv";
};
pythonOptions = {
propagatedBuildInputs = [ artiq ];
# no unit tests so do a simple smoke test
checkPhase = "python -m newfocus8742.aqctl_newfocus8742 --version";
}; };
pythonOptions = { buildInputs = [ artiq ]; };
}) })