diff options
| author | Jonas Chevalier <zimbatm@zimbatm.com> | 2021-03-04 16:32:02 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-04 16:32:02 +0000 |
| commit | 0722ddab3a7d71b6c788e4b2535411bbb9191a4a (patch) | |
| tree | 6d63b10156d2f035168647968a3c0026b3fe80f1 /pkgs | |
| parent | 8b8680bbc808f6bfee3913061739ad59388ace5b (diff) | |
| parent | 4c6e467d26f880c36f537b55923c7040035ae0fe (diff) | |
| download | nixpkgs-0722ddab3a7d71b6c788e4b2535411bbb9191a4a.tar nixpkgs-0722ddab3a7d71b6c788e4b2535411bbb9191a4a.tar.gz nixpkgs-0722ddab3a7d71b6c788e4b2535411bbb9191a4a.tar.bz2 nixpkgs-0722ddab3a7d71b6c788e4b2535411bbb9191a4a.tar.lz nixpkgs-0722ddab3a7d71b6c788e4b2535411bbb9191a4a.tar.xz nixpkgs-0722ddab3a7d71b6c788e4b2535411bbb9191a4a.tar.zst nixpkgs-0722ddab3a7d71b6c788e4b2535411bbb9191a4a.zip | |
Merge pull request #115064 from andir/update-tf-kubernetes
update terraform-providers.{helm,kubernetes} to 2.0.2Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/cluster/terraform-providers/providers.json | 13 | ||||
| -rwxr-xr-x | pkgs/applications/networking/cluster/terraform-providers/update-provider | 5 |
2 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 91b900db347..4ec886a34fc 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -398,10 +398,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/helm", "repo": "terraform-provider-helm", - "rev": "v1.3.2", - "sha256": "0mpbf03483jqrwd9cx4pdn2pcv4swfs5nbp021gaqr0jf1w970x6", + "rev": "v2.0.2", + "sha256": "119zvlkwa7ygwsjxxdl7z8cqb0c4m6gy21356jnsasf4c3557rrb", "vendorSha256": null, - "version": "1.3.2" + "version": "2.0.2" }, "heroku": { "owner": "terraform-providers", @@ -504,9 +504,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/kubernetes", "repo": "terraform-provider-kubernetes", - "rev": "v1.13.3", - "sha256": "01hkbb81r3k630s3ww6379p66h1fsd5cd1dz14jm833nsr142c0i", - "version": "1.13.3" + "rev": "v2.0.2", + "sha256": "129aylw6hxa44syfnb0kkkihwvlaa6d1jnxrcbwkql6xxhn9zizf", + "vendorSha256": null, + "version": "2.0.2" }, "kubernetes-alpha": { "owner": "hashicorp", diff --git a/pkgs/applications/networking/cluster/terraform-providers/update-provider b/pkgs/applications/networking/cluster/terraform-providers/update-provider index e1f1a0ef38a..f97bbce83fa 100755 --- a/pkgs/applications/networking/cluster/terraform-providers/update-provider +++ b/pkgs/applications/networking/cluster/terraform-providers/update-provider @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -i bash -p coreutils curl jq moreutils +#! nix-shell -I nixpkgs=../../../../.. -i bash -p coreutils curl jq moreutils nix # shellcheck shell=bash # vim: ft=sh # @@ -161,7 +161,8 @@ if [[ -z "$vendorSha256" ]]; then exit 1 fi rm -f vendor_log.txt - vendorSha256=${BASH_REMATCH[1]} + # trim the results in case it they have a sha256: prefix or contain more than one line + vendorSha256=$(echo "${BASH_REMATCH[1]#sha256:}" | head -n 1) # Deal with nix unstable if [[ $vendorSha256 = sha256-* ]]; then vendorSha256=$(nix to-base32 "$vendorSha256") |