From 607a8fcfee3565e84e67da14227fbed1693217f0 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Wed, 24 Apr 2019 15:17:40 +0800
Subject: [PATCH] fix other uses of artiq-version.nix

---
 artiq/artiq-board.nix       | 2 +-
 artiq/conda-artiq-board.nix | 2 +-
 artiq/conda-artiq.nix       | 2 +-
 main.nix                    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/artiq/artiq-board.nix b/artiq/artiq-board.nix
index 90f31db..dfbbe1e 100644
--- a/artiq/artiq-board.nix
+++ b/artiq/artiq-board.nix
@@ -46,7 +46,7 @@ let
 
 in pkgs.python3Packages.buildPythonPackage rec {
   name = "artiq-board-${target}-${variant}-${version}";
-  version = import ./pkgs/artiq-version.nix;
+  version = import ./pkgs/artiq-version.nix (with pkgs; { inherit stdenv fetchgit git; });
   phases = [ "buildPhase" "installPhase" ];
   buildPhase = 
     ''
diff --git a/artiq/conda-artiq-board.nix b/artiq/conda-artiq-board.nix
index 4368860..f56d4d4 100644
--- a/artiq/conda-artiq-board.nix
+++ b/artiq/conda-artiq-board.nix
@@ -4,7 +4,7 @@
 with pkgs;
 
 let
-  version = import ./pkgs/artiq-version.nix;
+  version = import ./pkgs/artiq-version.nix (with pkgs; { inherit stdenv fetchgit git; });
   fakeCondaSource = runCommand "fake-condasrc-artiq-board-${target}-${variant}" { }
     ''
     mkdir -p $out/fake-conda;
diff --git a/artiq/conda-artiq.nix b/artiq/conda-artiq.nix
index b5d2870..696aa06 100644
--- a/artiq/conda-artiq.nix
+++ b/artiq/conda-artiq.nix
@@ -1,7 +1,7 @@
 { pkgs }:
 
 let
-  version = import ./pkgs/artiq-version.nix;
+  version = import ./pkgs/artiq-version.nix (with pkgs; { inherit stdenv fetchgit git; });
   fakeCondaSource = import ./conda-fake-source.nix { inherit pkgs; } {
     name = "artiq";
     inherit version;
diff --git a/main.nix b/main.nix
index 3b02e99..c8af551 100644
--- a/main.nix
+++ b/main.nix
@@ -31,7 +31,7 @@ let
     echo \"$HASH\" > $out
     '';
   artiqpkgs = import "${generatedNix}/default.nix" { inherit pkgs; };
-  artiqVersion = import "${generatedNix}/pkgs/artiq-version.nix";
+  artiqVersion = import "${generatedNix}/pkgs/artiq-version.nix" (with pkgs; { inherit stdenv fetchgit git; });
   windowsRunner = overrides:
     import "${generatedNix}/windows/run-test.nix" ({
       inherit pkgs;