summary refs log tree commit diff
path: root/pkgs/test
diff options
context:
space:
mode:
authorRobert Hensing <robert@roberthensing.nl>2018-10-23 17:32:59 +0200
committerRobert Hensing <robert@roberthensing.nl>2018-11-13 10:43:05 +0100
commit5d594d764ebc488075596fbfccdc9baf95925bb1 (patch)
treee8ba842a04bed00ae89e2e941b1d3dc91e630ecc /pkgs/test
parent933c95c0f40973bd72f1e46767d001a8f1860f40 (diff)
downloadnixpkgs-5d594d764ebc488075596fbfccdc9baf95925bb1.tar
nixpkgs-5d594d764ebc488075596fbfccdc9baf95925bb1.tar.gz
nixpkgs-5d594d764ebc488075596fbfccdc9baf95925bb1.tar.bz2
nixpkgs-5d594d764ebc488075596fbfccdc9baf95925bb1.tar.lz
nixpkgs-5d594d764ebc488075596fbfccdc9baf95925bb1.tar.xz
nixpkgs-5d594d764ebc488075596fbfccdc9baf95925bb1.tar.zst
nixpkgs-5d594d764ebc488075596fbfccdc9baf95925bb1.zip
tests: Don't use pkgs.extend. OfBorg will reject it.
The good news is that it worked as expected.
Diffstat (limited to 'pkgs/test')
-rw-r--r--pkgs/test/nixos-functions/default.nix16
1 files changed, 3 insertions, 13 deletions
diff --git a/pkgs/test/nixos-functions/default.nix b/pkgs/test/nixos-functions/default.nix
index 3f345152539..a53157066bb 100644
--- a/pkgs/test/nixos-functions/default.nix
+++ b/pkgs/test/nixos-functions/default.nix
@@ -8,20 +8,10 @@ lib.optionalAttrs stdenv.hostPlatform.isLinux (
       fileSystems."/".device = "/dev/null";
     }).toplevel;
 
-    nixosTest-test = let
-      # extend pkgs with an extra overlay to make sure pkgs is passed along properly to machines.
-      altPkgs = pkgs.extend (self: super: {
-        # To test pkgs in machine
-        hello_s9e8ghsi = self.hello;
-        # To test lib in test
-        lib = super.lib // { testSubject_dohra8w = "nixosTest"; };
-        # To test pkgs in test
-        dash-test_ny3dseg = "-test";
-       });
-    in altPkgs.nixosTest ({ lib, pkgs, ... }: {
-      name = "${lib.testSubject_dohra8w}${pkgs.dash-test_ny3dseg}"; # These would fail if it's the wrong pkgs or lib
+    nixosTest-test = pkgs.nixosTest ({ lib, pkgs, ... }: {
+      name = "nixosTest-test";
       machine = { pkgs, ... }: {
-        environment.systemPackages = [ pkgs.hello_s9e8ghsi ];
+        environment.systemPackages = [ pkgs.hello ];
       };
       testScript = ''
         $machine->succeed("hello");