gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixops_unstable_*: Remove ad-hoc availablePlugins overriding state

Browse Source
This commit is contained in:
Robert Hensing
2024-03-06 22:47:24 +01:00
parent 48150e79c5
commit f5f2ef33fa
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/networking/cluster/nixops/default.nix
+5 -5
View File
@@ -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;