From ced5afc38c2ea5122bbb9c7d0e455aaeaac8cabd Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 23 Jan 2015 01:48:56 +0100 Subject: [PATCH] chromium: Update all channels to latest versions. This brings a new stable version 40.0.2214.91 along with a beta update to version 41.0.2272.16, the dev channel is still stuck at version 41.0.2272.12 and within the next days will jump to version 42. For this reason, I've done some cheating here and brought the beta channel in par with the dev channel, because dev is older than beta on OmahaProxy. Here's an overview of the channel upgrades: stable: 39.0.2171.65 -> 40.0.2214.91 [1] beta: 40.0.2214.10 -> 41.0.2272.16 [1] [2] [3] dev: 41.0.2224.3 -> 41.0.2272.16 [1] [2] [3] [1]: We needed to patch in locations of lib{pci,udev}.so, because Chromium tries to load them at runtime. For version 41 startup will fail if it is unable to load libudev, but it also has the advantage that this fixes GPU detection using libpci in the stable version, which in turn could fix a few bugs on NixOS. [2]: The upstream Debian package for the binary plugins now uses XZ compression for the enclosed data tarball. [3]: Chromium 41 needs {shapshot,natives}_blob.bin in order to start up, so let's cp it among with the .pak files to avoid adding a conditional for version 40. The release annoucement of the stable channel update can be found here: http://googlechromereleases.blogspot.de/2015/01/stable-update.html Note that this release contains 62 security fixes(!) and I'm hereby apologizing for the delay of this update. Signed-off-by: aszlig --- .../networking/browsers/chromium/browser.nix | 2 +- .../networking/browsers/chromium/common.nix | 6 +++++ .../networking/browsers/chromium/plugins.nix | 3 ++- .../browsers/chromium/source/sources.nix | 24 +++++++++---------- 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index f88d7df40306..6dcc1dbf8605 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -9,7 +9,7 @@ mkChromiumDerivation (base: rec { installPhase = '' mkdir -p "$libExecPath" - cp -v "$buildPath/"*.pak "$libExecPath/" + cp -v "$buildPath/"*.pak "$buildPath/"*.bin "$libExecPath/" cp -v "$buildPath/icudtl.dat" "$libExecPath/" cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/" cp -v "$buildPath/libpdf.so" "$buildPath/libffmpegsumo.so" "$libExecPath/" diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 5b662f4b29b9..9c8e7d083828 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -143,6 +143,12 @@ let sed -i -e '/module_path *=.*libexif.so/ { s|= [^;]*|= base::FilePath().AppendASCII("${libexif}/lib/libexif.so")| }' chrome/utility/media_galleries/image_metadata_extractor.cc + + sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${udev}/lib/\1!' \ + device/udev_linux/udev?_loader.cc + + sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ + gpu/config/gpu_info_collector_linux.cc ''; gypFlags = mkGypFlags (gypFlagsUseSystemLibs // { diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index 8e2dd2a48869..49d758c836cc 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -21,9 +21,10 @@ let chan = if source.channel == "dev" then "chrome-unstable" else if source.channel == "stable" then "chrome" else "chrome-${source.channel}"; + cext = if versionOlder source.version "41.0.0.0" then "lzma" else "xz"; in '' mkdir -p plugins - ar p "$src" data.tar.lzma | tar xJ -C plugins --strip-components=4 \ + ar p "$src" data.tar.${cext} | tar xJ -C plugins --strip-components=4 \ ./opt/google/${chan}/PepperFlash \ ./opt/google/${chan}/libwidevinecdm.so \ ./opt/google/${chan}/libwidevinecdmadapter.so diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix index 5437f8e283ae..5f40e63125de 100644 --- a/pkgs/applications/networking/browsers/chromium/source/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix @@ -1,21 +1,21 @@ # This file is autogenerated from update.sh in the parent directory. { dev = { - version = "41.0.2224.3"; - sha256 = "04lgklidxx4bryqhnm7kjqbfr12ns8ic9g4yxk3dig71081sas5f"; - sha256bin32 = "17fgh57yckk318r7r6qkc934dpq35qa6ps4x5fwscl070rzjf81k"; - sha256bin64 = "1qsvjm38cxx3inrw0hs4q9f4i9arqfj9cs57xh64wflrnh2z52zf"; + version = "41.0.2272.16"; + sha256 = "14l3l5gcjqszqjb3zmwxsyfci495fi315sznvm2n2ark24mf03yq"; + sha256bin32 = "0xqhzlmbyh5w678j7iwssd81z1bpggpzxni1y79xn5lhc26c50jd"; + sha256bin64 = "0c9j75xqv4jx57asiaadarz714h1adscvb4h5ng7mbmr268qp6f2"; }; beta = { - version = "40.0.2214.10"; - sha256 = "0wxkxgj6z18l2qkm0k16r8bpv9rdxk1g1ias03zzvlbj1bw3brdn"; - sha256bin32 = "0wr2vg97d3qrryb5sz31sd3ycb1l17irrs79vfa04ip85jqv89zn"; - sha256bin64 = "0bclgy386vdmfdf59hwkypcs8wwmlpgl3npp089hmcdvv7dmars8"; + version = "41.0.2272.16"; + sha256 = "14l3l5gcjqszqjb3zmwxsyfci495fi315sznvm2n2ark24mf03yq"; + sha256bin32 = "0xqhzlmbyh5w678j7iwssd81z1bpggpzxni1y79xn5lhc26c50jd"; + sha256bin64 = "0c9j75xqv4jx57asiaadarz714h1adscvb4h5ng7mbmr268qp6f2"; }; stable = { - version = "39.0.2171.65"; - sha256 = "0lglcjvyhgmdm0sd76wv509pgwcfl86rlp9rj83z9giadwqlcmxi"; - sha256bin32 = "1iqzi462vw8da5f8ysk76q68xhiw5ndqc3hhc6djipsc6h240bji"; - sha256bin64 = "1gxh3sxpnl0167la9ncnz7l85gzi4ax6g5pqni1nma5g5cqqm177"; + version = "40.0.2214.91"; + sha256 = "0ja1wvjn0g8xs20j87s3gl9h70yzx8rfa3k126wnl9gay6gxlbzp"; + sha256bin32 = "0mfg66s7fqx6v8n0hilsw40i5ximasbqhrmw4fpnpa0x0i77bphj"; + sha256bin64 = "14lqm8m937b9sl5k7sc939aar76ij9790c807yahk6q36mfyd269"; }; }