alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

chromium: Update all channels to latest versions.

Browse source 
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>
This commit is contained in:
aszlig 2013-03-26 21:10:49 +01:00
parent 432e0f869c
commit d5c8419823
No known key found for this signature in database
GPG key ID: D0EBD0EC8C2DC961
2 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/applications/networking/browsers/chromium/default.nix
View file

@ -21,6 +21,9 @@
# dependencies for >= v26 # dependencies for >= v26
, speechd, libXdamage , speechd, libXdamage
# dependencies for >= v27
, libXtst
# optional dependencies # optional dependencies
, libgcrypt ? null # gnomeSupport || cupsSupport , libgcrypt ? null # gnomeSupport || cupsSupport
@ -88,7 +91,9 @@ let
]; ];
pre26 = versionOlder sourceInfo.version "26.0.0.0"; pre26 = versionOlder sourceInfo.version "26.0.0.0";
pre27 = versionOlder sourceInfo.version "27.0.0.0";
post25 = !pre26; post25 = !pre26;
post26 = !pre27;
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "${packageName}-${version}"; name = "${packageName}-${version}";
@ -118,15 +123,16 @@ in stdenv.mkDerivation rec {
++ optional cupsSupport libgcrypt ++ optional cupsSupport libgcrypt
++ optional pulseSupport pulseaudio ++ optional pulseSupport pulseaudio
++ optional pre26 libvpx ++ optional pre26 libvpx
++ optionals post25 [ speechd libXdamage ]; ++ optionals post25 [ speechd libXdamage ]
++ optional post26 libXtst;
opensslPatches = optional useOpenSSL openssl.patches; opensslPatches = optional useOpenSSL openssl.patches;
prePatch = "patchShebangs ."; prePatch = "patchShebangs .";
patches = optional cupsSupport ./cups_allow_deprecated.patch patches = optional cupsSupport ./cups_allow_deprecated.patch
++ optional pulseSupport ./pulseaudio_array_bounds.patch ++ optional (pulseSupport && pre27) ./pulseaudio_array_bounds.patch
++ [ ./glibc-2.16-use-siginfo_t.patch ]; ++ optional pre27 ./glibc-2.16-use-siginfo_t.patch;
postPatch = '' postPatch = ''
sed -i -r -e 's/-f(stack-protector)(-all)?/-fno-\1/' build/common.gypi sed -i -r -e 's/-f(stack-protector)(-all)?/-fno-\1/' build/common.gypi

18
pkgs/applications/networking/browsers/chromium/sources.nix
View file

@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory. # This file is autogenerated from update.sh in the same directory.
{ {
dev = { dev = {
version = "26.0.1410.28"; version = "27.0.1448.0";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-26.0.1410.28.tar.xz"; url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1448.0.tar.xz";
sha256 = "1g32xyh06xsqkli0g83flqr1qvx2yxb7vaqshf9wcyqgkyzvy7il"; sha256 = "03sarp8drf9a6likk4m73lgk2i4nhqqri8ja9h8qiglqc4sf2hn0";
}; };
beta = { beta = {
version = "26.0.1410.28"; version = "26.0.1410.43";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-26.0.1410.28.tar.xz"; url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-26.0.1410.43.tar.xz";
sha256 = "1g32xyh06xsqkli0g83flqr1qvx2yxb7vaqshf9wcyqgkyzvy7il"; sha256 = "110x9cs88gqvqya71bqspx2s7ph6ca0als7sp5fbf911cj0iy0ii";
}; };
stable = { stable = {
version = "25.0.1364.152"; version = "26.0.1410.43";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1364.152.tar.bz2"; url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-26.0.1410.43.tar.xz";
sha256 = "1v8zpqk3q21d5hars1clss75n187hlg4zxbr68jj1ysmqclzbni8"; sha256 = "110x9cs88gqvqya71bqspx2s7ph6ca0als7sp5fbf911cj0iy0ii";
}; };
} }