diff options
| author | Kamil Chmielewski <kamil.chm@gmail.com> | 2016-06-05 11:16:58 +0200 |
|---|---|---|
| committer | Kamil Chmielewski <kamil.chm@gmail.com> | 2016-06-09 11:22:02 +0200 |
| commit | e89a086f06a2f15a2c476d48b25288936466152e (patch) | |
| tree | f42ab998cab59df153fd5e30f6858a5bc26d89e5 | |
| parent | 826ff3efc2dc78da1d8be355b354ef2a0e59d183 (diff) | |
| download | nixlib-e89a086f06a2f15a2c476d48b25288936466152e.tar nixlib-e89a086f06a2f15a2c476d48b25288936466152e.tar.gz nixlib-e89a086f06a2f15a2c476d48b25288936466152e.tar.bz2 nixlib-e89a086f06a2f15a2c476d48b25288936466152e.tar.lz nixlib-e89a086f06a2f15a2c476d48b25288936466152e.tar.xz nixlib-e89a086f06a2f15a2c476d48b25288936466152e.tar.zst nixlib-e89a086f06a2f15a2c476d48b25288936466152e.zip | |
terraform: extracted from goPackages
| -rw-r--r-- | pkgs/applications/networking/cluster/terraform/default.nix | 27 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/go-packages.nix | 17 |
3 files changed, 28 insertions, 18 deletions
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix new file mode 100644 index 000000000000..cacfaf15a21d --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -0,0 +1,27 @@ +# This file was generated by go2nix. +{ stdenv, lib, go16Packages, fetchgit, fetchhg, fetchbzr, fetchsvn }: + +with go16Packages; + +buildGoPackage rec { + name = "terraform-${version}"; + version = "0.6.15"; + rev = "v${version}"; + + goPackagePath = "github.com/hashicorp/terraform"; + + src = fetchgit { + inherit rev; + url = "https://github.com/hashicorp/terraform"; + sha256 = "1mf98hagb0yp40g2mbar7aw7hmpq01clnil6y9khvykrb33vy0nb"; + }; + + postInstall = '' + # prefix all the plugins with "terraform-" + for i in $bin/bin/*; do + if [[ ! $(basename $i) =~ terraform* ]]; then + mv -v $i $bin/bin/terraform-$(basename $i); + fi + done + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 23af18ea0760..a9d29823f499 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16763,7 +16763,7 @@ in sqsh = callPackage ../development/tools/sqsh { }; - terraform = goPackages.terraform.bin // { outputs = [ "bin" ]; }; + terraform = callPackage ../applications/networking/cluster/terraform { }; tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; }; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 0bd9f10f9dd6..a7699c282729 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -3330,23 +3330,6 @@ let subPackages = [ "./" ]; # prevent building _demos }; - terraform = buildFromGitHub { - rev = "v0.6.15"; - owner = "hashicorp"; - repo = "terraform"; - disabled = isGo14 || isGo15; - sha256 = "1mf98hagb0yp40g2mbar7aw7hmpq01clnil6y9khvykrb33vy0nb"; - - postInstall = '' - # prefix all the plugins with "terraform-" - for i in $bin/bin/*; do - if [[ ! $(basename $i) =~ terraform* ]]; then - mv -v $i $bin/bin/terraform-$(basename $i); - fi - done - ''; - }; - testify = buildGoPackage rec { rev = "089c7181b8c728499929ff09b62d3fdd8df8adff"; name = "testify-${stdenv.lib.strings.substring 0 7 rev}"; |