diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index a281505e0ec6..9bc29755ddb9 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -168,29 +168,6 @@ rec { # Constructor for other terraform versions mkTerraform = attrs: pluggable (generic attrs); - terraform_0_13 = mkTerraform { - version = "0.13.7"; - sha256 = "1cahnmp66dk21g7ga6454yfhaqrxff7hpwpdgc87cswyq823fgjn"; - patches = [ ./provider-path.patch ]; - passthru = { inherit plugins; }; - }; - - terraform_0_14 = mkTerraform { - version = "0.14.11"; - sha256 = "1yi1jj3n61g1kn8klw6l78shd23q79llb7qqwigqrx3ki2mp279j"; - vendorSha256 = "sha256-tWrSr6JCS9s+I0T1o3jgZ395u8IBmh73XGrnJidWI7U="; - patches = [ ./provider-path.patch ]; - passthru = { inherit plugins; }; - }; - - terraform_0_15 = mkTerraform { - version = "0.15.5"; - sha256 = "18f4a6l24s3cym7gk40agxikd90i56q84wziskw1spy9rgv2yx6d"; - vendorSha256 = "sha256-oFvoEsDunJR4IULdGwS6nHBKWEgUehgT+nNM41W/GYo="; - patches = [ ./provider-path-0_15.patch ]; - passthru = { inherit plugins; }; - }; - terraform_1 = mkTerraform { version = "1.2.3"; sha256 = "sha256-hkPlufjlvmI5tKz1VTY5RztuDKEsgjrLR+f7HRrJmkA="; diff --git a/pkgs/applications/networking/cluster/terraform/provider-path.patch b/pkgs/applications/networking/cluster/terraform/provider-path.patch deleted file mode 100644 index 39a69e4a389f..000000000000 --- a/pkgs/applications/networking/cluster/terraform/provider-path.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/command/init.go b/command/init.go -index 403ca245b..05d98329a 100644 ---- a/command/init.go -+++ b/command/init.go -@@ -64,6 +64,11 @@ func (c *InitCommand) Run(args []string) int { - return 1 - } - -+ val, ok := os.LookupEnv("NIX_TERRAFORM_PLUGIN_DIR") -+ if ok { -+ flagPluginPath = append(flagPluginPath, val) -+ } -+ - if len(flagPluginPath) > 0 { - c.pluginPath = flagPluginPath - c.getPlugins = false diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ba811bbcc3e1..11aa7b335e53 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1370,6 +1370,9 @@ mapAliases ({ telepathy_qt5 = throw "'telepathy_qt5' has been renamed to/replaced by 'libsForQt5.telepathy'"; # Converted to throw 2022-02-22 telnet = throw "'telnet' has been renamed to/replaced by 'inetutils'"; # Converted to throw 2022-02-22 terminus = throw "terminus has been removed, it was unmaintained in nixpkgs"; # Added 2021-08-21 + terraform_0_13 = throw "terraform_0_13 has been removed from nixpkgs"; # Added 2022-06-26 + terraform_0_14 = throw "terraform_0_14 has been removed from nixpkgs"; # Added 2022-06-26 + terraform_0_15 = throw "terraform_0_15 has been removed from nixpkgs"; # Added 2022-06-26 tesseract_4 = throw "'tesseract_4' has been renamed to/replaced by 'tesseract4'"; # Converted to throw 2022-02-22 testVersion = testers.testVersion; # Added 2022-04-20 invalidateFetcherByDrvHash = testers.invalidateFetcherByDrvHash; # Added 2022-05-05 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45a89043efa6..b0cb9592462f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34956,9 +34956,6 @@ with pkgs; inherit (callPackage ../applications/networking/cluster/terraform { }) mkTerraform - terraform_0_13 - terraform_0_14 - terraform_0_15 terraform_1 terraform_plugins_test ;