summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adler <therisen06@gmail.com>2021-10-21 09:13:10 +0200
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2021-10-21 19:45:44 +0000
commit4d6cfda283472cdc283f24eae61159e98213922c (patch)
tree210836bfb2ba637a9d6210807d6cb4ad14bac66d
parentMerge pull request #142335 from NixOS/backport-141382-to-release-21.05 (diff)
downloadnixpkgs-origin/backport-142450-to-release-21.05.tar.gz
ungoogled-chromium: 94.0.4606.81 -> 95.0.4638.54origin/backport-142450-to-release-21.05
(cherry picked from commit a8f4267547377cbd3abaf816ca6a6cf805bd0c01)
-rw-r--r--pkgs/applications/networking/browsers/chromium/common.nix4
-rw-r--r--pkgs/applications/networking/browsers/chromium/upstream-info.json10
2 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index a9331041ddde..e88c1fa1b94a 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -87,9 +87,7 @@ let
in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs));
# https://source.chromium.org/chromium/chromium/src/+/master:build/linux/unbundle/replace_gn_files.py
- gnSystemLibraries = lib.optionals (!chromiumVersionAtLeast "95") [
- "zlib"
- ] ++ [
+ gnSystemLibraries = [
# TODO:
# "ffmpeg"
# "snappy"
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index 6e890ccb6c37..ac13edac16e5 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -44,9 +44,9 @@
}
},
"ungoogled-chromium": {
- "version": "94.0.4606.81",
- "sha256": "16755mfqxxmvslm9ix060safrnml91ckj5p85960jj5g5hmslwbh",
- "sha256bin64": "1d3z5np6b6jax7afak7f0yh76kmmdggdjlrzwyhy8hgrv7c7rsdz",
+ "version": "95.0.4638.54",
+ "sha256": "1zb1009gg9962axn2l1krycz7ml20i8z2n3ka2psxpg68pbqivry",
+ "sha256bin64": "0mf9jfzwz6nkz1yg8lndz1gmsvmdh1rxhqkv0vd9nr04h5x9b41a",
"deps": {
"gn": {
"version": "2021-08-11",
@@ -55,8 +55,8 @@
"sha256": "031znmkbm504iim5jvg3gmazj4qnkfc7zg8aymjsij18fhf7piz0"
},
"ungoogled-patches": {
- "rev": "94.0.4606.81-1",
- "sha256": "113abybh8kkw9a92lj6jww6dl6rc1sv5x7a7a1gjwsihzd2r0cik"
+ "rev": "95.0.4638.54-1",
+ "sha256": "01jkkz5224aaj5cgdmqknf8v73fyaw4q8bzbqa520a0lvl7hwbg5"
}
}
}