From 3fec0fed02ef84e79328da36d696d760224214b5 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 13 May 2013 22:00:09 +0200 Subject: [PATCH] chromium: Update beta and dev channels. This updates the following channels to the latest upstream versions: beta: 27.0.1453.65 -> 27.0.1453.81 (builds fine, tested) dev: 28.0.1485.0 -> 28.0.1500.5 (builds fine, tested) For version 28, the reference to /usr/bin/gcc is now located in third_party/WebKit/Source/core/core.gypi instead of the previous third_party/WebKit/Source/core/core.gyp/core.gyp. Signed-off-by: aszlig --- .../networking/browsers/chromium/default.nix | 2 +- .../networking/browsers/chromium/sources.nix | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 682de909067..60b6ff674cc 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -130,7 +130,7 @@ in stdenv.mkDerivation rec { '' + '' sed -i -e 's|/usr/bin/gcc|gcc|' \ third_party/WebKit/Source/${if post27 - then "core/core.gyp/core.gyp" + then "core/core.gypi" else "WebCore/WebCore.gyp/WebCore.gyp"} ''; diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index 0e041ee9518..3f0cb0e3f83 100644 --- a/pkgs/applications/networking/browsers/chromium/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -1,14 +1,14 @@ # This file is autogenerated from update.sh in the same directory. { dev = { - version = "28.0.1485.0"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-28.0.1485.0.tar.xz"; - sha256 = "04whky5bwsj909cc1ycwrc91d04iynwncwh21cbbbvg93jsj2pq9"; + version = "28.0.1500.5"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-28.0.1500.5.tar.xz"; + sha256 = "1jpjmqag875bpy4rwvr362nzx0r8ffcrisil9ci2ar6ayjd4lfhd"; }; beta = { - version = "27.0.1453.65"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1453.65.tar.xz"; - sha256 = "1flv9870p0bqglnbm4gfzbxzcvz30k2chxgnlbqgpfk5c4qq9mpb"; + version = "27.0.1453.81"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1453.81.tar.xz"; + sha256 = "1g4gsrcdrp06hqr25fd9l4snjhibp5pi7pc3wv11fp8gd04cpv9w"; }; stable = { version = "26.0.1410.63";