From e18cd2f8ae67088c24d0d9484ab5531598ca473c Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 29 Jan 2014 09:21:07 +0100 Subject: [PATCH] chromium: Update all channels to latest versions. This closes #1623, and updates _all_ channels to the corresponding latest upstream versions. Thanks to @wizeman for opening the pull request noted above and for another update in between, @aristidb for fixing the patcheShebangs issue and @shlevy for notifying me about the build failure in stdenv-updates in the first place. Sorry to everyone for my inactivity lately. The following changes were needed in order to build those new releases: * Patch out /bin/echo to allow building with all options enabled. * Always use GN from the source tree. * Remove import of depot_tools for version 34. * Drop version 32 specific stuff. With this commit, the following new upstream versions are introduced: stable: 32.0.1700.77 -> 32.0.1700.102 (builds fine, tested) beta: 32.0.1700.19 -> 33.0.1750.46 (builds fine, tested) dev: 33.0.1712.4 -> 34.0.1809.0 (build broken with gnome_keyring) The dev version requires a more recent version gnome_keyring and thus won't build if gnomeKeyringSupport is set to true. I haven't tested this build without gnomeKeyringSupport yet, so it might be broken and will be fixed later. Signed-off-by: aszlig --- .../networking/browsers/chromium/default.nix | 13 ++++++++----- .../networking/browsers/chromium/sources.nix | 18 +++++++++--------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 908e54f3e43..eba32738e0b 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -51,15 +51,18 @@ let patches = singleton ./sandbox_userns_31.patch; postPatch = '' - sed -i -r -e 's/-f(stack-protector)(-all)?/-fno-\1/' build/common.gypi - '' + (if versionOlder version "32.0.0.0" then '' - sed -i -e 's|/usr/bin/gcc|gcc|' third_party/WebKit/Source/core/core.gypi - '' else '' + sed -i -r \ + -e 's/-f(stack-protector)(-all)?/-fno-\1/' \ + -e 's|/bin/echo|echo|' \ + build/common.gypi + sed -i '/not RunGN/,+1d' build/gyp_chromium sed -i -e 's|/usr/bin/gcc|gcc|' \ third_party/WebKit/Source/build/scripts/scripts.gypi \ third_party/WebKit/Source/build/scripts/preprocessor.pm - '') + optionalString useOpenSSL '' + '' + optionalString useOpenSSL '' cat $opensslPatches | patch -p1 -d third_party/openssl/openssl + '' + optionalString (!versionOlder version "34.0.0.0") '' + sed -i '/import.*depot/d' build/gyp_chromium ''; outputs = [ "out" "sandbox" "bundled" "main" ]; diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index b7a30ef63f7..6ad9d9090d5 100644 --- a/pkgs/applications/networking/browsers/chromium/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { dev = { - version = "33.0.1712.4"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-33.0.1712.4.tar.xz"; - sha256 = "1c1m0y3nnz2lclqi21j6hgqmb46p1hv7c22zz9fn7dax7jkimydk"; + version = "34.0.1809.0"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-34.0.1809.0.tar.xz"; + sha256 = "0hyqqqq2hzbzk325pk9bc70lsh0al2nqf1mlahybp5vigy5jzy88"; }; beta = { - version = "32.0.1700.19"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-32.0.1700.19.tar.xz"; - sha256 = "0d0kgy160pyg472ka43gxk7n09pqhhs9nd93jyxrp9qsyllfc425"; + version = "33.0.1750.46"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-33.0.1750.46.tar.xz"; + sha256 = "04n43c4vn8i7qhlybqb19c2c8kri8nc1wpa2l83vin4sqxkq519h"; }; stable = { - version = "32.0.1700.77"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-32.0.1700.77.tar.xz"; - sha256 = "1mwqa5k32d168swpw0bdcnhglxwcqdsx766fq0iz22h3hd4ccdwa"; + version = "32.0.1700.102"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-32.0.1700.102.tar.xz"; + sha256 = "0jxwhd7cd60ivisrnzcglqqnmy99np1vvjqa27y42d852xjx84ys"; }; }