diff options
author | talyz <kim.lindberger@gmail.com> | 2019-11-26 14:18:33 +0100 |
---|---|---|
committer | talyz <kim.lindberger@gmail.com> | 2019-11-26 14:18:33 +0100 |
commit | 809768bb91c04fd49b8500daf9b68a450b9fa55c (patch) | |
tree | 75aac41b147f73db477b33e16d4c5dc942b6a68f /pkgs/common-updater | |
parent | e5b32b9719757ce10a6804cba58aa266640ad0b8 (diff) | |
download | nixpkgs-809768bb91c04fd49b8500daf9b68a450b9fa55c.tar nixpkgs-809768bb91c04fd49b8500daf9b68a450b9fa55c.tar.gz nixpkgs-809768bb91c04fd49b8500daf9b68a450b9fa55c.tar.bz2 nixpkgs-809768bb91c04fd49b8500daf9b68a450b9fa55c.tar.lz nixpkgs-809768bb91c04fd49b8500daf9b68a450b9fa55c.tar.xz nixpkgs-809768bb91c04fd49b8500daf9b68a450b9fa55c.tar.zst nixpkgs-809768bb91c04fd49b8500daf9b68a450b9fa55c.zip |
common-updater-scripts: Fix breakage
Fixes a bug introduced by 9b090ccbca3f7dd26d91db06e96e8bf8282c37ca where the script fails to run if $attr.${versionKey} exists.
Diffstat (limited to 'pkgs/common-updater')
-rwxr-xr-x | pkgs/common-updater/scripts/update-source-version | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version index 0a436ff02a3..d051a0f75c1 100755 --- a/pkgs/common-updater/scripts/update-source-version +++ b/pkgs/common-updater/scripts/update-source-version @@ -93,7 +93,7 @@ if [ -z "$oldUrl" ]; then fi drvName=$(nix-instantiate $systemArg --eval -E "with import ./. {}; lib.getName $attr" | tr -d '"') -oldVersion=$(nix-instantiate $systemArg --eval -E "with import ./. {}; $attr.${versionKey} or lib.getVersion $attr" | tr -d '"') +oldVersion=$(nix-instantiate $systemArg --eval -E "with import ./. {}; $attr.${versionKey} or (lib.getVersion $attr)" | tr -d '"') if [ -z "$drvName" -o -z "$oldVersion" ]; then die "Couldn't evaluate name and version from '$attr.name'!" |