git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #104100 from primeos/chromium

chromium: 86.0.4240.198 -> 87.0.4280.66

commitad0958bf7df05b97d3d09e802e3698076afa95fa authorMichael Weiss <dev.primeos@gmail.com> dateWed 18 Nov 2020, 11:49 (6 years ago) parent09506f554673b1
3 files changed+11−15
compare with master
unifiedsplit
pkgs/applications/networking/browsers/chromium/common.nix−3 pkgs/applications/networking/browsers/chromium/default.nix+2−3 pkgs/applications/networking/browsers/chromium/upstream-info.json+9−9
pkgs/applications/networking/browsers/chromium/common.nix−3
@@ -152,9 +152,6 @@ let
152152 ./patches/no-build-timestamps.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed)
153153 ./patches/widevine-79.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags
154154 # ++ optional (versionRange "68" "72") ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" )
155− ] ++ optionals (useVaapi && versionRange "86" "87") [
156− # Check for enable-accelerated-video-decode on Linux:
157− (githubPatch "54deb9811ca9bd2327def5c05ba6987b8c7a0897" "11jvxjlkzz1hm0pvfyr88j7z3zbwzplyl5idkx92l2lzv4459c8d")
158155 ];
159156
160157 postPatch = ''
pkgs/applications/networking/browsers/chromium/default.nix+2−3
@@ -15,7 +15,7 @@
1515, enablePepperFlash ? false
1616, enableWideVine ? false
1717, enableVaapi ? false # Disabled by default due to unofficial support
18−, useOzone ? false
18+, useOzone ? true
1919, cupsSupport ? true
2020, pulseSupport ? config.pulseaudio or stdenv.isLinux
2121, commandLineArgs ? ""
@@ -41,8 +41,7 @@ let
4141 inherit (upstream-info.deps.gn) url rev sha256;
4242 };
4343 });
44− } // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "87") {
45− useOzone = true; # YAY: https://chromium-review.googlesource.com/c/chromium/src/+/2382834 \o/
44+ # TODO: Cleanup useOzone and useVaapi in common.nix:
4645 useVaapi = !stdenv.isAarch64; # TODO: Might be best to not set use_vaapi anymore (default is fine)
4746 });
4847
pkgs/applications/networking/browsers/chromium/upstream-info.json+9−9
@@ -1,21 +1,21 @@
11{
22 "stable": {
3− "version": "86.0.4240.198",
4− "sha256": "0i3s1il0x5yi3528gdsg3bhnyhs2x24zh7p1nd5apv3va9g85ax0",
5− "sha256bin64": "0qfhs73r6j0r3nyqbnscnf7h1rs1s68lfl5ndsyd32dmip7ma01x",
3+ "version": "87.0.4280.66",
4+ "sha256": "0hgpg31gkksqgyvycsan7l7vjypc7cr6ikjfygf2zv7dhbmf9a19",
5+ "sha256bin64": "09hjhxjihhxq5i2wadpa0g72a6iis0igarr8arrcah4122icdr77",
66 "deps": {
77 "gn": {
8− "version": "2020-08-07",
8+ "version": "2020-09-09",
99 "url": "https://gn.googlesource.com/gn",
10− "rev": "e327ffdc503815916db2543ec000226a8df45163",
11− "sha256": "0kvlfj3www84zp1vmxh76x8fdjm9hyk8lkh2vdsidafpmm75fphr"
10+ "rev": "e002e68a48d1c82648eadde2f6aafa20d08c36f2",
11+ "sha256": "0x4c7amxwzxs39grqs3dnnz0531mpf1p75niq7zhinyfqm86i4dk"
1212 }
1313 }
1414 },
1515 "beta": {
16− "version": "87.0.4280.47",
17− "sha256": "0a3c4kz85857wrbcxqknbqmai250d36nq332l66a83r8sidhbxfq",
18− "sha256bin64": "0bjls2airr4p448rx7im1a7gff68yfnfb5vymr4bin4kz0s38mpw",
16+ "version": "87.0.4280.66",
17+ "sha256": "0hgpg31gkksqgyvycsan7l7vjypc7cr6ikjfygf2zv7dhbmf9a19",
18+ "sha256bin64": "15n01jia8sxv3a7vfbla40rq45x54pyksg0kg14bm0br6m3n65pz",
1919 "deps": {
2020 "gn": {
2121 "version": "2020-09-09",