From 7b7f782c93fafe2c42f882b933cf49ba99e3e3bc Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Tue, 3 Apr 2018 04:00:20 +0200
Subject: tests: Properly propagate nixpkgs path

Yet another occasion where we import nixpkgs-path.nix unconditionally,
so let's actually pass a nixpkgsPath to every test function.

Signed-off-by: aszlig <aszlig@nix.build>
---
 tests/games/starbound.nix        | 4 ++--
 tests/make-test.nix              | 1 +
 tests/programs/gnupg/default.nix | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'tests')

diff --git a/tests/games/starbound.nix b/tests/games/starbound.nix
index 5f545fe0..0be34309 100644
--- a/tests/games/starbound.nix
+++ b/tests/games/starbound.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, nixpkgsPath, ... }:
 
 let
   xdo = { name, description, xdoScript }: let
@@ -55,7 +55,7 @@ in {
 
     client = { pkgs, ... }: {
       imports = [
-        "${import ../../nixpkgs-path.nix}/nixos/tests/common/x11.nix"
+        "${nixpkgsPath.nix}/nixos/tests/common/x11.nix"
       ];
       virtualisation.memorySize = 2047;
       environment.systemPackages = [
diff --git a/tests/make-test.nix b/tests/make-test.nix
index 6015023d..4534b991 100644
--- a/tests/make-test.nix
+++ b/tests/make-test.nix
@@ -17,6 +17,7 @@ testFun:
     pkgs = pkgs // {
       vuizvui = import ../pkgs { inherit pkgs; };
     };
+    inherit nixpkgsPath;
   }) else testFun;
 
   nodes = testArgs.nodes or (if testArgs ? machine then {
diff --git a/tests/programs/gnupg/default.nix b/tests/programs/gnupg/default.nix
index 24756a3e..43ba9f05 100644
--- a/tests/programs/gnupg/default.nix
+++ b/tests/programs/gnupg/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, nixpkgsPath, ... }:
 
 let
   mkExpect = expectScript: script: pkgs.writeScript "test-gnupg-cli" ''
@@ -27,7 +27,7 @@ in {
 
   machine = { lib, ... }: {
     imports = map (what:
-      "${import ../../../nixpkgs-path.nix}/nixos/tests/common/${what}.nix"
+      "${nixpkgsPath}/nixos/tests/common/${what}.nix"
     ) [ "user-account" "x11" ];
 
     services.openssh.enable = true;
-- 
cgit 1.4.1