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

ungoogled-chromium: 87.0.4280.141 -> 88.0.4324.104

Browse Source 
Unfortunately this requires a crazy hack to support building with
Google's proprietary Widevine DRM technology as that requires fetching
the Google Chrome sources (see also 86ff1e45ce).
The hack is required because ungoogled-chromium doesn't always use tags
that correspond to a Google Chrome release.
This commit is contained in:
Michael Weiss 2021-01-30 19:03:45 +01:00
parent e20fa5f1fb
commit 268600e6b7
No known key found for this signature in database
GPG Key ID: 5BE487C4D4771D83
3 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,14 +55,23 @@ let
pkgSuffix = if channel == "dev" then "unstable" else pkgSuffix = if channel == "dev" then "unstable" else
(if channel == "ungoogled-chromium" then "stable" else channel); (if channel == "ungoogled-chromium" then "stable" else channel);
pkgName = "google-chrome-${pkgSuffix}"; pkgName = "google-chrome-${pkgSuffix}";
chromeSrc = fetchurl { chromeSrc =
urls = map (repo: "${repo}/${pkgName}/${pkgName}_${version}-1_amd64.deb") [ let
"https://dl.google.com/linux/chrome/deb/pool/main/g" # Use the latest stable Chrome version if necessary:
"http://95.31.35.30/chrome/pool/main/g" version = if chromium.upstream-info.sha256bin64 != null
"http://mirror.pcbeta.com/google/chrome/deb/pool/main/g" then chromium.upstream-info.version
"http://repo.fdzh.org/chrome/deb/pool/main/g" else (lib.importJSON ./upstream-info.json).stable.version;
]; sha256 = if chromium.upstream-info.sha256bin64 != null
sha256 = chromium.upstream-info.sha256bin64; then chromium.upstream-info.sha256bin64
else (lib.importJSON ./upstream-info.json).stable.sha256bin64;
in fetchurl {
urls = map (repo: "${repo}/${pkgName}/${pkgName}_${version}-1_amd64.deb") [
"https://dl.google.com/linux/chrome/deb/pool/main/g"
"http://95.31.35.30/chrome/pool/main/g"
"http://mirror.pcbeta.com/google/chrome/deb/pool/main/g"
"http://repo.fdzh.org/chrome/deb/pool/main/g"
];
inherit sha256;
}; };
mkrpath = p: "${lib.makeSearchPathOutput "lib" "lib64" p}:${lib.makeLibraryPath p}"; mkrpath = p: "${lib.makeSearchPathOutput "lib" "lib64" p}:${lib.makeLibraryPath p}";

15
pkgs/applications/networking/browsers/chromium/update.py
View File

@ -166,9 +166,18 @@ with urlopen(HISTORY_URL) as resp:
f'{DEB_URL}/google-chrome-{google_chrome_suffix}/' + f'{DEB_URL}/google-chrome-{google_chrome_suffix}/' +
f'google-chrome-{google_chrome_suffix}_{build["version"]}-1_amd64.deb') f'google-chrome-{google_chrome_suffix}_{build["version"]}-1_amd64.deb')
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
# This build isn't actually available yet. Continue to if (channel_name == 'ungoogled-chromium' and 'sha256' in channel and
# the next one. build['version'].split('.')[0] == last_channels['stable']['version'].split('.')[0]):
continue # Sometimes ungoogled-chromium is updated to a newer tag than
# the latest stable Chromium version. In this case we'll set
# sha256bin64 to null and the Nixpkgs code will fall back to
# the latest stable Google Chrome (only required for
# Widevine/DRM which is disabled by default):
channel['sha256bin64'] = None
else:
# This build isn't actually available yet. Continue to
# the next one.
continue
channel['deps'] = get_channel_dependencies(channel['version']) channel['deps'] = get_channel_dependencies(channel['version'])
if channel_name == 'stable': if channel_name == 'stable':

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

@ -44,19 +44,19 @@
} }
}, },
"ungoogled-chromium": { "ungoogled-chromium": {
"version": "87.0.4280.141", "version": "88.0.4324.104",
"sha256": "0x9k809m36pfirnw2vnr9pk93nxdbgrvna0xf1rs3q91zkbr2x8l", "sha256": "0iq1rmfiqmxsj6skbi17g007zqgjsb50b59slfni2n4mz06xmgbx",
"sha256bin64": "0wq3yi0qyxzcid390w5rh4xjq92fjajvlifjl70g6sqnbk6vgvdp", "sha256bin64": null,
"deps": { "deps": {
"gn": { "gn": {
"version": "2020-09-09", "version": "2020-11-05",
"url": "https://gn.googlesource.com/gn", "url": "https://gn.googlesource.com/gn",
"rev": "e002e68a48d1c82648eadde2f6aafa20d08c36f2", "rev": "53d92014bf94c3893886470a1c7c1289f8818db0",
"sha256": "0x4c7amxwzxs39grqs3dnnz0531mpf1p75niq7zhinyfqm86i4dk" "sha256": "1xcm07qjk6m2czi150fiqqxql067i832adck6zxrishm70c9jbr9"
}, },
"ungoogled-patches": { "ungoogled-patches": {
"rev": "87.0.4280.141-1", "rev": "88.0.4324.104-1",
"sha256": "0r09d27jrdz01rcwifchbq7ksh2bac15h8svq18jx426mr56dzla" "sha256": "09x6kxd99a274mln3k3ckly6swyp5qdnkkp8p6grs9nr5jrgqqx5"
} }
} }
} }