From 57b9911c36f7bc041f0f9ed8a39a33d5846d3c94 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 9 Sep 2021 22:58:14 +0200 Subject: [PATCH 1/6] chromiumBeta: 94.0.4606.31 -> 94.0.4606.41 (cherry picked from commit 05c0b2743fb434ecf2d0b8446decdf4a0f9d1c4b) --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index cc1564ef1a4..8b4c3da7fbb 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -18,9 +18,9 @@ } }, "beta": { - "version": "94.0.4606.31", - "sha256": "1f5hk2acd9lj88m2acz8ik85fh5h3giz65p19dpfg92zsyly54nf", - "sha256bin64": "1ypf9j51a4kmx27x3s9izzbd2r094idz194gwhbdly75l1x8hk4z", + "version": "94.0.4606.41", + "sha256": "0kdi8rbly002abg9jwkmv6xmfcv7g0rm68lbdsnhr0biy7wvadij", + "sha256bin64": "0ayhppzwc4ia36hpakqg9rh3cggw33c7d2zkfaias3zm14k86ga2", "deps": { "gn": { "version": "2021-08-11", From 25bbb6bfcc44c33b42cfc77644836bbdd6f66e3f Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 10 Sep 2021 22:53:27 +0200 Subject: [PATCH 2/6] chromiumDev: 95.0.4628.3 -> 95.0.4636.4 (cherry picked from commit 6094ee5b4f9cf5873bc4f67b400b06084d6800dd) --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 8b4c3da7fbb..38b595d245b 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,9 +31,9 @@ } }, "dev": { - "version": "95.0.4628.3", - "sha256": "04r2db9kl77lp4jyyj01pc70jkxrifbnz5hic4r91lf8m2gf1fa3", - "sha256bin64": "1ssf8jdk6gn2mrnyvgz2c9nkk70rsidd5y26w2kx3s0cllfr7d96", + "version": "95.0.4636.4", + "sha256": "1rhkmja9p2a8cxnjsrs0ipzajxwgp3c8q3903rp8ns1g579c4g3j", + "sha256bin64": "0l89iqi95fa10m3jdhbvfdjf4x88gscx6imkhy2x2ax669d19606", "deps": { "gn": { "version": "2021-08-11", From 1f7132053685a10137902d2e819a25df1561d359 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 18 Sep 2021 12:13:17 +0200 Subject: [PATCH 3/6] chromiumBeta: 94.0.4606.41 -> 94.0.4606.50 (cherry picked from commit a11784ab9ca241f9d84e098825270d6c07bb4946) --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 38b595d245b..17dea552fa7 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -18,9 +18,9 @@ } }, "beta": { - "version": "94.0.4606.41", - "sha256": "0kdi8rbly002abg9jwkmv6xmfcv7g0rm68lbdsnhr0biy7wvadij", - "sha256bin64": "0ayhppzwc4ia36hpakqg9rh3cggw33c7d2zkfaias3zm14k86ga2", + "version": "94.0.4606.50", + "sha256": "1aqy9bvypx66bvn5p15g94p47yfbal8mixs1d0j82pznqnqgph1z", + "sha256bin64": "07hq4qnbgq6m43zhipgy84yhiiy1fs6ffjkgsi8ixhr9b5pipzpv", "deps": { "gn": { "version": "2021-08-11", From 559b5adf071065ee1f47304ae38702abd9d83145 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 18 Sep 2021 12:13:17 +0200 Subject: [PATCH 4/6] chromiumDev: 95.0.4636.4 -> 95.0.4638.10 (cherry picked from commit 6a40706d5146a0d0567fbdea59c3d67c340b7694) --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 17dea552fa7..14ef907ca27 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,9 +31,9 @@ } }, "dev": { - "version": "95.0.4636.4", - "sha256": "1rhkmja9p2a8cxnjsrs0ipzajxwgp3c8q3903rp8ns1g579c4g3j", - "sha256bin64": "0l89iqi95fa10m3jdhbvfdjf4x88gscx6imkhy2x2ax669d19606", + "version": "95.0.4638.10", + "sha256": "0pgd5k24yly9fqpzigc5qqx6lvn6m95fjp7294cgmk0132icx71j", + "sha256bin64": "1gfaal3yxmi1n2nvfp39xp82g8vykzm0fjbdk0c1wh4gvlq2xx85", "deps": { "gn": { "version": "2021-08-11", From f7be049abd79bb3317273c1ec4a194bef12e1045 Mon Sep 17 00:00:00 2001 From: Yureka Date: Sat, 18 Sep 2021 18:30:45 +0200 Subject: [PATCH 5/6] chromiumDev: fix build (cherry picked from commit a34f7dbb73831240702c1f60ca24e6f856622575) --- pkgs/applications/networking/browsers/chromium/common.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 9e174707e40..70d0d4bf08b 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -88,6 +88,8 @@ let gnSystemLibraries = lib.optionals (!chromiumVersionAtLeast "93") [ "ffmpeg" "snappy" + ] ++ lib.optionals (!chromiumVersionAtLeast "95") [ + "zlib" ] ++ [ "flac" "libjpeg" @@ -95,7 +97,6 @@ let "libwebp" "libxslt" "opus" - "zlib" ]; opusWithCustomModes = libopus.override { From af4338e6e735b97b6b311f8fac0a736d97343833 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 19 Sep 2021 13:08:14 +0200 Subject: [PATCH 6/6] ungoogled-chromium: 92.0.4515.159 -> 93.0.4577.82 (cherry picked from commit f8b837c808490644bc7de35108a2212c22c8b262) --- .../networking/browsers/chromium/common.nix | 8 ++++---- .../networking/browsers/chromium/default.nix | 7 ++----- .../browsers/chromium/upstream-info.json | 16 ++++++++-------- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 70d0d4bf08b..406f1ec479d 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -85,12 +85,12 @@ 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 "93") [ - "ffmpeg" - "snappy" - ] ++ lib.optionals (!chromiumVersionAtLeast "95") [ + gnSystemLibraries = lib.optionals (!chromiumVersionAtLeast "95") [ "zlib" ] ++ [ + # TODO: + # "ffmpeg" + # "snappy" "flac" "libjpeg" "libpng" diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 86ee33f3510..c4521c89caa 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,5 +1,5 @@ { newScope, config, stdenv, fetchurl, makeWrapper -, llvmPackages_12, llvmPackages_13, ed, gnugrep, coreutils, xdg-utils +, llvmPackages_13, ed, gnugrep, coreutils, xdg-utils , glib, gtk3, gnome, gsettings-desktop-schemas, gn, fetchgit , libva, pipewire, wayland , gcc, nspr, nss, runCommand @@ -19,7 +19,7 @@ }: let - llvmPackages = llvmPackages_12; + llvmPackages = llvmPackages_13; stdenv = llvmPackages.stdenv; upstream-info = (lib.importJSON ./upstream-info.json).${channel}; @@ -54,9 +54,6 @@ let inherit (upstream-info.deps.gn) url rev sha256; }; }); - } // lib.optionalAttrs (chromiumVersionAtLeast "93") rec { - llvmPackages = llvmPackages_13; - stdenv = llvmPackages.stdenv; }); browser = callPackage ./browser.nix { diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 14ef907ca27..676553c5731 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -44,19 +44,19 @@ } }, "ungoogled-chromium": { - "version": "92.0.4515.159", - "sha256": "04gxgimg5ygzx6nvfws5y9dppdfjg1fhyl8zbykmksbh1myk6zfr", - "sha256bin64": "0lxnqsvqr1kw6swvkhhz475j0xvaa58ha8r1gq8zxmk48mp41985", + "version": "93.0.4577.82", + "sha256": "0lr8zdq06smncdzd6knzww9hxl8ynvxadmrkyyl13fpwb1422rjx", + "sha256bin64": "0ydvcakpnl20gx7493hv6aqnyf8f28rkvzgwnm4gws92b92n9ify", "deps": { "gn": { - "version": "2021-05-07", + "version": "2021-07-08", "url": "https://gn.googlesource.com/gn", - "rev": "39a87c0b36310bdf06b692c098f199a0d97fc810", - "sha256": "0x63jr5hssm9dl6la4q5ahy669k4gxvbapqxi5w32vv107jrj8v4" + "rev": "24e2f7df92641de0351a96096fb2c490b2436bb8", + "sha256": "1lwkyhfhw0zd7daqz466n7x5cddf0danr799h4jg3s0yvd4galjl" }, "ungoogled-patches": { - "rev": "92.0.4515.159-1", - "sha256": "1mfkpkyj0sd2k07fzmxmqc24ywqqmcv3vpg1yhh96k676q0qkpd0" + "rev": "93.0.4577.82-1", + "sha256": "199f78f5gvnkpkcvh7587pk35jslkszhvv1d648b4qphzxmw7c66" } } }