diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 2df84736215..247df9544f5 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -58,6 +58,7 @@ let passthru = { withPlugins = newplugins: withPlugins (x: newplugins x ++ actualPlugins); + full = withPlugins lib.attrValues; # Ouch overrideDerivation = f: (pluggable (terraform.overrideDerivation f)).withPlugins plugins; @@ -93,7 +94,7 @@ in rec { passthru = { inherit plugins; }; }); - terraform_0_11-full = terraform_0_11.withPlugins lib.attrValues; + terraform_0_11-full = terraform_0_11.full; # Tests that the plugins are being used. Terraform looks at the specific # file pattern and if the plugin is not found it will try to download it diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 1fe9ad5ccc8..cb8cae47ab3 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, terraform-full, makeWrapper }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, terraform, makeWrapper }: buildGoPackage rec { name = "terragrunt-${version}"; @@ -23,7 +23,7 @@ buildGoPackage rec { postInstall = '' wrapProgram $bin/bin/terragrunt \ - --set TERRAGRUNT_TFPATH ${lib.getBin terraform-full}/bin/terraform + --set TERRAGRUNT_TFPATH ${lib.getBin terraform.full}/bin/terraform ''; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f1abe1ff798..634eddfadd5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22592,7 +22592,8 @@ with pkgs; ; terraform = terraform_0_11; - terraform-full = terraform_0_11-full; + # deprecated + terraform-full = terraform.full; terraform-providers = recurseIntoAttrs ( callPackage ../applications/networking/cluster/terraform-providers {}