From f5f2ef33fad2f550a833d754edc96686be66adf8 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Wed, 28 Feb 2024 22:38:45 +0100
Subject: [PATCH] nixops_unstable_*: Remove ad-hoc availablePlugins overriding
 state

---
 .../applications/networking/cluster/nixops/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/cluster/nixops/default.nix b/pkgs/applications/networking/cluster/nixops/default.nix
index ad3caf0d9dbf..f8373efdfecf 100644
--- a/pkgs/applications/networking/cluster/nixops/default.nix
+++ b/pkgs/applications/networking/cluster/nixops/default.nix
@@ -35,13 +35,13 @@ let
       nixopsvbox = nixops-vbox;
     };
 
-    withPlugins = this.withPlugins' { availablePlugins = this.plugins this.python.pkgs; };
+    availablePlugins = this.plugins this.python.pkgs;
 
     # selector is a function mapping pythonPackages to a list of plugins
     # e.g. nixops_unstable.withPlugins (ps: with ps; [ nixops-aws ])
-    withPlugins' = { availablePlugins }: selector:
+    withPlugins = selector:
       let
-        selectedPlugins = selector availablePlugins;
+        selectedPlugins = selector this.availablePlugins;
         r = this.python.pkgs.toPythonApplication (this.python.pkgs.nixops.overridePythonAttrs (old: {
           propagatedBuildInputs = old.propagatedBuildInputs ++ selectedPlugins;
 
@@ -52,8 +52,8 @@ let
           '';
 
           passthru = old.passthru // {
-            inherit availablePlugins selectedPlugins;
-            inherit (this) withPlugins python;
+            inherit selectedPlugins;
+            inherit (this) availablePlugins withPlugins python;
             tests = old.passthru.tests // {
               nixos = old.passthru.tests.nixos.passthru.override {
                 nixopsPkg = r;