diff options
author | Tim Steinbach <NeQuissimus@users.noreply.github.com> | 2017-04-01 13:45:26 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-01 13:45:26 -0400 |
commit | 97210a1f48defa49c690af419cd332ab3a6530c8 (patch) | |
tree | 03e081732573f63dca298746285885debd7bcbef /pkgs/applications/networking | |
parent | eec90be5cddbcdbcf3364059f543464b8a303e59 (diff) | |
parent | ae034020aa18455d86202be50bff0939aebfb18c (diff) | |
download | nixlib-97210a1f48defa49c690af419cd332ab3a6530c8.tar nixlib-97210a1f48defa49c690af419cd332ab3a6530c8.tar.gz nixlib-97210a1f48defa49c690af419cd332ab3a6530c8.tar.bz2 nixlib-97210a1f48defa49c690af419cd332ab3a6530c8.tar.lz nixlib-97210a1f48defa49c690af419cd332ab3a6530c8.tar.xz nixlib-97210a1f48defa49c690af419cd332ab3a6530c8.tar.zst nixlib-97210a1f48defa49c690af419cd332ab3a6530c8.zip |
Merge pull request #24505 from zimbatm/terraform-0.9.2
terraform: 0.9.1 -> 0.9.2
Diffstat (limited to 'pkgs/applications/networking')
-rw-r--r-- | pkgs/applications/networking/cluster/terraform/default.nix | 94 |
1 files changed, 54 insertions, 40 deletions
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index ab0771656b59..93a9894ba6b8 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, fetchpatch, fetchFromGitHub }: let - generic = { version, sha256 }: - buildGoPackage rec { - name = "terraform-${version}"; - - goPackagePath = "github.com/hashicorp/terraform"; - - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "terraform"; - rev = "v${version}"; - inherit sha256; - }; - - 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 - ''; - - preCheck = '' - export HOME=$TMP - ''; - - doCheck = builtins.compareVersions version "0.9.0" >= 0; - - 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 ]; - }; - }; + goPackagePath = "github.com/hashicorp/terraform"; + + generic = { version, sha256, ... }@attrs: + let attrs' = builtins.removeAttrs attrs ["version" "sha256"]; in + buildGoPackage ({ + name = "terraform-${version}"; + + inherit goPackagePath; + + src = fetchFromGitHub { + owner = "hashicorp"; + repo = "terraform"; + rev = "v${version}"; + inherit sha256; + }; + + 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 + ''; -in rec { + 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 ]; + }; + } // attrs'); + +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; }; } |