diff options
Diffstat (limited to 'nixpkgs/pkgs/common-updater/scripts/update-source-version')
| -rwxr-xr-x | nixpkgs/pkgs/common-updater/scripts/update-source-version | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/common-updater/scripts/update-source-version b/nixpkgs/pkgs/common-updater/scripts/update-source-version index d5c23466ee03..0ac6b3cf8c28 100755 --- a/nixpkgs/pkgs/common-updater/scripts/update-source-version +++ b/nixpkgs/pkgs/common-updater/scripts/update-source-version @@ -188,7 +188,9 @@ tempHash=$(printf '%0*d' "$hashLength" 0) if [[ -n "$sri" ]]; then # SRI hashes only support base64 # SRI hashes need to declare the hash type as part of the hash - tempHash="$(nix to-sri --type "$oldHashAlgo" "$tempHash")" + tempHash="$(nix hash to-sri --type "$oldHashAlgo" "$tempHash" 2>/dev/null \ + || nix to-sri --type "$oldHashAlgo" "$tempHash" 2>/dev/null)" \ + || die "Failed to convert hash to SRI representation!" fi # Escape regex metacharacter that are allowed in hashes (+) @@ -232,7 +234,9 @@ if [[ -z "$newHash" ]]; then if [[ -n "$sri" ]]; then # nix-build preserves the hashing scheme so we can just convert the result to SRI using the old type - newHash="$(nix to-sri --type "$oldHashAlgo" "$newHash")" + newHash="$(nix hash to-sri --type "$oldHashAlgo" "$newHash" 2>/dev/null \ + || nix to-sri --type "$oldHashAlgo" "$newHash" 2>/dev/null)" \ + || die "Failed to convert hash to SRI representation!" fi fi |