From 4798d7a4d22843b060f197eb8fadc54bc327d618 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 17 Nov 2006 16:38:24 +0000
Subject: [PATCH] * Use the same Nix consistently.

svn path=/nixu/trunk/; revision=7067
---
 test/boot-environment.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/test/boot-environment.nix b/test/boot-environment.nix
index 59fe96634e6..04434f69894 100644
--- a/test/boot-environment.nix
+++ b/test/boot-environment.nix
@@ -25,6 +25,8 @@ rec {
     allPackages = import ./pkgs/top-level/all-packages.nix;
   };
 
+  nix = pkgs.nixUnstable; # we need the exportReferencesGraph feature
+
 
   # Determine the set of modules that we need to mount the root FS.
   modulesClosure = import ./modules-closure.nix {
@@ -70,7 +72,8 @@ rec {
   # The installer.
   nixosInstaller = import ./installer.nix {
     inherit (pkgs) stdenv genericSubstituter;
-    nix = pkgs.nixUnstable; # needs the exportReferencesGraph feature
+    inherit nix;
+    nix = pkgs.nixUnstable; 
     shell = pkgs.bash + "/bin/sh";
   };
 
@@ -100,7 +103,6 @@ rec {
       pkgs.less
       pkgs.nano
       pkgs.netcat
-      pkgs.nix
       pkgs.perl
       pkgs.procps
       pkgs.rsync
@@ -109,6 +111,7 @@ rec {
       pkgs.sysklogd
       pkgs.sysvinit
 #      pkgs.vim
+      nix
       nixosInstaller
     ];