Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c291195eedf0
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0da54872f9da
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 9, 2020

  1. terraform_0_12: add patch with fix for macos mojave when built with g…

    …o 1.14
    
    otherwise we get a crash on startup
    risicle committed Sep 9, 2020
    Copy the full SHA
    6e9eedf View commit details

Commits on Sep 11, 2020

  1. Merge pull request #97557 from risicle/ris-terraform-0.12-go-1.14-moj…

    …ave-r20.03
    
    [20.03] terraform_0_12: add patch with fix for macos mojave when built with go 1.14
    marsam authored Sep 11, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    AluisioASG Aluísio Augusto Silva Gonçalves
    Copy the full SHA
    0da5487 View commit details
Showing with 7 additions and 2 deletions.
  1. +7 −2 pkgs/applications/networking/cluster/terraform/default.nix
9 changes: 7 additions & 2 deletions pkgs/applications/networking/cluster/terraform/default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, lib, buildEnv, buildGoPackage, fetchFromGitHub, makeWrapper
, runCommand, writeText, terraform-providers }:
, runCommand, writeText, terraform-providers, fetchpatch }:

let
goPackagePath = "github.com/hashicorp/terraform";
@@ -114,7 +114,12 @@ in rec {
terraform_0_12 = pluggable (generic {
version = "0.12.20";
sha256 = "1k94iwhdvp1ifg9w7y26cl89ihki2w9kxv8mz06pp9bnfwfw67x5";
patches = [ ./provider-path.patch ];
patches = [ ./provider-path.patch ]
++ lib.optional stdenv.isDarwin (fetchpatch {
name = "go1.14-mojave.patch";
url = "https://github.com/hashicorp/terraform/pull/24562.patch";
sha256 = "1k70kk4hli72x8gza6fy3vpckdm3sf881w61fmssrah3hgmfmbrs";
});
passthru = { inherit plugins; };
});