From 1afd3ceaaab5d11e17f47a473c6e6642aa074f18 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Fri, 31 Mar 2017 12:19:22 +0100
Subject: [PATCH 1/2] terraform: 0.9.1 -> 0.9.2

* makes the generic builder open for extension
* upgrades terraform and set the 0_9 series by default
---
 .../networking/cluster/terraform/default.nix  | 82 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  6 +-
 2 files changed, 51 insertions(+), 37 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index ab0771656b59..42a8465bf8a3 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -1,43 +1,44 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, lib, buildGoPackage, fetchurl, fetchFromGitHub }:
 
 let
-  generic = { version, sha256 }:
-  buildGoPackage rec {
-    name = "terraform-${version}";
+  goPackagePath = "github.com/hashicorp/terraform";
 
-    goPackagePath = "github.com/hashicorp/terraform";
+  generic = { version, sha256, ... }@attrs:
+    let attrs' = builtins.removeAttrs attrs ["version" "sha256"]; in
+    buildGoPackage ({
+      name = "terraform-${version}";
 
-    src = fetchFromGitHub {
-      owner  = "hashicorp";
-      repo   = "terraform";
-      rev    = "v${version}";
-      inherit sha256;
-    };
+      inherit goPackagePath;
 
-    postInstall = ''
-      # remove all plugins, they are part of the main binary now
-      for i in $bin/bin/*; do
-        if [[ $(basename $i) != terraform ]]; then
-          rm "$i"
-        fi
-      done
-    '';
+      src = fetchFromGitHub {
+        owner  = "hashicorp";
+        repo   = "terraform";
+        rev    = "v${version}";
+        inherit sha256;
+      };
 
-    preCheck = ''
-      export HOME=$TMP
-    '';
+      postInstall = ''
+        # remove all plugins, they are part of the main binary now
+        for i in $bin/bin/*; do
+          if [[ $(basename $i) != terraform ]]; then
+            rm "$i"
+          fi
+        done
+      '';
 
-    doCheck = builtins.compareVersions version "0.9.0" >= 0;
+      preCheck = ''
+        export HOME=$TMP
+      '';
 
-    meta = with stdenv.lib; {
-      description = "Tool for building, changing, and versioning infrastructure";
-      homepage = https://www.terraform.io/;
-      license = licenses.mpl20;
-      maintainers = with maintainers; [ jgeerds zimbatm peterhoeg ];
-    };
-  };
+      meta = with stdenv.lib; {
+        description = "Tool for building, changing, and versioning infrastructure";
+        homepage = https://www.terraform.io/;
+        license = licenses.mpl20;
+        maintainers = with maintainers; [ jgeerds zimbatm peterhoeg ];
+      };
+    } // attrs');
 
-in rec {
+in {
   terraform_0_8_5 = generic {
     version = "0.8.5";
     sha256 = "1cxwv3652fpsbm2zk1akw356cd7w7vhny1623ighgbz9ha8gvg09";
@@ -48,8 +49,21 @@ in rec {
     sha256 = "0ibgpcpvz0bmn3cw60nzsabsrxrbmmym1hv7fx6zmjxiwd68w5gb";
   };
 
-  terraform_0_9_1 = generic {
-    version = "0.9.1";
-    sha256 = "081p6dlvkg9mgaz49ichxzlk1ks0rxa7nvilaq8jj1gq3jvylqnh";
+  terraform_0_9_2 = generic {
+    version = "0.9.2";
+    sha256 = "1yj5x1d10028fm3v3gjyjdn128ps0as345hr50y8x3vn86n70lxl";
+
+    patches = [
+      (fetchurl {
+        url = "https://github.com/hashicorp/terraform/pull/13237.patch";
+        sha256 = "1f7hr1l5hck9mmqk01p6wxbfv9r3b0yi9ypz7bcmikp3bikza98x";
+      })
+      (fetchurl {
+        url = "https://github.com/hashicorp/terraform/pull/13248.patch";
+        sha256 = "1qc57kjhlqg5339him9bg4izdphins2fjjhb4ffr7bv9lb5k0hkr";
+      })
+    ];
+
+    doCheck = true;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6e6471ca83ab..ae7f46acea84 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18115,11 +18115,11 @@ with pkgs;
   inherit (callPackage ../applications/networking/cluster/terraform {})
     terraform_0_8_5
     terraform_0_8_8
-    terraform_0_9_1;
+    terraform_0_9_2;
 
   terraform_0_8 = terraform_0_8_8;
-  terraform_0_9 = terraform_0_9_1;
-  terraform = terraform_0_8;
+  terraform_0_9 = terraform_0_9_2;
+  terraform = terraform_0_9;
 
   terragrunt = callPackage ../applications/networking/cluster/terragrunt {
     terraform = terraform_0_8;

From ae034020aa18455d86202be50bff0939aebfb18c Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sat, 1 Apr 2017 12:54:24 +0100
Subject: [PATCH 2/2] fixup! terraform: 0.9.1 -> 0.9.2

use fetchpatch to improve patch download hash stability
---
 .../networking/cluster/terraform/default.nix           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 42a8465bf8a3..93a9894ba6b8 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchurl, fetchFromGitHub }:
+{ stdenv, lib, buildGoPackage, fetchpatch, fetchFromGitHub }:
 
 let
   goPackagePath = "github.com/hashicorp/terraform";
@@ -54,13 +54,13 @@ in {
     sha256 = "1yj5x1d10028fm3v3gjyjdn128ps0as345hr50y8x3vn86n70lxl";
 
     patches = [
-      (fetchurl {
+      (fetchpatch {
         url = "https://github.com/hashicorp/terraform/pull/13237.patch";
-        sha256 = "1f7hr1l5hck9mmqk01p6wxbfv9r3b0yi9ypz7bcmikp3bikza98x";
+        sha256 = "03c2nq12gvqqp12znvl3lmiviwsqksx4nrplv09fns2kz2gyfnbm";
       })
-      (fetchurl {
+      (fetchpatch {
         url = "https://github.com/hashicorp/terraform/pull/13248.patch";
-        sha256 = "1qc57kjhlqg5339him9bg4izdphins2fjjhb4ffr7bv9lb5k0hkr";
+        sha256 = "0awj8gaic0j7a69is95f2rll3yip4n6avai1jh20b1x7dybdrp5m";
       })
     ];