public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chromium: Update channels to stable v22.0.1229.79.

Browse Source 
dev: 23.0.1271.10
beta: 22.0.1229.91
stable: 22.0.1229.79

The revert for SVN revision 151720 is now obsolete in the current beta release
and is only needed for the stable version. So let's hope that >= 22.0.1229.91
will get stable soon.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
aszlig 2012-10-02 03:42:39 +02:00
parent 59a75fc985
commit d2df1ada27
No known key found for this signature in database
GPG Key ID: D0EBD0EC8C2DC961
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/browsers/chromium/default.nix
View File

@ -86,7 +86,7 @@ let
# XXX: this reverts r151720 to prevent http://crbug.com/143623 # XXX: this reverts r151720 to prevent http://crbug.com/143623
maybeRevertZlibChanges = let maybeRevertZlibChanges = let
below22 = versionOlder sourceInfo.version "22.0.0.0"; below22_91 = versionOlder sourceInfo.version "22.0.1229.91";
patch = fetchurl { patch = fetchurl {
name = "revert-r151720"; name = "revert-r151720";
url = "http://git.chromium.org/gitweb/?p=chromium.git;a=commitdiff_plain;" url = "http://git.chromium.org/gitweb/?p=chromium.git;a=commitdiff_plain;"
@ -94,7 +94,7 @@ let
+ "h=0fabb4fda7059a8757422e8a44e70deeab28e698"; + "h=0fabb4fda7059a8757422e8a44e70deeab28e698";
sha256 = "0n0d6mkg89g8q63cifapzpg9dxfs2n6xvk4k13szhymvf67b77pf"; sha256 = "0n0d6mkg89g8q63cifapzpg9dxfs2n6xvk4k13szhymvf67b77pf";
}; };
in optional (!below22) patch; in optional (below22_91) patch;
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "${packageName}-${version}"; name = "${packageName}-${version}";

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 = "23.0.1262.0"; version = "23.0.1271.10";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1262.0.tar.bz2"; url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1271.10.tar.bz2";
sha256 = "19sqiv2vg9qy1kj6s12sq5aknvp3969yw26szwp54ipfv7lxqjh6"; sha256 = "1jm9fhnq978lfn21xripf7l2n362axinggnxlz7rcc9as1y086y3";
}; };
beta = { beta = {
version = "22.0.1229.56"; version = "22.0.1229.91";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-22.0.1229.56.tar.bz2"; url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-22.0.1229.91.tar.bz2";
sha256 = "0wynq27yz1aslsnrjmf47dwbglblpfida2kmgv23l804mgdj19gv"; sha256 = "1b47rb5hw0k2fwc4jvmjpmxbhmqxgkz66j3mrjy4f8im41hmndyw";
}; };
stable = { stable = {
version = "21.0.1180.89"; version = "22.0.1229.79";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-21.0.1180.89.tar.bz2"; url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-22.0.1229.79.tar.bz2";
sha256 = "1i9mjbjj3aywg03hd59m9j5gq5b5fl8nvw56g47q8s9k1bcsik0n"; sha256 = "0f7py2hd7fnx5z0xrg2vwf675xbg9xvamx79jjyzbpljh32b3jh6";
}; };
} }