diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2022-03-06 12:18:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-06 12:18:28 +0100 |
| commit | d45e9975c1bb7fa6273e7842a499eb58bbe27cc4 (patch) | |
| tree | 8cefc555c71fad1e8fb7f83c86b7faa31449b4f9 /pkgs/applications/networking | |
| parent | 047ac8cca2b01ea1030740baab5a6d4bdc46e64b (diff) | |
| parent | 16fbf26530163d2244e2cdc2d4d1a12fe022ba0c (diff) | |
| download | nixpkgs-d45e9975c1bb7fa6273e7842a499eb58bbe27cc4.tar nixpkgs-d45e9975c1bb7fa6273e7842a499eb58bbe27cc4.tar.gz nixpkgs-d45e9975c1bb7fa6273e7842a499eb58bbe27cc4.tar.bz2 nixpkgs-d45e9975c1bb7fa6273e7842a499eb58bbe27cc4.tar.lz nixpkgs-d45e9975c1bb7fa6273e7842a499eb58bbe27cc4.tar.xz nixpkgs-d45e9975c1bb7fa6273e7842a499eb58bbe27cc4.tar.zst nixpkgs-d45e9975c1bb7fa6273e7842a499eb58bbe27cc4.zip | |
Merge pull request #162926 from primeos/ungoogled-chromium
ungoogled-chromium: 98.0.4758.102 -> 99.0.4844.51
Diffstat (limited to 'pkgs/applications/networking')
3 files changed, 11 insertions, 14 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 0eb1893e95c..e2acb21c6bc 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -266,7 +266,7 @@ let google_api_key = "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI"; # Optional features: - use_gio = gnomeSupport || chromiumVersionAtLeast "99"; + use_gio = true; use_gnome_keyring = gnomeKeyringSupport; use_cups = cupsSupport; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 084db58f38b..0202ead4605 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_13, llvmPackages_14, ed, gnugrep, coreutils, xdg-utils +, llvmPackages_14, 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_13; + llvmPackages = llvmPackages_14; 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 "99") rec { - llvmPackages = llvmPackages_14; - stdenv = llvmPackages_14.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 f59cee7bab0..33284faf14e 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": "98.0.4758.102", - "sha256": "0gpk13k8pfk65vinlmkg3p7mm0qb8z35psajkxzx0v3n2bllfns1", - "sha256bin64": "0pfrakkfqw6ni96s2d0z50mpd63maic9rsc64zd85vh2jkmzskw6", + "version": "99.0.4844.51", + "sha256": "1qxsn8zvvvsnn0k7nn606rhaial8ikrlfh175msqpp50xibjxicp", + "sha256bin64": "04kqfppa88g2q54vp53avyyhqzrxljz49p4wqk76kq7fz2rm94x1", "deps": { "gn": { - "version": "2021-12-07", + "version": "2022-01-10", "url": "https://gn.googlesource.com/gn", - "rev": "fc295f3ac7ca4fe7acc6cb5fb052d22909ef3a8f", - "sha256": "02bx3bp85kkis704gndb6jvjph7gv3ij746bq4anl30kfrkpcifh" + "rev": "80a40b07305373617eba2d5878d353532af77da3", + "sha256": "1103lf38h7412949j6nrk48m2vv2rrxacn42sjg33lg88nyv7skv" }, "ungoogled-patches": { - "rev": "98.0.4758.102-1", - "sha256": "0baz90fnzpldw0wwibhmh4pmki7vlpci9b9vvifa0rj5cwckl8a0" + "rev": "99.0.4844.51-1", + "sha256": "0rs10jrng63lk4xgnqpgc8zxaj6lp70csbx6r0ihpv4z3rdn37va" } } } |