forked from M-Labs/nix-scripts
artiq: depend on sipyco
This commit is contained in:
parent
ebe72e4f51
commit
63625e74b8
|
@ -37,6 +37,7 @@ let
|
||||||
windowsRunner = overrides:
|
windowsRunner = overrides:
|
||||||
import "${generatedNix}/windows/run-test.nix" ({
|
import "${generatedNix}/windows/run-test.nix" ({
|
||||||
inherit pkgs;
|
inherit pkgs;
|
||||||
|
sipycoPkg = artiqpkgs.conda-sipyco;
|
||||||
artiqPkg = artiqpkgs.conda-artiq;
|
artiqPkg = artiqpkgs.conda-artiq;
|
||||||
} // overrides);
|
} // overrides);
|
||||||
jobs = (builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) artiqpkgs);
|
jobs = (builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) artiqpkgs);
|
||||||
|
|
|
@ -15,4 +15,5 @@
|
||||||
"pygit2"
|
"pygit2"
|
||||||
"aiohttp >=3"
|
"aiohttp >=3"
|
||||||
"python-levenshtein"
|
"python-levenshtein"
|
||||||
|
"sipyco"
|
||||||
]
|
]
|
||||||
|
|
|
@ -9,7 +9,7 @@ in
|
||||||
src = import ./artiq-src.nix { inherit fetchgit; };
|
src = import ./artiq-src.nix { inherit fetchgit; };
|
||||||
preBuild = "export VERSIONEER_OVERRIDE=${version}";
|
preBuild = "export VERSIONEER_OVERRIDE=${version}";
|
||||||
propagatedBuildInputs = [ binutils-or1k llvm-or1k llvmlite-artiq qt5Full ]
|
propagatedBuildInputs = [ binutils-or1k llvm-or1k llvmlite-artiq qt5Full ]
|
||||||
++ (with pythonDeps; [ levenshtein pyqtgraph-qt5 quamash pythonparser ])
|
++ (with pythonDeps; [ sipyco levenshtein pyqtgraph-qt5 quamash pythonparser ])
|
||||||
++ (with python3Packages; [ aiohttp pygit2 numpy dateutil scipy prettytable pyserial h5py pyqt5 ]);
|
++ (with python3Packages; [ aiohttp pygit2 numpy dateutil scipy prettytable pyserial h5py pyqt5 ]);
|
||||||
checkInputs = [ binutils-or1k outputcheck ];
|
checkInputs = [ binutils-or1k outputcheck ];
|
||||||
checkPhase =
|
checkPhase =
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
# This runs `run-test.nix` with `nix-build`
|
# This runs `run-test.nix` with `nix-build`
|
||||||
|
|
||||||
{ pkgs ? import <nixpkgs> {},
|
{ pkgs ? import <nixpkgs> {},
|
||||||
|
artiqpkgs ? import ../. { inherit pkgs; },
|
||||||
diskImage ? "/opt/windows/c.img",
|
diskImage ? "/opt/windows/c.img",
|
||||||
qemuMem ? "2G",
|
qemuMem ? "2G",
|
||||||
testTimeout ? 180,
|
testTimeout ? 180,
|
||||||
|
@ -12,6 +13,8 @@ let
|
||||||
windowsRunner = overrides:
|
windowsRunner = overrides:
|
||||||
import ./run-test.nix ({
|
import ./run-test.nix ({
|
||||||
inherit pkgs diskImage qemuMem testTimeout;
|
inherit pkgs diskImage qemuMem testTimeout;
|
||||||
|
sipycoPkg = artiqpkgs.conda-sipyco;
|
||||||
|
artiqPkg = artiqpkgs.conda-artiq;
|
||||||
} // overrides);
|
} // overrides);
|
||||||
in
|
in
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,9 @@
|
||||||
{ pkgs,
|
{ pkgs,
|
||||||
|
sipycoPkg,
|
||||||
|
artiqPkg,
|
||||||
diskImage ? "/opt/windows/c.img",
|
diskImage ? "/opt/windows/c.img",
|
||||||
qemuMem ? "2G",
|
qemuMem ? "2G",
|
||||||
testTimeout ? 600,
|
testTimeout ? 600,
|
||||||
artiqPkg ? import ../conda-artiq.nix { inherit pkgs; },
|
|
||||||
testCommand ? "python -m unittest discover -v artiq.test",
|
testCommand ? "python -m unittest discover -v artiq.test",
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
@ -52,9 +53,9 @@ stdenv.mkDerivation {
|
||||||
echo "Wait for Windows to boot"
|
echo "Wait for Windows to boot"
|
||||||
sleep 10
|
sleep 10
|
||||||
${ssh "ver"}
|
${ssh "ver"}
|
||||||
for pkg in ${artiqPkg}/noarch/artiq*.tar.bz2 ; do
|
for pkg in ${sipycoPkg}/noarch/sipyco*.tar.bz2 ${artiqPkg}/noarch/artiq*.tar.bz2 ; do
|
||||||
${scp "\\$pkg" "artiq.tar.bz2"}
|
${scp "\\$pkg" "to_install.tar.bz2"}
|
||||||
${ssh "anaconda\\scripts\\activate ${condaEnv} && conda install artiq.tar.bz2"}
|
${ssh "anaconda\\scripts\\activate ${condaEnv} && conda install to_install.tar.bz2"}
|
||||||
done
|
done
|
||||||
|
|
||||||
# Schedule a timed shutdown against hanging test runs
|
# Schedule a timed shutdown against hanging test runs
|
||||||
|
|
Loading…
Reference in New Issue