nixops_unstable*: Make withPlugins.*.tests.nixos behave correctly

2 files changed, 9 insertions, 3 deletions

diff --git a/pkgs/applications/networking/cluster/nixops/default.nix b/pkgs/applications/networking/cluster/nixops/default.nix
index da9783b9a6eb1..6bdbebb8eb6d1 100644
--- a/pkgs/applications/networking/cluster/nixops/default.nix
+++ b/pkgs/applications/networking/cluster/nixops/default.nix
@@ -28,8 +28,8 @@ let
   # selector is a function mapping pythonPackages to a list of plugins
   # e.g. nixops_unstable.withPlugins (ps: with ps; [ nixops-aws ])
   withPlugins = selector: let
-    selected = selector (plugins python.pkgs);
-  in python.pkgs.toPythonApplication (python.pkgs.nixops.overridePythonAttrs (old: {
+   selected = selector (plugins python.pkgs);
+   r = python.pkgs.toPythonApplication (python.pkgs.nixops.overridePythonAttrs (old: {
     propagatedBuildInputs = old.propagatedBuildInputs ++ selected;
 
     # Propagating dependencies leaks them through $PYTHONPATH which causes issues
@@ -41,8 +41,14 @@ let
     passthru = old.passthru // {
       plugins = plugins python.pkgs;
       inherit withPlugins python;
+      tests = old.passthru.tests // {
+        nixos = old.passthru.tests.nixos.passthru.override {
+          nixopsPkg = r;
+        };
+      };
     };
   }));
+  in r;
 
 in {
   nixops_unstable_minimal = withPlugins (ps: []);
diff --git a/pkgs/applications/networking/cluster/nixops/unwrapped.nix b/pkgs/applications/networking/cluster/nixops/unwrapped.nix
index 34cbf09491546..058f7f2d2c1c9 100644
--- a/pkgs/applications/networking/cluster/nixops/unwrapped.nix
+++ b/pkgs/applications/networking/cluster/nixops/unwrapped.nix
@@ -50,7 +50,7 @@ buildPythonApplication rec {
   pythonImportsCheck = [ "nixops" ];
 
   passthru = {
-    tests.nixops = nixosTests.nixops.unstable;
+    tests.nixos = nixosTests.nixops.unstable;
     updateScript = unstableGitUpdater {};
   };