From 3919d7303074924cdc6ca941eb0424829d4fec54 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Tue, 15 Jun 2021 10:56:03 +0200 Subject: [PATCH] terraform: drop old versions Now that terraform 1.0 is stable, only keep that version. --- .../networking/cluster/terraform/default.nix | 37 ------------------- pkgs/top-level/aliases.nix | 4 ++ pkgs/top-level/all-packages.nix | 4 -- 3 files changed, 4 insertions(+), 41 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 2d351eebde24..739b1e2737d1 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -156,43 +156,6 @@ rec { # Constructor for other terraform versions mkTerraform = attrs: pluggable (generic attrs); - terraform_0_12 = mkTerraform { - version = "0.12.31"; - sha256 = "03p698xdbk5gj0f9v8v1fpd74zng3948dyy4f2hv7zgks9hid7fg"; - patches = [ - ./provider-path.patch - (fetchpatch { - name = "fix-mac-mojave-crashes.patch"; - url = "https://github.com/hashicorp/terraform/commit/cd65b28da051174a13ac76e54b7bb95d3051255c.patch"; - sha256 = "1k70kk4hli72x8gza6fy3vpckdm3sf881w61fmssrah3hgmfmbrs"; - }) - ]; - passthru = { inherit plugins; }; - }; - - 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 = "1d93aqkjdrvabkvix6h1qaxpjzv7w1wa7xa44czdnjs2lapx4smm"; - patches = [ ./provider-path.patch ]; - passthru = { inherit plugins; }; - }; - - terraform_0_15 = mkTerraform { - version = "0.15.5"; - sha256 = "18f4a6l24s3cym7gk40agxikd90i56q84wziskw1spy9rgv2yx6d"; - vendorSha256 = "12hrpxay6k3kz89ihyhl91c4lw4wp821ppa245w9977fq09fhnx0"; - patches = [ ./provider-path-0_15.patch ]; - passthru = { inherit plugins; }; - }; - terraform_1_0 = mkTerraform { version = "1.0.0"; sha256 = "sha256-ddcT/I2Qn1pKFyhXgh+CcD3fSv2steSNmjyyiS2SE/o="; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8721efb01386..eedf4fc75efc 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -818,6 +818,10 @@ mapAliases ({ telepathy_salut = telepathy-salut; # added 2018-02-25 telnet = inetutils; # added 2018-05-15 terraform_1_0_0 = terraform_1_0; # added 2021-06-15 + terraform_0_12 = throw "terraform 0.12 has been removed"; # added 2021-06-15 + terraform_0_13 = throw "terraform 0.13 has been removed"; # added 2021-06-15 + terraform_0_14 = throw "terraform 0.14 has been removed"; # added 2021-06-15 + terraform_0_15 = throw "terraform 0.15 has been removed"; # added 2021-06-15 terraform-provider-ibm = terraform-providers.ibm; # added 2018-09-28 terraform-provider-libvirt = terraform-providers.libvirt; # added 2018-09-28 terraform-provider-lxd = terraform-providers.lxd; # added 2020-03-16 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4103d1c7eddf..ecf9588683a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31243,10 +31243,6 @@ in inherit (callPackage ../applications/networking/cluster/terraform { }) mkTerraform - terraform_0_12 - terraform_0_13 - terraform_0_14 - terraform_0_15 terraform_1_0 terraform_plugins_test ;