Use the Disnix package reference from the release jobset. Don't refer…

… back
svanderburg · Jun 16, 2016 · 196ce64 · 196ce64
1 parent a9aed89
commit 196ce64
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 19 deletions.
diff --git a/release.nix b/release.nix
@@ -91,23 +91,23 @@ let
       in
       {
         install = import ./tests/install.nix {
-          inherit nixpkgs dysnomia;
+          inherit nixpkgs dysnomia disnix;
         };
         deployment = import ./tests/deployment.nix {
-          inherit nixpkgs dysnomia;
+          inherit nixpkgs dysnomia disnix;
         };
         distbuild = import ./tests/distbuild.nix {
-          inherit nixpkgs dysnomia;
+          inherit nixpkgs dysnomia disnix;
         };
         snapshots = import ./tests/snapshots.nix {
-          inherit nixpkgs dysnomia;
+          inherit nixpkgs dysnomia disnix;
           inherit (pkgs) stdenv;
         };
         datamigration = import ./tests/datamigration.nix {
-          inherit nixpkgs dysnomia;
+          inherit nixpkgs dysnomia disnix;
         };
         pkgs = import ./tests/pkgs.nix {
-          inherit nixpkgs dysnomia;
+          inherit nixpkgs dysnomia disnix;
         };
       };
 

diff --git a/tests/datamigration.nix b/tests/datamigration.nix
@@ -1,8 +1,8 @@
-{nixpkgs, dysnomia}:
+{nixpkgs, dysnomia, disnix}:
 
 let
   snapshotTests = ./snapshots;
-  machine = import ./machine.nix { inherit dysnomia; };
+  machine = import ./machine.nix { inherit dysnomia disnix; };
 in
 with import "${nixpkgs}/nixos/lib/testing.nix" { system = builtins.currentSystem; };
 

diff --git a/tests/deployment.nix b/tests/deployment.nix
@@ -1,8 +1,8 @@
-{nixpkgs, dysnomia}:
+{nixpkgs, dysnomia, disnix}:
 
 let
   manifestTests = ./manifest;
-  machine = import ./machine.nix { inherit dysnomia; };
+  machine = import ./machine.nix { inherit dysnomia disnix; };
 in
 with import "${nixpkgs}/nixos/lib/testing.nix" { system = builtins.currentSystem; };
 

diff --git a/tests/distbuild.nix b/tests/distbuild.nix
@@ -1,8 +1,8 @@
-{nixpkgs, dysnomia}:
+{nixpkgs, dysnomia, disnix}:
 
 let
   manifestTests = ./manifest;
-  machine = import ./machine.nix { inherit dysnomia; };
+  machine = import ./machine.nix { inherit dysnomia disnix; };
 in
 with import "${nixpkgs}/nixos/lib/testing.nix" { system = builtins.currentSystem; };
 

diff --git a/tests/install.nix b/tests/install.nix
@@ -1,8 +1,8 @@
-{nixpkgs, dysnomia}:
+{nixpkgs, dysnomia, disnix}:
 
 let
   manifestTests = ./manifest;
-  machine = import ./machine.nix { inherit dysnomia; };
+  machine = import ./machine.nix { inherit dysnomia disnix; };
 in
 with import "${nixpkgs}/nixos/lib/testing.nix" { system = builtins.currentSystem; };
 

diff --git a/tests/machine.nix b/tests/machine.nix
@@ -1,4 +1,4 @@
-{dysnomia}:
+{dysnomia, disnix}:
 {config, pkgs, ...}:
 
 {
@@ -8,6 +8,7 @@
   virtualisation.pathsInNixDB = [ pkgs.stdenv ];
 
   services.disnixTest.enable = true;
+  services.disnixTest.package = disnix;
   services.disnixTest.dysnomia = dysnomia;
 
   users.extraUsers = [

diff --git a/tests/pkgs.nix b/tests/pkgs.nix
@@ -1,8 +1,8 @@
-{nixpkgs, dysnomia}:
+{nixpkgs, dysnomia, disnix}:
 
 let
   pkgsTests = ./pkgs;
-  machine = import ./machine.nix { inherit dysnomia; };
+  machine = import ./machine.nix { inherit dysnomia disnix; };
 in
 with import "${nixpkgs}/nixos/lib/testing.nix" { system = builtins.currentSystem; };
 

diff --git a/tests/snapshots.nix b/tests/snapshots.nix
@@ -1,8 +1,8 @@
-{nixpkgs, stdenv, dysnomia}:
+{nixpkgs, stdenv, dysnomia, disnix}:
 
 let
   manifestTests = ./manifest;
-  machine = import ./machine.nix { inherit dysnomia; };
+  machine = import ./machine.nix { inherit dysnomia disnix; };
   wrapper = import ./snapshots/wrapper.nix { inherit stdenv dysnomia; } {};
 in
 with import "${nixpkgs}/nixos/lib/testing.nix" { system = builtins.currentSystem; };