From eb48b4a6b849004b79a1f481b370bb8f455ea19a Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Sat, 12 Dec 2020 22:27:23 +0800 Subject: [PATCH] artiq-fast: do not put both quamash and qasync in conda channel This causes conda's lame excuse for a dependency solver to break, as usual. --- artiq-fast/windows/run-test.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/artiq-fast/windows/run-test.nix b/artiq-fast/windows/run-test.nix index f478516..5fc86f4 100644 --- a/artiq-fast/windows/run-test.nix +++ b/artiq-fast/windows/run-test.nix @@ -15,6 +15,7 @@ let name = "conda-deps"; script = let artiq6 = pkgs.lib.strings.versionAtLeast artiqpkgs.artiq.version "6.0"; + qt-asyncio-package = if artiq6 then artiqpkgs.conda-qasync else artiqpkgs.conda-quamash; conda-deps-noarch = import (if artiq6 then ./conda_noarch_packages.nix else ./conda_noarch_packages-legacy.nix) { inherit pkgs; }; conda-deps-win-64 = import (if artiq6 then ./conda_win-64_packages.nix else ./conda_win-64_packages-legacy.nix) { inherit pkgs; }; conda-packages-put = pkgs.lib.strings.concatStringsSep "\n" @@ -32,8 +33,7 @@ let win-put ${artiqpkgs.conda-pythonparser}/noarch/*.tar.bz2 'fake-channel/noarch' win-put ${artiqpkgs.conda-sipyco}/noarch/*.tar.bz2 'fake-channel/noarch' - win-put ${artiqpkgs.conda-quamash}/noarch/*.tar.bz2 'fake-channel/noarch' - win-put ${artiqpkgs.conda-qasync}/noarch/*.tar.bz2 'fake-channel/noarch' + win-put ${qt-asyncio-package}/noarch/*.tar.bz2 'fake-channel/noarch' ''; }; in