diff options
| author | Domen Kožar <domen@dev.si> | 2016-03-16 22:20:43 +0000 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2016-03-16 22:20:43 +0000 |
| commit | c2013ea4ec9e6c5fbf9bf1e36259eff3283030d1 (patch) | |
| tree | ff624866848536fd72d057631174c130a6efc068 /pkgs/top-level | |
| parent | 78ad3a1658649ad012920bde7562ecf6f45685ce (diff) | |
| parent | 8b105a325ad4a5a49ebea700bb0b0e52d0807858 (diff) | |
| download | nixlib-c2013ea4ec9e6c5fbf9bf1e36259eff3283030d1.tar nixlib-c2013ea4ec9e6c5fbf9bf1e36259eff3283030d1.tar.gz nixlib-c2013ea4ec9e6c5fbf9bf1e36259eff3283030d1.tar.bz2 nixlib-c2013ea4ec9e6c5fbf9bf1e36259eff3283030d1.tar.lz nixlib-c2013ea4ec9e6c5fbf9bf1e36259eff3283030d1.tar.xz nixlib-c2013ea4ec9e6c5fbf9bf1e36259eff3283030d1.tar.zst nixlib-c2013ea4ec9e6c5fbf9bf1e36259eff3283030d1.zip | |
Merge pull request #13969 from mboes/terraform
terraform: init at 0.6.13.
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/go-packages.nix | 12 |
2 files changed, 14 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9eaaab0b0e87..c6195748ef3d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 {}; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index e49fe4516817..03c54d2ccc66 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -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}"; |