From fb5d76b89e8b0084fb147d79af5481e09b889386 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Apr 2014 15:32:27 +0200
Subject: [PATCH] Fix test evaluation

---
 tests/nix-copy-closure.nix | 6 +++---
 tests/remote-builds.nix    | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/nix-copy-closure.nix b/tests/nix-copy-closure.nix
index 66c19a45d4..bfd708404d 100644
--- a/tests/nix-copy-closure.nix
+++ b/tests/nix-copy-closure.nix
@@ -4,14 +4,14 @@
 
 with import <nixpkgs/nixos/lib/testing.nix> { inherit system; };
 
-makeTest ({ pkgs, ... }: let pkgA = pkgs.aterm; pkgB = pkgs.wget; in {
+makeTest (let pkgA = pkgs.aterm; pkgB = pkgs.wget; in {
 
   nodes =
     { client =
         { config, pkgs, ... }:
         { virtualisation.writableStore = true;
           virtualisation.pathsInNixDB = [ pkgA ];
-          environment.nix = nix;
+          nix.package = nix;
         };
 
       server =
@@ -19,7 +19,7 @@ makeTest ({ pkgs, ... }: let pkgA = pkgs.aterm; pkgB = pkgs.wget; in {
         { services.openssh.enable = true;
           virtualisation.writableStore = true;
           virtualisation.pathsInNixDB = [ pkgB ];
-          environment.nix = nix;
+          nix.package = nix;
         };
     };
 
diff --git a/tests/remote-builds.nix b/tests/remote-builds.nix
index 56514e1749..571cdfbdd2 100644
--- a/tests/remote-builds.nix
+++ b/tests/remote-builds.nix
@@ -4,7 +4,7 @@
 
 with import <nixpkgs/nixos/lib/testing.nix> { inherit system; };
 
-makeTest ({ pkgs, ... }:
+makeTest (
 
 let
 
@@ -57,7 +57,7 @@ in
             ];
           virtualisation.writableStore = true;
           virtualisation.pathsInNixDB = [ config.system.build.extraUtils ];
-          environment.nix = nix;
+          nix.package = nix;
         };
     };