git.iko.soy/typeable/nixpkgs
on master help sign in
terraform-full: Fix eval (#167857)

https://github.com/NixOS/nixpkgs/pull/166792 made the aliases work, which was unexpected for terraform-full. Thanks to zowoq for reporting https://github.com/NixOS/nixpkgs/pull/166792#issuecomment-1092742313

commit375eaf2b4fce26764ccddf347a0b422a82fe8e2b authorRobert Hensing <roberth@users.noreply.github.com> dateSat 9 Apr 2022, 11:04 (5 years ago) parentf63d377
2 files changed+5−2
pkgs/applications/networking/cluster/terraform-providers/default.nix+4−1 pkgs/applications/networking/cluster/terraform/default.nix+1−1
pkgs/applications/networking/cluster/terraform-providers/default.nix+4−1
@@ -104,5 +104,8 @@ let
104104 ultradns = archived "2022/01";
105105 vthunder = throw "provider was renamed to thunder on 2022/01";
106106 };
107+
108+ # excluding aliases, used by terraform-full
109+ actualProviders = automated-providers // special-providers;
107110in
108−automated-providers // special-providers // removed-providers // { inherit mkProvider; }
111+actualProviders // removed-providers // { inherit actualProviders mkProvider; }
pkgs/applications/networking/cluster/terraform/default.nix+1−1
@@ -85,7 +85,7 @@ let
8585 passthru = {
8686 withPlugins = newplugins:
8787 withPlugins (x: newplugins x ++ actualPlugins);
88− full = withPlugins (p: lib.filter lib.isDerivation (lib.attrValues p));
88+ full = withPlugins (p: lib.filter lib.isDerivation (lib.attrValues p.actualProviders));
8989
9090 # Expose wrappers around the override* functions of the terraform
9191 # derivation.