diff --git a/artiq-fast/windows/run-test.nix b/artiq-fast/windows/run-test.nix index eb64be5..76888e5 100644 --- a/artiq-fast/windows/run-test.nix +++ b/artiq-fast/windows/run-test.nix @@ -22,15 +22,19 @@ let 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) ); + conda-packages-legacy-put = if artiq7 then "" else + '' + win-put ${artiqpkgs.conda-windows-binutils-or1k}/win-64/*.tar.bz2 'fake-channel/win-64' + win-put ${artiqpkgs.conda-windows-llvm-or1k}/win-64/*.tar.bz2 'fake-channel/win-64' + win-put ${artiqpkgs.conda-windows-llvmlite-artiq}/win-64/*.tar.bz2 'fake-channel/win-64' + ''; in '' win-exec 'mkdir fake-channel && mkdir fake-channel\noarch && mkdir fake-channel\win-64' ${conda-packages-put} - win-put ${artiqpkgs.conda-windows-binutils-or1k}/win-64/*.tar.bz2 'fake-channel/win-64' - win-put ${artiqpkgs.conda-windows-llvm-or1k}/win-64/*.tar.bz2 'fake-channel/win-64' - win-put ${artiqpkgs.conda-windows-llvmlite-artiq}/win-64/*.tar.bz2 'fake-channel/win-64' + ${conda-packages-legacy-put} win-put ${artiqpkgs.conda-pythonparser}/noarch/*.tar.bz2 'fake-channel/noarch' win-put ${artiqpkgs.conda-sipyco}/noarch/*.tar.bz2 'fake-channel/noarch'