diff --git a/artiq-fast/windows/run-test.nix b/artiq-fast/windows/run-test.nix index 3d81299..eb64be5 100644 --- a/artiq-fast/windows/run-test.nix +++ b/artiq-fast/windows/run-test.nix @@ -11,14 +11,14 @@ let }) tcpPorts; artiq6 = pkgs.lib.strings.versionAtLeast artiqpkgs.artiq.version "6.0"; + artiq7 = pkgs.lib.strings.versionAtLeast artiqpkgs.artiq.version "7.0"; wfvm = import (if artiq6 then ../wfvm.nix else ../wfvm-legacy.nix) { inherit pkgs; }; conda-deps = { name = "conda-deps"; script = let qt-asyncio-package = if artiq6 then artiqpkgs.conda-qasync else artiqpkgs.conda-quamash; - vermajor = pkgs.lib.versions.major artiqpkgs.artiq.version; - conda-deps-noarch = import "./conda_noarch_packages-${vermajor}.nix" { inherit pkgs; }; - conda-deps-win-64 = import "./conda_win-64_packages-${vermajor}.nix" { inherit pkgs; }; + conda-deps-noarch = import (if artiq7 then ./conda_noarch_packages-7.nix else if artiq6 then ./conda_noarch_packages-6.nix else ./conda_noarch_packages-5.nix) { inherit pkgs; }; + conda-deps-win-64 = import (if artiq7 then ./conda_win-64_packages-7.nix else if artiq6 then ./conda_win-64_packages-6.nix else ./conda_win-64_packages-5.nix) { inherit pkgs; }; conda-packages-put = pkgs.lib.strings.concatStringsSep "\n" ( (map (package: ''win-put ${package} 'fake-channel/noarch' '') conda-deps-noarch) ++ (map (package: ''win-put ${package} 'fake-channel/win-64' '') conda-deps-win-64) );