nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-01 23:22:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #50781 from zimbatm/terraform_0_12-alpha

Browse Source 
Terraform 0.12.0-alpha2
This commit is contained in:
zimbatm 2018-11-20 11:09:33 +01:00 committed by GitHub
commit 7a9acea944
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 224 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

@ -58,6 +58,7 @@ let
passthru = {
withPlugins = newplugins: withPlugins (x: newplugins x ++ actualPlugins);
full = withPlugins lib.attrValues;
# Ouch
overrideDerivation = f: (pluggable (terraform.overrideDerivation f)).withPlugins plugins;
@ -86,32 +87,6 @@ let
plugins = removeAttrs terraform-providers ["override" "overrideDerivation" "recurseForDerivations"];
in rec {
terraform_0_8_5 = generic {
version = "0.8.5";
sha256 = "1cxwv3652fpsbm2zk1akw356cd7w7vhny1623ighgbz9ha8gvg09";
};
terraform_0_8 = generic {
version = "0.8.8";
sha256 = "0ibgpcpvz0bmn3cw60nzsabsrxrbmmym1hv7fx6zmjxiwd68w5gb";
};
terraform_0_9 = generic {
version = "0.9.11";
sha256 = "045zcpd4g9c52ynhgh3213p422ahds63mzhmd2iwcmj88g8i1w6x";
# checks are failing again
doCheck = false;
};
terraform_0_10 = pluggable (generic {
version = "0.10.8";
sha256 = "11hhij0hq99xhwlg5dx5nv7y074x79wkr8hr3wc6ln0kwdk5scdf";
patches = [ ./provider-path.patch ];
passthru = { inherit plugins; };
});
terraform_0_10-full = terraform_0_10.withPlugins lib.attrValues;
terraform_0_11 = pluggable (generic {
version = "0.11.10";
sha256 = "08mapla89g106bvqr41zfd7l4ki55by6207qlxq9caiha54nx4nb";
@ -119,7 +94,14 @@ in rec {
passthru = { inherit plugins; };
});
terraform_0_11-full = terraform_0_11.withPlugins lib.attrValues;
terraform_0_11-full = terraform_0_11.full;
terraform_0_12 = pluggable (generic {
version = "0.12.0-alpha2";
sha256 = "1rnxgwfk10b1g3jnh9gv4lqrcszhxq8shaqslml30hafs3dkg71q";
patches = [ ./provider-path.patch ];
passthru = { inherit plugins; };
});
# Tests that the plugins are being used. Terraform looks at the specific
# file pattern and if the plugin is not found it will try to download it

35
pkgs/applications/networking/cluster/terragrunt/0.11.1.nix
View File

@ -1,35 +0,0 @@
{ stdenv, lib, buildGoPackage, fetchFromGitHub, terraform, makeWrapper }:
buildGoPackage rec {
name = "terragrunt-${version}";
version = "0.11.1";
goPackagePath = "github.com/gruntwork-io/terragrunt";
src = fetchFromGitHub {
rev = "v${version}";
owner = "gruntwork-io";
repo = "terragrunt";
sha256 = "061ix4m64i8bvjpqm6hn83nnkvqrp5y0hh5gzmxiik2nz3by1rx5";
};
goDeps = ./deps_0_11.nix;
buildInputs = [ makeWrapper ];
preBuild = ''
buildFlagsArray+=("-ldflags" "-X main.VERSION=v${version}")
'';
postInstall = ''
wrapProgram $bin/bin/terragrunt \
--set TERRAGRUNT_TFPATH ${lib.getBin terraform}/bin/terraform
'';
meta = with stdenv.lib; {
description = "A thin wrapper for Terraform that supports locking for Terraform state and enforces best practices.";
homepage = https://github.com/gruntwork-io/terragrunt/;
license = licenses.mit;
maintainers = with maintainers; [ peterhoeg ];
};
}

35
pkgs/applications/networking/cluster/terragrunt/0.9.8.nix
View File

@ -1,35 +0,0 @@
{ stdenv, lib, buildGoPackage, fetchFromGitHub, terraform, makeWrapper }:
buildGoPackage rec {
name = "terragrunt-${version}";
version = "0.9.8";
goPackagePath = "github.com/gruntwork-io/terragrunt";
src = fetchFromGitHub {
rev = "v${version}";
owner = "gruntwork-io";
repo = "terragrunt";
sha256 = "0aakr17yzh5jzvlmg3pzpnsfwl31njg27bpck541492shqcqmkiz";
};
goDeps = ./deps.nix;
buildInputs = [ makeWrapper ];
preBuild = ''
buildFlagsArray+=("-ldflags" "-X main.VERSION=v${version}")
'';
postInstall = ''
wrapProgram $bin/bin/terragrunt \
--set TERRAGRUNT_TFPATH ${lib.getBin terraform}/bin/terraform
'';
meta = with stdenv.lib; {
description = "A thin wrapper for Terraform that supports locking for Terraform state and enforces best practices.";
homepage = https://github.com/gruntwork-io/terragrunt/;
license = licenses.mit;
maintainers = with maintainers; [ peterhoeg ];
};
}

4
pkgs/applications/networking/cluster/terragrunt/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, buildGoPackage, fetchFromGitHub, terraform-full, makeWrapper }:
{ stdenv, lib, buildGoPackage, fetchFromGitHub, terraform, makeWrapper }:
buildGoPackage rec {
name = "terragrunt-${version}";
@ -23,7 +23,7 @@ buildGoPackage rec {
postInstall = ''
wrapProgram $bin/bin/terragrunt \
--set TERRAGRUNT_TFPATH ${lib.getBin terraform-full}/bin/terraform
--set TERRAGRUNT_TFPATH ${lib.getBin terraform.full}/bin/terraform
'';
meta = with stdenv.lib; {

111
pkgs/applications/networking/cluster/terragrunt/deps_0_11.nix
View File

@ -1,111 +0,0 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.2.0
[
{
goPackagePath = "github.com/aws/aws-sdk-go";
fetch = {
type = "git";
url = "https://github.com/aws/aws-sdk-go";
rev = "952498f4a390118ac65ad59cbe0c8b57ed69b6b5";
sha256 = "03j2dn4v2wr32jd9iki68ra0r8aghy7hpad94bf8zdgsrjn6rwvj";
};
}
{
goPackagePath = "github.com/bgentry/go-netrc";
fetch = {
type = "git";
url = "https://github.com/bgentry/go-netrc";
rev = "9fd32a8b3d3d3f9d43c341bfe098430e07609480";
sha256 = "0dn2h8avgavqdzdqnph8bkhj35bx0wssczry1zdczr22xv650g1l";
};
}
{
goPackagePath = "github.com/go-errors/errors";
fetch = {
type = "git";
url = "https://github.com/go-errors/errors";
rev = "8fa88b06e5974e97fbf9899a7f86a344bfd1f105";
sha256 = "02mvb2clbmfcqb4yclv5zhs4clkk9jxi2hiawsynl5fwmgn0d3xa";
};
}
{
goPackagePath = "github.com/hashicorp/go-getter";
fetch = {
type = "git";
url = "https://github.com/hashicorp/go-getter";
rev = "90b6568eac830f62a08e8f1f46375daa63e57015";
sha256 = "1cl0yqlhffjmf4qan093z49i88i7wjp9lsfwfzn52sk3c09ksism";
};
}
{
goPackagePath = "github.com/hashicorp/go-version";
fetch = {
type = "git";
url = "https://github.com/hashicorp/go-version";
rev = "03c5bf6be031b6dd45afec16b1cf94fc8938bc77";
sha256 = "0sjq57gpfznaqdrbyb2p0bn90g9h661cvr0jrk6ngags4pbw14ik";
};
}
{
goPackagePath = "github.com/hashicorp/hcl";
fetch = {
type = "git";
url = "https://github.com/hashicorp/hcl";
rev = "392dba7d905ed5d04a5794ba89f558b27e2ba1ca";
sha256 = "1rfm67kma2hpakabf7hxlj196jags4rpjpcirwg4kan4g9b6j0kb";
};
}
{
goPackagePath = "github.com/mattn/go-zglob";
fetch = {
type = "git";
url = "https://github.com/mattn/go-zglob";
rev = "95345c4e1c0ebc9d16a3284177f09360f4d20fab";
sha256 = "012hrd67v4gp3b621rykg2kp6a7iq4dr585qavragbif0z1whckx";
};
}
{
goPackagePath = "github.com/mitchellh/go-homedir";
fetch = {
type = "git";
url = "https://github.com/mitchellh/go-homedir";
rev = "b8bc1bf767474819792c23f32d8286a45736f1c6";
sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q";
};
}
{
goPackagePath = "github.com/mitchellh/go-testing-interface";
fetch = {
type = "git";
url = "https://github.com/mitchellh/go-testing-interface";
rev = "477c2d05a845d8b55912a5a7993b9b24abcc5ef8";
sha256 = "0llpcyiqfjdri7pba1p13maafgcyzjbd29h99b1hgj848k5avd61";
};
}
{
goPackagePath = "github.com/mitchellh/mapstructure";
fetch = {
type = "git";
url = "https://github.com/mitchellh/mapstructure";
rev = "cc8532a8e9a55ea36402aa21efdf403a60d34096";
sha256 = "0705c0hq7b993sabnjy65yymvpy9w1j84bg9bjczh5607z16nw86";
};
}
{
goPackagePath = "github.com/stretchr/testify";
fetch = {
type = "git";
url = "https://github.com/stretchr/testify";
rev = "4d4bfba8f1d1027c4fdbe371823030df51419987";
sha256 = "1d3yz1d2s88byjzmn60jbi1m9s552f7ghzbzik97fbph37i8yjhp";
};
}
{
goPackagePath = "github.com/urfave/cli";
fetch = {
type = "git";
url = "https://github.com/urfave/cli";
rev = "d70f47eeca3afd795160003bc6e28b001d60c67c";
sha256 = "1xm203qp4sdlvffcbag7v6mc2d6q61i25iiz3y9yqpy25jpcpgif";
};
}
]

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

@ -22586,18 +22586,15 @@ with pkgs;
sqsh = callPackage ../development/tools/sqsh { };
inherit (callPackage ../applications/networking/cluster/terraform {})
terraform_0_8_5
terraform_0_8
terraform_0_9
terraform_0_10
terraform_0_10-full
terraform_0_11
terraform_0_11-full
terraform_0_12
terraform_plugins_test
;
terraform = terraform_0_11;
terraform-full = terraform_0_11-full;
# deprecated
terraform-full = terraform.full;
terraform-providers = recurseIntoAttrs (
callPackage ../applications/networking/cluster/terraform-providers {}
@ -22609,14 +22606,6 @@ with pkgs;
terragrunt = callPackage ../applications/networking/cluster/terragrunt {};
terragrunt_0_11_1 = callPackage ../applications/networking/cluster/terragrunt/0.11.1.nix {
terraform = terraform_0_8;
};
terragrunt_0_9_8 = callPackage ../applications/networking/cluster/terragrunt/0.9.8.nix {
terraform = terraform_0_8_5;
};
tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; };
tetra-gtk-theme = callPackage ../misc/themes/tetra { };