JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #162926 from primeos/ungoogled-chromium

Browse Source 
ungoogled-chromium: 98.0.4758.102 -> 99.0.4844.51
This commit is contained in:
Michael Weiss 2022-03-06 12:18:28 +01:00 committed by GitHub
commit d45e9975c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/networking/browsers/chromium/common.nix
View File

@ -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;

7
pkgs/applications/networking/browsers/chromium/default.nix
View File

@ -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 {

16
pkgs/applications/networking/browsers/chromium/upstream-info.json
View File

@ -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"
}
}
}