diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-04-12 18:39:58 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-06-02 09:31:51 +0200 |
| commit | 5751988b556ef354b3689e82406ddc9df8d39547 (patch) | |
| tree | 7f4367bbe1f35d2aef8c6309fb850341630ce75a /pkgs/common-updater | |
| parent | 1b507bea4d181fb1fc15ddc6d3ac01aa5f8ab664 (diff) | |
| download | nixpkgs-5751988b556ef354b3689e82406ddc9df8d39547.tar nixpkgs-5751988b556ef354b3689e82406ddc9df8d39547.tar.gz nixpkgs-5751988b556ef354b3689e82406ddc9df8d39547.tar.bz2 nixpkgs-5751988b556ef354b3689e82406ddc9df8d39547.tar.lz nixpkgs-5751988b556ef354b3689e82406ddc9df8d39547.tar.xz nixpkgs-5751988b556ef354b3689e82406ddc9df8d39547.tar.zst nixpkgs-5751988b556ef354b3689e82406ddc9df8d39547.zip | |
common-updater-scripts: simplify fetchgit fix
No need to try evaluate the URL twice as introduced in the original fix https://github.com/NixOS/nixpkgs/commit/cce486838b6c52dedfec1c93f60ebadb72c48431
Diffstat (limited to 'pkgs/common-updater')
| -rwxr-xr-x | pkgs/common-updater/scripts/update-source-version | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version index e1eece1fbf4..591ffa6ca5b 100755 --- a/pkgs/common-updater/scripts/update-source-version +++ b/pkgs/common-updater/scripts/update-source-version @@ -86,14 +86,10 @@ if [ $(grep -c "$oldHash" "$nixFile") != 1 ]; then die "Couldn't locate old source hash '$oldHash' (or it appeared more than once) in '$nixFile'!" fi -oldUrl=$(nix-instantiate $systemArg --eval -E "with import ./. {}; builtins.elemAt $attr.src.drvAttrs.urls 0" | tr -d '"') +oldUrl=$(nix-instantiate $systemArg --eval -E "with import ./. {}; builtins.elemAt ($attr.src.drvAttrs.urls or [ $attr.src.url ]) 0" | tr -d '"') if [ -z "$oldUrl" ]; then - oldUrl=$(nix-instantiate $systemArg --eval -E "with import ./. {}; $attr.src.url" | tr -d '"') - - if [ -z "$oldUrl" ]; then - die "Couldn't evaluate source url from '$attr.src'!" - fi + die "Couldn't evaluate source url from '$attr.src'!" fi drvName=$(nix-instantiate $systemArg --eval -E "with import ./. {}; (builtins.parseDrvName $attr.name).name" | tr -d '"') |