From 9479f297fc57ad31c48fa04facdb4754b1786141 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Thu, 18 Jun 2020 16:05:20 +0800 Subject: [PATCH] conda-windows: restrict to beta channel Windoze is a truly horrible excuse for a OS and there have been lots of problems with those packages. --- artiq-fast/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/artiq-fast/default.nix b/artiq-fast/default.nix index d6f8520..50b9384 100644 --- a/artiq-fast/default.nix +++ b/artiq-fast/default.nix @@ -91,26 +91,28 @@ let dependencies = ["pyserial"]; }; }; + }; + condaWindows = (pkgs.lib.attrsets.optionalAttrs (pkgs.lib.strings.versionAtLeast mainPackages.artiq.version "6.0")) { conda-windows-binutils-or1k = import ./conda-windows/binutils.nix { inherit pkgs; - inherit (binutils-or1k) version src; + inherit (mainPackages.binutils-or1k) version src; target = "or1k-linux"; }; conda-windows-binutils-arm = import ./conda-windows/binutils.nix { inherit pkgs; - inherit (binutils-arm) version src; + inherit (mainPackages.binutils-arm) version src; target = "armv7-unknown-linux-gnueabihf"; }; conda-windows-llvm-or1k = import ./conda-windows/llvm-or1k.nix { inherit pkgs; - inherit (llvm-or1k) version; + inherit (mainPackages.llvm-or1k) version; src = llvm-or1k.llvm-src; }; conda-windows-llvmlite-artiq = import ./conda-windows/llvmlite-artiq.nix { inherit pkgs conda-windows-llvm-or1k; - inherit (llvmlite-artiq) version src; + inherit (mainPackages.llvmlite-artiq) version src; }; }; in - mainPackages // boardPackages + mainPackages // condaWindows // boardPackages