diff options
Diffstat (limited to 'nixpkgs/pkgs/common-updater')
| -rwxr-xr-x | nixpkgs/pkgs/common-updater/scripts/update-source-version | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/common-updater/scripts/update-source-version b/nixpkgs/pkgs/common-updater/scripts/update-source-version index 75433fe4c596..bc2c68feaeaa 100755 --- a/nixpkgs/pkgs/common-updater/scripts/update-source-version +++ b/nixpkgs/pkgs/common-updater/scripts/update-source-version @@ -97,7 +97,7 @@ if [ -z "$oldUrl" ]; then fi drvName=$(nix-instantiate $systemArg --eval -E "with import ./. {}; (builtins.parseDrvName $attr.name).name" | tr -d '"') -oldVersion=$(nix-instantiate $systemArg --eval -E "with import ./. {}; $attr.${versionKey} or (builtins.parseDrvName $attr.name).${versionKey}" | tr -d '"') +oldVersion=$(nix-instantiate $systemArg --eval -E "with import ./. {}; $attr.${versionKey} or (builtins.parseDrvName $attr.name).version" | tr -d '"') if [ -z "$drvName" -o -z "$oldVersion" ]; then die "Couldn't evaluate name and version from '$attr.name'!" @@ -161,7 +161,7 @@ if [ -z "$newHash" ]; then die "Couldn't figure out new hash of '$attr.src'!" fi -if [ -z "${ignoreSameHash}"] && [ "$oldVersion" != "$newVersion" ] && [ "$oldHash" = "$newHash" ]; then +if [ -z "${ignoreSameHash}" ] && [ "$oldVersion" != "$newVersion" ] && [ "$oldHash" = "$newHash" ]; then mv "$nixFile.bak" "$nixFile" die "Both the old and new source hashes of '$attr.src' were equivalent. Please fix the package's source URL to be dependent on '\${version}'!" fi |