From adfc5939a7d59d78d3509c152223bd79537d80fd Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 26 Mar 2013 21:06:36 +0100 Subject: [PATCH] chromium: Fix updater for version 26 and newer. The updater was actually getting the -lite version, which our expression won't build with, except if we switch some bundled dependencies to those in nixpkgs. Of course the problem with fetching version 27 was me being stupid and using a case statement in the updater, as if there won't be any version after 26 ;-) Signed-off-by: aszlig --- .../networking/browsers/chromium/update.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/update.sh b/pkgs/applications/networking/browsers/chromium/update.sh index cc38125c193..0c21213a751 100755 --- a/pkgs/applications/networking/browsers/chromium/update.sh +++ b/pkgs/applications/networking/browsers/chromium/update.sh @@ -62,7 +62,7 @@ then sha256="$(nix_getattr "$output_file" "$channel.sha256")"; fi; - sha_insert "$version" "$sha256" + sha_insert "$version" "$sha256"; echo "$sha256"; } else @@ -80,10 +80,11 @@ get_channel_exprs() version="${chline##*,}"; # XXX: Remove case after version 26 is stable: - case "${version%%.*}" in - 26) url="${bucket_url%/}/chromium-$version-lite.tar.xz";; - *) url="${bucket_url%/}/chromium-$version.tar.bz2";; - esac; + if [ "${version%%.*}" -ge 26 ]; then + url="${bucket_url%/}/chromium-$version.tar.xz"; + else + url="${bucket_url%/}/chromium-$version.tar.bz2"; + fi; echo -n "Checking if sha256 of version $version is cached..." >&2; if sha256="$(sha_lookup "$version")";