b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

terraform-full: Fix eval (#167857)

Browse source 
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
This commit is contained in:
Robert Hensing 2022-04-09 11:04:53 +02:00 committed by GitHub
parent f63d377a5f
commit 375eaf2b4f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/applications/networking/cluster/terraform-providers/default.nix
View file

@ -104,5 +104,8 @@ let
ultradns = archived "2022/01";
vthunder = throw "provider was renamed to thunder on 2022/01";
};
# excluding aliases, used by terraform-full
actualProviders = automated-providers // special-providers;
in
automated-providers // special-providers // removed-providers // { inherit mkProvider; }
actualProviders // removed-providers // { inherit actualProviders mkProvider; }

2
pkgs/applications/networking/cluster/terraform/default.nix
View file

@ -85,7 +85,7 @@ let
passthru = {
withPlugins = newplugins:
withPlugins (x: newplugins x ++ actualPlugins);
full = withPlugins (p: lib.filter lib.isDerivation (lib.attrValues p));
full = withPlugins (p: lib.filter lib.isDerivation (lib.attrValues p.actualProviders));
# Expose wrappers around the override* functions of the terraform
# derivation.