From 5280e28e13eda6e98784dbb28e987a436d9a9d5a Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 2 Jan 2022 08:19:54 +1000 Subject: [PATCH] terraform-providers: update-provider scripts - use nix-prefetch for vendorSha256 - use no-out-link for nix-build - fix nixpkgs import path --- .../terraform-providers/update-all-providers | 2 +- .../terraform-providers/update-provider | 21 +++---------------- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/update-all-providers b/pkgs/applications/networking/cluster/terraform-providers/update-all-providers index a072e6cd4172..46f0ce1be561 100755 --- a/pkgs/applications/networking/cluster/terraform-providers/update-all-providers +++ b/pkgs/applications/networking/cluster/terraform-providers/update-all-providers @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -i bash -p jq +#! nix-shell -I nixpkgs=../../../../.. -i bash -p jq # shellcheck shell=bash # Update all providers which have specified provider source address diff --git a/pkgs/applications/networking/cluster/terraform-providers/update-provider b/pkgs/applications/networking/cluster/terraform-providers/update-provider index d5f0bbc3ef14..47206914f7a9 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 nixpkgs=../../../../.. -i bash -p coreutils curl jq moreutils nix +#! nix-shell -I nixpkgs=../../../../.. -i bash -p coreutils curl jq moreutils nix nix-prefetch # shellcheck shell=bash # vim: ft=sh # @@ -149,22 +149,7 @@ if [[ -z ${vendorSha256} ]]; then vendorSha256=null elif [[ -n ${old_vendor_sha256} || ${vendor} == 1 ]]; then echo "=== Calculating vendorSha256 ===" - update_attr vendorSha256 "0000000000000000000000000000000000000000000000000000000000000000" - # Hackish way to find out the desired sha256. First build, then extract the - # error message from the logs. - set +e - nix-build --no-out-link "${repo_root}" -A "terraform-providers.${provider_name}.go-modules" 2>vendor_log.txt - set -e - logs=$(