Merge pull request #13969 from mboes/terraform

terraform: init at 0.6.13.
This commit is contained in:
Domen Kožar 2016-03-16 22:20:43 +00:00
commit c2013ea4ec
2 changed files with 14 additions and 0 deletions

View file

@ -16233,6 +16233,8 @@ let
sqsh = callPackage ../development/tools/sqsh { };
terraform = go16Packages.terraform.bin // { outputs = [ "bin" ]; };
tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; };
tewi-font = callPackage ../data/fonts/tewi {};

View file

@ -5,6 +5,8 @@
let
isGo14 = go.meta.branch == "1.4";
isGo15 = go.meta.branch == "1.5";
isGo16 = go.meta.branch == "1.6";
self = _self // overrides; _self = with self; {
@ -3459,6 +3461,16 @@ let
subPackages = [ "./" ]; # prevent building _demos
};
terraform = buildFromGitHub {
rev = "v0.6.13";
owner = "hashicorp";
repo = "terraform";
disabled = !isGo16;
sha256 = "1f1xm5pyz1hxqm2k74psanirpydf71pmxixplyc2x2w68hgjzi2l";
buildInputs = [ ];
};
testify = buildGoPackage rec {
rev = "089c7181b8c728499929ff09b62d3fdd8df8adff";
name = "testify-${stdenv.lib.strings.substring 0 7 rev}";