diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2022-05-26 22:08:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-26 22:08:43 +0200 |
| commit | 7c75ba3448235564c7a8911799543eb9d130d93a (patch) | |
| tree | 9420ed17b9e43787839e3faaeceeb5d7c8da2710 | |
| parent | Merge pull request #174781 from NixOS/backport-174338-to-release-21.11 (diff) | |
| parent | ungoogled-chromium: 101.0.4951.64 -> 102.0.5005.61 (diff) | |
| download | nixpkgs-7c75ba3448235564c7a8911799543eb9d130d93a.tar.gz | |
Merge pull request #174780 from NixOS/backport-174623-to-release-21.11
[Backport release-21.11] ungoogled-chromium: 101.0.4951.64 -> 102.0.5005.61
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 5 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/upstream-info.json | 16 |
2 files changed, 10 insertions, 11 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 8d99fcc8abf6..c397936a7cc7 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -166,7 +166,7 @@ let ./patches/m102-fix-dawn_version_generator-failure.patch ]; - postPatch = optionalString (chromiumVersionAtLeast "102") '' + postPatch = '' # Workaround/fix for https://bugs.chromium.org/p/chromium/issues/detail?id=1313361: substituteInPlace BUILD.gn \ --replace '"//infra/orchestrator:orchestrator_all",' "" @@ -174,7 +174,6 @@ let substituteInPlace build/config/compiler/BUILD.gn \ --replace '"-Xclang",' "" \ --replace '"-no-opaque-pointers",' "" - '' + '' # remove unused third-party for lib in ${toString gnSystemLibraries}; do if [ -d "third_party/$lib" ]; then @@ -194,7 +193,7 @@ let --replace "/usr/bin/env -S make -f" "/usr/bin/make -f" fi chmod -x third_party/webgpu-cts/src/tools/run_deno - ${lib.optionalString (chromiumVersionAtLeast "102") "chmod -x third_party/dawn/third_party/webgpu-cts/tools/run_deno"} + chmod -x third_party/dawn/third_party/webgpu-cts/tools/run_deno # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \ diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 5cd12fbd2826..4eae1d13099f 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -45,19 +45,19 @@ } }, "ungoogled-chromium": { - "version": "101.0.4951.64", - "sha256": "1xyqm32y9v1hn8ji6qfw6maynqgg3266j58dq4x4aqsm2gj9cn4w", - "sha256bin64": "14ijrj7h2y72ppyysz6jv40c01lbnan7z69cl24asch2zjlgwv8v", + "version": "102.0.5005.61", + "sha256": "07vbi3gn9g4n04b2qi2hm34r122snrqaifa46yk3pyh1d79rfdqs", + "sha256bin64": "100n8k3d9k5bq58irc36ig6m5m0lxggffyk4crqqqcib2anqd0zv", "deps": { "gn": { - "version": "2022-03-14", + "version": "2022-04-14", "url": "https://gn.googlesource.com/gn", - "rev": "bd99dbf98cbdefe18a4128189665c5761263bcfb", - "sha256": "0nql15ckjqkm001xajq3qyn4h4q80i7x6dm9zinxxr1a8q5lppx3" + "rev": "fd9f2036f26d83f9fcfe93042fb952e5a7fe2167", + "sha256": "0b5xs0chcv3hfhy71rycsmgxnqbm375a333hwav8929k9cbi5p9h" }, "ungoogled-patches": { - "rev": "101.0.4951.64-1", - "sha256": "0k7w6xvjf1yzyak9ywvcdw762d8zbx6d8haz35q87jz0mxfn2mr3" + "rev": "102.0.5005.61-1", + "sha256": "1hlyi6k894blkkqmqsizx72bag2vj6wlpza0fvi8db5wp6i5b58g" } } } |