-
-
Notifications
You must be signed in to change notification settings - Fork 14.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #292099 from hercules-ci/update-nixops_unstable
nixops_unstable to nixops_unstable_minimal.withPlugins migration + update
- Loading branch information
Showing
6 changed files
with
138 additions
and
61 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
167 changes: 116 additions & 51 deletions
167
pkgs/applications/networking/cluster/nixops/default.nix
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,56 +1,121 @@ | ||
| { python3 }: | ||
| { lib, python3, emptyFile }: | ||
|
|
||
| let | ||
| python = python3.override { | ||
| packageOverrides = self: super: { | ||
| nixops = self.callPackage ./unwrapped.nix { }; | ||
| } // (plugins self); | ||
| }; | ||
| inherit (lib) extends; | ||
|
|
||
| plugins = ps: with ps; rec { | ||
| nixops-aws = callPackage ./plugins/nixops-aws.nix { }; | ||
| nixops-digitalocean = callPackage ./plugins/nixops-digitalocean.nix { }; | ||
| nixops-encrypted-links = callPackage ./plugins/nixops-encrypted-links.nix { }; | ||
| nixops-gce = callPackage ./plugins/nixops-gce.nix { }; | ||
| nixops-hercules-ci = callPackage ./plugins/nixops-hercules-ci.nix { }; | ||
| nixops-hetzner = callPackage ./plugins/nixops-hetzner.nix { }; | ||
| nixops-hetznercloud = callPackage ./plugins/nixops-hetznercloud.nix { }; | ||
| nixops-libvirtd = callPackage ./plugins/nixops-libvirtd.nix { }; | ||
| nixops-vbox = callPackage ./plugins/nixops-vbox.nix { }; | ||
| nixos-modules-contrib = callPackage ./plugins/nixos-modules-contrib.nix { }; | ||
|
|
||
| # aliases for backwards compatibility | ||
| nixops-gcp = nixops-gce; | ||
| nixops-virtd = nixops-libvirtd; | ||
| nixopsvbox = nixops-vbox; | ||
| }; | ||
| # doc: https://github.com/NixOS/nixpkgs/pull/158781/files#diff-854251fa1fe071654921224671c8ba63c95feb2f96b2b3a9969c81676780053a | ||
| encapsulate = layerZero: | ||
| let | ||
| fixed = layerZero ({ extend = f: encapsulate (extends f layerZero); } // fixed); | ||
| in fixed.public; | ||
|
|
||
| nixopsContextBase = this: { | ||
|
|
||
| python = python3.override { | ||
| packageOverrides = self: super: { | ||
| nixops = self.callPackage ./unwrapped.nix { }; | ||
| } // (this.plugins self super); | ||
| }; | ||
|
|
||
| plugins = ps: _super: with ps; rec { | ||
| nixops-aws = callPackage ./plugins/nixops-aws.nix { }; | ||
| nixops-digitalocean = callPackage ./plugins/nixops-digitalocean.nix { }; | ||
| nixops-encrypted-links = callPackage ./plugins/nixops-encrypted-links.nix { }; | ||
| nixops-gce = callPackage ./plugins/nixops-gce.nix { }; | ||
| nixops-hercules-ci = callPackage ./plugins/nixops-hercules-ci.nix { }; | ||
| nixops-hetzner = callPackage ./plugins/nixops-hetzner.nix { }; | ||
| nixops-hetznercloud = callPackage ./plugins/nixops-hetznercloud.nix { }; | ||
| nixops-libvirtd = callPackage ./plugins/nixops-libvirtd.nix { }; | ||
| nixops-vbox = callPackage ./plugins/nixops-vbox.nix { }; | ||
| nixos-modules-contrib = callPackage ./plugins/nixos-modules-contrib.nix { }; | ||
|
|
||
| # aliases for backwards compatibility | ||
| nixops-gcp = nixops-gce; | ||
| nixops-virtd = nixops-libvirtd; | ||
| nixopsvbox = nixops-vbox; | ||
| }; | ||
|
|
||
| # We should not reapply the overlay, but it tends to work out. (It's been this way since poetry2nix was dropped.) | ||
| availablePlugins = this.plugins this.python.pkgs this.python.pkgs; | ||
|
|
||
| selectedPlugins = []; | ||
|
|
||
| # 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: { | ||
| propagatedBuildInputs = old.propagatedBuildInputs ++ selected; | ||
|
|
||
| # Propagating dependencies leaks them through $PYTHONPATH which causes issues | ||
| # when used in nix-shell. | ||
| postFixup = '' | ||
| rm $out/nix-support/propagated-build-inputs | ||
| ''; | ||
|
|
||
| passthru = old.passthru // { | ||
| plugins = plugins python.pkgs; | ||
| inherit withPlugins python; | ||
| # selector is a function mapping pythonPackages to a list of plugins | ||
| # e.g. nixops_unstable.withPlugins (ps: with ps; [ nixops-aws ]) | ||
| withPlugins = selector: | ||
| this.extend (this: _old: { | ||
| selectedPlugins = selector this.availablePlugins; | ||
| }); | ||
|
|
||
| rawPackage = this.python.pkgs.toPythonApplication (this.python.pkgs.nixops.overridePythonAttrs (old: { | ||
| propagatedBuildInputs = old.propagatedBuildInputs ++ this.selectedPlugins; | ||
|
|
||
| # Propagating dependencies leaks them through $PYTHONPATH which causes issues | ||
| # when used in nix-shell. | ||
| postFixup = '' | ||
| rm $out/nix-support/propagated-build-inputs | ||
| ''; | ||
| })); | ||
|
|
||
| # Extra package attributes that aren't derivation attributes, just like `mkDerivation`'s `passthru`. | ||
| extraPackageAttrs = { | ||
| inherit (this) selectedPlugins availablePlugins withPlugins python; | ||
| tests = this.rawPackage.tests // { | ||
| nixos = this.rawPackage.tests.nixos.passthru.override { | ||
| nixopsPkg = this.rawPackage; | ||
| }; | ||
| commutative_addAvailablePlugins_withPlugins = | ||
| assert | ||
| (this.public.addAvailablePlugins (self: super: { inherit emptyFile; })).withPlugins (ps: [ emptyFile ]) | ||
| == | ||
| # Note that this value proves that the package is not instantiated until the end, where it's valid again. | ||
| (this.public.withPlugins (ps: [ emptyFile ])).addAvailablePlugins (self: super: { inherit emptyFile; }); | ||
| emptyFile; | ||
| } | ||
| # Make sure we also test with a configuration that's been extended with a plugin. | ||
| // lib.optionalAttrs (this.selectedPlugins == [ ]) { | ||
| withAPlugin = | ||
| lib.recurseIntoAttrs | ||
| (this.withPlugins (ps: with ps; [ nixops-encrypted-links ])).tests; | ||
| }; | ||
| overrideAttrs = f: this.extend (this: oldThis: { | ||
| rawPackage = oldThis.rawPackage.overrideAttrs f; | ||
| }); | ||
| /** | ||
| * nixops.addAvailablePlugins: Overlay -> Package | ||
| * | ||
| * Add available plugins to the package. You probably also want to enable | ||
| * them with the `withPlugins` method. | ||
| */ | ||
| addAvailablePlugins = newPlugins: this.extend (finalThis: oldThis: { | ||
| plugins = lib.composeExtensions oldThis.plugins newPlugins; | ||
| }); | ||
|
|
||
| # For those who need or dare. | ||
| internals = this; | ||
| }; | ||
| })); | ||
| in withPlugins (ps: [ | ||
| ps.nixops-aws | ||
| ps.nixops-digitalocean | ||
| ps.nixops-encrypted-links | ||
| ps.nixops-gce | ||
| ps.nixops-hercules-ci | ||
| ps.nixops-hetzner | ||
| ps.nixops-hetznercloud | ||
| ps.nixops-libvirtd | ||
| ps.nixops-vbox | ||
| ]) | ||
|
|
||
| package = lib.lazyDerivation { outputs = [ "out" "dist" ]; derivation = this.rawPackage; } // this.extraPackageAttrs; | ||
|
|
||
| public = this.package; | ||
| }; | ||
|
|
||
| minimal = encapsulate nixopsContextBase; | ||
|
|
||
| in | ||
| { | ||
| nixops_unstable_minimal = minimal; | ||
|
|
||
| # Not recommended; too fragile. | ||
| nixops_unstable_full = minimal.withPlugins (ps: [ | ||
| ps.nixops-aws | ||
| ps.nixops-digitalocean | ||
| ps.nixops-encrypted-links | ||
| ps.nixops-gce | ||
| ps.nixops-hercules-ci | ||
| ps.nixops-hetzner | ||
| ps.nixops-hetznercloud | ||
| ps.nixops-libvirtd | ||
| ps.nixops-vbox | ||
| ]); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters