chromium: Update all channels to latest versions.

stable: 25.0.1364.152 -> 26.0.1410.43 (builds fine, tested)
beta:   26.0.1410.28  -> 26.0.1410.43 (builds fine, tested)
dev:    26.0.1410.28  -> 27.0.1448.0  (build fixed and tested)

For version 27, this introduces a new dependency on libXtst and removes the
patch for siginfo_t and the pulseaudio array bounds error.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>

2 files changed, 18 insertions, 12 deletions

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 094ddb54c38a..a4f71ffcb259 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -21,6 +21,9 @@
 # dependencies for >= v26
 , speechd, libXdamage
 
+# dependencies for >= v27
+, libXtst
+
 # optional dependencies
 , libgcrypt ? null # gnomeSupport || cupsSupport
 
@@ -88,7 +91,9 @@ let
   ];
 
   pre26 = versionOlder sourceInfo.version "26.0.0.0";
+  pre27 = versionOlder sourceInfo.version "27.0.0.0";
   post25 = !pre26;
+  post26 = !pre27;
 
 in stdenv.mkDerivation rec {
   name = "${packageName}-${version}";
@@ -118,15 +123,16 @@ in stdenv.mkDerivation rec {
     ++ optional cupsSupport libgcrypt
     ++ optional pulseSupport pulseaudio
     ++ optional pre26 libvpx
-    ++ optionals post25 [ speechd libXdamage ];
+    ++ optionals post25 [ speechd libXdamage ]
+    ++ optional post26 libXtst;
 
   opensslPatches = optional useOpenSSL openssl.patches;
 
   prePatch = "patchShebangs .";
 
   patches = optional cupsSupport ./cups_allow_deprecated.patch
-         ++ optional pulseSupport ./pulseaudio_array_bounds.patch
-         ++ [ ./glibc-2.16-use-siginfo_t.patch ];
+         ++ optional (pulseSupport && pre27) ./pulseaudio_array_bounds.patch
+         ++ optional pre27 ./glibc-2.16-use-siginfo_t.patch;
 
   postPatch = ''
     sed -i -r -e 's/-f(stack-protector)(-all)?/-fno-\1/' build/common.gypi
diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix
index a14b10fcfde7..9e4c0cff5634 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 = "26.0.1410.28";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-26.0.1410.28.tar.xz";
-    sha256 = "1g32xyh06xsqkli0g83flqr1qvx2yxb7vaqshf9wcyqgkyzvy7il";
+    version = "27.0.1448.0";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1448.0.tar.xz";
+    sha256 = "03sarp8drf9a6likk4m73lgk2i4nhqqri8ja9h8qiglqc4sf2hn0";
   };
   beta = {
-    version = "26.0.1410.28";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-26.0.1410.28.tar.xz";
-    sha256 = "1g32xyh06xsqkli0g83flqr1qvx2yxb7vaqshf9wcyqgkyzvy7il";
+    version = "26.0.1410.43";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-26.0.1410.43.tar.xz";
+    sha256 = "110x9cs88gqvqya71bqspx2s7ph6ca0als7sp5fbf911cj0iy0ii";
   };
   stable = {
-    version = "25.0.1364.152";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1364.152.tar.bz2";
-    sha256 = "1v8zpqk3q21d5hars1clss75n187hlg4zxbr68jj1ysmqclzbni8";
+    version = "26.0.1410.43";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-26.0.1410.43.tar.xz";
+    sha256 = "110x9cs88gqvqya71bqspx2s7ph6ca0als7sp5fbf911cj0iy0ii";
   };
 }