diff options
| author | zimbatm <zimbatm@zimbatm.com> | 2020-07-26 09:03:23 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-26 09:03:23 +0000 |
| commit | 93013cd8b36a8898fdf55df485c38bddd414b2e0 (patch) | |
| tree | 64e4012592569ebb224b32cb950f15eda304a710 | |
| parent | 12f4c3b35785dc7dd301dc7a8562d21a3400201a (diff) | |
| parent | fd4e3392fc4317a6ee9a1954e87719d9e7c1c22e (diff) | |
| download | nixpkgs-93013cd8b36a8898fdf55df485c38bddd414b2e0.tar nixpkgs-93013cd8b36a8898fdf55df485c38bddd414b2e0.tar.gz nixpkgs-93013cd8b36a8898fdf55df485c38bddd414b2e0.tar.bz2 nixpkgs-93013cd8b36a8898fdf55df485c38bddd414b2e0.tar.lz nixpkgs-93013cd8b36a8898fdf55df485c38bddd414b2e0.tar.xz nixpkgs-93013cd8b36a8898fdf55df485c38bddd414b2e0.tar.zst nixpkgs-93013cd8b36a8898fdf55df485c38bddd414b2e0.zip | |
Merge pull request #93871 from Chili-Man/terraform-0.12.29-update
terraform: 0.12.28 -> 0.12.29
| -rw-r--r-- | maintainers/maintainer-list.nix | 10 | ||||
| -rw-r--r-- | pkgs/applications/networking/cluster/terraform/default.nix | 5 |
2 files changed, 13 insertions, 2 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 91bdfb5b083..8c901162e5e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1412,6 +1412,16 @@ githubId = 30435868; name = "Okina Matara"; }; + Chili-Man = { + email = "dr.elhombrechile@gmail.com"; + name = "Diego Rodriguez"; + github = "Chili-Man"; + githubId = 631802; + keys = [{ + longkeyid = "rsa4096/0xE0EBAD78F0190BD9"; + fingerprint = "099E 3F97 FA08 3D47 8C75 EBEC E0EB AD78 F019 0BD9"; + }]; + }; chkno = { email = "chuck@intelligence.org"; github = "chkno"; diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 78d4c6f797f..74aa881c999 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -48,6 +48,7 @@ let kalbasit marsam babariviere + Chili-Man ]; }; } // attrs'); @@ -118,8 +119,8 @@ in rec { terraform_0_11-full = terraform_0_11.full; terraform_0_12 = pluggable (generic { - version = "0.12.28"; - sha256 = "05ymr6vc0sqh1sia0qawhz0mag8jdrq157mbj9bkdpsnlyv209p3"; + version = "0.12.29"; + sha256 = "18i7vkvnvfybwzhww8d84cyh93xfbwswcnwfrgvcny1qwm8rsaj8"; patches = [ ./provider-path.patch (fetchpatch { |