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

Merge ungoogled-chromium back into the chromium expressions

commitf5944b74e670cac2746edaee609c9f31d816bcbd authorMichael Weiss <dev.primeos@gmail.com> dateThu 17 Dec 2020, 19:02 (6 years ago) parent230e0a3240a8f7
16 files changed+73−950
pkgs/applications/networking/browsers/chromium/browser.nix+12−5 pkgs/applications/networking/browsers/chromium/common.nix+27 pkgs/applications/networking/browsers/chromium/default.nix+10−4 pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled.nix → pkgs/applications/networking/browsers/chromium/ungoogled.nix+1 pkgs/applications/networking/browsers/chromium/update.py+3 pkgs/applications/networking/browsers/chromium/upstream-info.json+16 pkgs/applications/networking/browsers/ungoogled-chromium/browser.nix−86 pkgs/applications/networking/browsers/ungoogled-chromium/common.nix−345 pkgs/applications/networking/browsers/ungoogled-chromium/default.nix−214 pkgs/applications/networking/browsers/ungoogled-chromium/patches/no-build-timestamps.patch−17 pkgs/applications/networking/browsers/ungoogled-chromium/patches/widevine-79.patch−13 pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix−92 pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix−6 pkgs/applications/networking/browsers/ungoogled-chromium/update.py−121 pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.json−46 pkgs/top-level/all-packages.nix+4−1
pkgs/applications/networking/browsers/chromium/browser.nix+12−5
@@ -1,4 +1,4 @@
1−{ stdenv, mkChromiumDerivation, channel, enableWideVine }:
1+{ stdenv, mkChromiumDerivation, channel, enableWideVine, ungoogled }:
22
33with stdenv.lib;
44
@@ -69,18 +69,25 @@ mkChromiumDerivation (base: rec {
6969 requiredSystemFeatures = [ "big-parallel" ];
7070
7171 meta = {
72− description = "An open source web browser from Google";
72+ description = "An open source web browser from Google"
73+ + optionalString ungoogled ", with dependencies on Google web services removed";
7374 longDescription = ''
7475 Chromium is an open source web browser from Google that aims to build a
7576 safer, faster, and more stable way for all Internet users to experience
7677 the web. It has a minimalist user interface and provides the vast majority
7778 of source code for Google Chrome (which has some additional features).
7879 '';
79− homepage = "https://www.chromium.org/";
80− maintainers = with maintainers; [ primeos thefloweringash bendlas ]; # See README.md
80+ homepage = if ungoogled
81+ then "https://github.com/Eloston/ungoogled-chromium"
82+ else "https://www.chromium.org/";
83+ maintainers = with maintainers; if ungoogled
84+ then [ squalus primeos ]
85+ else [ primeos thefloweringash bendlas ];
8186 license = if enableWideVine then licenses.unfree else licenses.bsd3;
8287 platforms = platforms.linux;
83− hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else [];
88+ hydraPlatforms = if (channel == "stable" || channel == "ungoogled-chromium")
89+ then ["aarch64-linux" "x86_64-linux"]
90+ else [];
8491 timeout = 172800; # 48 hours (increased from the Hydra default of 10h)
8592 };
8693})
pkgs/applications/networking/browsers/chromium/common.nix+27
@@ -31,6 +31,7 @@
3131, proprietaryCodecs ? true
3232, cupsSupport ? true
3333, pulseSupport ? false, libpulseaudio ? null
34+, ungoogled ? false, ungoogled-chromium
3435
3536, channel
3637, upstream-info
@@ -109,6 +110,10 @@ let
109110 result
110111 else result;
111112
113+ ungoogler = ungoogled-chromium {
114+ inherit (upstream-info.deps.ungoogled-patches) rev sha256;
115+ };
116+
112117 base = rec {
113118 name = "${packageName}-unwrapped-${version}";
114119 inherit (upstream-info) version;
@@ -208,6 +213,10 @@ let
208213 '' + optionalString stdenv.isAarch64 ''
209214 substituteInPlace build/toolchain/linux/BUILD.gn \
210215 --replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""'
216+ '' + optionalString ungoogled ''
217+ ${ungoogler}/utils/prune_binaries.py . ${ungoogler}/pruning.list || echo "some errors"
218+ ${ungoogler}/utils/patches.py . ${ungoogler}/patches
219+ ${ungoogler}/utils/domain_substitution.py apply -r ${ungoogler}/domain_regex.list -f ${ungoogler}/domain_substitution.list -c ./ungoogled-domsubcache.tar.gz .
211220 '';
212221
213222 gnFlags = mkGnFlags ({
@@ -260,6 +269,24 @@ let
260269 use_system_minigbm = true;
261270 use_system_libdrm = true;
262271 system_wayland_scanner_path = "${wayland}/bin/wayland-scanner";
272+ } // optionalAttrs ungoogled {
273+ chrome_pgo_phase = 0;
274+ enable_hangout_services_extension = false;
275+ enable_js_type_check = false;
276+ enable_mdns = false;
277+ enable_nacl_nonsfi = false;
278+ enable_one_click_signin = false;
279+ enable_reading_list = false;
280+ enable_remoting = false;
281+ enable_reporting = false;
282+ enable_service_discovery = false;
283+ exclude_unwind_tables = true;
284+ google_api_key = "";
285+ google_default_client_id = "";
286+ google_default_client_secret = "";
287+ safe_browsing_mode = 0;
288+ use_official_google_api_keys = false;
289+ use_unofficial_version_number = false;
263290 } // (extraAttrs.gnFlags or {}));
264291
265292 configurePhase = ''
pkgs/applications/networking/browsers/chromium/default.nix+10−4
@@ -15,6 +15,7 @@
1515, enablePepperFlash ? false
1616, enableWideVine ? false
1717, enableVaapi ? false # Disabled by default due to unofficial support
18+, ungoogled ? false # Whether to build chromium or ungoogled-chromium
1819, cupsSupport ? true
1920, pulseSupport ? config.pulseaudio or stdenv.isLinux
2021, commandLineArgs ? ""
@@ -33,7 +34,7 @@ let
3334
3435 mkChromiumDerivation = callPackage ./common.nix ({
3536 inherit channel gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs
36− cupsSupport pulseSupport;
37+ cupsSupport pulseSupport ungoogled;
3738 gnChromium = gn.overrideAttrs (oldAttrs: {
3839 inherit (upstream-info.deps.gn) version;
3940 src = fetchgit {
@@ -42,11 +43,13 @@ let
4243 });
4344 });
4445
45− browser = callPackage ./browser.nix { inherit channel enableWideVine; };
46+ browser = callPackage ./browser.nix { inherit channel enableWideVine ungoogled; };
4647
4748 plugins = callPackage ./plugins.nix {
4849 inherit enablePepperFlash;
4950 };
51+
52+ ungoogled-chromium = callPackage ./ungoogled.nix {};
5053 };
5154
5255 pkgSuffix = if channel == "dev" then "unstable" else channel;
@@ -113,7 +116,9 @@ let
113116 };
114117 };
115118
116− suffix = if channel != "stable" then "-" + channel else "";
119+ suffix = if (channel == "stable" || channel == "ungoogled-chromium")
120+ then ""
121+ else "-" + channel;
117122
118123 sandboxExecutableName = chromium.browser.passthru.sandboxExecutableName;
119124
@@ -133,7 +138,8 @@ let
133138 else browser;
134139
135140in stdenv.mkDerivation {
136− name = "chromium${suffix}-${version}";
141+ name = lib.optionalString ungoogled "ungoogled-"
142+ + "chromium${suffix}-${version}";
137143 inherit version;
138144
139145 buildInputs = [
pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled.nix → pkgs/applications/networking/browsers/chromium/ungoogled.nixrenamed+1
@@ -4,6 +4,7 @@
44, makeWrapper
55, patch
66}:
7+
78{ rev
89, sha256
910}:
pkgs/applications/networking/browsers/chromium/update.py+3
@@ -113,9 +113,12 @@ with open(JSON_PATH, 'w') as out:
113113 return 1
114114 elif channel_name == 'dev':
115115 return 2
116+ elif channel_name == 'ungoogled-chromium':
117+ return 3
116118 else:
117119 print(f'Error: Unexpected channel: {channel_name}', file=sys.stderr)
118120 sys.exit(1)
121+ channels['ungoogled-chromium'] = last_channels['ungoogled-chromium'] # Keep ungoogled-chromium unchanged
119122 sorted_channels = OrderedDict(sorted(channels.items(), key=get_channel_key))
120123 json.dump(sorted_channels, out, indent=2)
121124 out.write('\n')
pkgs/applications/networking/browsers/chromium/upstream-info.json+16
@@ -42,5 +42,21 @@
4242 "sha256": "1xcm07qjk6m2czi150fiqqxql067i832adck6zxrishm70c9jbr9"
4343 }
4444 }
45+ },
46+ "ungoogled-chromium": {
47+ "version": "87.0.4280.88",
48+ "sha256": "1h09g9b2zxad85vd146ymvg3w2kpngpi78yig3dn1vrmhwr4aiiy",
49+ "deps": {
50+ "ungoogled-patches": {
51+ "rev": "87.0.4280.88-1",
52+ "sha256": "0w2137w8hfcgl6f938hqnb4ffp33v5r8vdzxrvs814w7dszkiqgg"
53+ },
54+ "gn": {
55+ "version": "2020-09-09",
56+ "url": "https://gn.googlesource.com/gn",
57+ "rev": "e002e68a48d1c82648eadde2f6aafa20d08c36f2",
58+ "sha256": "0x4c7amxwzxs39grqs3dnnz0531mpf1p75niq7zhinyfqm86i4dk"
59+ }
60+ }
4561 }
4662}
pkgs/applications/networking/browsers/ungoogled-chromium/browser.nixdeleted−86
@@ -1,86 +0,0 @@
1−{ stdenv, mkChromiumDerivation, channel, enableWideVine }:
2−
3−with stdenv.lib;
4−
5−mkChromiumDerivation (base: rec {
6− name = "chromium-browser";
7− packageName = "chromium";
8− buildTargets = [ "mksnapshot" "chrome_sandbox" "chrome" ];
9−
10− outputs = ["out" "sandbox"];
11−
12− sandboxExecutableName = "__chromium-suid-sandbox";
13−
14− installPhase = ''
15− mkdir -p "$libExecPath"
16− cp -v "$buildPath/"*.so "$buildPath/"*.pak "$buildPath/"*.bin "$libExecPath/"
17− cp -v "$buildPath/icudtl.dat" "$libExecPath/"
18− cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/"
19− cp -v "$buildPath/chrome" "$libExecPath/$packageName"
20−
21− # Swiftshader
22− # See https://stackoverflow.com/a/4264351/263061 for the find invocation.
23− if [ -n "$(find "$buildPath/swiftshader/" -maxdepth 1 -name '*.so' -print -quit)" ]; then
24− echo "Swiftshader files found; installing"
25− mkdir -p "$libExecPath/swiftshader"
26− cp -v "$buildPath/swiftshader/"*.so "$libExecPath/swiftshader/"
27− else
28− echo "Swiftshader files not found"
29− fi
30−
31− mkdir -p "$sandbox/bin"
32− cp -v "$buildPath/chrome_sandbox" "$sandbox/bin/${sandboxExecutableName}"
33−
34− mkdir -vp "$out/share/man/man1"
35− cp -v "$buildPath/chrome.1" "$out/share/man/man1/$packageName.1"
36−
37− for icon_file in chrome/app/theme/chromium/product_logo_*[0-9].png; do
38− num_and_suffix="''${icon_file##*logo_}"
39− icon_size="''${num_and_suffix%.*}"
40− expr "$icon_size" : "^[0-9][0-9]*$" || continue
41− logo_output_prefix="$out/share/icons/hicolor"
42− logo_output_path="$logo_output_prefix/''${icon_size}x''${icon_size}/apps"
43− mkdir -vp "$logo_output_path"
44− cp -v "$icon_file" "$logo_output_path/$packageName.png"
45− done
46−
47− # Install Desktop Entry
48− install -D chrome/installer/linux/common/desktop.template \
49− $out/share/applications/chromium-browser.desktop
50−
51− substituteInPlace $out/share/applications/chromium-browser.desktop \
52− --replace "@@MENUNAME@@" "Chromium" \
53− --replace "@@PACKAGE@@" "chromium" \
54− --replace "Exec=/usr/bin/@@USR_BIN_SYMLINK_NAME@@" "Exec=chromium"
55−
56− # Append more mime types to the end
57− sed -i '/^MimeType=/ s,$,x-scheme-handler/webcal;x-scheme-handler/mailto;x-scheme-handler/about;x-scheme-handler/unknown,' \
58− $out/share/applications/chromium-browser.desktop
59−
60− # See https://github.com/NixOS/nixpkgs/issues/12433
61− sed -i \
62− -e '/\[Desktop Entry\]/a\' \
63− -e 'StartupWMClass=chromium-browser' \
64− $out/share/applications/chromium-browser.desktop
65− '';
66−
67− passthru = { inherit sandboxExecutableName; };
68−
69− requiredSystemFeatures = [ "big-parallel" ];
70−
71− meta = {
72− description = "An open source web browser from Google, with dependencies on Google web services removed";
73− longDescription = ''
74− Chromium is an open source web browser from Google that aims to build a
75− safer, faster, and more stable way for all Internet users to experience
76− the web. It has a minimalist user interface and provides the vast majority
77− of source code for Google Chrome (which has some additional features).
78− '';
79− homepage = "https://github.com/Eloston/ungoogled-chromium";
80− maintainers = with maintainers; [ squalus ];
81− license = if enableWideVine then licenses.unfree else licenses.bsd3;
82− platforms = platforms.linux;
83− hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else [];
84− timeout = 172800; # 48 hours (increased from the Hydra default of 10h)
85− };
86−})
pkgs/applications/networking/browsers/ungoogled-chromium/common.nixdeleted−345
@@ -1,345 +0,0 @@
1−{ stdenv, lib, llvmPackages, gnChromium, ninja, which, nodejs, fetchpatch, fetchurl
2−
3−# default dependencies
4−, gnutar, bzip2, flac, speex, libopus
5−, libevent, expat, libjpeg, snappy
6−, libpng, libcap
7−, xdg_utils, yasm, nasm, minizip, libwebp
8−, libusb1, pciutils, nss, re2
9−
10−, python2Packages, perl, pkgconfig
11−, nspr, systemd, kerberos
12−, util-linux, alsaLib
13−, bison, gperf
14−, glib, gtk3, dbus-glib
15−, glibc
16−, libXScrnSaver, libXcursor, libXtst, libGLU, libGL
17−, protobuf, speechd, libXdamage, cups
18−, ffmpeg, libxslt, libxml2, at-spi2-core
19−, jre8
20−, pipewire_0_2
21−, libva
22−
23−# optional dependencies
24−, libgcrypt ? null # gnomeSupport || cupsSupport
25−, libdrm ? null, wayland ? null, mesa ? null, libxkbcommon ? null # useOzone
26−
27−# package customization
28−, useOzone ? true
29−, gnomeSupport ? false, gnome ? null
30−, gnomeKeyringSupport ? false, libgnome-keyring3 ? null
31−, proprietaryCodecs ? true
32−, cupsSupport ? true
33−, pulseSupport ? false, libpulseaudio ? null
34−, ungoogled-chromium
35−, ungoogled ? false
36−
37−, channel
38−, upstream-info
39−}:
40−
41−buildFun:
42−
43−with stdenv.lib;
44−
45−let
46− jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
47−
48− # The additional attributes for creating derivations based on the chromium
49− # source tree.
50− extraAttrs = buildFun base;
51−
52− githubPatch = commit: sha256: fetchpatch {
53− url = "https://github.com/chromium/chromium/commit/${commit}.patch";
54− inherit sha256;
55− };
56−
57− mkGnFlags =
58− let
59− # Serialize Nix types into GN types according to this document:
60− # https://source.chromium.org/gn/gn/+/master:docs/language.md
61− mkGnString = value: "\"${escape ["\"" "$" "\\"] value}\"";
62− sanitize = value:
63− if value == true then "true"
64− else if value == false then "false"
65− else if isList value then "[${concatMapStringsSep ", " sanitize value}]"
66− else if isInt value then toString value
67− else if isString value then mkGnString value
68− else throw "Unsupported type for GN value `${value}'.";
69− toFlag = key: value: "${key}=${sanitize value}";
70− in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs));
71−
72− # https://source.chromium.org/chromium/chromium/src/+/master:build/linux/unbundle/replace_gn_files.py
73− gnSystemLibraries = [
74− "ffmpeg"
75− "flac"
76− "libjpeg"
77− "libpng"
78− "libwebp"
79− "libxslt"
80− "opus"
81− "snappy"
82− "zlib"
83− ];
84−
85− opusWithCustomModes = libopus.override {
86− withCustomModes = true;
87− };
88−
89− defaultDependencies = [
90− bzip2 flac speex opusWithCustomModes
91− libevent expat libjpeg snappy
92− libpng libcap
93− xdg_utils minizip libwebp
94− libusb1 re2
95− ffmpeg libxslt libxml2
96− nasm
97− ];
98−
99− # build paths and release info
100− packageName = extraAttrs.packageName or extraAttrs.name;
101− buildType = "Release";
102− buildPath = "out/${buildType}";
103− libExecPath = "$out/libexec/${packageName}";
104−
105− versionRange = min-version: upto-version:
106− let inherit (upstream-info) version;
107− result = versionAtLeast version min-version && versionOlder version upto-version;
108− stable-version = (importJSON ./upstream-info.json).stable.version;
109− in if versionAtLeast stable-version upto-version
110− then warn "chromium: stable version ${stable-version} is newer than a patchset bounded at ${upto-version}. You can safely delete it."
111− result
112− else result;
113−
114− ungoogler =
115− let versionEntry = (import ./ungoogled-src.nix)."${upstream-info.version}";
116− in ungoogled-chromium {
117− inherit (versionEntry) rev sha256;
118− };
119− base = rec {
120− name = "${packageName}-unwrapped-${version}";
121− inherit (upstream-info) version;
122− inherit channel packageName buildType buildPath;
123−
124− src = fetchurl {
125− url = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz";
126− inherit (upstream-info) sha256;
127− };
128−
129− nativeBuildInputs = [
130− llvmPackages.lldClang.bintools
131− ninja which python2Packages.python perl pkgconfig
132− python2Packages.ply python2Packages.jinja2 nodejs
133− gnutar python2Packages.setuptools
134− ];
135−
136− buildInputs = defaultDependencies ++ [
137− nspr nss systemd
138− util-linux alsaLib
139− bison gperf kerberos
140− glib gtk3 dbus-glib
141− libXScrnSaver libXcursor libXtst libGLU libGL
142− pciutils protobuf speechd libXdamage at-spi2-core
143− jre
144− pipewire_0_2
145− libva
146− ] ++ optional gnomeKeyringSupport libgnome-keyring3
147− ++ optionals gnomeSupport [ gnome.GConf libgcrypt ]
148− ++ optionals cupsSupport [ libgcrypt cups ]
149− ++ optional pulseSupport libpulseaudio
150− ++ optionals useOzone [ libdrm wayland mesa.drivers libxkbcommon ];
151−
152− patches = [
153− ./patches/no-build-timestamps.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed)
154− ./patches/widevine-79.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags
155− # ++ optional (versionRange "68" "72") ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" )
156− ];
157−
158− postPatch = ''
159− # remove unused third-party
160− for lib in ${toString gnSystemLibraries}; do
161− if [ -d "third_party/$lib" ]; then
162− find "third_party/$lib" -type f \
163− \! -path "third_party/$lib/chromium/*" \
164− \! -path "third_party/$lib/google/*" \
165− \! -path "third_party/harfbuzz-ng/utils/hb_scoped.h" \
166− \! -regex '.*\.\(gn\|gni\|isolate\)' \
167− -delete
168− fi
169− done
170−
171− # Required for patchShebangs (unsupported interpreter directive, basename: invalid option -- '*', etc.):
172− substituteInPlace native_client/SConstruct --replace "#! -*- python -*-" ""
173− if [ -e third_party/harfbuzz-ng/src/src/update-unicode-tables.make ]; then
174− substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \
175− --replace "/usr/bin/env -S make -f" "/usr/bin/make -f"
176− fi
177−
178− # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX
179− substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \
180− --replace \
181− 'return sandbox_binary;' \
182− 'return base::FilePath(GetDevelSandboxPath());'
183−
184− substituteInPlace services/audio/audio_sandbox_hook_linux.cc \
185− --replace \
186− '/usr/share/alsa/' \
187− '${alsaLib}/share/alsa/' \
188− --replace \
189− '/usr/lib/x86_64-linux-gnu/gconv/' \
190− '${glibc}/lib/gconv/' \
191− --replace \
192− '/usr/share/locale/' \
193− '${glibc}/share/locale/'
194−
195− sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg_utils}/bin/xdg-@' \
196− chrome/browser/shell_integration_linux.cc
197−
198− sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \
199− device/udev_linux/udev?_loader.cc
200−
201− sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \
202− gpu/config/gpu_info_collector_linux.cc
203−
204− # Allow to put extensions into the system-path.
205− sed -i -e 's,/usr,/run/current-system/sw,' chrome/common/chrome_paths.cc
206−
207− patchShebangs .
208− # use our own nodejs
209− mkdir -p third_party/node/linux/node-linux-x64/bin
210− ln -s "$(command -v node)" third_party/node/linux/node-linux-x64/bin/node
211−
212− # Allow building against system libraries in official builds
213− sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' tools/generate_shim_headers/generate_shim_headers.py
214−
215− '' + optionalString stdenv.isAarch64 ''
216− substituteInPlace build/toolchain/linux/BUILD.gn \
217− --replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""'
218− '' + optionalString ungoogled ''
219− ${ungoogler}/utils/prune_binaries.py . ${ungoogler}/pruning.list || echo "some errors"
220− ${ungoogler}/utils/patches.py . ${ungoogler}/patches
221− ${ungoogler}/utils/domain_substitution.py apply -r ${ungoogler}/domain_regex.list -f ${ungoogler}/domain_substitution.list -c ./ungoogled-domsubcache.tar.gz .
222− '';
223−
224− gnFlags = mkGnFlags ({
225− custom_toolchain = "//build/toolchain/linux/unbundle:default";
226− host_toolchain = "//build/toolchain/linux/unbundle:default";
227− is_official_build = true;
228−
229− use_vaapi = !stdenv.isAarch64; # TODO: Remove once M88 is released
230− use_sysroot = false;
231− use_gnome_keyring = gnomeKeyringSupport;
232− use_gio = gnomeSupport;
233− # ninja: error: '../../native_client/toolchain/linux_x86/pnacl_newlib/bin/x86_64-nacl-objcopy',
234− # needed by 'nacl_irt_x86_64.nexe', missing and no known rule to make it
235− enable_nacl = false;
236− # Enabling the Widevine component here doesn't affect whether we can
237− # redistribute the chromium package; the Widevine component is either
238− # added later in the wrapped -wv build or downloaded from Google.
239− enable_widevine = true;
240− use_cups = cupsSupport;
241− # Provides the enable-webrtc-pipewire-capturer flag to support Wayland screen capture.
242− rtc_use_pipewire = true;
243−
244− treat_warnings_as_errors = false;
245− clang_use_chrome_plugins = false;
246− blink_symbol_level = 0;
247− symbol_level = 0;
248− fieldtrial_testing_like_official_build = true;
249−
250− # Google API keys, see:
251− # http://www.chromium.org/developers/how-tos/api-keys
252− # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution,
253− # please get your own set of keys.
254− google_api_key = "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI";
255− google_default_client_id = "404761575300.apps.googleusercontent.com";
256− google_default_client_secret = "9rIFQjfnkykEmqb6FfjJQD1D";
257− } // optionalAttrs proprietaryCodecs {
258− # enable support for the H.264 codec
259− proprietary_codecs = true;
260− enable_hangout_services_extension = true;
261− ffmpeg_branding = "Chrome";
262− } // optionalAttrs pulseSupport {
263− use_pulseaudio = true;
264− link_pulseaudio = true;
265− } // optionalAttrs useOzone {
266− use_ozone = true;
267− use_xkbcommon = true;
268− use_glib = true;
269− use_gtk = true;
270− use_system_libwayland = true;
271− use_system_minigbm = true;
272− use_system_libdrm = true;
273− system_wayland_scanner_path = "${wayland}/bin/wayland-scanner";
274− } // optionalAttrs ungoogled {
275− chrome_pgo_phase = 0;
276− enable_hangout_services_extension = false;
277− enable_js_type_check = false;
278− enable_mdns = false;
279− enable_nacl_nonsfi = false;
280− enable_one_click_signin = false;
281− enable_reading_list = false;
282− enable_remoting = false;
283− enable_reporting = false;
284− enable_service_discovery = false;
285− exclude_unwind_tables = true;
286− google_api_key = "";
287− google_default_client_id = "";
288− google_default_client_secret = "";
289− safe_browsing_mode = 0;
290− use_official_google_api_keys = false;
291− use_unofficial_version_number = false;
292− } // (extraAttrs.gnFlags or {}));
293−
294− configurePhase = ''
295− runHook preConfigure
296−
297− # This is to ensure expansion of $out.
298− libExecPath="${libExecPath}"
299− python build/linux/unbundle/replace_gn_files.py --system-libraries ${toString gnSystemLibraries}
300− ${gnChromium}/bin/gn gen --args=${escapeShellArg gnFlags} out/Release | tee gn-gen-outputs.txt
301−
302− # Fail if `gn gen` contains a WARNING.
303− grep -o WARNING gn-gen-outputs.txt && echo "Found gn WARNING, exiting nix build" && exit 1
304−
305− runHook postConfigure
306− '';
307−
308− # Don't spam warnings about unknown warning options. This is useful because
309− # our Clang is always older than Chromium's and the build logs have a size
310− # of approx. 25 MB without this option (and this saves e.g. 66 %).
311− NIX_CFLAGS_COMPILE = "-Wno-unknown-warning-option";
312−
313− buildPhase = let
314− buildCommand = target: ''
315− ninja -C "${buildPath}" -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES "${target}"
316− (
317− source chrome/installer/linux/common/installer.include
318− PACKAGE=$packageName
319− MENUNAME="Chromium"
320− process_template chrome/app/resources/manpage.1.in "${buildPath}/chrome.1"
321− )
322− '';
323− targets = extraAttrs.buildTargets or [];
324− commands = map buildCommand targets;
325− in concatStringsSep "\n" commands;
326−
327− postFixup = ''
328− # Make sure that libGLESv2 is found by dlopen (if using EGL).
329− chromiumBinary="$libExecPath/$packageName"
330− origRpath="$(patchelf --print-rpath "$chromiumBinary")"
331− patchelf --set-rpath "${libGL}/lib:$origRpath" "$chromiumBinary"
332− '';
333−
334− passthru = {
335− updateScript = ./update.py;
336− chromiumDeps = {
337− gn = gnChromium;
338− };
339− };
340− };
341−
342−# Remove some extraAttrs we supplied to the base attributes already.
343−in stdenv.mkDerivation (base // removeAttrs extraAttrs [
344− "name" "gnFlags" "buildTargets"
345−] // { passthru = base.passthru // (extraAttrs.passthru or {}); })
pkgs/applications/networking/browsers/ungoogled-chromium/default.nixdeleted−214
@@ -1,214 +0,0 @@
1−{ newScope, config, stdenv, fetchurl, makeWrapper
2−, llvmPackages_11, ed, gnugrep, coreutils, xdg_utils
3−, glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit
4−, libva ? null
5−, pipewire_0_2
6−, gcc, nspr, nss, runCommand
7−, lib
8−
9−# package customization
10−# Note: enable* flags should not require full rebuilds (i.e. only affect the wrapper)
11−, channel ? "stable"
12−, gnomeSupport ? false, gnome ? null
13−, gnomeKeyringSupport ? false
14−, proprietaryCodecs ? true
15−, enablePepperFlash ? false
16−, enableWideVine ? false
17−, enableVaapi ? false # Disabled by default due to unofficial support
18−, ungoogled ? true
19−, cupsSupport ? true
20−, pulseSupport ? config.pulseaudio or stdenv.isLinux
21−, commandLineArgs ? ""
22−}:
23−
24−let
25− llvmPackages = llvmPackages_11;
26− stdenv = llvmPackages.stdenv;
27−
28− callPackage = newScope chromium;
29−
30− chromium = rec {
31− inherit stdenv llvmPackages;
32−
33− upstream-info = (lib.importJSON ./upstream-info.json).${channel};
34−
35− mkChromiumDerivation = callPackage ./common.nix ({
36− inherit channel gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs
37− cupsSupport pulseSupport;
38− inherit ungoogled;
39− gnChromium = gn.overrideAttrs (oldAttrs: {
40− inherit (upstream-info.deps.gn) version;
41− src = fetchgit {
42− inherit (upstream-info.deps.gn) url rev sha256;
43− };
44− });
45− });
46−
47− browser = callPackage ./browser.nix { inherit channel enableWideVine; };
48−
49− plugins = callPackage ./plugins.nix {
50− inherit enablePepperFlash;
51− };
52−
53− ungoogled-chromium = callPackage ./ungoogled.nix {};
54− };
55−
56− pkgSuffix = if channel == "dev" then "unstable" else channel;
57− pkgName = "google-chrome-${pkgSuffix}";
58− chromeSrc = fetchurl {
59− urls = map (repo: "${repo}/${pkgName}/${pkgName}_${version}-1_amd64.deb") [
60− "https://dl.google.com/linux/chrome/deb/pool/main/g"
61− "http://95.31.35.30/chrome/pool/main/g"
62− "http://mirror.pcbeta.com/google/chrome/deb/pool/main/g"
63− "http://repo.fdzh.org/chrome/deb/pool/main/g"
64− ];
65− sha256 = chromium.upstream-info.sha256bin64;
66− };
67−
68− mkrpath = p: "${lib.makeSearchPathOutput "lib" "lib64" p}:${lib.makeLibraryPath p}";
69− widevineCdm = stdenv.mkDerivation {
70− name = "chrome-widevine-cdm";
71−
72− src = chromeSrc;
73−
74− phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ];
75−
76− unpackCmd = let
77− widevineCdmPath =
78− if channel == "stable" then
79− "./opt/google/chrome/WidevineCdm"
80− else if channel == "beta" then
81− "./opt/google/chrome-beta/WidevineCdm"
82− else if channel == "dev" then
83− "./opt/google/chrome-unstable/WidevineCdm"
84− else
85− throw "Unknown chromium channel.";
86− in ''
87− # Extract just WidevineCdm from upstream's .deb file
88− ar p "$src" data.tar.xz | tar xJ "${widevineCdmPath}"
89−
90− # Move things around so that we don't have to reference a particular
91− # chrome-* directory later.
92− mv "${widevineCdmPath}" ./
93−
94− # unpackCmd wants a single output directory; let it take WidevineCdm/
95− rm -rf opt
96− '';
97−
98− doCheck = true;
99− checkPhase = ''
100− ! find -iname '*.so' -exec ldd {} + | grep 'not found'
101− '';
102−
103− PATCH_RPATH = mkrpath [ gcc.cc glib nspr nss ];
104−
105− patchPhase = ''
106− patchelf --set-rpath "$PATCH_RPATH" _platform_specific/linux_x64/libwidevinecdm.so
107− '';
108−
109− installPhase = ''
110− mkdir -p $out/WidevineCdm
111− cp -a * $out/WidevineCdm/
112− '';
113−
114− meta = {
115− platforms = [ "x86_64-linux" ];
116− license = lib.licenses.unfree;
117− };
118− };
119−
120− suffix = if channel != "stable" then "-" + channel else "";
121−
122− sandboxExecutableName = chromium.browser.passthru.sandboxExecutableName;
123−
124− version = chromium.browser.version;
125−
126− # We want users to be able to enableWideVine without rebuilding all of
127− # chromium, so we have a separate derivation here that copies chromium
128− # and adds the unfree WidevineCdm.
129− chromiumWV = let browser = chromium.browser; in if enableWideVine then
130− runCommand (browser.name + "-wv") { version = browser.version; }
131− ''
132− mkdir -p $out
133− cp -a ${browser}/* $out/
134− chmod u+w $out/libexec/chromium
135− cp -a ${widevineCdm}/WidevineCdm $out/libexec/chromium/
136− ''
137− else browser;
138−
139−in stdenv.mkDerivation {
140− name = "ungoogled-chromium${suffix}-${version}";
141− inherit version;
142−
143− buildInputs = [
144− makeWrapper ed
145−
146− # needed for GSETTINGS_SCHEMAS_PATH
147− gsettings-desktop-schemas glib gtk3
148−
149− # needed for XDG_ICON_DIRS
150− gnome3.adwaita-icon-theme
151− ];
152−
153− outputs = ["out" "sandbox"];
154−
155− buildCommand = let
156− browserBinary = "${chromiumWV}/libexec/chromium/chromium";
157− getWrapperFlags = plugin: "$(< \"${plugin}/nix-support/wrapper-flags\")";
158− libPath = stdenv.lib.makeLibraryPath [ libva pipewire_0_2 ];
159−
160− in with stdenv.lib; ''
161− mkdir -p "$out/bin"
162−
163− eval makeWrapper "${browserBinary}" "$out/bin/chromium" \
164− --add-flags ${escapeShellArg (escapeShellArg commandLineArgs)} \
165− ${lib.optionalString enableVaapi "--add-flags --enable-accelerated-video-decode"} \
166− ${concatMapStringsSep " " getWrapperFlags chromium.plugins.enabled}
167−
168− ed -v -s "$out/bin/chromium" << EOF
169− 2i
170−
171− if [ -x "/run/wrappers/bin/${sandboxExecutableName}" ]
172− then
173− export CHROME_DEVEL_SANDBOX="/run/wrappers/bin/${sandboxExecutableName}"
174− else
175− export CHROME_DEVEL_SANDBOX="$sandbox/bin/${sandboxExecutableName}"
176− fi
177−
178− '' + lib.optionalString (libPath != "") ''
179− # To avoid loading .so files from cwd, LD_LIBRARY_PATH here must not
180− # contain an empty section before or after a colon.
181− export LD_LIBRARY_PATH="\$LD_LIBRARY_PATH\''${LD_LIBRARY_PATH:+:}${libPath}"
182− '' + ''
183−
184− # libredirect causes chromium to deadlock on startup
185− export LD_PRELOAD="\$(echo -n "\$LD_PRELOAD" | ${coreutils}/bin/tr ':' '\n' | ${gnugrep}/bin/grep -v /lib/libredirect\\\\.so$ | ${coreutils}/bin/tr '\n' ':')"
186−
187− export XDG_DATA_DIRS=$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH\''${XDG_DATA_DIRS:+:}\$XDG_DATA_DIRS
188−
189− # Mainly for xdg-open but also other xdg-* tools:
190− export PATH="${xdg_utils}/bin\''${PATH:+:}\$PATH"
191−
192− .
193− w
194− EOF
195−
196− ln -sv "${chromium.browser.sandbox}" "$sandbox"
197−
198− ln -s "$out/bin/chromium" "$out/bin/chromium-browser"
199−
200− mkdir -p "$out/share"
201− for f in '${chromium.browser}'/share/*; do # hello emacs */
202− ln -s -t "$out/share/" "$f"
203− done
204− '';
205−
206− inherit (chromium.browser) packageName;
207− meta = chromium.browser.meta;
208− passthru = {
209− inherit (chromium) upstream-info browser;
210− mkDerivation = chromium.mkChromiumDerivation;
211− inherit chromeSrc sandboxExecutableName;
212− updateScript = ./update.py;
213− };
214−}
pkgs/applications/networking/browsers/ungoogled-chromium/patches/no-build-timestamps.patchdeleted−17
@@ -1,17 +0,0 @@
1−--- chromium-70.0.3538.67/build/compute_build_timestamp.py.orig 2018-11-02 16:00:34.368933077 +0200
2−+++ chromium-70.0.3538.67/build/compute_build_timestamp.py 2018-11-08 04:06:21.658105129 +0200
3−@@ -94,6 +94,14 @@
4− 'build_type', help='The type of build', choices=('official', 'default'))
5− args = argument_parser.parse_args()
6−
7−+ # I don't trust LASTCHANGE magic, and I definelly want something deterministic here
8−+ SOURCE_DATE_EPOCH = os.getenv("SOURCE_DATE_EPOCH", None)
9−+ if SOURCE_DATE_EPOCH is not None:
10−+ print(SOURCE_DATE_EPOCH)
11−+ return 0
12−+ else:
13−+ raise RuntimeError("SOURCE_DATE_EPOCH not set")
14−+
15− # The mtime of the revision in build/util/LASTCHANGE is stored in a file
16− # next to it. Read it, to get a deterministic time close to "now".
17− # That date is then modified as described at the top of the file so that
pkgs/applications/networking/browsers/ungoogled-chromium/patches/widevine-79.patchdeleted−13
@@ -1,13 +0,0 @@
1−diff --git a/third_party/widevine/cdm/BUILD.gn b/third_party/widevine/cdm/BUILD.gn
2−index ed0e2f5208b..5b431a030d5 100644
3−--- a/third_party/widevine/cdm/BUILD.gn
4−+++ b/third_party/widevine/cdm/BUILD.gn
5−@@ -14,7 +14,7 @@ buildflag_header("buildflags") {
6−
7− flags = [
8− "ENABLE_WIDEVINE=$enable_widevine",
9−- "BUNDLE_WIDEVINE_CDM=$bundle_widevine_cdm",
10−+ "BUNDLE_WIDEVINE_CDM=true",
11− "ENABLE_WIDEVINE_CDM_COMPONENT=$enable_widevine_cdm_component",
12− ]
13− }
pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nixdeleted−92
@@ -1,92 +0,0 @@
1−{ stdenv, gcc
2−, jshon
3−, glib
4−, nspr
5−, nss
6−, fetchzip
7−, enablePepperFlash ? false
8−
9−, upstream-info
10−}:
11−
12−with stdenv.lib;
13−
14−let
15− mkrpath = p: "${makeSearchPathOutput "lib" "lib64" p}:${makeLibraryPath p}";
16−
17− # Generate a shell fragment that emits flags appended to the
18− # final makeWrapper call for wrapping the browser's main binary.
19− #
20− # Note that this is shell-escaped so that only the variable specified
21− # by the "output" attribute is substituted.
22− mkPluginInfo = { output ? "out", allowedVars ? [ output ]
23− , flags ? [], envVars ? {}
24− }: let
25− shSearch = ["'"] ++ map (var: "@${var}@") allowedVars;
26− shReplace = ["'\\''"] ++ map (var: "'\"\${${var}}\"'") allowedVars;
27− # We need to triple-escape "val":
28− # * First because makeWrapper doesn't do any quoting of its arguments by
29− # itself.
30− # * Second because it's passed to the makeWrapper call separated by IFS but
31− # not by the _real_ arguments, for example the Widevine plugin flags
32− # contain spaces, so they would end up as separate arguments.
33− # * Third in order to be correctly quoted for the "echo" call below.
34− shEsc = val: "'${replaceStrings ["'"] ["'\\''"] val}'";
35− mkSh = val: "'${replaceStrings shSearch shReplace (shEsc val)}'";
36− mkFlag = flag: ["--add-flags" (shEsc flag)];
37− mkEnvVar = key: val: ["--set" (shEsc key) (shEsc val)];
38− envList = mapAttrsToList mkEnvVar envVars;
39− quoted = map mkSh (flatten ((map mkFlag flags) ++ envList));
40− in ''
41− mkdir -p "''$${output}/nix-support"
42− echo ${toString quoted} > "''$${output}/nix-support/wrapper-flags"
43− '';
44−
45− flash = stdenv.mkDerivation rec {
46− pname = "flashplayer-ppapi";
47− version = "32.0.0.465";
48−
49− src = fetchzip {
50− url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz";
51− sha256 = "16qbc2s8dg2rwggphf8f5665iccc6lrvgz45bdwskg9pwg87hlj1";
52− stripRoot = false;
53− };
54−
55− patchPhase = ''
56− chmod +x libpepflashplayer.so
57− patchelf --set-rpath "${mkrpath [ gcc.cc ]}" libpepflashplayer.so
58− '';
59−
60− doCheck = true;
61− checkPhase = ''
62− ! find -iname '*.so' -exec ldd {} + | grep 'not found'
63− '';
64−
65− installPhase = ''
66− flashVersion="$(
67− "${jshon}/bin/jshon" -F manifest.json -e version -u
68− )"
69−
70− install -vD libpepflashplayer.so "$out/lib/libpepflashplayer.so"
71−
72− ${mkPluginInfo {
73− allowedVars = [ "out" "flashVersion" ];
74− flags = [
75− "--ppapi-flash-path=@out@/lib/libpepflashplayer.so"
76− "--ppapi-flash-version=@flashVersion@"
77− ];
78− }}
79− '';
80−
81− dontStrip = true;
82−
83− meta = {
84− license = stdenv.lib.licenses.unfree;
85− maintainers = with stdenv.lib.maintainers; [ taku0 ];
86− platforms = platforms.x86_64;
87− };
88− };
89−
90−in {
91− enabled = optional enablePepperFlash flash;
92−}
pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nixdeleted−6
@@ -1,6 +0,0 @@
1−{
2− "87.0.4280.88" = {
3− rev = "87.0.4280.88-1";
4− sha256 = "0w2137w8hfcgl6f938hqnb4ffp33v5r8vdzxrvs814w7dszkiqgg";
5− };
6−}
pkgs/applications/networking/browsers/ungoogled-chromium/update.pydeleted−121
@@ -1,121 +0,0 @@
1−#! /usr/bin/env nix-shell
2−#! nix-shell -i python -p python3 nix nix-prefetch-git
3−
4−import csv
5−import json
6−import re
7−import subprocess
8−import sys
9−
10−from codecs import iterdecode
11−from collections import OrderedDict
12−from datetime import datetime
13−from os.path import abspath, dirname
14−from urllib.request import urlopen
15−
16−HISTORY_URL = 'https://omahaproxy.appspot.com/history?os=linux'
17−DEB_URL = 'https://dl.google.com/linux/chrome/deb/pool/main/g'
18−BUCKET_URL = 'https://commondatastorage.googleapis.com/chromium-browser-official'
19−
20−JSON_PATH = dirname(abspath(__file__)) + '/upstream-info.json'
21−
22−def load_json(path):
23− with open(path, 'r') as f:
24− return json.load(f)
25−
26−def nix_prefetch_url(url, algo='sha256'):
27− print(f'nix-prefetch-url {url}')
28− out = subprocess.check_output(['nix-prefetch-url', '--type', algo, url])
29− return out.decode('utf-8').rstrip()
30−
31−def nix_prefetch_git(url, rev):
32− print(f'nix-prefetch-git {url} {rev}')
33− out = subprocess.check_output(['nix-prefetch-git', '--quiet', '--url', url, '--rev', rev])
34− return json.loads(out)
35−
36−def get_file_revision(revision, file_path):
37− url = f'https://raw.githubusercontent.com/chromium/chromium/{revision}/{file_path}'
38− with urlopen(url) as http_response:
39− return http_response.read()
40−
41−def get_matching_chromedriver(version):
42− # See https://chromedriver.chromium.org/downloads/version-selection
43− build = re.sub('.[0-9]+$', '', version)
44− chromedriver_version_url = f'https://chromedriver.storage.googleapis.com/LATEST_RELEASE_{build}'
45− with urlopen(chromedriver_version_url) as http_response:
46− chromedriver_version = http_response.read().decode()
47− def get_chromedriver_url(system):
48− return f'https://chromedriver.storage.googleapis.com/{chromedriver_version}/chromedriver_{system}.zip'
49− return {
50− 'version': chromedriver_version,
51− 'sha256_linux': nix_prefetch_url(get_chromedriver_url('linux64')),
52− 'sha256_darwin': nix_prefetch_url(get_chromedriver_url('mac64'))
53− }
54−
55−def get_channel_dependencies(channel):
56− deps = get_file_revision(channel['version'], 'DEPS')
57− gn_pattern = b"'gn_version': 'git_revision:([0-9a-f]{40})'"
58− gn_commit = re.search(gn_pattern, deps).group(1).decode()
59− gn = nix_prefetch_git('https://gn.googlesource.com/gn', gn_commit)
60− return {
61− 'gn': {
62− 'version': datetime.fromisoformat(gn['date']).date().isoformat(),
63− 'url': gn['url'],
64− 'rev': gn['rev'],
65− 'sha256': gn['sha256']
66− }
67− }
68−
69−channels = {}
70−last_channels = load_json(JSON_PATH)
71−
72−print(f'GET {HISTORY_URL}', file=sys.stderr)
73−with urlopen(HISTORY_URL) as resp:
74− builds = csv.DictReader(iterdecode(resp, 'utf-8'))
75− for build in builds:
76− channel_name = build['channel']
77−
78− # If we've already found a newer build for this channel, we're
79− # no longer interested in it.
80− if channel_name in channels:
81− continue
82−
83− # If we're back at the last build we used, we don't need to
84− # keep going -- there's no new version available, and we can
85− # just reuse the info from last time.
86− if build['version'] == last_channels[channel_name]['version']:
87− channels[channel_name] = last_channels[channel_name]
88− continue
89−
90− channel = {'version': build['version']}
91− suffix = 'unstable' if channel_name == 'dev' else channel_name
92−
93− try:
94− channel['sha256'] = nix_prefetch_url(f'{BUCKET_URL}/chromium-{build["version"]}.tar.xz')
95− channel['sha256bin64'] = nix_prefetch_url(f'{DEB_URL}/google-chrome-{suffix}/google-chrome-{suffix}_{build["version"]}-1_amd64.deb')
96− except subprocess.CalledProcessError:
97− # This build isn't actually available yet. Continue to
98− # the next one.
99− continue
100−
101− channel['deps'] = get_channel_dependencies(channel)
102− if channel_name == 'stable':
103− channel['chromedriver'] = get_matching_chromedriver(channel['version'])
104−
105− channels[channel_name] = channel
106−
107−with open(JSON_PATH, 'w') as out:
108− def get_channel_key(item):
109− channel_name = item[0]
110− if channel_name == 'stable':
111− return 0
112− elif channel_name == 'beta':
113− return 1
114− elif channel_name == 'dev':
115− return 2
116− else:
117− print(f'Error: Unexpected channel: {channel_name}', file=sys.stderr)
118− sys.exit(1)
119− sorted_channels = OrderedDict(sorted(channels.items(), key=get_channel_key))
120− json.dump(sorted_channels, out, indent=2)
121− out.write('\n')
pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.jsondeleted−46
@@ -1,46 +0,0 @@
1−{
2− "stable": {
3− "version": "87.0.4280.88",
4− "sha256": "1h09g9b2zxad85vd146ymvg3w2kpngpi78yig3dn1vrmhwr4aiiy",
5− "sha256bin64": "0n3fm6wf8zfkv135d50xl8xxrnng3q55vyxkck1da8jyvh18bijb",
6− "deps": {
7− "gn": {
8− "version": "2020-09-09",
9− "url": "https://gn.googlesource.com/gn",
10− "rev": "e002e68a48d1c82648eadde2f6aafa20d08c36f2",
11− "sha256": "0x4c7amxwzxs39grqs3dnnz0531mpf1p75niq7zhinyfqm86i4dk"
12− }
13− },
14− "chromedriver": {
15− "version": "87.0.4280.88",
16− "sha256_linux": "141mr2jiy3nslwd3s43m4i6plkv9wv5fgi78cn7mz0ac9x6fpcgx",
17− "sha256_darwin": "048hsqp6575r980m769lzznvxypmfcwn89f1d3ik751ymzmb5r78"
18− }
19− },
20− "beta": {
21− "version": "88.0.4324.27",
22− "sha256": "0mciiyh3sn2zrl8g6znylc2pm9sb0wzsclgavf7mmlknri5sjblc",
23− "sha256bin64": "0qf2j1j3p94s724rwh8fydpjn88cs9yxxhjf5axvqwi7q3h35cfx",
24− "deps": {
25− "gn": {
26− "version": "2020-11-05",
27− "url": "https://gn.googlesource.com/gn",
28− "rev": "53d92014bf94c3893886470a1c7c1289f8818db0",
29− "sha256": "1xcm07qjk6m2czi150fiqqxql067i832adck6zxrishm70c9jbr9"
30− }
31− }
32− },
33− "dev": {
34− "version": "89.0.4343.0",
35− "sha256": "0jmc1l0lysl5zax98fjhzsfq3c1sqh3n3xscidafflx362wcfpwa",
36− "sha256bin64": "1v6xik8kf531y0g5xj0c8szjmak0qvh77kwkw7p7hqxqmnwwp06d",
37− "deps": {
38− "gn": {
39− "version": "2020-11-05",
40− "url": "https://gn.googlesource.com/gn",
41− "rev": "53d92014bf94c3893886470a1c7c1289f8818db0",
42− "sha256": "1xcm07qjk6m2czi150fiqqxql067i832adck6zxrishm70c9jbr9"
43− }
44− }
45− }
46−}
pkgs/top-level/all-packages.nix+4−1
@@ -24477,7 +24477,10 @@ in
2447724477 uefitoolPackages = recurseIntoAttrs (callPackage ../tools/system/uefitool/variants.nix {});
2447824478 uefitool = uefitoolPackages.new-engine;
2447924479
24480− ungoogled-chromium = callPackage ../applications/networking/browsers/ungoogled-chromium (config.chromium or {});
24480+ ungoogled-chromium = callPackage ../applications/networking/browsers/chromium ((config.chromium or {}) // {
24481+ ungoogled = true;
24482+ channel = "ungoogled-chromium";
24483+ });
2448124484
2448224485 unigine-valley = callPackage ../applications/graphics/unigine-valley { };
2448324486