diff options
| author | Colin <486199+c00w@users.noreply.github.com> | 2020-04-26 04:37:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-26 08:37:59 +0000 |
| commit | 3e0aa4af2da4e4010cd9011aaa125fed7ca220e6 (patch) | |
| tree | 5c0f61cd58e1bb62340992bf826560c270243ccd /pkgs/applications/networking/cluster/terraform | |
| parent | 7c399a4ee080f33cc500a3fda33af6fccfd617bd (diff) | |
Get rid of go 1.13 (#86036)
Kubernetes builds with go1.14.
Terraform has an upstream patch which fixes the macos mojave issues -
it's a bug in terraform, not go.
Diffstat (limited to 'pkgs/applications/networking/cluster/terraform')
| -rw-r--r-- | pkgs/applications/networking/cluster/terraform/default.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index ee27422a1391..50a5129226a7 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, buildEnv, buildGoPackage, fetchFromGitHub, makeWrapper, coreutils -, runCommand, writeText, terraform-providers }: +, runCommand, writeText, terraform-providers, fetchpatch }: let goPackagePath = "github.com/hashicorp/terraform"; @@ -120,7 +120,13 @@ in rec { terraform_0_12 = pluggable (generic { version = "0.12.24"; sha256 = "1rjihp6qcaizp2nnv4z20kpmjnqcw95pq5rnhq381a3pdzr0cd0z"; - patches = [ ./provider-path.patch ]; + patches = [ + ./provider-path.patch + (fetchpatch { + name = "fix-mac-mojave-crashes.patch"; + url = "https://github.com/hashicorp/terraform/pull/24562.patch"; + sha256 = "1k70kk4hli72x8gza6fy3vpckdm3sf881w61fmssrah3hgmfmbrs"; + }) ]; passthru = { inherit plugins; }; }); |