From ecf962fddda954619f9a8f113993b82b8c858059 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Wed, 31 Aug 2022 10:06:10 +0200 Subject: [PATCH 01/30] tor-browser-bundle-bin: 11.5.1 -> 11.5.2 (cherry picked from commit 9895ba4b77ac614a3faba06a53dae5168eaf5c3b) --- .../networking/browsers/tor-browser-bundle-bin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 7cae2700ee7c..5ec7026db077 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -87,7 +87,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "11.5.1"; + version = "11.5.2"; lang = "en-US"; @@ -98,7 +98,7 @@ let "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "sha256-LgzvptQoTHGngW4xDZNfm5teSjpAjcUzMKDbBHRInoo="; + sha256 = "sha256-kM3OOFTpEU7nIyqqdGcqLZ86QLb6isM5cfWG7jo891o="; }; i686-linux = fetchurl { @@ -107,7 +107,7 @@ let "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "sha256-J/ka/Qvu2UC5KTfatkWq0jc6bHTazA20vL9tz1sK/Rg="; + sha256 = "sha256-62dGoIqaCrSzsDjvt8c5hEAwOSTFst9PCpvMzveBukY="; }; }; in From e5dea85646b12ee5e1036514bc911f76f5c70cda Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Sep 2022 23:00:01 +0000 Subject: [PATCH 02/30] pdns-recursor: 4.7.1 -> 4.7.2 (cherry picked from commit bd1c1724d1bab756cc12478584befe5ee3c8011c) --- pkgs/servers/dns/pdns-recursor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index ded457c43a8b..35d79d6b1439 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "pdns-recursor"; - version = "4.7.1"; + version = "4.7.2"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "sha256-0vlFc6bw5joQNMorMBwn6/LhMAplW6ZpzFAtXqjW7Gg="; + sha256 = "sha256-vbQZB5D+dZd41vBRWvu8wKKLPn4bg8Vwyq84QZ1Xgg0="; }; nativeBuildInputs = [ pkg-config ]; From d549290eeec8ce962ccb9d3444a57ff525237cdf Mon Sep 17 00:00:00 2001 From: Timothy DeHerrera Date: Fri, 19 Aug 2022 11:36:03 -0600 Subject: [PATCH 03/30] libliftoff: 0.2.0 -> 0.3.0 (cherry picked from commit 508b6b66575af5161755a9abbbf207a8edda562a) --- pkgs/development/libraries/libliftoff/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libliftoff/default.nix b/pkgs/development/libraries/libliftoff/default.nix index 88588a9fee75..fa0bc6d3d999 100644 --- a/pkgs/development/libraries/libliftoff/default.nix +++ b/pkgs/development/libraries/libliftoff/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "libliftoff"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "emersion"; repo = pname; rev = "v${version}"; - sha256 = "1ysxm7kg1gwrsn29lw8kngvkxp46g4m2pvbwcvscgvr54ikirn4q"; + sha256 = "sha256-MbXDUkAA9gY6Qb6Ok33MNuqIfb4bPIEHd1IVH/UmH10="; }; nativeBuildInputs = [ meson pkg-config ninja ]; From 7524eee28e3c728470de8143a39bacf3067a70c1 Mon Sep 17 00:00:00 2001 From: Timothy DeHerrera Date: Fri, 19 Aug 2022 11:36:21 -0600 Subject: [PATCH 04/30] gamescope: 3.11.33-jupiter-3.3-2 -> 3.11.39 (cherry picked from commit a8b135297c4926cc98d60eac40e6c5f0233c52cb) --- pkgs/applications/window-managers/gamescope/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/gamescope/default.nix b/pkgs/applications/window-managers/gamescope/default.nix index 237a33d5ca3e..f7d2f4cf2084 100644 --- a/pkgs/applications/window-managers/gamescope/default.nix +++ b/pkgs/applications/window-managers/gamescope/default.nix @@ -26,7 +26,7 @@ }: let pname = "gamescope"; - version = "3.11.33-jupiter-3.3-2"; + version = "3.11.39"; in stdenv.mkDerivation { inherit pname version; @@ -35,7 +35,7 @@ stdenv.mkDerivation { owner = "Plagman"; repo = "gamescope"; rev = "refs/tags/${version}"; - hash = "sha256-6/gTsQGZDQPCdmXe5EI9QcT/MkdTf6odsI2/+g/W7Qc="; + hash = "sha256-MpJczFZk0syt/CMwAhA7H+01G8E4syFsJGnzD/RneQQ="; }; patches = [ ./use-pkgconfig.patch ]; From 253ccce6afbbe035026ba5bcc099349c9a73d243 Mon Sep 17 00:00:00 2001 From: kilianar Date: Thu, 1 Sep 2022 10:36:45 +0200 Subject: [PATCH 05/30] signal-desktop: 5.56.0 -> 5.57.0 https://github.com/signalapp/Signal-Desktop/releases/tag/v5.57.0 (cherry picked from commit 1ac9fea548cf8b60090d448bf0beea8c84c632d1) --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 2488b4011337..2a7f15315d04 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.56.0"; # Please backport all updates to the stable channel. + version = "5.57.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "sha256-8z6FSeEEOrkNYWh9cS7c6GDAufBuiVmHmo7Ie6mueyI="; + sha256 = "sha256-42xKqK/7V2GPHk/L396O7UoWn5vTyILVTbLa0Tf6NaY="; }; nativeBuildInputs = [ From c4bd47953256b19f0f6991f84e17b56dba26a353 Mon Sep 17 00:00:00 2001 From: George Shammas Date: Fri, 11 Feb 2022 13:51:42 -0500 Subject: [PATCH 06/30] chromium: improve kerberos support (cherry picked from commit acef4bfe614d4b826015498b9dff2052516523c7) --- pkgs/applications/networking/browsers/chromium/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 5bd24faafe40..79a53fbfea47 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -3,7 +3,7 @@ , glib, gtk3, gnome, gsettings-desktop-schemas, gn, fetchgit , libva, pipewire, wayland , gcc, nspr, nss, runCommand -, lib +, lib, libkrb5 # package customization # Note: enable* flags should not require full rebuilds (i.e. only affect the wrapper) @@ -169,13 +169,16 @@ in stdenv.mkDerivation { # needed for XDG_ICON_DIRS gnome.adwaita-icon-theme + + # Needed for kerberos at runtime + libkrb5 ]; outputs = ["out" "sandbox"]; buildCommand = let browserBinary = "${chromiumWV}/libexec/chromium/chromium"; - libPath = lib.makeLibraryPath [ libva pipewire wayland gtk3 ]; + libPath = lib.makeLibraryPath [ libva pipewire wayland gtk3 libkrb5 ]; in with lib; '' mkdir -p "$out/bin" From 8c0e24082ca9f314886733bfecf0cbd7ab35ca6d Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 26 Jun 2022 23:38:16 +0200 Subject: [PATCH 07/30] chromiumBeta: 103.0.5060.53 -> 104.0.5112.20 (cherry picked from commit 57a56ee3d56b63d820db30fa18b1595209ab0986) --- .../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 efa9d34bece9..938d9abf2688 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": "103.0.5060.53", - "sha256": "00di0nw6h3kb0qp2wp3ny3zsar1ayn1lyx5zr28dl1h5cwaaxjqf", - "sha256bin64": "01vzhhnngr6a7mm1y25ax8vhph6dl948fvkyhdhb9m4j5l4lcqj4", + "version": "104.0.5112.20", + "sha256": "0adzdk3m2l4pjlk82sqavwgxf6a5darbiwchmlrsxc58p9xxag4s", + "sha256bin64": "1cm5k4gpxc0dn0vdqf3qwwf36pc77va9pnci84zcpaxx0jih7l9b", "deps": { "gn": { - "version": "2022-05-11", + "version": "2022-06-08", "url": "https://gn.googlesource.com/gn", - "rev": "578a7fe4c3c6b0bc2ae1fd2e37f14857d09895bf", - "sha256": "03dqfrdpf5xxl64dby3qmbwpzdq2gsa8g7xl438py3a629rgxg63" + "rev": "2ecd43a10266bd091c98e6dcde507c64f6a0dad3", + "sha256": "1q06vsz9b4bb764wy1wy8n177z2pgpm97kq3rl1hmq185mz5fhra" } } }, From 8c0adb83e83e72071bb015e985abe3c767c78ce0 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 26 Jun 2022 23:38:16 +0200 Subject: [PATCH 08/30] chromiumDev: 104.0.5112.12 -> 104.0.5112.20 (cherry picked from commit 4a4f0cc4111a06b102528b90a44dbcdeaf7f39a1) --- .../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 938d9abf2688..2dd4e1e38259 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": "104.0.5112.12", - "sha256": "040xi7cwgxi1hahv8is088gma2cyz8xhsb62jfq5ahzjx2d93qp9", - "sha256bin64": "1av8wn3x7m9gixh8s0mv8w0hxlk80dh7y7x3fska5fjplf4x94ij", + "version": "104.0.5112.20", + "sha256": "0adzdk3m2l4pjlk82sqavwgxf6a5darbiwchmlrsxc58p9xxag4s", + "sha256bin64": "13p2w4wwd8ji5ydgz4x7w2q4rmn74w3z2fl999q7zaq1cra21pzd", "deps": { "gn": { "version": "2022-06-08", From 181dcc0097ad7e5f0c0aa5a13231128229683f99 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 7 Jul 2022 09:54:57 +0200 Subject: [PATCH 09/30] chromiumBeta: 104.0.5112.20 -> 104.0.5112.29 (cherry picked from commit b19cb885f364d37461668e0e921579cd21cae7c5) --- .../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 2dd4e1e38259..6441e51deed9 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": "104.0.5112.20", - "sha256": "0adzdk3m2l4pjlk82sqavwgxf6a5darbiwchmlrsxc58p9xxag4s", - "sha256bin64": "1cm5k4gpxc0dn0vdqf3qwwf36pc77va9pnci84zcpaxx0jih7l9b", + "version": "104.0.5112.29", + "sha256": "1cjqr1d2cgiwq7vlb26ilyw2r79wgyd7dkxaipmjiqyyrl4bfm6y", + "sha256bin64": "1vbhm3pm1jgifmg6dc4aqi7xf12dx37spifjs3flq4v2lixg5r6f", "deps": { "gn": { "version": "2022-06-08", From 101418191439e8cdb4b586cded56c2cea42ed3f9 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 9 Jul 2022 01:19:54 +0200 Subject: [PATCH 10/30] chromiumDev: 104.0.5112.20 -> 105.0.5148.2 (cherry picked from commit 924540c6c7478092e4b9933a4b0f09454fcbb4d8) --- .../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 6441e51deed9..3f85059893e7 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": "104.0.5112.20", - "sha256": "0adzdk3m2l4pjlk82sqavwgxf6a5darbiwchmlrsxc58p9xxag4s", - "sha256bin64": "13p2w4wwd8ji5ydgz4x7w2q4rmn74w3z2fl999q7zaq1cra21pzd", + "version": "105.0.5148.2", + "sha256": "0qnkpda0chsxgfby5g38xmpkilyz2v12mrwlayfsp2iqhc7d07vz", + "sha256bin64": "045czwsra17iclgyzsnbbjr55lrmhzf97c2k0wwjrmd59cx4b1sa", "deps": { "gn": { - "version": "2022-06-08", + "version": "2022-06-22", "url": "https://gn.googlesource.com/gn", - "rev": "2ecd43a10266bd091c98e6dcde507c64f6a0dad3", - "sha256": "1q06vsz9b4bb764wy1wy8n177z2pgpm97kq3rl1hmq185mz5fhra" + "rev": "29accf5ac2eadfc53e687081583b7bc1592a8839", + "sha256": "0z9gaw8p88yhb7fi844pvylsbgjy3ni7bnca1yx37928fjw3ppln" } } }, From bf11ada791468c29d09df68c3e93a8362afdf5f7 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 12 Jul 2022 20:59:15 +0200 Subject: [PATCH 11/30] chromiumBeta: 104.0.5112.29 -> 104.0.5112.39 (cherry picked from commit 8d73ee918766ada5c2caed6cf4aeac310ae45f88) --- .../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 3f85059893e7..b7727911ba1f 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": "104.0.5112.29", - "sha256": "1cjqr1d2cgiwq7vlb26ilyw2r79wgyd7dkxaipmjiqyyrl4bfm6y", - "sha256bin64": "1vbhm3pm1jgifmg6dc4aqi7xf12dx37spifjs3flq4v2lixg5r6f", + "version": "104.0.5112.39", + "sha256": "0xgw1n5lcqqbs0b8bpd05f1z0q2lpajg2dxangd1yfl7y16yfxv9", + "sha256bin64": "0abprih2sh483cqv9rqs67ha3cm9744h3gdc342lgqj3x8bmspmj", "deps": { "gn": { "version": "2022-06-08", From 3f192407b05f3d55c5a3100550c0cf5f90e24ff4 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 14 Jul 2022 21:48:28 +0200 Subject: [PATCH 12/30] chromiumBeta: 104.0.5112.39 -> 104.0.5112.48 (cherry picked from commit 41a5ec97d586dc4e7fe578193a7a188c049518b4) --- .../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 b7727911ba1f..180714297967 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": "104.0.5112.39", - "sha256": "0xgw1n5lcqqbs0b8bpd05f1z0q2lpajg2dxangd1yfl7y16yfxv9", - "sha256bin64": "0abprih2sh483cqv9rqs67ha3cm9744h3gdc342lgqj3x8bmspmj", + "version": "104.0.5112.48", + "sha256": "1zk4ywphcy6nrv0yf38yhl2bcq6fk34makglx31aalf2nhhw945i", + "sha256bin64": "14cx0m6jak4cma62axli0l4gqzqqh4gs7gam2dfahmwxsgcdwwn7", "deps": { "gn": { "version": "2022-06-08", From 7fbe0334a1c0fc950ed3d30e2b9e91b7afc58b69 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 17 Jul 2022 14:54:33 +0200 Subject: [PATCH 13/30] chromiumDev: 105.0.5148.2 -> 105.0.5176.3 (cherry picked from commit ddf49ce022c61a78eac1db553f6e0b555fbe9c92) --- .../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 180714297967..85dd74a156a4 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": "105.0.5148.2", - "sha256": "0qnkpda0chsxgfby5g38xmpkilyz2v12mrwlayfsp2iqhc7d07vz", - "sha256bin64": "045czwsra17iclgyzsnbbjr55lrmhzf97c2k0wwjrmd59cx4b1sa", + "version": "105.0.5176.3", + "sha256": "11zdihvy1n7d3vfl88477ppbfjd3mmkdsj4pfmfqm4mpw7zgi7fy", + "sha256bin64": "08rhg2am01dbb15djh7200wsg0wb48na09i706035wnnf0d8z313", "deps": { "gn": { - "version": "2022-06-22", + "version": "2022-07-11", "url": "https://gn.googlesource.com/gn", - "rev": "29accf5ac2eadfc53e687081583b7bc1592a8839", - "sha256": "0z9gaw8p88yhb7fi844pvylsbgjy3ni7bnca1yx37928fjw3ppln" + "rev": "9ef321772ecc161937db69acb346397e0ccc484d", + "sha256": "0j85kgf8c1psys6kfsq5mph8n80hcbzhr7d2blqiiysmjj0wc6ng" } } }, From fff867de585f9e4d9462f7d6a521135c1348834a Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 20 Jul 2022 21:37:21 +0200 Subject: [PATCH 14/30] chromiumBeta: 104.0.5112.48 -> 104.0.5112.57 (cherry picked from commit 9e393ee5dd54dc2d86118875d1d1efd7238eee2f) --- .../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 85dd74a156a4..54a1e8bade07 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": "104.0.5112.48", - "sha256": "1zk4ywphcy6nrv0yf38yhl2bcq6fk34makglx31aalf2nhhw945i", - "sha256bin64": "14cx0m6jak4cma62axli0l4gqzqqh4gs7gam2dfahmwxsgcdwwn7", + "version": "104.0.5112.57", + "sha256": "1fvcmnxfw65c2dgis2vwhzg671y62irzvcl609vxwxcslhwwqc4r", + "sha256bin64": "0nx4ca2v1bgk25yjlfgn8vgdwwplyim6a0ai1hppy4yhm9mhppk7", "deps": { "gn": { "version": "2022-06-08", From 0cd8b8ec716a8ece52c549b8e212af8905d946c2 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 22 Jul 2022 23:43:40 +0200 Subject: [PATCH 15/30] chromiumDev: 105.0.5176.3 -> 105.0.5191.2 (cherry picked from commit 92bb481cd710e367cf3b7efa8fe54dc112f9dd83) --- .../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 54a1e8bade07..917e8e9d7c2c 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": "105.0.5176.3", - "sha256": "11zdihvy1n7d3vfl88477ppbfjd3mmkdsj4pfmfqm4mpw7zgi7fy", - "sha256bin64": "08rhg2am01dbb15djh7200wsg0wb48na09i706035wnnf0d8z313", + "version": "105.0.5191.2", + "sha256": "1vfgazay1h125qjiy9fnymmdskw06l8lhvllkbbpvz08zf9jfmaj", + "sha256bin64": "06l9ypr945dic3kj5m12dr9x098lfh208blp8gax6rxvdj8br4wh", "deps": { "gn": { "version": "2022-07-11", From 267aaa09bc36d7afce41b179f692e8471d0d4ed8 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 28 Jul 2022 22:47:32 +0200 Subject: [PATCH 16/30] chromiumBeta: 104.0.5112.57 -> 104.0.5112.65 (cherry picked from commit 5af51045018bdb0d8d81026df53d7dec22049c01) --- .../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 917e8e9d7c2c..988630f11369 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": "104.0.5112.57", - "sha256": "1fvcmnxfw65c2dgis2vwhzg671y62irzvcl609vxwxcslhwwqc4r", - "sha256bin64": "0nx4ca2v1bgk25yjlfgn8vgdwwplyim6a0ai1hppy4yhm9mhppk7", + "version": "104.0.5112.65", + "sha256": "03adyhinhmih54rsv23w0cm86ldyfsxlmqhgk36vhgylgdras81v", + "sha256bin64": "17rck7zvyxmlhmi4x27xhlrn6sznx75cbidhbw7bxk3z9x7qybfy", "deps": { "gn": { "version": "2022-06-08", From 6b02cc42e60e10f7069885df55363662323d09af Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 28 Jul 2022 22:47:33 +0200 Subject: [PATCH 17/30] chromiumDev: 105.0.5191.2 -> 105.0.5195.10 (cherry picked from commit b746ec744631bee0cc2a0f37884ce698089d4dba) --- .../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 988630f11369..52fde470f661 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": "105.0.5191.2", - "sha256": "1vfgazay1h125qjiy9fnymmdskw06l8lhvllkbbpvz08zf9jfmaj", - "sha256bin64": "06l9ypr945dic3kj5m12dr9x098lfh208blp8gax6rxvdj8br4wh", + "version": "105.0.5195.10", + "sha256": "12spa7b8iy1ipj6f2rs6kdv6r986zdjmdkng5gk1ki1qli80gv2x", + "sha256bin64": "146qxhzhlmd5hvp2g1nrfk7hjdxjlrafwa1gl4msjgrdrfz3bdql", "deps": { "gn": { "version": "2022-07-11", From 5beb4da537a981ba10055ede0bad85f2aa08894f Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 3 Aug 2022 21:55:54 +0200 Subject: [PATCH 18/30] chromiumBeta: 104.0.5112.65 -> 104.0.5112.79 (cherry picked from commit 8ce54794cc8ea2540b38dda928def26816a7a0be) --- .../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 52fde470f661..b292a268d34c 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": "104.0.5112.65", - "sha256": "03adyhinhmih54rsv23w0cm86ldyfsxlmqhgk36vhgylgdras81v", - "sha256bin64": "17rck7zvyxmlhmi4x27xhlrn6sznx75cbidhbw7bxk3z9x7qybfy", + "version": "104.0.5112.79", + "sha256": "1wxb3nl080wgg1g61g3pgzz3gaawg442iv8pxqhnayacm3qn5ilw", + "sha256bin64": "1vagpsnjrdjcisgg7i56l3zcgvb5sg4pkaq5li500vmgcjin8irq", "deps": { "gn": { "version": "2022-06-08", From f1b1c741afe3a480fa86317ef5cc8d1a049d2986 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 3 Aug 2022 21:55:54 +0200 Subject: [PATCH 19/30] chromiumDev: 105.0.5195.10 -> 105.0.5195.19 (cherry picked from commit 201eb18f4d5236b00234f2207424bdba59194444) --- .../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 b292a268d34c..194e7c7a1b15 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": "105.0.5195.10", - "sha256": "12spa7b8iy1ipj6f2rs6kdv6r986zdjmdkng5gk1ki1qli80gv2x", - "sha256bin64": "146qxhzhlmd5hvp2g1nrfk7hjdxjlrafwa1gl4msjgrdrfz3bdql", + "version": "105.0.5195.19", + "sha256": "08wap1v2qjx8nzd8sbiv24vx0vdc2dhlzrlv3g4zpm2qj7l4mki7", + "sha256bin64": "1alj49ysqdr5w1q42ww36kxfx60df2z5jxj39lza4vxm9b8r6ij2", "deps": { "gn": { "version": "2022-07-11", From 456bc2e564a0f1594869dcd579116da2049ca850 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 5 Aug 2022 20:16:43 +0200 Subject: [PATCH 20/30] chromiumBeta: 104.0.5112.79 -> 105.0.5195.19 (cherry picked from commit a43bf95ad00bd02311a30c1a102f5a221641d637) --- .../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 194e7c7a1b15..61334576ed46 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": "104.0.5112.79", - "sha256": "1wxb3nl080wgg1g61g3pgzz3gaawg442iv8pxqhnayacm3qn5ilw", - "sha256bin64": "1vagpsnjrdjcisgg7i56l3zcgvb5sg4pkaq5li500vmgcjin8irq", + "version": "105.0.5195.19", + "sha256": "08wap1v2qjx8nzd8sbiv24vx0vdc2dhlzrlv3g4zpm2qj7l4mki7", + "sha256bin64": "15rhslgq77wiwiycf6m89vi3f5vry286b7kqfk0v5ibmcsf6clgf", "deps": { "gn": { - "version": "2022-06-08", + "version": "2022-07-11", "url": "https://gn.googlesource.com/gn", - "rev": "2ecd43a10266bd091c98e6dcde507c64f6a0dad3", - "sha256": "1q06vsz9b4bb764wy1wy8n177z2pgpm97kq3rl1hmq185mz5fhra" + "rev": "9ef321772ecc161937db69acb346397e0ccc484d", + "sha256": "0j85kgf8c1psys6kfsq5mph8n80hcbzhr7d2blqiiysmjj0wc6ng" } } }, From 6e54d818bccbc78e03644948ab54f8a92b1dde27 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 9 Aug 2022 23:36:01 +0200 Subject: [PATCH 21/30] chromiumDev: 105.0.5195.19 -> 106.0.5216.6 (cherry picked from commit 22eae24df0986d32c1f9658bf8498241309697c4) --- .../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 61334576ed46..7bdaed07a519 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": "105.0.5195.19", - "sha256": "08wap1v2qjx8nzd8sbiv24vx0vdc2dhlzrlv3g4zpm2qj7l4mki7", - "sha256bin64": "1alj49ysqdr5w1q42ww36kxfx60df2z5jxj39lza4vxm9b8r6ij2", + "version": "106.0.5216.6", + "sha256": "1mgdzm5iw0ml9w68wszcscw0d3l2rlsanhznyz2ll2qv412wxgci", + "sha256bin64": "02kj2swqfvcvn27x22i98g7r0fj4p20bqcabagigxs1bhxw56akc", "deps": { "gn": { "version": "2022-07-11", From c312ffb328463ed1d3200f73fe23e2f6052fe2ff Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 13 Aug 2022 00:10:50 +0200 Subject: [PATCH 22/30] chromiumBeta: 105.0.5195.19 -> 105.0.5195.28 (cherry picked from commit 61063f32767364f1b9c8c7c51a24b1a50d2fee1d) --- .../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 7bdaed07a519..da3bbb4b8870 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": "105.0.5195.19", - "sha256": "08wap1v2qjx8nzd8sbiv24vx0vdc2dhlzrlv3g4zpm2qj7l4mki7", - "sha256bin64": "15rhslgq77wiwiycf6m89vi3f5vry286b7kqfk0v5ibmcsf6clgf", + "version": "105.0.5195.28", + "sha256": "14hy1f59ypsvqmrp0k4kv5cfcw48dizw4nkmigaxxv4bnmpwlcy1", + "sha256bin64": "0rgv1r94z91khzwmf1scnnsz9yqks6ygicl7bdsdbckw69njq91z", "deps": { "gn": { "version": "2022-07-11", From 935a287ebaacece068ae3dff8454d8c5e5184768 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 13 Aug 2022 00:10:50 +0200 Subject: [PATCH 23/30] chromiumDev: 106.0.5216.6 -> 106.0.5231.2 (cherry picked from commit 0e03ad366a4a07354a7a09866fd0b2d8a524a1f0) --- .../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 da3bbb4b8870..46af062c414d 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": "106.0.5216.6", - "sha256": "1mgdzm5iw0ml9w68wszcscw0d3l2rlsanhznyz2ll2qv412wxgci", - "sha256bin64": "02kj2swqfvcvn27x22i98g7r0fj4p20bqcabagigxs1bhxw56akc", + "version": "106.0.5231.2", + "sha256": "0cygann80jmc2vk83kpc7kprhw75yf7qqfi1208ksyp6m94cxnp6", + "sha256bin64": "1p7hq5vsmwgkyjam7blm1gxa246dg5plhk2f0vbvlnycwj54cvjm", "deps": { "gn": { - "version": "2022-07-11", + "version": "2022-08-08", "url": "https://gn.googlesource.com/gn", - "rev": "9ef321772ecc161937db69acb346397e0ccc484d", - "sha256": "0j85kgf8c1psys6kfsq5mph8n80hcbzhr7d2blqiiysmjj0wc6ng" + "rev": "3d773bba0927e67eae8fdaee5e28b0f6203d3bee", + "sha256": "1pfv6iq04r5lbg5b6xa6d5vn6mzyqksmspris7cgq5lihwq825ld" } } }, From 11ad494717632bb56400dc7cd30e9929c51431fe Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 18 Aug 2022 10:37:55 +0200 Subject: [PATCH 24/30] chromiumBeta: 105.0.5195.28 -> 105.0.5195.37 (cherry picked from commit d0bbad1246388649ab824261abeee1012dff51b2) --- .../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 46af062c414d..9aa1d9c8c5c6 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": "105.0.5195.28", - "sha256": "14hy1f59ypsvqmrp0k4kv5cfcw48dizw4nkmigaxxv4bnmpwlcy1", - "sha256bin64": "0rgv1r94z91khzwmf1scnnsz9yqks6ygicl7bdsdbckw69njq91z", + "version": "105.0.5195.37", + "sha256": "0ffzphr66z3g3l695b5liswpfp0577knn06mzdmwq9x1lk87cwiq", + "sha256bin64": "1cfkjzqwj4s5djzl2rka9kbc28i6zph0xqv1534cb68hzgwy171a", "deps": { "gn": { "version": "2022-07-11", From 1076de3f5b1ba53e125568ae4a47ea7c2206727b Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 18 Aug 2022 23:33:44 +0200 Subject: [PATCH 25/30] chromiumDev: 106.0.5231.2 -> 106.0.5245.0 (cherry picked from commit 872ca61379acdd98eb46391969d46901ece9ea77) --- .../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 9aa1d9c8c5c6..560c021af260 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": "106.0.5231.2", - "sha256": "0cygann80jmc2vk83kpc7kprhw75yf7qqfi1208ksyp6m94cxnp6", - "sha256bin64": "1p7hq5vsmwgkyjam7blm1gxa246dg5plhk2f0vbvlnycwj54cvjm", + "version": "106.0.5245.0", + "sha256": "1hpp5gcajmjf2wvgrnsrfwl879gj8w8b6asn79raqj1qf2pa7wxg", + "sha256bin64": "1d4v2mwpbn3h533lkh8270hmj71ag9ivh7ns03qifsqsl9jv4zdv", "deps": { "gn": { - "version": "2022-08-08", + "version": "2022-08-11", "url": "https://gn.googlesource.com/gn", - "rev": "3d773bba0927e67eae8fdaee5e28b0f6203d3bee", - "sha256": "1pfv6iq04r5lbg5b6xa6d5vn6mzyqksmspris7cgq5lihwq825ld" + "rev": "0bcd37bd2b83f1a9ee17088037ebdfe6eab6d31a", + "sha256": "13zks2z65kg7fzzsysq4mswd4bhhy3h7ycdrpxfilcvixx2n2gac" } } }, From 679c505d8e5148debd667a8e362ee87eb3bd904f Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 25 Aug 2022 20:33:38 +0200 Subject: [PATCH 26/30] chromiumBeta: 105.0.5195.37 -> 105.0.5195.52 (cherry picked from commit a5cb5ba44a2cb3ffc0649f7147aec7e228d68b9e) --- .../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 560c021af260..bbdb3b3a9291 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": "105.0.5195.37", - "sha256": "0ffzphr66z3g3l695b5liswpfp0577knn06mzdmwq9x1lk87cwiq", - "sha256bin64": "1cfkjzqwj4s5djzl2rka9kbc28i6zph0xqv1534cb68hzgwy171a", + "version": "105.0.5195.52", + "sha256": "0hkwjilzy0x28knm6nrkywnsmldhz4kgpnxka2iaghihkjzb4wfw", + "sha256bin64": "155w4h4py3pn337060csfia9xxbjlxvhw7s7ljb9mz6qvpijd434", "deps": { "gn": { "version": "2022-07-11", From 5006760920e75e3a7694e9ec977a8890f63f738c Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 25 Aug 2022 23:35:33 +0200 Subject: [PATCH 27/30] chromiumBeta: Fix errors due to incompatible Wayland headers This "fixes" errors like these: ``` FAILED: obj/third_party/angle/angle_gpu_info_util/SystemInfo_vulkan.o [...] In file included from ../../third_party/wayland/src/src/wayland-client.h:40: /nix/store/an42rhwn6ck2nix6caikrr4rvizknjhh-wayland-1.21.0-dev/include/wayland-client-protocol.h:1040:13: error: use of undeclared identifier 'wl_proxy_marshal_flags' callback = wl_proxy_marshal_flags((struct wl_proxy *) wl_display, ^ [...] /nix/store/an42rhwn6ck2nix6caikrr4rvizknjhh-wayland-1.21.0-dev/include/wayland-client-protocol.h:1392:87: error: use of undeclared identifier 'WL_MARSHAL_FLAG_DESTROY' WL_SHM_POOL_DESTROY, NULL, wl_proxy_get_version((struct wl_proxy *) wl_shm_pool), WL_MARSHAL_FLAG_DESTROY); ^ [...] fatal error: too many errors emitted, stopping now [-ferror-limit=] ``` At least for now (until Chromium updates their bundled Wayland version) it seems best to use the bundled headers/versions to avoid version incompatibility issues (we should hopefully be able to drop use_system_wayland_scanner though). (cherry picked from commit b6b51374fc7508aa4f3d90d24653fbc01ec3d1b3) --- pkgs/applications/networking/browsers/chromium/common.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 1cfc90dd4f14..1bad824b4e59 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -289,6 +289,10 @@ let rtc_use_pipewire = true; # Disable PGO because the profile data requires a newer compiler version (LLVM 14 isn't sufficient): chrome_pgo_phase = 0; + } // optionalAttrs (chromiumVersionAtLeast "105") { + # https://bugs.chromium.org/p/chromium/issues/detail?id=1334390: + use_system_libwayland = false; + use_system_wayland_scanner = false; } // optionalAttrs proprietaryCodecs { # enable support for the H.264 codec proprietary_codecs = true; From 1bc63f680d868148f159ba97ccaba13f9d6c3b0d Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 31 Aug 2022 00:59:36 +0200 Subject: [PATCH 28/30] chromiumDev: 106.0.5245.0 -> 106.0.5249.12 (cherry picked from commit 50e7538f3e57eaa3ebd8778903204ef39b7d8129) --- .../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 bbdb3b3a9291..ac20f8ae5ccd 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": "106.0.5245.0", - "sha256": "1hpp5gcajmjf2wvgrnsrfwl879gj8w8b6asn79raqj1qf2pa7wxg", - "sha256bin64": "1d4v2mwpbn3h533lkh8270hmj71ag9ivh7ns03qifsqsl9jv4zdv", + "version": "106.0.5249.12", + "sha256": "0brqn9rs3z3fdsnzjq2mr4p5c6d5fjllhfjfg39z3zmijcmd7f5y", + "sha256bin64": "1giay4nfcyczzcgrrdxrizd4pkiy7hqqc4ni6jg4rnbalh72p78n", "deps": { "gn": { "version": "2022-08-11", From dfa1f11a34b7ca8b05310648d511ff3ceee13afa Mon Sep 17 00:00:00 2001 From: Stefan Radziuk Date: Thu, 1 Sep 2022 23:31:31 +0100 Subject: [PATCH 29/30] google-chrome: add commandLineArgs after wayland flags (#189199) (cherry picked from commit 1be806f07f1393fabe37badb3ff66fe17058e7b6) --- .../networking/browsers/google-chrome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 4d096f46ce08..61c46a25208a 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -147,8 +147,8 @@ in stdenv.mkDerivation { --prefix PATH : "$binpath" \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addOpenGLRunpath.driverLink}/share" \ --set CHROME_WRAPPER "google-chrome-$dist" \ - --add-flags ${escapeShellArg commandLineArgs} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" \ + --add-flags ${escapeShellArg commandLineArgs} for elf in $out/share/google/$appname/{chrome,chrome-sandbox,${crashpadHandlerBinary},nacl_helper}; do patchelf --set-rpath $rpath $elf From 369c72776081589946fcdc0f1298016b38c0fffd Mon Sep 17 00:00:00 2001 From: Stefan Radziuk Date: Fri, 2 Sep 2022 00:38:22 +0100 Subject: [PATCH 30/30] chromium: add commandLineArgs after wayland flags (#189371) (cherry picked from commit d32eae0f230f5713c254b08edf91f1571c4f73a2) --- pkgs/applications/networking/browsers/chromium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 79a53fbfea47..55863787f41c 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -184,8 +184,8 @@ in stdenv.mkDerivation { mkdir -p "$out/bin" makeWrapper "${browserBinary}" "$out/bin/chromium" \ - --add-flags ${escapeShellArg commandLineArgs} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" \ + --add-flags ${escapeShellArg commandLineArgs} ed -v -s "$out/bin/chromium" << EOF 2i