diff options
Diffstat (limited to 'pkgs/applications/networking')
-rw-r--r-- | pkgs/applications/networking/cluster/terraform-providers/data.nix (renamed from pkgs/applications/networking/cluster/terraform/providers/data.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/networking/cluster/terraform-providers/default.nix (renamed from pkgs/applications/networking/cluster/terraform/providers/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/networking/cluster/terraform-providers/providers.txt (renamed from pkgs/applications/networking/cluster/terraform/providers/providers.txt) | 0 | ||||
-rwxr-xr-x | pkgs/applications/networking/cluster/terraform-providers/update-all (renamed from pkgs/applications/networking/cluster/terraform/providers/update-all) | 0 | ||||
-rw-r--r-- | pkgs/applications/networking/cluster/terraform/default.nix | 11 |
5 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/applications/networking/cluster/terraform/providers/data.nix b/pkgs/applications/networking/cluster/terraform-providers/data.nix index fead9af601f7..fead9af601f7 100644 --- a/pkgs/applications/networking/cluster/terraform/providers/data.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/data.nix diff --git a/pkgs/applications/networking/cluster/terraform/providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index a535ab06f453..a535ab06f453 100644 --- a/pkgs/applications/networking/cluster/terraform/providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix diff --git a/pkgs/applications/networking/cluster/terraform/providers/providers.txt b/pkgs/applications/networking/cluster/terraform-providers/providers.txt index d0c4a6505981..d0c4a6505981 100644 --- a/pkgs/applications/networking/cluster/terraform/providers/providers.txt +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.txt diff --git a/pkgs/applications/networking/cluster/terraform/providers/update-all b/pkgs/applications/networking/cluster/terraform-providers/update-all index 2009d474db7b..2009d474db7b 100755 --- a/pkgs/applications/networking/cluster/terraform/providers/update-all +++ b/pkgs/applications/networking/cluster/terraform-providers/update-all diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 1a88fea3d775..767eb94454d8 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -1,4 +1,11 @@ -{ stdenv, lib, buildEnv, buildGoPackage, fetchFromGitHub, makeWrapper }: +{ stdenv +, lib +, buildEnv +, buildGoPackage +, fetchFromGitHub +, makeWrapper +, terraform-providers +}: let goPackagePath = "github.com/hashicorp/terraform"; @@ -75,7 +82,7 @@ let }); in withPlugins (_: []); - plugins = import ./providers { inherit lib buildGoPackage fetchFromGitHub; }; + plugins = removeAttrs terraform-providers ["override" "overrideDerivation" "recurseForDerivations"]; in rec { terraform_0_8_5 = generic { version = "0.8.5"; |