From 48bc991c7cc16852d1e75493d717dcfe3bc5286d Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Sun, 28 Jun 2020 14:50:44 +0800
Subject: [PATCH] move wfvm.nix into artiq-fast

Avoids issue with generatedNix
---
 artiq-fast/conda-windows/binutils.nix       | 2 +-
 artiq-fast/conda-windows/llvm-or1k.nix      | 2 +-
 artiq-fast/conda-windows/llvmlite-artiq.nix | 2 +-
 wfvm.nix => artiq-fast/wfvm.nix             | 0
 artiq-fast/windows/make_conda_packages.sh   | 2 +-
 artiq-fast/windows/run-test.nix             | 2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename wfvm.nix => artiq-fast/wfvm.nix (100%)

diff --git a/artiq-fast/conda-windows/binutils.nix b/artiq-fast/conda-windows/binutils.nix
index 48b45f7..6358ebe 100644
--- a/artiq-fast/conda-windows/binutils.nix
+++ b/artiq-fast/conda-windows/binutils.nix
@@ -1,7 +1,7 @@
 { pkgs, version, src, target }:
 
 let
-  wfvm = import ../../wfvm.nix { inherit pkgs; };
+  wfvm = import ../wfvm.nix { inherit pkgs; };
   libiconv-filename = "libiconv-1.15-h1df5818_7.tar.bz2";
   libiconv = pkgs.fetchurl {
     url = "https://anaconda.org/anaconda/libiconv/1.15/download/win-64/${libiconv-filename}";
diff --git a/artiq-fast/conda-windows/llvm-or1k.nix b/artiq-fast/conda-windows/llvm-or1k.nix
index eefc297..e23140a 100644
--- a/artiq-fast/conda-windows/llvm-or1k.nix
+++ b/artiq-fast/conda-windows/llvm-or1k.nix
@@ -1,7 +1,7 @@
 { pkgs, version, src }:
 
 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 = pkgs.fetchurl {
     url = "https://anaconda.org/anaconda/vs2015_runtime/14.16.27012/download/win-64/${conda-vs2015_runtime-filename}";
diff --git a/artiq-fast/conda-windows/llvmlite-artiq.nix b/artiq-fast/conda-windows/llvmlite-artiq.nix
index 9c9f515..3bfd98a 100644
--- a/artiq-fast/conda-windows/llvmlite-artiq.nix
+++ b/artiq-fast/conda-windows/llvmlite-artiq.nix
@@ -1,7 +1,7 @@
 { pkgs, conda-windows-llvm-or1k, version, src }:
 
 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 = pkgs.fetchurl {
     url = "https://anaconda.org/anaconda/vs2015_runtime/14.16.27012/download/win-64/${conda-vs2015_runtime-filename}";
diff --git a/wfvm.nix b/artiq-fast/wfvm.nix
similarity index 100%
rename from wfvm.nix
rename to artiq-fast/wfvm.nix
diff --git a/artiq-fast/windows/make_conda_packages.sh b/artiq-fast/windows/make_conda_packages.sh
index d39090f..4cf32d8 100755
--- a/artiq-fast/windows/make_conda_packages.sh
+++ b/artiq-fast/windows/make_conda_packages.sh
@@ -5,7 +5,7 @@ set -e
 nix-build -E "
 let
   pkgs = import <nixpkgs> {};
-  wfvm = import ../../wfvm.nix { inherit pkgs; };
+  wfvm = import ../wfvm.nix { inherit pkgs; };
 in
   wfvm.utils.wfvm-run {
     name = \"get-conda-packages\";
diff --git a/artiq-fast/windows/run-test.nix b/artiq-fast/windows/run-test.nix
index 85a1d6b..1c09ed9 100644
--- a/artiq-fast/windows/run-test.nix
+++ b/artiq-fast/windows/run-test.nix
@@ -10,7 +10,7 @@ let
       inherit port;
     }) tcpPorts;
 
-  wfvm = import ../../wfvm.nix { inherit pkgs; };
+  wfvm = import ../wfvm.nix { inherit pkgs; };
   conda-deps = {
     name = "conda-deps";
     script = let