JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #24505 from zimbatm/terraform-0.9.2

Browse Source 
terraform: 0.9.1 -> 0.9.2
This commit is contained in:
Tim Steinbach 2017-04-01 13:45:26 -04:00 committed by GitHub
commit 97210a1f48
2 changed files with 51 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
pkgs/applications/networking/cluster/terraform/default.nix
View File

@ -1,43 +1,44 @@
{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
{ stdenv, lib, buildGoPackage, fetchpatch, 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 = [
(fetchpatch {
url = "https://github.com/hashicorp/terraform/pull/13237.patch";
sha256 = "03c2nq12gvqqp12znvl3lmiviwsqksx4nrplv09fns2kz2gyfnbm";
})
(fetchpatch {
url = "https://github.com/hashicorp/terraform/pull/13248.patch";
sha256 = "0awj8gaic0j7a69is95f2rll3yip4n6avai1jh20b1x7dybdrp5m";
})
];
doCheck = true;
};
}

6
pkgs/top-level/all-packages.nix
View File

@ -18123,11 +18123,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;