diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 626a2b8a81a..5c8c25553ee 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -12,7 +12,7 @@ mkChromiumDerivation (base: rec { cp -v "$buildPath/"*.pak "$buildPath/"*.bin "$libExecPath/" cp -v "$buildPath/icudtl.dat" "$libExecPath/" cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/" - ${optionalString (versionOlder base.version "45.0.0.0") '' + ${optionalString (versionOlder base.version "44.0.0.0") '' cp -v "$buildPath/libffmpegsumo.so" "$libExecPath/" ''} cp -v "$buildPath/chrome" "$libExecPath/$packageName" diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix index bb68e4a0ca8..e8ad569adbf 100644 --- a/pkgs/applications/networking/browsers/chromium/source/default.nix +++ b/pkgs/applications/networking/browsers/chromium/source/default.nix @@ -18,7 +18,6 @@ let ]); pre44 = versionOlder version "44.0.0.0"; - is44 = versionOlder version "45.0.0.0" && !pre44; in stdenv.mkDerivation { name = "chromium-source-${version}"; @@ -47,39 +46,9 @@ in stdenv.mkDerivation { done ''; - 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; + patches = if pre44 + then singleton ./nix_plugin_paths_42.patch + else singleton ./nix_plugin_paths_44.patch; patchPhase = let diffmod = sym: "/^${sym} /{s/^${sym} //;${transform ""};s/^/${sym} /}"; diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix index 2ffb8c970e4..86dd127aa6b 100644 --- a/pkgs/applications/networking/browsers/chromium/source/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix @@ -7,15 +7,15 @@ sha256bin64 = "1jzmkgiqn17ynbv0xljiifvlj1136jq98zrkd4hdmkgv8xrrzd74"; }; beta = { - version = "44.0.2403.52"; - sha256 = "0zgcqbxm2slxpj6i50w7r3xxql1k6kgd51qn8w8gwfzhmad4zxyx"; - sha256bin32 = "1kfgl2l7j5fhj6wg4i3bsany2rlwspprypdy0z7k3pqiwwyiw658"; - sha256bin64 = "1sabqqh1hii7appmx6xwabnapf4cv7smsy31nvz063fa5p6h21m8"; + version = "44.0.2403.61"; + sha256 = "16bifaqs3fmfms305c1h10kabsyrscxkywf32pl6zwlzjd3y4ncm"; + sha256bin32 = "1lgqf6bid02pjdzxg1jipfzjqzp5frqxv4bi6q127kky3lz9lmlc"; + sha256bin64 = "1l6cyfn5mraprisib7q5rgy8vvkc7ky8z91c2iqsikjv7nmrm6hv"; }; stable = { - version = "43.0.2357.125"; - sha256 = "01alba50zrc50bn4p3f298khk8fam2rv5wyysz7rq3zrjg8785xg"; - sha256bin32 = "0527bdlf4nd4b1ydmwn6rnxy377388qb98v9anicfd4bc2p9jjml"; - sha256bin64 = "0yhgcjaxcpgk32l1sjrgkq447ywcj156a7372v87m22dcwl8fi01"; + version = "43.0.2357.130"; + sha256 = "0bh093rfiklwj03my9d6x3118k2msbl7fhrxlndx99cnjd1mbyv2"; + sha256bin32 = "083scn6dd11lnd0z5yxd6jfgdxj7iaafssccj8a9ybr1ay894ch1"; + sha256bin64 = "14mfw64ips6nzz6kr8k8dq5253cbqd69hjlc54fl7nqfxi9zw31f"; }; }