cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #146433 from primeos/ungoogled-chromium

Browse source 
ungoogled-chromium: 95.0.4638.69 -> 96.0.4664.45
This commit is contained in:
Michael Weiss 2021-11-19 22:07:21 +01:00 committed by GitHub
commit 51712daede
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/applications/networking/browsers/chromium/common.nix
View file

@ -150,7 +150,6 @@ let
libva libva
libdrm wayland mesa.drivers libxkbcommon libdrm wayland mesa.drivers libxkbcommon
curl curl
] ++ optionals (chromiumVersionAtLeast "96") [
epoxy epoxy
] ++ optionals gnomeSupport [ gnome2.GConf libgcrypt ] ] ++ optionals gnomeSupport [ gnome2.GConf libgcrypt ]
++ optional gnomeKeyringSupport libgnome-keyring3 ++ optional gnomeKeyringSupport libgnome-keyring3
@ -183,7 +182,7 @@ let
substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \ substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \
--replace "/usr/bin/env -S make -f" "/usr/bin/make -f" --replace "/usr/bin/env -S make -f" "/usr/bin/make -f"
fi fi
chmod -x third_party/webgpu-cts/src/tools/${lib.optionalString (chromiumVersionAtLeast "96") "run_"}deno chmod -x third_party/webgpu-cts/src/tools/run_deno
# We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX
substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \ substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \

16
pkgs/applications/networking/browsers/chromium/upstream-info.json
View file

@ -44,19 +44,19 @@
} }
}, },
"ungoogled-chromium": { "ungoogled-chromium": {
"version": "95.0.4638.69", "version": "96.0.4664.45",
"sha256": "1rzg48mbd5n75nq2rfwknyxpmfrddds199ic82c736kcgirpv8rq", "sha256": "01q4fsf2cbx6g9nnaihvc5jj3ap8jq2gf16pnhf7ixzbhgcnm328",
"sha256bin64": "1jhxm12sdlgvgnny0p56xsfyxd78mwn9qwc20c33qfvwxrzp9ajp", "sha256bin64": "0546i4yd1jahv088hjxpq0jc393pscvl5ap3s2qw5jrybliyfd2g",
"deps": { "deps": {
"gn": { "gn": {
"version": "2021-08-11", "version": "2021-09-24",
"url": "https://gn.googlesource.com/gn", "url": "https://gn.googlesource.com/gn",
"rev": "69ec4fca1fa69ddadae13f9e6b7507efa0675263", "rev": "0153d369bbccc908f4da4993b1ba82728055926a",
"sha256": "031znmkbm504iim5jvg3gmazj4qnkfc7zg8aymjsij18fhf7piz0" "sha256": "0y4414h8jqsbz5af6pn91c0vkfp4s281s85g992xfyl785c5zbsi"
}, },
"ungoogled-patches": { "ungoogled-patches": {
"rev": "95.0.4638.69-1", "rev": "96.0.4664.45-1",
"sha256": "19azr4m4rd6za9vgcggijyq9x54jrjp0n07y4falgjrdz9q4f7aj" "sha256": "1k0kf5ika1sz489bcbn485kmdq1xp7ssa80gbqrpd60xihkhnrm3"
} }
} }
} }