esavkin
/
nix-scripts
forked from M-Labs/nix-scripts
1
0
Fork 0
Code Pull Requests Activity

move wfvm.nix into artiq-fast 

Avoids issue with generatedNix
This commit is contained in:
Sebastien Bourdeauducq 2020-06-28 14:50:44 +08:00
parent 4cd7a559e8
commit 48bc991c7c
6 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
{ pkgs, version, src, target }: { pkgs, version, src, target }:
let let
wfvm = import ../../wfvm.nix { inherit pkgs; }; wfvm = import ../wfvm.nix { inherit 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}";

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

@ -1,7 +1,7 @@
{ pkgs, version, src }: { pkgs, version, src }:
let let
wfvm = import ../../wfvm.nix { inherit pkgs; }; wfvm = import ../wfvm.nix { inherit 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}";

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

@ -1,7 +1,7 @@
{ 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; };
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}";

0
wfvm.nix → artiq-fast/wfvm.nix
View File

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

@ -5,7 +5,7 @@ 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; };
in in
wfvm.utils.wfvm-run { wfvm.utils.wfvm-run {
name = \"get-conda-packages\"; name = \"get-conda-packages\";

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

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