diff options
| author | Will Dietz <w@wdtz.org> | 2019-02-05 15:39:58 -0600 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2019-02-11 17:54:35 -0600 |
| commit | 8611d2e632d363d3679cca7afd1df1dd2bb81318 (patch) | |
| tree | a8f30ab9571c660557b42c0bccf1fb21afd99de1 /pkgs/common-updater/scripts | |
| parent | c569643f4a654e40193d3ca12787feee1529a198 (diff) | |
common-update-scripts: fixup for current/latest nix hash output
Courtesy of @jtojnar, thanks!
See https://github.com/NixOS/nixpkgs/issues/54962#issuecomment-459429698
Diffstat (limited to 'pkgs/common-updater/scripts')
| -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 57b52553c2be..117e8724cd82 100755 --- a/pkgs/common-updater/scripts/update-source-version +++ b/pkgs/common-updater/scripts/update-source-version @@ -96,7 +96,7 @@ fi if [ -z "$newHash" ]; then nix-build --no-out-link -A "$attr.src" 2>"$attr.fetchlog" >/dev/null || true # FIXME: use nix-build --hash here once https://github.com/NixOS/nix/issues/1172 is fixed - newHash=$(egrep -v "killing process|dependencies couldn't be built" "$attr.fetchlog" | tail -n2 | sed "s~output path .* has .* hash ‘\(.*\)’ when .* was expected\|fixed-output derivation produced path '.*' with .* hash '\(.*\)' instead of the expected hash '.*'~\1\2~" | head -n1) + newHash=$(egrep -v "killing process|dependencies couldn't be built|wanted: " "$attr.fetchlog" | tail -n2 | sed "s~output path .* has .* hash ‘\(.*\)’ when .* was expected\|fixed-output derivation produced path '.*' with .* hash '\(.*\)' instead of the expected hash '.*'\| got: .*:\(.*\)~\1\2\3~" | head -n1) fi if [ -z "$newHash" ]; then |