diff options
author | Robert Hensing <robert@roberthensing.nl> | 2024-02-28 22:38:45 +0100 |
---|---|---|
committer | Robert Hensing <robert@roberthensing.nl> | 2024-03-06 22:47:24 +0100 |
commit | f5f2ef33fad2f550a833d754edc96686be66adf8 (patch) | |
tree | 28d11fc94072a94452992e3b5c0aebb2329bdc4f /pkgs/applications/networking/cluster/nixops/default.nix | |
parent | 48150e79c52b4f212ddf608d85b242c0a957fc2b (diff) |
nixops_unstable_*: Remove ad-hoc availablePlugins overriding state
Diffstat (limited to 'pkgs/applications/networking/cluster/nixops/default.nix')
-rw-r--r-- | pkgs/applications/networking/cluster/nixops/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/networking/cluster/nixops/default.nix b/pkgs/applications/networking/cluster/nixops/default.nix index ad3caf0d9dbfd..f8373efdfecf6 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; |