From e4493addd8a4d36ca65416c1372ab46acb6b20d0 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Fri, 3 May 2019 23:25:49 +0200
Subject: [PATCH] pass nixos path explicitly

---
 ci.nix              | 8 ++++++--
 modules/testing.nix | 8 ++++----
 release.nix         | 5 +++--
 tests/default.nix   | 3 ++-
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/ci.nix b/ci.nix
index ec99ff8..41fa5ea 100644
--- a/ci.nix
+++ b/ci.nix
@@ -1,7 +1,11 @@
 let
-  pkgs = import (builtins.fetchTarball "https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz") {};
+  nixpkgsSrc = builtins.fetchTarball "https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz";
+  pkgs = import nixpkgsSrc {};
 
   lib = pkgs.lib;
 
-  release = import ./release.nix { inherit pkgs lib; };
+  release = import ./release.nix {
+    inherit pkgs lib;
+    nixosPath = "${nixpkgsSrc}/nixos";
+  };
 in with lib; release.test-results
diff --git a/modules/testing.nix b/modules/testing.nix
index 6653ce5..b2d089c 100644
--- a/modules/testing.nix
+++ b/modules/testing.nix
@@ -1,16 +1,16 @@
-{ config, pkgs, lib, kubenix, ... }:
+{ nixosPath, config, pkgs, lib, kubenix, ... }:
 
 with lib;
 
 let
   cfg = config.testing;
 
-  nixosTesting = import <nixpkgs/nixos/lib/testing.nix> {
+  nixosTesting = import "${nixosPath}/lib/testing.nix" {
     inherit pkgs;
     system = "x86_64-linux";
   };
 
-  kubernetesBaseConfig = { config, pkgs, lib, nodes, ... }: let
+  kubernetesBaseConfig = { modulesPath, config, pkgs, lib, nodes, ... }: let
     master = findFirst
       (node: any (role: role == "master") node.config.services.kubernetes.roles)
       (throw "no master node")
@@ -23,7 +23,7 @@ let
         (attrValues nodes)}
     '';
   in {
-    imports = [ <nixpkgs/nixos/modules/profiles/minimal.nix> ];
+    imports = [ "${toString modulesPath}/profiles/minimal.nix" ];
 
     config = mkMerge [{
       boot.postBootCommands = "rm -fr /var/lib/kubernetes/secrets /tmp/shared/*";
diff --git a/release.nix b/release.nix
index d11cf67..e71297b 100644
--- a/release.nix
+++ b/release.nix
@@ -1,4 +1,5 @@
-{ pkgs ? import <nixpkgs> {}, lib ? pkgs.lib, e2e ? true, throwError ? true }:
+{ pkgs ? import <nixpkgs> {}, nixosPath ? <nixpkgs/nixos>, lib ? pkgs.lib
+, e2e ? true, throwError ? true }:
 
 with lib;
 
@@ -19,7 +20,7 @@ let
   };
 
   runK8STests = k8sVersion: pkgs.recurseIntoAttrs (import ./tests {
-    inherit pkgs lib kubenix k8sVersion e2e throwError;
+    inherit pkgs lib kubenix k8sVersion e2e throwError nixosPath;
   });
 in rec {
   generate.k8s = pkgs.linkFarm "k8s-generated.nix" [{
diff --git a/tests/default.nix b/tests/default.nix
index c6c59e8..5912a47 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -2,6 +2,7 @@
 , lib ? pkgs.lib
 , kubenix ? import ../. { inherit pkgs lib; }
 , k8sVersion ? "1.13"
+, nixosPath ? <nixpkgs/nixos>
 
 # whether any testing error should throw an error
 , throwError ? true
@@ -43,7 +44,7 @@ let
       inherit pkgs;
     };
     specialArgs = {
-      inherit kubenix;
+      inherit kubenix nixosPath;
     };
   }).config;
 in test.testing