From e3a4ba005213c1df01330faf9254ac665e64f8c6 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Mon, 8 Feb 2021 15:28:12 +0100 Subject: [PATCH 1/3] terraform-providers: fix impurity about Nix version used I wasn't able to figure out for which unstable version of Nix this is supposed to work so I added nix itself to the package list. Nix will now be the same stable version that is also provided in this nixpkgs checkout. To make it work with a stable Nix version I also had to trim the build error output as otherwise it would contain the sha256 prefix & a newline followed by "error:". --- .../networking/cluster/terraform-providers/update-provider | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/update-provider b/pkgs/applications/networking/cluster/terraform-providers/update-provider index e1f1a0ef38a5..f97bbce83faa 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") From 84e4da60df7e46ec5876543c0a5a28f036eac8b1 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Thu, 4 Mar 2021 12:27:39 +0100 Subject: [PATCH 2/3] terraform-providers.helm: 1.3.2 -> 2.0.2 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 91b900db3477..d4b8a52d7ae2 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", From 4c6e467d26f880c36f537b55923c7040035ae0fe Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Thu, 4 Mar 2021 12:28:00 +0100 Subject: [PATCH 3/3] terraform-providers.kubernetes: 1.13.3 -> 2.0.2 --- .../networking/cluster/terraform-providers/providers.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index d4b8a52d7ae2..4ec886a34fcd 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -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",