diff --git a/artiq-fast.nix b/artiq-fast.nix index 85c2616..76b0096 100644 --- a/artiq-fast.nix +++ b/artiq-fast.nix @@ -37,6 +37,7 @@ let windowsRunner = overrides: import "${generatedNix}/windows/run-test.nix" ({ inherit pkgs; + sipycoPkg = artiqpkgs.conda-sipyco; artiqPkg = artiqpkgs.conda-artiq; } // overrides); jobs = (builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) artiqpkgs); diff --git a/artiq-fast/conda-artiq-deps.nix b/artiq-fast/conda-artiq-deps.nix index 0a451cf..2be8139 100644 --- a/artiq-fast/conda-artiq-deps.nix +++ b/artiq-fast/conda-artiq-deps.nix @@ -15,4 +15,5 @@ "pygit2" "aiohttp >=3" "python-levenshtein" + "sipyco" ] diff --git a/artiq-fast/pkgs/artiq.nix b/artiq-fast/pkgs/artiq.nix index 5e2892d..83555fa 100644 --- a/artiq-fast/pkgs/artiq.nix +++ b/artiq-fast/pkgs/artiq.nix @@ -9,7 +9,7 @@ in src = import ./artiq-src.nix { inherit fetchgit; }; preBuild = "export VERSIONEER_OVERRIDE=${version}"; 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 ]); checkInputs = [ binutils-or1k outputcheck ]; checkPhase = diff --git a/artiq-fast/windows/manual-test-run.nix b/artiq-fast/windows/manual-test-run.nix index 609c1e5..b04ae8d 100644 --- a/artiq-fast/windows/manual-test-run.nix +++ b/artiq-fast/windows/manual-test-run.nix @@ -1,6 +1,7 @@ # This runs `run-test.nix` with `nix-build` { pkgs ? import {}, + artiqpkgs ? import ../. { inherit pkgs; }, diskImage ? "/opt/windows/c.img", qemuMem ? "2G", testTimeout ? 180, @@ -12,6 +13,8 @@ let windowsRunner = overrides: import ./run-test.nix ({ inherit pkgs diskImage qemuMem testTimeout; + sipycoPkg = artiqpkgs.conda-sipyco; + artiqPkg = artiqpkgs.conda-artiq; } // overrides); in diff --git a/artiq-fast/windows/run-test.nix b/artiq-fast/windows/run-test.nix index dc15b43..24b2cc1 100644 --- a/artiq-fast/windows/run-test.nix +++ b/artiq-fast/windows/run-test.nix @@ -1,8 +1,9 @@ { pkgs, + sipycoPkg, + artiqPkg, diskImage ? "/opt/windows/c.img", qemuMem ? "2G", testTimeout ? 600, - artiqPkg ? import ../conda-artiq.nix { inherit pkgs; }, testCommand ? "python -m unittest discover -v artiq.test", }: @@ -52,9 +53,9 @@ stdenv.mkDerivation { echo "Wait for Windows to boot" sleep 10 ${ssh "ver"} - for pkg in ${artiqPkg}/noarch/artiq*.tar.bz2 ; do - ${scp "\\$pkg" "artiq.tar.bz2"} - ${ssh "anaconda\\scripts\\activate ${condaEnv} && conda install artiq.tar.bz2"} + for pkg in ${sipycoPkg}/noarch/sipyco*.tar.bz2 ${artiqPkg}/noarch/artiq*.tar.bz2 ; do + ${scp "\\$pkg" "to_install.tar.bz2"} + ${ssh "anaconda\\scripts\\activate ${condaEnv} && conda install to_install.tar.bz2"} done # Schedule a timed shutdown against hanging test runs