From b461721f17d7104c7ef08a0840d80685b9ae853e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon, 12 Mar 2012 21:41:45 +0100
Subject: [PATCH] Fix tests

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

diff --git a/release.nix b/release.nix
index 0d3cd8be98..c1173c30f3 100644
--- a/release.nix
+++ b/release.nix
@@ -1,4 +1,4 @@
-{ nixpkgs ? <nixpkgs>, nixos ? <nixos>
+{ nixpkgs ? <nixpkgs>
 , nix ? { outPath = ./.; revCount = 1234; shortRev = "abcdef"; }
 , officialRelease ? false
 }:
@@ -145,11 +145,11 @@ let
 
     # System tests.
     tests.remote_builds = (import ./tests/remote-builds.nix rec {
-      inherit nixpkgs nixos; nix = build { inherit system; }; system = "x86_64-linux";
+      nix = build { inherit system; }; system = "x86_64-linux";
     }).test;
 
     tests.nix_copy_closure = (import ./tests/nix-copy-closure.nix rec {
-      inherit nixpkgs nixos; nix = build { inherit system; }; system = "x86_64-linux";
+      nix = build { inherit system; }; system = "x86_64-linux";
     }).test;
 
   };
diff --git a/tests/nix-copy-closure.nix b/tests/nix-copy-closure.nix
index 7e2cf3a088..db6103b9cb 100644
--- a/tests/nix-copy-closure.nix
+++ b/tests/nix-copy-closure.nix
@@ -1,8 +1,8 @@
 # Test ‘nix-copy-closure’.
 
-{ nixpkgs, nixos, system, nix }:
+{ system, nix }:
 
-with import "${nixos}/lib/testing.nix" { inherit nixpkgs system; };
+with import <nixos/lib/testing.nix> { inherit system; };
 
 makeTest ({ pkgs, ... }: let pkgA = pkgs.aterm; pkgB = pkgs.wget; in {
 
diff --git a/tests/remote-builds.nix b/tests/remote-builds.nix
index de127b8aee..b0d2547c66 100644
--- a/tests/remote-builds.nix
+++ b/tests/remote-builds.nix
@@ -1,8 +1,8 @@
 # Test Nix's remote build feature.
 
-{ nixpkgs, nixos, system, nix }:
+{ system, nix }:
 
-with import "${nixos}/lib/testing.nix" { inherit nixpkgs system; };
+with import <nixos/lib/testing.nix> { inherit system; };
 
 makeTest ({ pkgs, ... }: