From d646b327780ffbf9798fb8ab66a439e927d77a3f Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 3 Mar 2022 22:29:48 +0100 Subject: chromiumBeta: 99.0.4844.51 -> 100.0.4896.20 (cherry picked from commit 05aa1711fd50a5fec1eb8397b7616f1cad622e15) --- .../networking/browsers/chromium/upstream-info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index a674cdcc2004..c25c76252412 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,15 +19,15 @@ } }, "beta": { - "version": "99.0.4844.51", - "sha256": "1qxsn8zvvvsnn0k7nn606rhaial8ikrlfh175msqpp50xibjxicp", - "sha256bin64": "1bayx03xf94ra0wid1jn10vysa6src4hmrdzdxf566rx9wcg29pk", + "version": "100.0.4896.20", + "sha256": "0g16xzimp39vk5b27bj12rh14520wihj4m4mwxf387rv0yp03cnr", + "sha256bin64": "1qkz32xvgbnd7xck0hm2mcrgdawn6xilldjgfckaaavvj4zinnk9", "deps": { "gn": { - "version": "2022-01-10", + "version": "2022-01-21", "url": "https://gn.googlesource.com/gn", - "rev": "80a40b07305373617eba2d5878d353532af77da3", - "sha256": "1103lf38h7412949j6nrk48m2vv2rrxacn42sjg33lg88nyv7skv" + "rev": "0725d7827575b239594fbc8fd5192873a1d62f44", + "sha256": "1dzdvcn2r5c9giknvasf3y5y4901kav7igivjvrpww66ywsj8fzr" } } }, -- cgit v1.2.3 From 825d3a57338576646b82982386f42dca4a1df32d Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 3 Mar 2022 22:29:48 +0100 Subject: chromiumDev: 100.0.4896.12 -> 100.0.4896.20 (cherry picked from commit 691919bf0003817a02fa0c4bb3210a6aa633f03a) --- pkgs/applications/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 c25c76252412..d72a0b1cd86d 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -32,9 +32,9 @@ } }, "dev": { - "version": "100.0.4896.12", - "sha256": "07jd3d5jhs659wwxnbxk6h93pz8zaynrw72b0y9l6l824lip6hl2", - "sha256bin64": "0fnxq0vjn00zai94p8jgx69bag30zzlfl2vzn0zb65pr10fpac87", + "version": "100.0.4896.20", + "sha256": "0g16xzimp39vk5b27bj12rh14520wihj4m4mwxf387rv0yp03cnr", + "sha256bin64": "1hyqsqpmhxdja6jzvmq0cwwcg4nq72w0zdpa0xh24n5g4cd9xz04", "deps": { "gn": { "version": "2022-01-21", -- cgit v1.2.3 From ed4e3b463430aa9636e86e576eb90fca3a5518b3 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 4 Mar 2022 22:20:41 +0100 Subject: chromiumDev: 100.0.4896.20 -> 101.0.4919.0 (cherry picked from commit e1185bdd8ffe0e376cb43ab21652a2bc23246042) --- .../networking/browsers/chromium/upstream-info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index d72a0b1cd86d..3d24db5923de 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -32,15 +32,15 @@ } }, "dev": { - "version": "100.0.4896.20", - "sha256": "0g16xzimp39vk5b27bj12rh14520wihj4m4mwxf387rv0yp03cnr", - "sha256bin64": "1hyqsqpmhxdja6jzvmq0cwwcg4nq72w0zdpa0xh24n5g4cd9xz04", + "version": "101.0.4919.0", + "sha256": "01dp3pkpf2m6r6vfyqgcg99xcii0qi3qm0g69r3nnj2hrs7ziqv2", + "sha256bin64": "1x7bfcnhrbakcbdyp1sc79jx6qysnnyj1by6qnl7gyffh8xyb95g", "deps": { "gn": { - "version": "2022-01-21", + "version": "2022-03-01", "url": "https://gn.googlesource.com/gn", - "rev": "0725d7827575b239594fbc8fd5192873a1d62f44", - "sha256": "1dzdvcn2r5c9giknvasf3y5y4901kav7igivjvrpww66ywsj8fzr" + "rev": "d7c2209cebcfe37f46dba7be4e1a7000ffc342fb", + "sha256": "0b024mr8bdsnkkd3qkh097a7w0gpicarijnsbpfgkf6imnkccg5w" } } }, -- cgit v1.2.3 From e8561d139829740f1e2c4f7042a375f3623a2c35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Sat, 5 Feb 2022 20:02:07 +0100 Subject: ungoogled-chromium: inherit upstream's build flags This ensures that our build flags for ungoogled-chromium will remain up-to-date with upstream's defaults (also important for avoiding build errors). Co-authored-by: Michael Weiss (cherry picked from commit 1122130c6f5b1bd388334ba02f06383ab4ceffa6) --- .../networking/browsers/chromium/common.nix | 20 ++----------------- .../browsers/chromium/ungoogled-flags.toml | 23 ++++++++++++++++++++++ .../networking/browsers/chromium/update.py | 11 +++++++++++ 3 files changed, 36 insertions(+), 18 deletions(-) create mode 100644 pkgs/applications/networking/browsers/chromium/ungoogled-flags.toml diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index e2acb21c6bc6..9b18590817f8 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -287,24 +287,8 @@ let } // optionalAttrs pulseSupport { use_pulseaudio = true; link_pulseaudio = true; - } // optionalAttrs ungoogled { - chrome_pgo_phase = 0; - enable_hangout_services_extension = false; - enable_js_type_check = false; - enable_mdns = false; - enable_one_click_signin = false; - enable_reading_list = false; - enable_remoting = false; - enable_reporting = false; - enable_service_discovery = false; - exclude_unwind_tables = true; - google_api_key = ""; - google_default_client_id = ""; - google_default_client_secret = ""; - safe_browsing_mode = 0; - use_official_google_api_keys = false; - use_unofficial_version_number = false; - } // (extraAttrs.gnFlags or {})); + } // optionalAttrs ungoogled (importTOML ./ungoogled-flags.toml) + // (extraAttrs.gnFlags or {})); configurePhase = '' runHook preConfigure diff --git a/pkgs/applications/networking/browsers/chromium/ungoogled-flags.toml b/pkgs/applications/networking/browsers/chromium/ungoogled-flags.toml new file mode 100644 index 000000000000..f2bf29cda24b --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/ungoogled-flags.toml @@ -0,0 +1,23 @@ +build_with_tflite_lib=false +chrome_pgo_phase=0 +clang_use_chrome_plugins=false +disable_fieldtrial_testing_config=true +enable_hangout_services_extension=false +enable_js_type_check=false +enable_mdns=false +enable_mse_mpeg2ts_stream_parser=true +enable_nacl=false +enable_one_click_signin=false +enable_reading_list=false +enable_remoting=false +enable_reporting=false +enable_service_discovery=false +enable_widevine=true +exclude_unwind_tables=true +google_api_key="" +google_default_client_id="" +google_default_client_secret="" +safe_browsing_mode=0 +treat_warnings_as_errors=false +use_official_google_api_keys=false +use_unofficial_version_number=false diff --git a/pkgs/applications/networking/browsers/chromium/update.py b/pkgs/applications/networking/browsers/chromium/update.py index 3ea5dea50cd6..8341f2c6ee22 100755 --- a/pkgs/applications/networking/browsers/chromium/update.py +++ b/pkgs/applications/networking/browsers/chromium/update.py @@ -24,6 +24,7 @@ DEB_URL = 'https://dl.google.com/linux/chrome/deb/pool/main/g' BUCKET_URL = 'https://commondatastorage.googleapis.com/chromium-browser-official' JSON_PATH = dirname(abspath(__file__)) + '/upstream-info.json' +UNGOOGLED_FLAGS_PATH = dirname(abspath(__file__)) + '/ungoogled-flags.toml' COMMIT_MESSAGE_SCRIPT = dirname(abspath(__file__)) + '/get-commit-message.py' @@ -108,6 +109,12 @@ def get_latest_ungoogled_chromium_build(): } +def get_ungoogled_chromium_gn_flags(revision): + """Returns ungoogled-chromium's GN build flags for the given revision.""" + gn_flags_url = f'https://raw.githubusercontent.com/Eloston/ungoogled-chromium/{revision}/flags.gn' + return urlopen(gn_flags_url).read().decode() + + def channel_name_to_attr_name(channel_name): """Maps a channel name to the corresponding main Nixpkgs attribute name.""" if channel_name == 'stable': @@ -208,6 +215,8 @@ with urlopen(HISTORY_URL) as resp: 'rev': build['ungoogled_tag'], 'sha256': nix_prefetch_git(ungoogled_repo_url, build['ungoogled_tag'])['sha256'] } + with open(UNGOOGLED_FLAGS_PATH, 'w') as out: + out.write(get_ungoogled_chromium_gn_flags(build['ungoogled_tag'])) channels[channel_name] = channel @@ -227,6 +236,8 @@ if len(sys.argv) == 2 and sys.argv[1] == '--commit': if channel_name == 'stable': body = subprocess.check_output([COMMIT_MESSAGE_SCRIPT, version_new]).decode('utf-8') commit_message += '\n\n' + body + elif channel_name == 'ungoogled-chromium': + subprocess.run(['git', 'add', UNGOOGLED_FLAGS_PATH], check=True) subprocess.run(['git', 'add', JSON_PATH], check=True) subprocess.run(['git', 'commit', '--file=-'], input=commit_message.encode(), check=True) else: -- cgit v1.2.3 From 381028f447140e87df1520b48e85024ba0023c4f Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 12 Mar 2022 20:35:00 +0100 Subject: chromiumBeta: 100.0.4896.20 -> 100.0.4896.30 (cherry picked from commit 7d5e470e1fdd564d725f1b8db82fe126efcd649f) --- pkgs/applications/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 3d24db5923de..950c05fff375 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,9 +19,9 @@ } }, "beta": { - "version": "100.0.4896.20", - "sha256": "0g16xzimp39vk5b27bj12rh14520wihj4m4mwxf387rv0yp03cnr", - "sha256bin64": "1qkz32xvgbnd7xck0hm2mcrgdawn6xilldjgfckaaavvj4zinnk9", + "version": "100.0.4896.30", + "sha256": "06zfx9f6wv4j4fz7ss8pjlxfcsrwrvwqkmdk5bin7slxg4sq31fl", + "sha256bin64": "06s2p81grqrxl3p9ksy9q7s3s42ijmcw316nb51f7zx4ijk5hzya", "deps": { "gn": { "version": "2022-01-21", -- cgit v1.2.3 From 2ec364e0d00a0fa3053710c0e0b816369a248f7c Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 12 Mar 2022 20:35:00 +0100 Subject: chromiumDev: 101.0.4919.0 -> 101.0.4929.5 (cherry picked from commit 7d5373b0bab22db3e708fe9dc3cfbdf5d9b0982e) --- pkgs/applications/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 950c05fff375..eda6c1a0a680 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -32,9 +32,9 @@ } }, "dev": { - "version": "101.0.4919.0", - "sha256": "01dp3pkpf2m6r6vfyqgcg99xcii0qi3qm0g69r3nnj2hrs7ziqv2", - "sha256bin64": "1x7bfcnhrbakcbdyp1sc79jx6qysnnyj1by6qnl7gyffh8xyb95g", + "version": "101.0.4929.5", + "sha256": "0330vs0np23x390lfnc5gzmbnkdak590rzqpa7abpfx1gzj1rd3s", + "sha256bin64": "0670z86sz2wxpfxda32cirara7yg87g67cymh8ik3w99g5q7cb1d", "deps": { "gn": { "version": "2022-03-01", -- cgit v1.2.3 From ba927da77d0f9366418bea433e3f2c1a363a1ea2 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 17 Mar 2022 21:26:32 +0100 Subject: chromiumBeta: 100.0.4896.30 -> 100.0.4896.46 (cherry picked from commit 3e7268af67af97ee109b96f0ddba652c08854d99) --- pkgs/applications/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 eda6c1a0a680..c8cc70474030 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,9 +19,9 @@ } }, "beta": { - "version": "100.0.4896.30", - "sha256": "06zfx9f6wv4j4fz7ss8pjlxfcsrwrvwqkmdk5bin7slxg4sq31fl", - "sha256bin64": "06s2p81grqrxl3p9ksy9q7s3s42ijmcw316nb51f7zx4ijk5hzya", + "version": "100.0.4896.46", + "sha256": "1qx22vadv9yd3n52pjn2sr153w70k3sxi2i8f99fdpil0kin8jkx", + "sha256bin64": "1g4xygj3946322aill7lk1qf0hi07bjn3awa17pkn1sgbl3gm8nr", "deps": { "gn": { "version": "2022-01-21", -- cgit v1.2.3 From 7879a26800f39c5067f220e33f1f7608be7b1e21 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 19 Mar 2022 00:10:45 +0100 Subject: chromiumDev: 101.0.4929.5 -> 101.0.4947.0 (cherry picked from commit 93edc87eac3ba3599ddf0314ac0a05014a8d2045) --- .../networking/browsers/chromium/upstream-info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index c8cc70474030..018d4ffa80a3 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -32,15 +32,15 @@ } }, "dev": { - "version": "101.0.4929.5", - "sha256": "0330vs0np23x390lfnc5gzmbnkdak590rzqpa7abpfx1gzj1rd3s", - "sha256bin64": "0670z86sz2wxpfxda32cirara7yg87g67cymh8ik3w99g5q7cb1d", + "version": "101.0.4947.0", + "sha256": "176bby8xis0j3ifvxxxjgklvs7yd7v71c5lc18qdjkgzv5qdx0sy", + "sha256bin64": "1rkpc25ff8vf1p7znpmaljj8gwcym34qg28b4anv8x9zvwn7w21s", "deps": { "gn": { - "version": "2022-03-01", + "version": "2022-03-14", "url": "https://gn.googlesource.com/gn", - "rev": "d7c2209cebcfe37f46dba7be4e1a7000ffc342fb", - "sha256": "0b024mr8bdsnkkd3qkh097a7w0gpicarijnsbpfgkf6imnkccg5w" + "rev": "bd99dbf98cbdefe18a4128189665c5761263bcfb", + "sha256": "0nql15ckjqkm001xajq3qyn4h4q80i7x6dm9zinxxr1a8q5lppx3" } } }, -- cgit v1.2.3 From cd9c2a713b9ffb6a1d81dbd08f065fbc6e828a47 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 24 Mar 2022 21:33:37 +0100 Subject: chromiumBeta: 100.0.4896.46 -> 100.0.4896.56 (cherry picked from commit ab49a71ae0d7f5d7e4bb5128f6e16ea84f2d6759) --- pkgs/applications/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 018d4ffa80a3..d6a386939210 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,9 +19,9 @@ } }, "beta": { - "version": "100.0.4896.46", - "sha256": "1qx22vadv9yd3n52pjn2sr153w70k3sxi2i8f99fdpil0kin8jkx", - "sha256bin64": "1g4xygj3946322aill7lk1qf0hi07bjn3awa17pkn1sgbl3gm8nr", + "version": "100.0.4896.56", + "sha256": "0vdyddxhmkw9bqwx5j19h69swx9ysiipsmcc1sjl0qv8bn8f790z", + "sha256bin64": "09h4fxsx0q5b0gn258xnmk11qz7ql8flpn4mq5x201abmv29y856", "deps": { "gn": { "version": "2022-01-21", -- cgit v1.2.3 From b145c6c070f7d94b471c9288af8c7674349a274d Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 24 Mar 2022 21:33:38 +0100 Subject: chromiumDev: 101.0.4947.0 -> 101.0.4951.7 (cherry picked from commit a29f5a2eb3c6fecbbf743391e130ef6ebe910863) --- pkgs/applications/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 d6a386939210..c3ffe5cf116d 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -32,9 +32,9 @@ } }, "dev": { - "version": "101.0.4947.0", - "sha256": "176bby8xis0j3ifvxxxjgklvs7yd7v71c5lc18qdjkgzv5qdx0sy", - "sha256bin64": "1rkpc25ff8vf1p7znpmaljj8gwcym34qg28b4anv8x9zvwn7w21s", + "version": "101.0.4951.7", + "sha256": "0xnvbiqi50hgky35qaivcyzfp05nnwfwqrd50dksqkzycl8avb4z", + "sha256bin64": "19my3zr9d3w2ypl9cm1xa15vhyv9add1f283alb9fmh2qwhl4scg", "deps": { "gn": { "version": "2022-03-14", -- cgit v1.2.3 From c4759273121db29fb732ccba69ede460fc2fbae6 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 19 Feb 2022 21:24:15 -0800 Subject: chromium: honor systemdSupport This commit exposes that support for compilation without systemd, controlled by the global systemdSupport argument. This argument is understood by many other nixpkgs expressions and can be set globally in ~/.config/nixpkgs/config.nix. (cherry picked from commit 5f9ce130b2f99f6cc818428913b1929519757089) --- pkgs/applications/networking/browsers/chromium/common.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 9b18590817f8..a9532f517eb1 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -23,7 +23,7 @@ , libusb1, re2 , ffmpeg, libxslt, libxml2 , nasm -, nspr, nss, systemd +, nspr, nss , util-linux, alsa-lib , bison, gperf, libkrb5 , glib, gtk3, dbus-glib @@ -47,6 +47,8 @@ , ungoogled ? false, ungoogled-chromium # Optional dependencies: , libgcrypt ? null # gnomeSupport || cupsSupport +, systemdSupport ? stdenv.isLinux +, systemd }: buildFun: @@ -139,7 +141,7 @@ let libusb1 re2 ffmpeg libxslt libxml2 nasm - nspr nss systemd + nspr nss util-linux alsa-lib bison gperf libkrb5 glib gtk3 dbus-glib @@ -151,7 +153,8 @@ let libdrm wayland mesa.drivers libxkbcommon curl libepoxy - ] ++ optionals gnomeSupport [ gnome2.GConf libgcrypt ] + ] ++ optional systemdSupport systemd + ++ optionals gnomeSupport [ gnome2.GConf libgcrypt ] ++ optional gnomeKeyringSupport libgnome-keyring3 ++ optionals cupsSupport [ libgcrypt cups ] ++ optional pulseSupport libpulseaudio; @@ -204,9 +207,10 @@ let sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg-utils}/bin/xdg-@' \ chrome/browser/shell_integration_linux.cc + '' + lib.optionalString systemdSupport '' sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \ device/udev_linux/udev?_loader.cc - + '' + '' sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ gpu/config/gpu_info_collector_linux.cc -- cgit v1.2.3