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

chromium: Update all channels to latest versions.

Browse Source 
Overview of the updated versions:

stable: 43.0.2357.124 -> 43.0.2357.125
beta:   44.0.2403.39  -> 44.0.2403.52  [1]
dev:    45.0.2421.0   -> 45.0.2431.0   [2]

[1] Beta channel fixes:

    I had to fetch a patch from a newer revision of Blink (r195908), see
    https://codereview.chromium.org/1157943002/ for more information
    about the patch.

    Here is the failing build log:

    https://headcounter.org/hydra/build/704037/nixlog/2

    Another fix for Blink, was needed in order to get it to build,
    see: https://codereview.chromium.org/1156113007/

    Also I needed to revert https://codereview.chromium.org/1150543002/
    using another patch, because the build won't succeed and bail out
    with WEBRTC_VIDEO_CODEC_FALLBACK_SOFTWARE not being found (it's only
    used once in the source, but isn't defined anywhere). Here are the
    trybot results:

    https://chromium-cq-status.appspot.com/patch-status/1150543002/20001

[2] Dev channel fixes:

    The "ffmpegsumo" shared library is now no longer built, because it
    is now statically linked against Chromium, for details see:

    https://codereview.chromium.org/1141703002

All channels built and tested on my Hydra at:

https://headcounter.org/hydra/eval/178458

Test reports:

x86:    https://headcounter.org/hydra/build/704908/download/1/log.html
x86_64: https://headcounter.org/hydra/build/704914/download/1/log.html

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
aszlig 2015-06-19 04:34:47 +02:00
parent d2df553da1
commit c290595e5b
No known key found for this signature in database
GPG Key ID: D0EBD0EC8C2DC961
3 changed files with 50 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,7 +12,9 @@ mkChromiumDerivation (base: rec {
cp -v "$buildPath/"*.pak "$buildPath/"*.bin "$libExecPath/"
cp -v "$buildPath/icudtl.dat" "$libExecPath/"
cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/"
cp -v "$buildPath/libffmpegsumo.so" "$libExecPath/"
${optionalString (versionOlder base.version "45.0.0.0") ''
cp -v "$buildPath/libffmpegsumo.so" "$libExecPath/"
''}
${optionalString (versionOlder base.version "42.0.0.0") ''
cp -v "$buildPath/libpdf.so" "$libExecPath/"
''}

41
pkgs/applications/networking/browsers/chromium/source/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, python
{ stdenv, fetchurl, fetchpatch, patchutils, python
, channel ? "stable"
, useOpenSSL # XXX
}:
@ -19,6 +19,7 @@ let
]);
pre44 = versionOlder version "44.0.0.0";
is44 = versionOlder version "45.0.0.0" && !pre44;
in stdenv.mkDerivation {
name = "chromium-source-${version}";
@ -47,11 +48,39 @@ in stdenv.mkDerivation {
done
'';
patches = if pre44 then [
./nix_plugin_paths_42.patch
] else [
./nix_plugin_paths_44.patch
];
patches = let
baseURL = "https://codereview.chromium.org/download";
mkBlinkFix = issue: sha256: fetchpatch {
url = "${baseURL}/issue${issue}.diff";
inherit sha256;
postFetch = ''
sed -i -e 's,^\(---\|+++\) *[ab]/,&third_party/WebKit/,' "$out"
'';
};
fixes44 = [
# WebPluginContainer::setNeedsLayout
# https://codereview.chromium.org/1157943002/
(mkBlinkFix "1157943002_20001"
"0932yd15zlh2g5a5bbm6qrnfvv22jlfdg8pj0w9z58m5zdzw1p82")
# WebRuntimeFeatures::enablePermissionsAPI
# https://codereview.chromium.org/1156113007/
(mkBlinkFix "1156113007_1"
"1v76brrgdziv1q62ba4bimg0my2dmnkyl68b21nv2vw661v0hzwh")
# Revert of https://codereview.chromium.org/1150543002/
(fetchpatch {
url = "${baseURL}/issue1150543002_1.diff";
sha256 = "0x9sya0m1zcb2vcp2vfss88qqdrh6bzcbx2ngfiql7rkbynnpqn6";
postFetch = ''
${patchutils}/bin/interdiff "$out" /dev/null > reversed.patch
mv reversed.patch "$out"
'';
})
];
pluginPaths = if pre44 then singleton ./nix_plugin_paths_42.patch
else singleton ./nix_plugin_paths_44.patch;
in pluginPaths ++ optionals is44 fixes44;
patchPhase = let
diffmod = sym: "/^${sym} /{s/^${sym} //;${transform ""};s/^/${sym} /}";

24
pkgs/applications/networking/browsers/chromium/source/sources.nix
View File

@ -1,21 +1,21 @@
# This file is autogenerated from update.sh in the parent directory.
{
dev = {
version = "45.0.2421.0";
sha256 = "1qc80y0mhwnvxrvpc3csskgb536wq34c0fgk19h1qb4xc62lxhsk";
sha256bin32 = "1xqhyrlmh00md6i1q4wr0xihqbvcpshzscnjclrn53dlw5zs2s89";
sha256bin64 = "0akdhwwdfcbqfh65a82zigbhsi8sbhhw6904cjprb3bmv4l3c598";
version = "45.0.2431.0";
sha256 = "0irlrym8r1wa6zb5bg4paxy3h5fg300k5c9vkj3xmhdp567clfja";
sha256bin32 = "1lfrd7x7cav5mr7pg0a3d4a9dyy6f0rklarprfrcvqwipjkddb3f";
sha256bin64 = "1jzmkgiqn17ynbv0xljiifvlj1136jq98zrkd4hdmkgv8xrrzd74";
};
beta = {
version = "44.0.2403.39";
sha256 = "15c4adg0r9ym3pxya7vv4d148gv2pdwaaymxvvw511fjwffdv71n";
sha256bin32 = "1gaypkah10y31gb5f7vnyv0v73z5zjznmsp6vh2m4hfajx7s55jn";
sha256bin64 = "1j1ma6asl3ibjv3apyw24vhyi1qy64f586w8jizqzp4h962gj95c";
version = "44.0.2403.52";
sha256 = "0zgcqbxm2slxpj6i50w7r3xxql1k6kgd51qn8w8gwfzhmad4zxyx";
sha256bin32 = "1kfgl2l7j5fhj6wg4i3bsany2rlwspprypdy0z7k3pqiwwyiw658";
sha256bin64 = "1sabqqh1hii7appmx6xwabnapf4cv7smsy31nvz063fa5p6h21m8";
};
stable = {
version = "43.0.2357.124";
sha256 = "09m8bb5f17mx6cd3h5irslw07h2s0drda35v17vcr7qfhk8jdh92";
sha256bin32 = "15n2fla1ixrqzi0in0vyl8n5wkv20fpd96lff65rwr9diylz287p";
sha256bin64 = "0x6igpcf29zmwqgphvy9nm527k9g7na2cvgc5nimw4fs5dakzzjr";
version = "43.0.2357.125";
sha256 = "01alba50zrc50bn4p3f298khk8fam2rv5wyysz7rq3zrjg8785xg";
sha256bin32 = "0527bdlf4nd4b1ydmwn6rnxy377388qb98v9anicfd4bc2p9jjml";
sha256bin64 = "0yhgcjaxcpgk32l1sjrgkq447ywcj156a7372v87m22dcwl8fi01";
};
}