From 2f791c7444d739b35dd7879dbc7e326ea3c9f17b Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Wed, 3 Aug 2016 09:51:59 +0100
Subject: [PATCH] terraform: 0.6.16 -> 0.7.0

---
 pkgs/applications/networking/cluster/terraform/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix                            | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 3d1834ce9b6..78edcff30cc 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "terraform-${version}";
-  version = "0.6.16";
+  version = "0.7.0";
   rev = "v${version}";
 
   goPackagePath = "github.com/hashicorp/terraform";
@@ -11,13 +11,13 @@ buildGoPackage rec {
     inherit rev;
     owner = "hashicorp";
     repo = "terraform";
-    sha256 = "1bg8hn4b31xphyxrc99bpnf7gmq20fxqx1k871nidx132brcsah2";
+    sha256 = "0k5d6zph6sq1qg8vi5jmk7apy6v67xn5i7rqjamyr5an7lpxssc9";
   };
 
   postInstall = ''
     # prefix all the plugins with "terraform-"
     for i in $bin/bin/*; do
-      if [[ ! $(basename $i) =~ terraform* ]]; then
+      if [[ $(basename $i) != terraform ]]; then
         mv -v $i $bin/bin/terraform-$(basename $i);
       fi
     done
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 313d0bd8662..b353a5bf29b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17319,7 +17319,9 @@ in
 
   sqsh = callPackage ../development/tools/sqsh { };
 
-  terraform = callPackage ../applications/networking/cluster/terraform { };
+  terraform =
+    (callPackage ../applications/networking/cluster/terraform {}).bin //
+      { outputs = [ "bin" ]; };
 
   tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; };