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

terraform: 0.9.1 -> 0.9.2

Browse Source 
* makes the generic builder open for extension
* upgrades terraform and set the 0_9 series by default
This commit is contained in:
zimbatm 2017-03-31 12:19:22 +01:00
parent c923c6c7c5
commit 1afd3ceaaa
2 changed files with 51 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,11 +1,14 @@
{ stdenv, lib, buildGoPackage, fetchFromGitHub }: { stdenv, lib, buildGoPackage, fetchurl, fetchFromGitHub }:
let let
generic = { version, sha256 }: goPackagePath = "github.com/hashicorp/terraform";
buildGoPackage rec {
generic = { version, sha256, ... }@attrs:
let attrs' = builtins.removeAttrs attrs ["version" "sha256"]; in
buildGoPackage ({
name = "terraform-${version}"; name = "terraform-${version}";
goPackagePath = "github.com/hashicorp/terraform"; inherit goPackagePath;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hashicorp"; owner = "hashicorp";
@ -27,17 +30,15 @@ let
export HOME=$TMP export HOME=$TMP
''; '';
doCheck = builtins.compareVersions version "0.9.0" >= 0;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Tool for building, changing, and versioning infrastructure"; description = "Tool for building, changing, and versioning infrastructure";
homepage = https://www.terraform.io/; homepage = https://www.terraform.io/;
license = licenses.mpl20; license = licenses.mpl20;
maintainers = with maintainers; [ jgeerds zimbatm peterhoeg ]; maintainers = with maintainers; [ jgeerds zimbatm peterhoeg ];
}; };
}; } // attrs');
in rec { in {
terraform_0_8_5 = generic { terraform_0_8_5 = generic {
version = "0.8.5"; version = "0.8.5";
sha256 = "1cxwv3652fpsbm2zk1akw356cd7w7vhny1623ighgbz9ha8gvg09"; sha256 = "1cxwv3652fpsbm2zk1akw356cd7w7vhny1623ighgbz9ha8gvg09";
@ -48,8 +49,21 @@ in rec {
sha256 = "0ibgpcpvz0bmn3cw60nzsabsrxrbmmym1hv7fx6zmjxiwd68w5gb"; sha256 = "0ibgpcpvz0bmn3cw60nzsabsrxrbmmym1hv7fx6zmjxiwd68w5gb";
}; };
terraform_0_9_1 = generic { terraform_0_9_2 = generic {
version = "0.9.1"; version = "0.9.2";
sha256 = "081p6dlvkg9mgaz49ichxzlk1ks0rxa7nvilaq8jj1gq3jvylqnh"; 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;
}; };
} }

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

@ -18115,11 +18115,11 @@ with pkgs;
inherit (callPackage ../applications/networking/cluster/terraform {}) inherit (callPackage ../applications/networking/cluster/terraform {})
terraform_0_8_5 terraform_0_8_5
terraform_0_8_8 terraform_0_8_8
terraform_0_9_1; terraform_0_9_2;
terraform_0_8 = terraform_0_8_8; terraform_0_8 = terraform_0_8_8;
terraform_0_9 = terraform_0_9_1; terraform_0_9 = terraform_0_9_2;
terraform = terraform_0_8; terraform = terraform_0_9;
terragrunt = callPackage ../applications/networking/cluster/terragrunt { terragrunt = callPackage ../applications/networking/cluster/terragrunt {
terraform = terraform_0_8; terraform = terraform_0_8;