From 561eb3a02e0e32829b14d148c1478a6a05165e9d Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Sat, 20 Jun 2020 13:56:15 +0800 Subject: [PATCH] conda-windows: redistribute old packages --- artiq-fast/default.nix | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/artiq-fast/default.nix b/artiq-fast/default.nix index 5053b45..5927aed 100644 --- a/artiq-fast/default.nix +++ b/artiq-fast/default.nix @@ -93,25 +93,27 @@ let }; }; - condaWindows = (pkgs.lib.attrsets.optionalAttrs (pkgs.lib.strings.versionAtLeast mainPackages.artiq.version "6.0")) rec { - conda-windows-binutils-or1k = import ./conda-windows/binutils.nix { + condaWindows = (pkgs.lib.attrsets.optionalAttrs (pkgs.lib.strings.versionAtLeast mainPackages.artiq.version "6.0")) { + conda-windows-binutils-or1k = import ./conda-windows/redistribute.nix { inherit pkgs; - inherit (mainPackages.binutils-or1k) version src; - target = "or1k-linux"; + name = "binutils-or1k"; + filename = "binutils-or1k-linux-2.27-h93a10e1_6.tar.bz2"; + baseurl = "https://anaconda.org/m-labs/binutils-or1k-linux/2.27/download/win-64/"; + sha256 = "0gbks36hfsx3893mihj0bdmg5vwccrq5fw8xp9b9xb8p5pr8qhzx"; }; - conda-windows-binutils-arm = import ./conda-windows/binutils.nix { + conda-windows-llvm-or1k = import ./conda-windows/redistribute.nix { inherit pkgs; - inherit (mainPackages.binutils-arm) version src; - target = "armv7-unknown-linux-gnueabihf"; + name = "llvm-or1k"; + filename = "llvm-or1k-6.0.0-25.tar.bz2"; + baseurl = "https://anaconda.org/m-labs/llvm-or1k/6.0.0/download/win-64/"; + sha256 = "06mnrg79rn9ni0d5z0x3jzb300nhqhbc2h9qbq5m50x3sgm8km63"; }; - conda-windows-llvm-or1k = import ./conda-windows/llvm-or1k.nix { + conda-windows-llvmlite-artiq = import ./conda-windows/redistribute.nix { inherit pkgs; - inherit (mainPackages.llvm-or1k) version; - src = mainPackages.llvm-or1k.llvm-src; - }; - conda-windows-llvmlite-artiq = import ./conda-windows/llvmlite-artiq.nix { - inherit pkgs conda-windows-llvm-or1k; - inherit (mainPackages.llvmlite-artiq) version src; + name = "llvmlite-artiq"; + filename = "llvmlite-artiq-0.23.0.dev-py35_5.tar.bz2"; + baseurl = "https://anaconda.org/m-labs/llvmlite-artiq/0.23.0.dev/download/win-64/"; + sha256 = "10w24w5ljvan06pbvwqj4pzal072jnyynmwm42dn06pq88ryz9wj"; }; }; in