M-Labs
/
nix-scripts
9
0
Fork 9
Code Issues 6 Pull Requests Releases Wiki Activity

wfvm.nix: turn wfvm-pkgs into an arg with default

This commit is contained in:
Astro 2021-03-05 19:08:00 +01:00
parent fd40670b3b
commit 5d4a89f654
6 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
artiq-fast/conda-windows/binutils.nix
View File

@ -1,7 +1,10 @@
{ pkgs, version, src, target }: { pkgs, version, src, target }:
let let
wfvm = import ../wfvm.nix { inherit pkgs; }; wfvm = import ../wfvm.nix {
inherit pkgs;
wfvm-pkgs = pkgs;
};
libiconv-filename = "libiconv-1.15-h1df5818_7.tar.bz2"; libiconv-filename = "libiconv-1.15-h1df5818_7.tar.bz2";
libiconv = pkgs.fetchurl { libiconv = pkgs.fetchurl {
url = "https://anaconda.org/anaconda/libiconv/1.15/download/win-64/${libiconv-filename}"; url = "https://anaconda.org/anaconda/libiconv/1.15/download/win-64/${libiconv-filename}";

5
artiq-fast/conda-windows/llvm-or1k.nix
View File

@ -1,7 +1,10 @@
{ pkgs, version, src }: { pkgs, version, src }:
let let
wfvm = import ../wfvm.nix { inherit pkgs; }; wfvm = import ../wfvm.nix {
inherit pkgs;
wfvm-pkgs = pkgs;
};
conda-vs2015_runtime-filename = "vs2015_runtime-14.16.27012-hf0eaf9b_2.tar.bz2"; conda-vs2015_runtime-filename = "vs2015_runtime-14.16.27012-hf0eaf9b_2.tar.bz2";
conda-vs2015_runtime = pkgs.fetchurl { conda-vs2015_runtime = pkgs.fetchurl {
url = "https://anaconda.org/anaconda/vs2015_runtime/14.16.27012/download/win-64/${conda-vs2015_runtime-filename}"; url = "https://anaconda.org/anaconda/vs2015_runtime/14.16.27012/download/win-64/${conda-vs2015_runtime-filename}";

5
artiq-fast/conda-windows/llvmlite-artiq.nix
View File

@ -1,7 +1,10 @@
{ pkgs, conda-windows-llvm-or1k, version, src }: { pkgs, conda-windows-llvm-or1k, version, src }:
let let
wfvm = import ../wfvm.nix { inherit pkgs; }; wfvm = import ../wfvm.nix {
inherit pkgs;
wfvm-pkgs = pkgs;
};
conda-vs2015_runtime-filename = "vs2015_runtime-14.16.27012-hf0eaf9b_2.tar.bz2"; conda-vs2015_runtime-filename = "vs2015_runtime-14.16.27012-hf0eaf9b_2.tar.bz2";
conda-vs2015_runtime = pkgs.fetchurl { conda-vs2015_runtime = pkgs.fetchurl {
url = "https://anaconda.org/anaconda/vs2015_runtime/14.16.27012/download/win-64/${conda-vs2015_runtime-filename}"; url = "https://anaconda.org/anaconda/vs2015_runtime/14.16.27012/download/win-64/${conda-vs2015_runtime-filename}";

14
artiq-fast/wfvm.nix
View File

@ -1,16 +1,16 @@
{ pkgs }: { pkgs
, wfvm-pkgs ? import (pkgs.fetchFromGitHub {
let
# Pin nixpkgs to avoid frequent resource-intensive Windows reinstallations on Hydra.
wfvm-pkgs = pkgs.fetchFromGitHub {
owner = "NixOS"; owner = "NixOS";
repo = "nixpkgs"; repo = "nixpkgs";
rev = "f8248ab6d9e69ea9c07950d73d48807ec595e923"; rev = "f8248ab6d9e69ea9c07950d73d48807ec595e923";
sha256 = "009i9j6mbq6i481088jllblgdnci105b2q4mscprdawg3knlyahk"; sha256 = "009i9j6mbq6i481088jllblgdnci105b2q4mscprdawg3knlyahk";
}; }) {}
}:
let
wfvm = pkgs.fetchgit { wfvm = pkgs.fetchgit {
url = "https://git.m-labs.hk/M-Labs/wfvm.git"; url = "https://git.m-labs.hk/M-Labs/wfvm.git";
rev = "4b497938ffd9fcddf84a3dbe2f01524395292adb"; rev = "4b497938ffd9fcddf84a3dbe2f01524395292adb";
sha256 = "0m3kdbbcskqc1lf8b5f7ccbll9b7vkl4r00kbyx3yjb2rs6cqvil"; sha256 = "0m3kdbbcskqc1lf8b5f7ccbll9b7vkl4r00kbyx3yjb2rs6cqvil";
}; };
in import "${wfvm}/wfvm" { pkgs = (import wfvm-pkgs {}); } in import "${wfvm}/wfvm" { pkgs = wfvm-pkgs; }

5
artiq-fast/windows/make_conda_packages.sh
View File

@ -13,7 +13,10 @@ set -e
nix-build -E " nix-build -E "
let let
pkgs = import <nixpkgs> {}; pkgs = import <nixpkgs> {};
wfvm = import ../wfvm.nix { inherit pkgs; }; wfvm = import ../wfvm.nix {
inherit pkgs;
wfvm-pkgs = pkgs;
};
in in
wfvm.utils.wfvm-run { wfvm.utils.wfvm-run {
name = \"get-conda-packages\"; name = \"get-conda-packages\";

5
artiq-fast/windows/run-test.nix
View File

@ -10,7 +10,10 @@ let
inherit port; inherit port;
}) tcpPorts; }) tcpPorts;
wfvm = import ../wfvm.nix { inherit pkgs; }; wfvm = import ../wfvm.nix {
inherit pkgs;
wfvm-pkgs = pkgs;
};
conda-deps = { conda-deps = {
name = "conda-deps"; name = "conda-deps";
script = let script = let