summary refs log tree commit diff
path: root/pkgs/common-updater
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas@tuxera.com>2017-04-11 12:52:43 +0300
committerTuomas Tynkkynen <tuomas@tuxera.com>2017-12-26 20:02:01 +0200
commitce421a7283d88b3c9d8f16c9d3e277f678fda15c (patch)
tree9e7fadb6d3b4f44e88f8825d0b2f72b43bdb3e3e /pkgs/common-updater
parent47acd09fdb8e582d7dbb804d3661e65ce32d6c0a (diff)
downloadnixpkgs-ce421a7283d88b3c9d8f16c9d3e277f678fda15c.tar
nixpkgs-ce421a7283d88b3c9d8f16c9d3e277f678fda15c.tar.gz
nixpkgs-ce421a7283d88b3c9d8f16c9d3e277f678fda15c.tar.bz2
nixpkgs-ce421a7283d88b3c9d8f16c9d3e277f678fda15c.tar.lz
nixpkgs-ce421a7283d88b3c9d8f16c9d3e277f678fda15c.tar.xz
nixpkgs-ce421a7283d88b3c9d8f16c9d3e277f678fda15c.tar.zst
nixpkgs-ce421a7283d88b3c9d8f16c9d3e277f678fda15c.zip
update-source-version: More robust scanning for the output hash
Diffstat (limited to 'pkgs/common-updater')
-rwxr-xr-xpkgs/common-updater/scripts/update-source-version2
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 7a105b67522..243358beb70 100755
--- a/pkgs/common-updater/scripts/update-source-version
+++ b/pkgs/common-updater/scripts/update-source-version
@@ -74,7 +74,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=$(tail -n2 "$attr.fetchlog" | grep "output path .* has .* hash .* when .* was expected" | head -n1 | tr -dc '\040-\177' | awk '{ print $(NF-4) }')
+    newHash=$(egrep -v "killing process|dependencies couldn't be built" "$attr.fetchlog" | tail -n2 | grep "output path .* has .* hash .* when .* was expected" | head -n1 | tr -dc '\040-\177' | tr -d "'" | awk '{ print $(NF-4) }')
 fi
 
 if [ -z "$newHash" ]; then