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

ungoogled-chromium: 92.0.4515.159 -> 93.0.4577.82

commit19da21137a75b4951c7778154f6b577a085fd974 authorMichael Weiss <dev.primeos@gmail.com> dateSun 19 Sep 2021, 21:48 (5 years ago) parent0428e50f8b837c
3 files changed+14−17
compare with master
unifiedsplit
pkgs/applications/networking/browsers/chromium/common.nix+4−4 pkgs/applications/networking/browsers/chromium/default.nix+2−5 pkgs/applications/networking/browsers/chromium/upstream-info.json+8−8
pkgs/applications/networking/browsers/chromium/common.nix+4−4
@@ -85,12 +85,12 @@ let
8585 in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs));
8686
8787 # https://source.chromium.org/chromium/chromium/src/+/master:build/linux/unbundle/replace_gn_files.py
88− gnSystemLibraries = lib.optionals (!chromiumVersionAtLeast "93") [
89− "ffmpeg"
90− "snappy"
91− ] ++ lib.optionals (!chromiumVersionAtLeast "95") [
88+ gnSystemLibraries = lib.optionals (!chromiumVersionAtLeast "95") [
9289 "zlib"
9390 ] ++ [
91+ # TODO:
92+ # "ffmpeg"
93+ # "snappy"
9494 "flac"
9595 "libjpeg"
9696 "libpng"
pkgs/applications/networking/browsers/chromium/default.nix+2−5
@@ -1,5 +1,5 @@
11{ newScope, config, stdenv, fetchurl, makeWrapper
2−, llvmPackages_12, llvmPackages_13, ed, gnugrep, coreutils, xdg-utils
2+, llvmPackages_13, ed, gnugrep, coreutils, xdg-utils
33, glib, gtk3, gnome, gsettings-desktop-schemas, gn, fetchgit
44, libva, pipewire, wayland
55, gcc, nspr, nss, runCommand
@@ -19,7 +19,7 @@
1919}:
2020
2121let
22− llvmPackages = llvmPackages_12;
22+ llvmPackages = llvmPackages_13;
2323 stdenv = llvmPackages.stdenv;
2424
2525 upstream-info = (lib.importJSON ./upstream-info.json).${channel};
@@ -54,9 +54,6 @@ let
5454 inherit (upstream-info.deps.gn) url rev sha256;
5555 };
5656 });
57− } // lib.optionalAttrs (chromiumVersionAtLeast "93") rec {
58− llvmPackages = llvmPackages_13;
59− stdenv = llvmPackages.stdenv;
6057 });
6158
6259 browser = callPackage ./browser.nix {
pkgs/applications/networking/browsers/chromium/upstream-info.json+8−8
@@ -44,19 +44,19 @@
4444 }
4545 },
4646 "ungoogled-chromium": {
47− "version": "92.0.4515.159",
48− "sha256": "04gxgimg5ygzx6nvfws5y9dppdfjg1fhyl8zbykmksbh1myk6zfr",
49− "sha256bin64": "0lxnqsvqr1kw6swvkhhz475j0xvaa58ha8r1gq8zxmk48mp41985",
47+ "version": "93.0.4577.82",
48+ "sha256": "0lr8zdq06smncdzd6knzww9hxl8ynvxadmrkyyl13fpwb1422rjx",
49+ "sha256bin64": "0ydvcakpnl20gx7493hv6aqnyf8f28rkvzgwnm4gws92b92n9ify",
5050 "deps": {
5151 "gn": {
52− "version": "2021-05-07",
52+ "version": "2021-07-08",
5353 "url": "https://gn.googlesource.com/gn",
54− "rev": "39a87c0b36310bdf06b692c098f199a0d97fc810",
55− "sha256": "0x63jr5hssm9dl6la4q5ahy669k4gxvbapqxi5w32vv107jrj8v4"
54+ "rev": "24e2f7df92641de0351a96096fb2c490b2436bb8",
55+ "sha256": "1lwkyhfhw0zd7daqz466n7x5cddf0danr799h4jg3s0yvd4galjl"
5656 },
5757 "ungoogled-patches": {
58− "rev": "92.0.4515.159-1",
59− "sha256": "1mfkpkyj0sd2k07fzmxmqc24ywqqmcv3vpg1yhh96k676q0qkpd0"
58+ "rev": "93.0.4577.82-1",
59+ "sha256": "199f78f5gvnkpkcvh7587pk35jslkszhvv1d648b4qphzxmw7c66"
6060 }
6161 }
6262 }