From a100f1beb40bd05dfd3cce7eaebdbb0e83832489 Mon Sep 17 00:00:00 2001
From: Kilty McGowan <kiltyj@gmail.com>
Date: Sun, 19 May 2024 15:49:24 -0700
Subject: [PATCH 01/53] darwin.xcode: add 15.2, 15.3 and 15.4

---
 pkgs/os-specific/darwin/xcode/default.nix | 3 +++
 pkgs/top-level/darwin-packages.nix        | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix
index 1b7949dcb124..5825a4534b42 100644
--- a/pkgs/os-specific/darwin/xcode/default.nix
+++ b/pkgs/os-specific/darwin/xcode/default.nix
@@ -83,5 +83,8 @@ in lib.makeExtensible (self: {
   xcode_14_1 = requireXcode "14.1" "sha256-QJGAUVIhuDYyzDNttBPv5lIGOfvkYqdOFSUAr5tlkfs=";
   xcode_15 = requireXcode "15" "sha256-ffqISt2Ayccln5BArKIjSdzbEgoSoNwq8TPLGysAE0c=";
   xcode_15_1 = requireXcode "15.1" "sha256-0djqoSamU87rCpjo50Un3cFg9wKf+pSczRko6uumGM0=";
+  xcode_15_2 = requireXcode "15.2" "sha256-9B/4Tdyb3QGAzm579QGn5Iq/hA2hscD8OcoSJ5BFFXs=";
+  xcode_15_3 = requireXcode "15.3" "sha256-FyVA8EEPCI12Z4sJ4RQRZlMMpFmi7S8VYLcyvad3swM=";
+  xcode_15_4 = requireXcode "15.4" "sha256-yeo+sf6bBIJy9/1sQiMuPEMPniwGXMB6/FXXL0UrI5U=";
   xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if (stdenv.targetPlatform ? xcodeVer) then stdenv.targetPlatform.xcodeVer else "12.3")}";
 })
diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix
index cca74e047dbd..6b2d99a57cfb 100644
--- a/pkgs/top-level/darwin-packages.nix
+++ b/pkgs/top-level/darwin-packages.nix
@@ -188,7 +188,7 @@ impure-cmds // appleSourcePackages // chooseLibs // {
     xcode_12 xcode_12_0_1 xcode_12_1 xcode_12_2 xcode_12_3 xcode_12_4 xcode_12_5 xcode_12_5_1
     xcode_13 xcode_13_1 xcode_13_2 xcode_13_3 xcode_13_3_1 xcode_13_4 xcode_13_4_1
     xcode_14 xcode_14_1
-    xcode_15 xcode_15_1
+    xcode_15 xcode_15_1 xcode_15_2 xcode_15_3 xcode_15_4
     xcode;
 
   CoreSymbolication = callPackage ../os-specific/darwin/CoreSymbolication {

From 36590a42fec5d406b470878e019eb5e9a54cc91d Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Sat, 13 Jul 2024 09:47:45 -0300
Subject: [PATCH 02/53] dotnet: expose stage0 vmr derivations

This is only meant to be a helper for testing, so recursion is disabled.
---
 pkgs/development/compilers/dotnet/stage1.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/dotnet/stage1.nix b/pkgs/development/compilers/dotnet/stage1.nix
index 4212aaaab024..319c83bd1fa7 100644
--- a/pkgs/development/compilers/dotnet/stage1.nix
+++ b/pkgs/development/compilers/dotnet/stage1.nix
@@ -24,4 +24,4 @@ let
     };
   });
 
-in mkPackages { inherit vmr; }
+in mkPackages { inherit vmr; } // { stage0 = lib.dontRecurseIntoAttrs stage0; }

From 89967da19531aa1a97dd1796504439be02d875fe Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 1 Sep 2024 17:12:18 +0400
Subject: [PATCH 03/53] kotatogram-desktop: 0-unstable-2024-07-01 ->
 0-unstable-2024-09-01

---
 .../telegram/kotatogram-desktop/default.nix   |  10 +-
 .../telegram/kotatogram-desktop/macos.patch   | 123 +++++++++++++++++-
 2 files changed, 124 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix
index 4f382dc28e75..b19e3efa8ac7 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix
@@ -27,12 +27,10 @@
 , tl-expected
 , hunspell
 , gobject-introspection
-, glibmm_2_68
 , jemalloc
 , rnnoise
 , microsoft-gsl
 , boost
-, fmt
 , wayland
 , libicns
 , darwin
@@ -48,13 +46,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "kotatogram-desktop";
-  version = "0-unstable-2024-07-01";
+  version = "0-unstable-2024-09-01";
 
   src = fetchFromGitHub {
     owner = "kotatogram";
     repo = "kotatogram-desktop";
-    rev = "fbb22ebd3e39dfa4a036fa79a7a3f78b86b1cea2";
-    hash = "sha256-ccfmaqapk9ct+5kvBI02xHJ7YCGmm1CcqwM+3hC1bk0=";
+    rev = "e30c1857bf38c354467f4e6a2a37b1252b4e28e6";
+    hash = "sha256-kmJeqaDAVKhMWwcazy+gGB+55Kao67RJrlLvZQ+AtqY=";
     fetchSubmodules = true;
   };
 
@@ -115,9 +113,7 @@ stdenv.mkDerivation rec {
     alsa-lib
     libpulseaudio
     hunspell
-    glibmm_2_68
     jemalloc
-    fmt
     wayland
   ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [
     Cocoa
diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos.patch b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos.patch
index 8082f0964605..941e5f80526b 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos.patch
+++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos.patch
@@ -1,3 +1,19 @@
+diff --git a/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm b/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm
+index ef544803e9..69c61b3139 100644
+--- a/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm
++++ b/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm
+@@ -97,9 +97,11 @@ void MacOverlayWidgetHelper::updateStyles(bool fullscreen) {
+ 	[window setTitleVisibility:NSWindowTitleHidden];
+ 	[window setTitlebarAppearsTransparent:YES];
+ 	[window setStyleMask:[window styleMask] | NSWindowStyleMaskFullSizeContentView];
++#if 0
+ 	if (@available(macOS 12.0, *)) {
+ 		_data->topNotchSkip = [[window screen] safeAreaInsets].top;
+ 	}
++#endif
+ }
+ 
+ void MacOverlayWidgetHelper::refreshButtons(bool fullscreen) {
 Submodule Telegram/lib_base contains modified content
 diff --git a/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm b/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm
 index 7ce90d3..dac3c2c 100644
@@ -33,14 +49,88 @@ index 7ce90d3..dac3c2c 100644
  	const auto state = DetectBatteryState();
  	if (!state.has || !state.draining) {
  		return false;
+Submodule Telegram/lib_webrtc contains modified content
+diff --git a/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm b/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm
+index 7521c08..5e22da2 100644
+--- a/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm
++++ b/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm
+@@ -364,6 +364,7 @@ EnvironmentMac::EnvironmentMac(not_null<EnvironmentDelegate*> delegate)
+ 	DefaultCaptureDeviceChangedMonitor.registerEnvironment(this);
+ 	AudioDeviceListChangedMonitor.registerEnvironment(this);
+ 
++#if 0
+ 	if (@available(macOS 14.0, *)) {
+ 		const auto weak = base::make_weak(this);
+ 		id block = [^(BOOL shouldBeMuted){
+@@ -387,6 +388,7 @@ EnvironmentMac::EnvironmentMac(not_null<EnvironmentDelegate*> delegate)
+ 			setInputMuteStateChangeHandler:block
+ 			error:nil];
+ 	}
++#endif
+ }
+ 
+ EnvironmentMac::~EnvironmentMac() {
+@@ -537,15 +539,18 @@ void EnvironmentMac::devicesRequested(DeviceType type) {
+ }
+ 
+ void EnvironmentMac::setCaptureMuted(bool muted) {
++#if 0
+ 	if (@available(macOS 14.0, *)) {
+ 		if (!_captureMuteNotification) {
+ 			const auto value = muted ? YES : NO;
+ 			[[AVAudioApplication sharedInstance] setInputMuted:value error:nil];
+ 		}
+ 	}
++#endif
+ }
+ 
+ void EnvironmentMac::captureMuteSubscribe() {
++#if 0
+ 	if (@available(macOS 14.0, *)) {
+ 		id observer = [[InputMuteObserver alloc] init];
+ 		[[[NSWorkspace sharedWorkspace] notificationCenter]
+@@ -578,6 +583,7 @@ void EnvironmentMac::captureMuteSubscribe() {
+ 			[observer release];
+ 		});
+ 	}
++#endif
+ }
+ 
+ void EnvironmentMac::captureMuteUnsubscribe() {
+@@ -595,6 +601,7 @@ void EnvironmentMac::captureMuteRestartAdm() {
+ void EnvironmentMac::setCaptureMuteTracker(
+ 		not_null<CaptureMuteTracker*> tracker,
+ 		bool track) {
++#if 0
+ 	if (@available(macOS 14.0, *)) {
+ 		if (track) {
+ 			if (!_captureMuteTracker) {
+@@ -619,6 +626,7 @@ void EnvironmentMac::setCaptureMuteTracker(
+ 			}
+ 		}
+ 	}
++#endif
+ }
+ 
+ std::unique_ptr<Environment> CreateEnvironment(
 Submodule Telegram/lib_webview contains modified content
 diff --git a/Telegram/lib_webview/webview/platform/mac/webview_mac.mm b/Telegram/lib_webview/webview/platform/mac/webview_mac.mm
-index 657c5a4..4bfc097 100644
+index e7808fc..34020f0 100644
 --- a/Telegram/lib_webview/webview/platform/mac/webview_mac.mm
 +++ b/Telegram/lib_webview/webview/platform/mac/webview_mac.mm
-@@ -317,9 +317,11 @@ Instance::Instance(Config config) {
+@@ -334,6 +334,7 @@ Instance::Instance(Config config) {
+ 	_handler = [[Handler alloc] initWithMessageHandler:config.messageHandler navigationStartHandler:config.navigationStartHandler navigationDoneHandler:config.navigationDoneHandler dialogHandler:config.dialogHandler dataRequested:handleDataRequest];
  	_dataRequestHandler = std::move(config.dataRequestHandler);
  	[configuration setURLSchemeHandler:_handler forURLScheme:stdToNS(kDataUrlScheme)];
++#if 0
+ 	if (@available(macOS 14, *)) {
+ 		if (config.userDataToken != LegacyStorageIdToken().toStdString()) {
+ 			NSUUID *uuid = UuidFromToken(config.userDataToken);
+@@ -341,10 +342,13 @@ Instance::Instance(Config config) {
+ 			[uuid release];
+ 		}
+ 	}
++#endif
  	_webview = [[WKWebView alloc] initWithFrame:NSZeroRect configuration:configuration];
 +#if 0
  	if (@available(macOS 13.3, *)) {
@@ -50,3 +140,32 @@ index 657c5a4..4bfc097 100644
  	[_manager addScriptMessageHandler:_handler name:@"external"];
  	[_webview setNavigationDelegate:_handler];
  	[_webview setUIDelegate:_handler];
+@@ -700,10 +704,12 @@ void *Instance::winId() {
+ }
+ 
+ void Instance::setOpaqueBg(QColor opaqueBg) {
++#if 0
+ 	if (@available(macOS 12.0, *)) {
+ 		[_webview setValue: @NO forKey: @"drawsBackground"];
+ 		[_webview setUnderPageBackgroundColor:[NSColor clearColor]];
+ 	}
++#endif
+ }
+ 
+ void Instance::resizeToWindow() {
+@@ -739,6 +745,7 @@ std::string GenerateStorageToken() {
+ }
+ 
+ void ClearStorageDataByToken(const std::string &token) {
++#if 0
+ 	if (@available(macOS 14, *)) {
+ 		if (!token.empty() && token != LegacyStorageIdToken().toStdString()) {
+ 			if (NSUUID *uuid = UuidFromToken(token)) {
+@@ -754,6 +761,7 @@ void ClearStorageDataByToken(const std::string &token) {
+ 			}
+ 		}
+ 	}
++#endif
+ }
+ 
+ } // namespace Webview

From b598d8cf91554ea61994aa7c27b03ddbf59f601e Mon Sep 17 00:00:00 2001
From: Nadir Ishiguro <23151917+nadir-ishiguro@users.noreply.github.com>
Date: Tue, 3 Sep 2024 17:05:27 +0200
Subject: [PATCH 04/53] shotcut: 24.06.26 -> 24.08.29

---
 pkgs/by-name/sh/shotcut/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sh/shotcut/package.nix b/pkgs/by-name/sh/shotcut/package.nix
index bb5227ad89a4..811f34bf6d46 100644
--- a/pkgs/by-name/sh/shotcut/package.nix
+++ b/pkgs/by-name/sh/shotcut/package.nix
@@ -18,13 +18,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "shotcut";
-  version = "24.06.26";
+  version = "24.08.29";
 
   src = fetchFromGitHub {
     owner = "mltframework";
     repo = "shotcut";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-9eQF3s4BAUK81/94z7cMkd2NWdNLVMraP08qsDmuAI8=";
+    hash = "sha256-iWXq9IdXfARe9h3Habe0rr0ohdxBARiwg5g7F53bhRg=";
   };
 
   nativeBuildInputs = [

From 2ae2daf06948b36babe5ca232e9bcc61942994ad Mon Sep 17 00:00:00 2001
From: Sean Buckley <sean.bck@gmail.com>
Date: Tue, 3 Sep 2024 13:03:05 -0400
Subject: [PATCH 05/53] brave: 1.69.153 -> 1.69.162

https://community.brave.com/t/release-channel-1-69-162/566686
---
 pkgs/applications/networking/browsers/brave/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix
index e73772ce4155..caddc7e0be62 100644
--- a/pkgs/applications/networking/browsers/brave/default.nix
+++ b/pkgs/applications/networking/browsers/brave/default.nix
@@ -6,17 +6,17 @@ callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ])
     if stdenv.isAarch64 then
       rec {
         pname = "brave";
-        version = "1.69.153";
+        version = "1.69.162";
         url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
-        hash = "sha256-4j5Byts8mawq3Z7pgVhtujE+RR/uOb5MIC4iip0GtEw=";
+        hash = "sha256-uG3I91XyuEn/ZFjlv84041ZTCslkC5XElag/4R7MBHc=";
         platform = "aarch64-linux";
       }
     else if stdenv.isx86_64 then
       rec {
         pname = "brave";
-        version = "1.69.153";
+        version = "1.69.162";
         url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-        hash = "sha256-a5Hg7DoasbTQ7NOcx6XZ9zQosT5Y+TgQW5XCyYmIZDw=";
+        hash = "sha256-O8sf0sw6ljemNdSJwHyX2JjqQWEuKvSP9hj0H2VXQC8=";
         platform = "x86_64-linux";
       }
     else

From 9a89dc1cff1e9983407f623b83bd1eb640c8f77f Mon Sep 17 00:00:00 2001
From: John Garcia <jgarcia3788@yahoo.co.uk>
Date: Wed, 4 Sep 2024 18:17:10 +0100
Subject: [PATCH 06/53] onedrivegui: 1.0.3 -> 1.1.0rc3

---
 pkgs/by-name/on/onedrivegui/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/on/onedrivegui/package.nix b/pkgs/by-name/on/onedrivegui/package.nix
index 53dda082e8d5..045b0e2b468c 100644
--- a/pkgs/by-name/on/onedrivegui/package.nix
+++ b/pkgs/by-name/on/onedrivegui/package.nix
@@ -9,7 +9,7 @@
 }:
 
 let
-  version = "1.0.3";
+  version = "1.1.0rc3";
 
   setupPy = writeText "setup.py" ''
     from setuptools import setup
@@ -31,7 +31,7 @@ python3Packages.buildPythonApplication rec {
     owner = "bpozdena";
     repo = "OneDriveGUI";
     rev = "v${version}";
-    hash = "sha256-HutziAzhIDYP8upNPieL2GNrxPBHUCVs09FFxdSqeBs=";
+    hash = "sha256-d5NAcT3x9R/2DVQKZsw4GH63nTlVFsvkWwMrb42s18s=";
   };
 
   nativeBuildInputs = [ copyDesktopItems makeWrapper ];

From 2ac6d58a7c3f396c5b8fd02e9ca18522d1ff1031 Mon Sep 17 00:00:00 2001
From: John Garcia <jgarcia3788@yahoo.co.uk>
Date: Wed, 4 Sep 2024 18:17:37 +0100
Subject: [PATCH 07/53] onedrivegui: format with nixfmt

---
 pkgs/by-name/on/onedrivegui/package.nix | 31 ++++++++++++++++---------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/on/onedrivegui/package.nix b/pkgs/by-name/on/onedrivegui/package.nix
index 045b0e2b468c..2277cb5248de 100644
--- a/pkgs/by-name/on/onedrivegui/package.nix
+++ b/pkgs/by-name/on/onedrivegui/package.nix
@@ -1,11 +1,12 @@
-{ lib
-, python3Packages
-, fetchFromGitHub
-, writeText
-, copyDesktopItems
-, makeDesktopItem
-, makeWrapper
-, onedrive
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+  writeText,
+  copyDesktopItems,
+  makeDesktopItem,
+  makeWrapper,
+  onedrive,
 }:
 
 let
@@ -34,9 +35,15 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-d5NAcT3x9R/2DVQKZsw4GH63nTlVFsvkWwMrb42s18s=";
   };
 
-  nativeBuildInputs = [ copyDesktopItems makeWrapper ];
+  nativeBuildInputs = [
+    copyDesktopItems
+    makeWrapper
+  ];
 
-  propagatedBuildInputs = with python3Packages; [ pyside6 requests ];
+  propagatedBuildInputs = with python3Packages; [
+    pyside6
+    requests
+  ];
 
   # wrap manually to avoid having a bash script in $out/bin with a .py extension
   dontWrapPythonPrograms = true;
@@ -73,7 +80,9 @@ python3Packages.buildPythonApplication rec {
 
     makeWrapper ${python3Packages.python.interpreter} $out/bin/onedrivegui \
       --prefix PATH : ${lib.makeBinPath [ onedrive ]} \
-      --prefix PYTHONPATH : ${python3Packages.makePythonPath (propagatedBuildInputs ++ [(placeholder "out")])} \
+      --prefix PYTHONPATH : ${
+        python3Packages.makePythonPath (propagatedBuildInputs ++ [ (placeholder "out") ])
+      } \
       --add-flags $out/${python3Packages.python.sitePackages}/OneDriveGUI.py
   '';
 

From 17a46028b978a68ed613716fbe0daaab71d311ac Mon Sep 17 00:00:00 2001
From: Vivek <vivek@master-hax.com>
Date: Wed, 4 Sep 2024 20:02:22 -0700
Subject: [PATCH 08/53] nixos/endlessh-go: fix firewall bugs

this change fixes 2 major bugs in the endlessh-go service's firewall options:

1. prometheus port unexpectedly allowed through firewall (services.endlessh-go.openFirewall)

the description of the option is "Whether to open a firewall port for the SSH listener." however as we can see, both the ssh listener AND the prometheus listener have their ports opened. this is especially troublesome because endlessh-go (i guess as an artifact of being developed for docker) defaults the prometheus listener to 0.0.0.0.

2. the prometheus port unexpectedly allowed through firewall when prometheus is disabled (services.endlessh-go.prometheus.enable)

even when prometheus is disabled, its port is allowed through the firewall
---
 nixos/modules/services/security/endlessh-go.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/security/endlessh-go.nix b/nixos/modules/services/security/endlessh-go.nix
index 480bfc8cb9ef..20c3a3da4112 100644
--- a/nixos/modules/services/security/endlessh-go.nix
+++ b/nixos/modules/services/security/endlessh-go.nix
@@ -131,7 +131,7 @@ in
     };
 
     networking.firewall.allowedTCPPorts = with cfg;
-      optionals openFirewall [ port prometheus.port ];
+      optionals openFirewall [ port ];
   };
 
   meta.maintainers = with maintainers; [ azahi ];

From 22e2c17c464716a42bcb7a53c32d26bc69dd7f4e Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Thu, 5 Sep 2024 19:23:29 +0400
Subject: [PATCH 09/53] =?UTF-8?q?gcalcli:=204.3.0=20=E2=86=92=204.4.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/applications/misc/gcalcli/default.nix | 31 ++++++++++++++--------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/applications/misc/gcalcli/default.nix
index 6a55f0ff7420..da456226b1a7 100644
--- a/pkgs/applications/misc/gcalcli/default.nix
+++ b/pkgs/applications/misc/gcalcli/default.nix
@@ -8,43 +8,52 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "gcalcli";
-  version = "4.3.0";
+  version = "4.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "insanum";
     repo = "gcalcli";
     rev = "refs/tags/v${version}";
-    hash = "sha256-roHMWUwklLMNhLJANsAeBKcSX1Qk47kH5A3Y8SuDrmg=";
+    hash = "sha256-X9sgnujHMbmrt7cpcBOvTycIKFz3G2QzNDt3me5GUrQ=";
   };
 
-  postPatch = lib.optionalString stdenv.isLinux ''
-    substituteInPlace gcalcli/argparsers.py \
-      --replace-fail "'notify-send" "'${lib.getExe libnotify}"
-  '';
+  postPatch =
+    ''
+      # dev dependencies
+      substituteInPlace pyproject.toml \
+        --replace-fail "\"google-api-python-client-stubs\"," "" \
+        --replace-fail "\"types-python-dateutil\"," "" \
+        --replace-fail "\"types-requests\"," "" \
+        --replace-fail "\"types-vobject\"," ""
+    ''
+    + lib.optionalString stdenv.isLinux ''
+      substituteInPlace gcalcli/argparsers.py \
+        --replace-fail "'notify-send" "'${lib.getExe libnotify}"
+    '';
 
   build-system = with python3Packages; [ setuptools ];
 
   dependencies = with python3Packages; [
+    argcomplete
     python-dateutil
     gflags
     httplib2
     parsedatetime
-    six
     vobject
     google-api-python-client
-    oauth2client
+    google-auth-oauthlib
     uritemplate
     libnotify
   ];
 
   nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
 
-  meta = with lib; {
+  meta = {
     description = "CLI for Google Calendar";
     mainProgram = "gcalcli";
     homepage = "https://github.com/insanum/gcalcli";
-    license = licenses.mit;
-    maintainers = with maintainers; [ nocoolnametom ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ nocoolnametom ];
   };
 }

From 13bd1003004f8a0832229cb1f33a7cac3331f54f Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Mon, 26 Aug 2024 00:59:52 -0300
Subject: [PATCH 10/53] update-dotnet-lockfiles.nix: disable aliases

---
 maintainers/scripts/update-dotnet-lockfiles.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintainers/scripts/update-dotnet-lockfiles.nix b/maintainers/scripts/update-dotnet-lockfiles.nix
index 22ceff1ffa99..a79b0b074c8d 100644
--- a/maintainers/scripts/update-dotnet-lockfiles.nix
+++ b/maintainers/scripts/update-dotnet-lockfiles.nix
@@ -10,7 +10,7 @@
   update scripts.
  */
 let
-  pkgs = import ../.. {};
+  pkgs = import ../.. { config.allowAliases = false; };
 
   inherit (pkgs) lib;
 

From 9a14832d2e4a723ba53258bb8df04b5c81360065 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Thu, 5 Sep 2024 00:51:14 -0300
Subject: [PATCH 11/53] dotnet: fix fetch-deps in paket projects

---
 pkgs/development/compilers/dotnet/dotnet-sdk-setup-hook.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/dotnet/dotnet-sdk-setup-hook.sh b/pkgs/development/compilers/dotnet/dotnet-sdk-setup-hook.sh
index cac55cb56017..5d657eaf3122 100644
--- a/pkgs/development/compilers/dotnet/dotnet-sdk-setup-hook.sh
+++ b/pkgs/development/compilers/dotnet/dotnet-sdk-setup-hook.sh
@@ -60,7 +60,7 @@ configureNuget() {
         done
     fi
 
-    if [[ -f paket.dependencies ]]; then
+    if [[ -z ${keepNugetConfig-} && -f paket.dependencies ]]; then
        sed -i "s:source .*:source $nugetSource:" paket.dependencies
        sed -i "s:remote\:.*:remote\: $nugetSource:" paket.lock
 

From e530139caa10efda9d23217ada93e8488c43181b Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Thu, 5 Sep 2024 12:57:57 -0300
Subject: [PATCH 12/53] buildDotnetModule: fix tool manifest detection

---
 .../dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh   | 2 +-
 pkgs/by-name/ro/roslyn-ls/deps.nix                              | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh
index 1e421cb18ce1..37c815e004e3 100644
--- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh
+++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh
@@ -50,7 +50,7 @@ dotnetConfigureHook() {
         fi
     done
 
-    if [[ -f .config/dotnet-tools.json || -f .dotnet-tools.json ]]; then
+    if [[ -f .config/dotnet-tools.json || -f dotnet-tools.json ]]; then
         dotnet tool restore
     fi
 
diff --git a/pkgs/by-name/ro/roslyn-ls/deps.nix b/pkgs/by-name/ro/roslyn-ls/deps.nix
index 27aa7a75d268..a16363944efd 100644
--- a/pkgs/by-name/ro/roslyn-ls/deps.nix
+++ b/pkgs/by-name/ro/roslyn-ls/deps.nix
@@ -2,6 +2,7 @@
 # Please dont edit it manually, your changes might get overwritten!
 
 { fetchNuGet }: [
+  (fetchNuGet { pname = "dotnet-format"; version = "7.0.360304"; hash = "sha256-TuhZIhearocl702hLzGJCcRd8+RWoI4tDY02Bf6Lus8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/dotnet-format/7.0.360304/dotnet-format.7.0.360304.nupkg"; })
   (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; hash = "sha256-EXvojddPu+9JKgOG9NSQgUTfWq1RpOYw7adxDPKDJ6o="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/humanizer.core/2.14.1/humanizer.core.2.14.1.nupkg"; })
   (fetchNuGet { pname = "ICSharpCode.Decompiler"; version = "8.1.1.7464"; hash = "sha256-71/e9zuQIfqRXOiWxZkUFW/tMAj63nE8tg/sR7bGzuM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/icsharpcode.decompiler/8.1.1.7464/icsharpcode.decompiler.8.1.1.7464.nupkg"; })
   (fetchNuGet { pname = "MessagePack"; version = "2.5.108"; hash = "sha256-+vMXyEbfutY5WOFuFnNF24uLcKJTTdntVrVlSJH4yjI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/messagepack/2.5.108/messagepack.2.5.108.nupkg"; })
@@ -116,6 +117,7 @@
   (fetchNuGet { pname = "NuGet.ProjectModel"; version = "6.8.0-rc.112"; hash = "sha256-geQh1fSRTp2FTzeilFL8gxFFq7q8u7YaakShPKiTwns="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.projectmodel/6.8.0-rc.112/nuget.projectmodel.6.8.0-rc.112.nupkg"; })
   (fetchNuGet { pname = "NuGet.Protocol"; version = "6.8.0-rc.112"; hash = "sha256-6r/MJCo2ngibSAfNdH+xmeNUl38EPjQkaewKsTJpfvU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.protocol/6.8.0-rc.112/nuget.protocol.6.8.0-rc.112.nupkg"; })
   (fetchNuGet { pname = "NuGet.Versioning"; version = "6.8.0-rc.112"; hash = "sha256-BzAWS5wpGnNj0gU33sfWao7BELGjrQBT4xj3EC7qRRE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.versioning/6.8.0-rc.112/nuget.versioning.6.8.0-rc.112.nupkg"; })
+  (fetchNuGet { pname = "PowerShell"; version = "7.0.0"; hash = "sha256-ioasr71UIhDmeZ2Etw52lQ7QsioEd1pnbpVlEeCyUI4="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/powershell/7.0.0/powershell.7.0.0.nupkg"; })
   (fetchNuGet { pname = "RichCodeNav.EnvVarDump"; version = "0.1.1643-alpha"; hash = "sha256-bwND+Na9iEnkEdeL1elY34+m4/F4BYATBHv/2BEw4d4="; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/58ca65bb-e6c1-4210-88ac-fa55c1cd7877/nuget/v3/flat2/richcodenav.envvardump/0.1.1643-alpha/richcodenav.envvardump.0.1.1643-alpha.nupkg"; })
   (fetchNuGet { pname = "Roslyn.Diagnostics.Analyzers"; version = "3.11.0-beta1.24081.1"; hash = "sha256-wIOhKwvYetwytnuNX0uNC5oyBDU7xAhLqzTvyuGDVMM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/roslyn.diagnostics.analyzers/3.11.0-beta1.24081.1/roslyn.diagnostics.analyzers.3.11.0-beta1.24081.1.nupkg"; })
   (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; hash = "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.collections/4.3.0/runtime.any.system.collections.4.3.0.nupkg"; })

From e49642596f20f2730d4ad136d96f8bd3cbc080e8 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Sat, 24 Aug 2024 14:35:27 -0300
Subject: [PATCH 13/53] buildDotnetModule: set TMPDIR in fetch-deps

Some packages assume TMPDIR is unshared, even in nix-shell.
---
 pkgs/build-support/dotnet/build-dotnet-module/fetch-deps.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/build-support/dotnet/build-dotnet-module/fetch-deps.sh b/pkgs/build-support/dotnet/build-dotnet-module/fetch-deps.sh
index c8d428240621..ff971ce1e592 100644
--- a/pkgs/build-support/dotnet/build-dotnet-module/fetch-deps.sh
+++ b/pkgs/build-support/dotnet/build-dotnet-module/fetch-deps.sh
@@ -4,6 +4,8 @@ tmp=$(mktemp -d)
 trap 'chmod -R +w "$tmp" && rm -fr "$tmp"' EXIT
 
 HOME=$tmp/.home
+export TMPDIR="$tmp/.tmp"
+mkdir "$HOME" "$TMPDIR"
 cd "$tmp"
 
 phases="

From 04686b6b28c20ce39cb858308badc96700da4ce9 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Thu, 5 Sep 2024 00:08:17 -0300
Subject: [PATCH 14/53] dotnet: add .nupkg.metadata to VMR packages

This fixes nuget-to-nix in projects that use the source-built sdk and
`linkNugetPackages`.
---
 pkgs/development/compilers/dotnet/packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/dotnet/packages.nix b/pkgs/development/compilers/dotnet/packages.nix
index db9b5e68bdbf..fc569b6b7e1f 100644
--- a/pkgs/development/compilers/dotnet/packages.nix
+++ b/pkgs/development/compilers/dotnet/packages.nix
@@ -65,6 +65,7 @@ in {
             read version
             mkdir -p "$packages"/share/nuget/packages/"$id"
             cp -r "$package" "$packages"/share/nuget/packages/"$id"/"$version"
+            echo {} > "$packages"/share/nuget/packages/"$id"/"$version"/.nupkg.metadata
           )
         fi
       done

From e78882326b6744060af5da512311a90dd33ba0db Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Tue, 3 Sep 2024 21:54:18 -0300
Subject: [PATCH 15/53] mkNugetDeps: unpack to source/

Unpacking to the build root was a bad idea. stdenv uses dumpVars() to
create a file env-vars containing the entire environment.  This was
being installed in the derivation output, and since it contains lots of
store paths, it was bloating the closure for every nuget package.
---
 pkgs/build-support/dotnet/make-nuget-deps/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/dotnet/make-nuget-deps/default.nix b/pkgs/build-support/dotnet/make-nuget-deps/default.nix
index 341ab82ccddb..7266a2913732 100644
--- a/pkgs/build-support/dotnet/make-nuget-deps/default.nix
+++ b/pkgs/build-support/dotnet/make-nuget-deps/default.nix
@@ -39,8 +39,9 @@ lib.makeOverridable(
           ];
 
           unpackPhase = ''
-            unzip -nq $src
-            chmod -R +rw .
+            unzip -nqd source $src
+            chmod -R +rw source
+            cd source
           '';
 
           prePatch = ''

From 2d43ecc4002d8643d0b3373480b1707f477a40d0 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Tue, 3 Sep 2024 22:49:22 -0300
Subject: [PATCH 16/53] buildDotnetModule: clean-up stdenv attributes

- stop binding attributes we don't care about (e.g. name, doCheck)
- remove attributes we handle in nix (e.g. useAppHost)
- inherit attributes with default values (e.g. packNupkg)
---
 .../dotnet/build-dotnet-module/default.nix    | 38 ++++++++++++++-----
 pkgs/by-name/ro/roslyn-ls/package.nix         |  4 +-
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/default.nix
index e36e339dfa7f..82e900360ebc 100644
--- a/pkgs/build-support/dotnet/build-dotnet-module/default.nix
+++ b/pkgs/build-support/dotnet/build-dotnet-module/default.nix
@@ -18,10 +18,7 @@ let
   transformArgs =
     finalAttrs:
     {
-      name ? "${args.pname}-${args.version}",
-      pname ? name,
       enableParallelBuilding ? true,
-      doCheck ? false,
       # Flags to pass to `makeWrapper`. This is done to avoid double wrapping.
       makeWrapperArgs ? [ ],
 
@@ -118,7 +115,7 @@ let
             nugetDeps
           else
             mkNugetDeps {
-              inherit name;
+              inherit (finalAttrs.finalPackage) name;
               sourceFile = nugetDeps;
             }
         else
@@ -130,7 +127,21 @@ let
     in
     # Not all args need to be passed through to mkDerivation
     # TODO: We should probably filter out even more attrs
-    removeAttrs args [ "nugetDeps" ]
+    removeAttrs args [
+      "nugetDeps"
+      "installPath"
+      "executables"
+      "projectFile"
+      "projectReferences"
+      "runtimeDeps"
+      "runtimeId"
+      "disabledTests"
+      "testProjectFile"
+      "buildType"
+      "selfContainedBuild"
+      "useDotnet"
+      "useAppHost"
+    ]
     // {
       dotnetInstallPath = installPath;
       dotnetExecutables = executables;
@@ -145,9 +156,18 @@ let
       dotnetRuntimeDeps = map lib.getLib runtimeDeps;
       dotnetSelfContainedBuild = selfContainedBuild;
       dotnetUseAppHost = useAppHost;
-      inherit useDotnetFromEnv;
 
-      inherit enableParallelBuilding;
+      inherit
+        enableParallelBuilding
+        dotnetRestoreFlags
+        dotnetBuildFlags
+        dotnetTestFlags
+        dotnetInstallFlags
+        dotnetPackFlags
+        dotnetFlags
+        packNupkg
+        useDotnetFromEnv
+        ;
 
       nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [
         dotnetConfigureHook
@@ -241,12 +261,12 @@ let
                   if lib.isPath nugetDepsFile && !lib.hasPrefix "${builtins.storeDir}/" (toString nugetDepsFile) then
                     toString nugetDepsFile
                   else
-                    ''$(mktemp -t "${pname}-deps-XXXXXX.nix")'';
+                    ''$(mktemp -t "${finalAttrs.pname ? finalAttrs.finalPackage.name}-deps-XXXXXX.nix")'';
                 nugetToNix = (nuget-to-nix.override { inherit dotnet-sdk; });
               };
 
             in
-            writeShellScript "${name}-fetch-deps" ''
+            writeShellScript "${finalAttrs.finalPackage.name}-fetch-deps" ''
               NIX_BUILD_SHELL="${runtimeShell}" exec ${nix}/bin/nix-shell \
                 --pure --run 'source "${innerScript}"' "${drv}"
             '';
diff --git a/pkgs/by-name/ro/roslyn-ls/package.nix b/pkgs/by-name/ro/roslyn-ls/package.nix
index 3207eea29d09..8955d46b5b7b 100644
--- a/pkgs/by-name/ro/roslyn-ls/package.nix
+++ b/pkgs/by-name/ro/roslyn-ls/package.nix
@@ -33,7 +33,7 @@ buildDotnetModule rec {
     jq '.sdk.rollForward = "latestMinor"' < global.json > global.json.tmp
     mv global.json.tmp global.json
 
-    substituteInPlace $projectFile \
+    substituteInPlace $dotnetProjectFiles \
       --replace-fail \
         '>win-x64;win-arm64;linux-x64;linux-arm64;linux-musl-x64;linux-musl-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>' \
         '>linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>'
@@ -58,7 +58,7 @@ buildDotnetModule rec {
     ''
       runHook preInstall
 
-      env dotnet publish $projectFile \
+      env dotnet publish $dotnetProjectFiles \
           -p:ContinuousIntegrationBuild=true \
           -p:Deterministic=true \
           -p:InformationalVersion=$version \

From d4776214f794ebeb96d3ba49be4dfa119ef7358a Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Tue, 3 Sep 2024 23:01:00 -0300
Subject: [PATCH 17/53] mkNugetSource/Deps: move into dotnetCorePackages

---
 pkgs/development/compilers/dotnet/default.nix | 3 +++
 pkgs/top-level/all-packages.nix               | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix
index 9a1acf4ad70d..0604e5706b02 100644
--- a/pkgs/development/compilers/dotnet/default.nix
+++ b/pkgs/development/compilers/dotnet/default.nix
@@ -51,6 +51,9 @@ makeScopeWithSplicing' {
       patchNupkgs = callPackage ./patch-nupkgs.nix {};
       nugetPackageHook = callPackage ./nuget-package-hook.nix {};
 
+      mkNugetSource = callPackage ../../../build-support/dotnet/make-nuget-source { };
+      mkNugetDeps = callPackage ../../../build-support/dotnet/make-nuget-deps { };
+
       dotnet_8 = recurseIntoAttrs (callPackage ./8 { bootstrapSdk = dotnet_8_0.sdk_8_0_1xx; });
       dotnet_9 = recurseIntoAttrs (callPackage ./9 {});
     } // lib.optionalAttrs config.allowAliases {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e69ca4d78f5b..9441405e1666 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -880,8 +880,7 @@ with pkgs;
 
   buildDotnetModule = callPackage ../build-support/dotnet/build-dotnet-module { };
   nuget-to-nix = callPackage ../build-support/dotnet/nuget-to-nix { };
-  mkNugetSource = callPackage ../build-support/dotnet/make-nuget-source { };
-  mkNugetDeps = (newScope dotnetCorePackages) ../build-support/dotnet/make-nuget-deps { };
+  inherit (dotnetCorePackages) mkNugetSource mkNugetDeps;
 
   buildDotnetGlobalTool = callPackage ../build-support/dotnet/build-dotnet-global-tool { };
 

From 7ea78aaf5a1001152e46184020f647398ada3d84 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Tue, 3 Sep 2024 23:05:32 -0300
Subject: [PATCH 18/53] dotnetCorePackages.fetchNupkg: split from mkNugetDeps

---
 .../dotnet/fetch-nupkg/default.nix            | 67 +++++++++++++++++++
 .../dotnet/make-nuget-deps/default.nix        | 53 +--------------
 pkgs/development/compilers/dotnet/default.nix |  1 +
 3 files changed, 70 insertions(+), 51 deletions(-)
 create mode 100644 pkgs/build-support/dotnet/fetch-nupkg/default.nix

diff --git a/pkgs/build-support/dotnet/fetch-nupkg/default.nix b/pkgs/build-support/dotnet/fetch-nupkg/default.nix
new file mode 100644
index 000000000000..66bf503a6518
--- /dev/null
+++ b/pkgs/build-support/dotnet/fetch-nupkg/default.nix
@@ -0,0 +1,67 @@
+{
+  symlinkJoin,
+  fetchurl,
+  stdenvNoCC,
+  lib,
+  unzip,
+  patchNupkgs,
+  nugetPackageHook,
+}:
+{
+  pname,
+  version,
+  sha256 ? "",
+  hash ? "",
+  url ? "https://www.nuget.org/api/v2/package/${pname}/${version}",
+  installable ? false,
+}:
+stdenvNoCC.mkDerivation rec {
+  inherit pname version;
+
+  src = fetchurl {
+    name = "${pname}.${version}.nupkg";
+    # There is no need to verify whether both sha256 and hash are
+    # valid here, because nuget-to-nix does not generate a deps.nix
+    # containing both.
+    inherit
+      url
+      sha256
+      hash
+      version
+      ;
+  };
+
+  nativeBuildInputs = [
+    unzip
+    patchNupkgs
+    nugetPackageHook
+  ];
+
+  unpackPhase = ''
+    unzip -nqd source $src
+    chmod -R +rw source
+    cd source
+  '';
+
+  prePatch = ''
+    shopt -s nullglob
+    local dir
+    for dir in tools runtimes/*/native; do
+      [[ ! -d "$dir" ]] || chmod -R +x "$dir"
+    done
+    rm -rf .signature.p7s
+  '';
+
+  installPhase = ''
+    dir=$out/share/nuget/packages/${lib.toLower pname}/${lib.toLower version}
+    mkdir -p $dir
+    cp -r . $dir
+    echo {} > "$dir"/.nupkg.metadata
+  '';
+
+  preFixup = ''
+    patch-nupkgs $out/share/nuget/packages
+  '';
+
+  createInstallableNugetSource = installable;
+}
diff --git a/pkgs/build-support/dotnet/make-nuget-deps/default.nix b/pkgs/build-support/dotnet/make-nuget-deps/default.nix
index 7266a2913732..efc3d07e9777 100644
--- a/pkgs/build-support/dotnet/make-nuget-deps/default.nix
+++ b/pkgs/build-support/dotnet/make-nuget-deps/default.nix
@@ -5,6 +5,7 @@
 , unzip
 , patchNupkgs
 , nugetPackageHook
+, fetchNupkg
 }:
 lib.makeOverridable(
   { name
@@ -15,57 +16,7 @@ lib.makeOverridable(
   (symlinkJoin {
     name = "${name}-nuget-deps";
     paths = nugetDeps {
-      fetchNuGet =
-        { pname
-        , version
-        , sha256 ? ""
-        , hash ? ""
-        , url ? "https://www.nuget.org/api/v2/package/${pname}/${version}" }:
-        stdenvNoCC.mkDerivation rec {
-          inherit pname version;
-
-          src = fetchurl {
-            name = "${pname}.${version}.nupkg";
-            # There is no need to verify whether both sha256 and hash are
-            # valid here, because nuget-to-nix does not generate a deps.nix
-            # containing both.
-            inherit url sha256 hash version;
-          };
-
-          nativeBuildInputs = [
-            unzip
-            patchNupkgs
-            nugetPackageHook
-          ];
-
-          unpackPhase = ''
-            unzip -nqd source $src
-            chmod -R +rw source
-            cd source
-          '';
-
-          prePatch = ''
-            shopt -s nullglob
-            local dir
-            for dir in tools runtimes/*/native; do
-              [[ ! -d "$dir" ]] || chmod -R +x "$dir"
-            done
-            rm -rf .signature.p7s
-          '';
-
-          installPhase = ''
-            dir=$out/share/nuget/packages/${lib.toLower pname}/${lib.toLower version}
-            mkdir -p $dir
-            cp -r . $dir
-            echo {} > "$dir"/.nupkg.metadata
-          '';
-
-          preFixup = ''
-            patch-nupkgs $out/share/nuget/packages
-          '';
-
-          createInstallableNugetSource = installable;
-        };
+      fetchNuGet = args: fetchNupkg (args // { inherit installable; });
     };
   }) // {
     inherit sourceFile;
diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix
index 0604e5706b02..fec4583bf558 100644
--- a/pkgs/development/compilers/dotnet/default.nix
+++ b/pkgs/development/compilers/dotnet/default.nix
@@ -53,6 +53,7 @@ makeScopeWithSplicing' {
 
       mkNugetSource = callPackage ../../../build-support/dotnet/make-nuget-source { };
       mkNugetDeps = callPackage ../../../build-support/dotnet/make-nuget-deps { };
+      fetchNupkg = callPackage ../../../build-support/dotnet/fetch-nupkg { };
 
       dotnet_8 = recurseIntoAttrs (callPackage ./8 { bootstrapSdk = dotnet_8_0.sdk_8_0_1xx; });
       dotnet_9 = recurseIntoAttrs (callPackage ./9 {});

From 32ccfdc278542a03cce351b9346e3bfa87802ae0 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Tue, 3 Sep 2024 23:10:54 -0300
Subject: [PATCH 19/53] dotnetCorePackages.fetchNupkg: run missing hooks

---
 pkgs/build-support/dotnet/fetch-nupkg/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/build-support/dotnet/fetch-nupkg/default.nix b/pkgs/build-support/dotnet/fetch-nupkg/default.nix
index 66bf503a6518..031a8d50207a 100644
--- a/pkgs/build-support/dotnet/fetch-nupkg/default.nix
+++ b/pkgs/build-support/dotnet/fetch-nupkg/default.nix
@@ -38,9 +38,13 @@ stdenvNoCC.mkDerivation rec {
   ];
 
   unpackPhase = ''
+    runHook preUnpack
+
     unzip -nqd source $src
     chmod -R +rw source
     cd source
+
+    runHook postUnpack
   '';
 
   prePatch = ''
@@ -53,10 +57,14 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   installPhase = ''
+    runHook preInstall
+
     dir=$out/share/nuget/packages/${lib.toLower pname}/${lib.toLower version}
     mkdir -p $dir
     cp -r . $dir
     echo {} > "$dir"/.nupkg.metadata
+
+    runHook postInstall
   '';
 
   preFixup = ''

From 1f6cd35f5efa75edfcd8172f010eee71741e45ff Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Tue, 3 Sep 2024 23:33:28 -0300
Subject: [PATCH 20/53] dotnetCorePackages.fetchNupkg: add override mechanism

---
 .../dotnet/fetch-nupkg/default.nix            | 117 +++++++++---------
 .../dotnet/fetch-nupkg/overrides.nix          |   9 ++
 2 files changed, 70 insertions(+), 56 deletions(-)
 create mode 100644 pkgs/build-support/dotnet/fetch-nupkg/overrides.nix

diff --git a/pkgs/build-support/dotnet/fetch-nupkg/default.nix b/pkgs/build-support/dotnet/fetch-nupkg/default.nix
index 031a8d50207a..07f1f2fc617f 100644
--- a/pkgs/build-support/dotnet/fetch-nupkg/default.nix
+++ b/pkgs/build-support/dotnet/fetch-nupkg/default.nix
@@ -6,6 +6,8 @@
   unzip,
   patchNupkgs,
   nugetPackageHook,
+  callPackage,
+  overrides ? callPackage ./overrides.nix { },
 }:
 {
   pname,
@@ -15,61 +17,64 @@
   url ? "https://www.nuget.org/api/v2/package/${pname}/${version}",
   installable ? false,
 }:
-stdenvNoCC.mkDerivation rec {
-  inherit pname version;
+let
+  package = stdenvNoCC.mkDerivation rec {
+    inherit pname version;
 
-  src = fetchurl {
-    name = "${pname}.${version}.nupkg";
-    # There is no need to verify whether both sha256 and hash are
-    # valid here, because nuget-to-nix does not generate a deps.nix
-    # containing both.
-    inherit
-      url
-      sha256
-      hash
-      version
-      ;
+    src = fetchurl {
+      name = "${pname}.${version}.nupkg";
+      # There is no need to verify whether both sha256 and hash are
+      # valid here, because nuget-to-nix does not generate a deps.nix
+      # containing both.
+      inherit
+        url
+        sha256
+        hash
+        version
+        ;
+    };
+
+    nativeBuildInputs = [
+      unzip
+      patchNupkgs
+      nugetPackageHook
+    ];
+
+    unpackPhase = ''
+      runHook preUnpack
+
+      unzip -nqd source $src
+      chmod -R +rw source
+      cd source
+
+      runHook postUnpack
+    '';
+
+    prePatch = ''
+      shopt -s nullglob
+      local dir
+      for dir in tools runtimes/*/native; do
+        [[ ! -d "$dir" ]] || chmod -R +x "$dir"
+      done
+      rm -rf .signature.p7s
+    '';
+
+    installPhase = ''
+      runHook preInstall
+
+      dir=$out/share/nuget/packages/${lib.toLower pname}/${lib.toLower version}
+      mkdir -p $dir
+      cp -r . $dir
+      echo {} > "$dir"/.nupkg.metadata
+
+      runHook postInstall
+    '';
+
+    preFixup = ''
+      patch-nupkgs $out/share/nuget/packages
+    '';
+
+    createInstallableNugetSource = installable;
   };
-
-  nativeBuildInputs = [
-    unzip
-    patchNupkgs
-    nugetPackageHook
-  ];
-
-  unpackPhase = ''
-    runHook preUnpack
-
-    unzip -nqd source $src
-    chmod -R +rw source
-    cd source
-
-    runHook postUnpack
-  '';
-
-  prePatch = ''
-    shopt -s nullglob
-    local dir
-    for dir in tools runtimes/*/native; do
-      [[ ! -d "$dir" ]] || chmod -R +x "$dir"
-    done
-    rm -rf .signature.p7s
-  '';
-
-  installPhase = ''
-    runHook preInstall
-
-    dir=$out/share/nuget/packages/${lib.toLower pname}/${lib.toLower version}
-    mkdir -p $dir
-    cp -r . $dir
-    echo {} > "$dir"/.nupkg.metadata
-
-    runHook postInstall
-  '';
-
-  preFixup = ''
-    patch-nupkgs $out/share/nuget/packages
-  '';
-
-  createInstallableNugetSource = installable;
-}
+in
+overrides.${pname} or lib.id package
diff --git a/pkgs/build-support/dotnet/fetch-nupkg/overrides.nix b/pkgs/build-support/dotnet/fetch-nupkg/overrides.nix
new file mode 100644
index 000000000000..f00e41fb1fad
--- /dev/null
+++ b/pkgs/build-support/dotnet/fetch-nupkg/overrides.nix
@@ -0,0 +1,9 @@
+{ autoPatchelfHook }:
+{
+  # e.g.
+  # "Package.Id" =
+  #   package:
+  #   package.overrideAttrs (old: {
+  #     buildInputs = old.buildInputs or [ ] ++ [ hello ];
+  #   });
+}

From 9c0e4b3b6098273a3a8e5c06d4bb2d3ec9f80723 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 6 Sep 2024 10:55:04 +0200
Subject: [PATCH 21/53] dmarc-metrics-exporter: format with nixfmt

---
 .../dmarc-metrics-exporter/default.nix        | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix b/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix
index 169e14f75753..ca4822859792 100644
--- a/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix
+++ b/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix
@@ -1,6 +1,7 @@
-{ lib
-, python3
-, fetchFromGitHub
+{
+  lib,
+  python3,
+  fetchFromGitHub,
 }:
 
 python3.pkgs.buildPythonApplication rec {
@@ -24,15 +25,17 @@ python3.pkgs.buildPythonApplication rec {
     poetry-core
   ];
 
-  propagatedBuildInputs = with python3.pkgs; [
-    bite-parser
-    dataclasses-serialization
-    prometheus-client
-    structlog
-    uvicorn
-    xsdata
-  ]
-  ++ uvicorn.optional-dependencies.standard;
+  propagatedBuildInputs =
+    with python3.pkgs;
+    [
+      bite-parser
+      dataclasses-serialization
+      prometheus-client
+      structlog
+      uvicorn
+      xsdata
+    ]
+    ++ uvicorn.optional-dependencies.standard;
 
   nativeCheckInputs = with python3.pkgs; [
     aiohttp

From 68843533645276b26a6969b935b149aff44eeef6 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 6 Sep 2024 10:55:45 +0200
Subject: [PATCH 22/53] dmarc-metrics-exporter: clean

---
 .../prometheus/dmarc-metrics-exporter/default.nix           | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix b/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix
index ca4822859792..33a3998caefd 100644
--- a/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix
+++ b/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix
@@ -8,8 +8,6 @@ python3.pkgs.buildPythonApplication rec {
   pname = "dmarc-metrics-exporter";
   version = "1.1.0";
 
-  disabled = python3.pythonOlder "3.8";
-
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -21,11 +19,11 @@ python3.pkgs.buildPythonApplication rec {
 
   pythonRelaxDeps = true;
 
-  nativeBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [
     poetry-core
   ];
 
-  propagatedBuildInputs =
+  dependencies =
     with python3.pkgs;
     [
       bite-parser

From 750a94a55122cb65426d067c13f93c388de18702 Mon Sep 17 00:00:00 2001
From: Guillaume Girol <symphorien+git@xlumurb.eu>
Date: Wed, 4 Sep 2024 12:00:00 +0000
Subject: [PATCH 23/53] pantalaimon: fix startup

Fixes: ImportError: cannot import name GLib, introspection typelib not found
---
 .../instant-messengers/pantalaimon/default.nix         | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix
index f5118bb96863..994596f8af16 100644
--- a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix
@@ -5,6 +5,7 @@
 , installShellFiles
 , nixosTests
 , enableDbusUi ? true
+, wrapGAppsHook3
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -61,6 +62,15 @@ python3Packages.buildPythonApplication rec {
   ]
   ++ lib.flatten (lib.attrValues optional-dependencies);
 
+  nativeBuildInputs = lib.optionals enableDbusUi [
+    wrapGAppsHook3
+  ];
+
+  dontWrapGApps = enableDbusUi;
+  makeWrapperArgs = lib.optionals enableDbusUi [
+    "\${gappsWrapperArgs[@]}"
+  ];
+
   # darwin has difficulty communicating with server, fails some integration tests
   doCheck = !stdenv.isDarwin;
 

From 73a4d0d583d6bd8cdd09ce290766737906459157 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 6 Sep 2024 16:19:39 +0200
Subject: [PATCH 24/53] python312Packages.cx-freeze: 7.1.1 -> 7.2.0

Changelog: https://github.com/marcelotduarte/cx_Freeze/releases/tag/7.2.0
---
 .../python-modules/cx-freeze/default.nix      | 35 +++++++++----------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/python-modules/cx-freeze/default.nix b/pkgs/development/python-modules/cx-freeze/default.nix
index 44dc7e32fd4b..d8e05e3e70fe 100644
--- a/pkgs/development/python-modules/cx-freeze/default.nix
+++ b/pkgs/development/python-modules/cx-freeze/default.nix
@@ -1,54 +1,53 @@
 {
   lib,
   buildPythonPackage,
+  distutils,
   fetchPypi,
   pythonOlder,
   ncurses,
+  packaging,
   setuptools,
   filelock,
-  typing-extensions,
   wheel,
   patchelf,
 }:
 
 buildPythonPackage rec {
   pname = "cx-freeze";
-  version = "7.1.1";
+  version = "7.2.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.11";
 
   src = fetchPypi {
     pname = "cx_freeze";
     inherit version;
-    hash = "sha256-M1wwutDj5lNlXyMJkzCEWL7cmXuvW3qZXoZB3rousoc=";
+    hash = "sha256-xX9xAbTTUTJGSx7IjLiUjDt8W07OS7NUwWCRWJyzNYM=";
   };
 
-  pythonRelaxDeps = [
-    "setuptools"
-    "wheel"
-  ];
+  postPatch = ''
+    sed -i /patchelf/d pyproject.toml
+    # Build system requirements
+    substituteInPlace pyproject.toml \
+      --replace-fail "setuptools>=65.6.3,<71" "setuptools" \
+      --replace-fail "wheel>=0.42.0,<=0.43.0" "wheel"
+  '';
 
   build-system = [
     setuptools
     wheel
   ];
 
-  buildInputs = [
-    ncurses
-  ];
+  buildInputs = [ ncurses ];
 
   dependencies = [
+    distutils
     filelock
+    packaging
     setuptools
-  ] ++ lib.optionals (pythonOlder "3.10") [
-    typing-extensions
+    wheel
   ];
 
-  postPatch = ''
-    sed -i /patchelf/d pyproject.toml
-  '';
-
   makeWrapperArgs = [
     "--prefix"
     "PATH"
@@ -56,7 +55,7 @@ buildPythonPackage rec {
     (lib.makeBinPath [ patchelf ])
   ];
 
-  # fails to find Console even though it exists on python 3.x
+  # Fails to find Console even though it exists on python 3.x
   doCheck = false;
 
   meta = with lib; {

From 5b33b2391db44f25da3c2787196a3bbbaeebfcf4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Sep 2024 14:48:10 +0000
Subject: [PATCH 25/53] php83Extensions.snuffleupagus: 0.10.0 -> 0.11.0

---
 pkgs/development/php-packages/snuffleupagus/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/php-packages/snuffleupagus/default.nix b/pkgs/development/php-packages/snuffleupagus/default.nix
index aa5faa665afb..d9c201e67a2d 100644
--- a/pkgs/development/php-packages/snuffleupagus/default.nix
+++ b/pkgs/development/php-packages/snuffleupagus/default.nix
@@ -11,13 +11,13 @@
 
 buildPecl rec {
   pname = "snuffleupagus";
-  version = "0.10.0";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "jvoisin";
     repo = "snuffleupagus";
     rev = "v${version}";
-    hash = "sha256-NwG8gBaToBaJGrZoCD7bDym7hQidWU0ArckoQCHN81o=";
+    hash = "sha256-W+EQXjvmDHih5YW/SjRcEdUELePUPKrNWB8vW9dLK/g=";
   };
 
   buildInputs =

From 52ec79a6382d7c20907e2226707950559db8e8e1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 6 Sep 2024 16:58:35 +0200
Subject: [PATCH 26/53] python312Packages.howdoi: disable flaky tests

---
 .../python-modules/howdoi/default.nix         | 28 ++++++++++++++-----
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/howdoi/default.nix b/pkgs/development/python-modules/howdoi/default.nix
index db109c2f70ee..4a716b8b037b 100644
--- a/pkgs/development/python-modules/howdoi/default.nix
+++ b/pkgs/development/python-modules/howdoi/default.nix
@@ -15,19 +15,20 @@
   rich,
   pytestCheckHook,
   pythonOlder,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "howdoi";
   version = "2.0.20";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "gleitz";
-    repo = pname;
-    rev = "v${version}";
+    repo = "howdoi";
+    rev = "refs/tags/v${version}";
     hash = "sha256-u0k+h7Sp2t/JUnfPqRzDpEA+vNXB7CpyZ/SRvk+B9t0=";
   };
 
@@ -37,11 +38,13 @@ buildPythonPackage rec {
     # Please remove on the next release
     (fetchpatch {
       url = "https://github.com/gleitz/howdoi/commit/7d24e9e1c87811a6e66d60f504381383cf1ac3fd.patch";
-      sha256 = "sha256-AFQMnMEijaExqiimbNaVeIRmZJ4Yj0nGUOEjfsvBLh8=";
+      hash = "sha256-AFQMnMEijaExqiimbNaVeIRmZJ4Yj0nGUOEjfsvBLh8=";
     })
   ];
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     appdirs
     cachelib
     colorama
@@ -60,14 +63,25 @@ buildPythonPackage rec {
     export HOME=$(mktemp -d)
   '';
 
-  disabledTests = [ "test_colorize" ];
+  disabledTests = [
+    "test_colorize"
+    # Tests are flaky, OSError: [Errno 24] Too many open files happpens
+    "test_answer_links_using_l_option"
+    "test_answers_bing"
+    "test_answers"
+    "test_json_output"
+    "test_missing_pre_or_code_query"
+    "test_multiple_answers"
+    "test_position"
+    "test_unicode_answer"
+  ];
 
   pythonImportsCheck = [ "howdoi" ];
 
   meta = with lib; {
-    changelog = "https://github.com/gleitz/howdoi/blob/v${version}/CHANGES.txt";
     description = "Instant coding answers via the command line";
     homepage = "https://github.com/gleitz/howdoi";
+    changelog = "https://github.com/gleitz/howdoi/blob/v${version}/CHANGES.txt";
     license = licenses.mit;
     maintainers = [ ];
   };

From 84c51bef56a6ca94a15b1ef672bf7b6f17793a6a Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 6 Sep 2024 20:57:18 +0300
Subject: [PATCH 27/53] wireplumber: 0.5.5 -> 0.5.6

Diff: https://gitlab.freedesktop.org/pipewire/wireplumber/-/compare/0.5.5...0.5.6
---
 pkgs/development/libraries/pipewire/wireplumber.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/pipewire/wireplumber.nix b/pkgs/development/libraries/pipewire/wireplumber.nix
index 607565b8fe69..ae4656a2f666 100644
--- a/pkgs/development/libraries/pipewire/wireplumber.nix
+++ b/pkgs/development/libraries/pipewire/wireplumber.nix
@@ -24,7 +24,7 @@
 
 stdenv.mkDerivation rec {
   pname = "wireplumber";
-  version = "0.5.5";
+  version = "0.5.6";
 
   outputs = [ "out" "dev" ] ++ lib.optional enableDocs "doc";
 
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     owner = "pipewire";
     repo = "wireplumber";
     rev = version;
-    hash = "sha256-evqQCKf4oE/PwkAOMPPPw8LPiNIWQ2gkOJzsFC8UN+k=";
+    hash = "sha256-UAx7laULICb9ClZsIFcKi687M0yEgV4sCyhKqxs4nHE=";
   };
 
   nativeBuildInputs = [

From a0134dd1d8c2cf71ef8d10b7566ccbeb39e81d84 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 6 Sep 2024 20:58:12 +0300
Subject: [PATCH 28/53] nixos/wireplumber: drop hack for systemwide setups

Should not be necessary with 0.5.6.
---
 .../services/desktops/pipewire/wireplumber.nix     | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/nixos/modules/services/desktops/pipewire/wireplumber.nix b/nixos/modules/services/desktops/pipewire/wireplumber.nix
index c924801bcd8b..cccb892cecf7 100644
--- a/nixos/modules/services/desktops/pipewire/wireplumber.nix
+++ b/nixos/modules/services/desktops/pipewire/wireplumber.nix
@@ -215,17 +215,6 @@ in
         }
       '';
 
-      systemwideConfigPkg = pkgs.writeTextDir "share/wireplumber/wireplumber.conf.d/90-nixos-systemwide.conf" ''
-        # When running system-wide, we don't have logind to call ReserveDevice,
-        # And bluetooth logind integration needs to be disabled
-        wireplumber.profiles = {
-          main = {
-            support.reserve-device = disabled
-            monitor.bluez.seat-monitoring = disabled
-          }
-        }
-      '';
-
       extraConfigPkg = pkgs.buildEnv {
         name = "wireplumber-extra-config";
         paths = mapConfigToFiles cfg.extraConfig;
@@ -240,8 +229,7 @@ in
 
       configPackages = cfg.configPackages
         ++ [ extraConfigPkg extraScriptsPkg ]
-        ++ optional (!pwUsedForAudio) pwNotForAudioConfigPkg
-        ++ optional pwCfg.systemWide systemwideConfigPkg;
+        ++ optional (!pwUsedForAudio) pwNotForAudioConfigPkg;
 
       configs = pkgs.buildEnv {
         name = "wireplumber-configs";

From c6deee04b55637f7a91c18514c1cdbce715f8f56 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 6 Sep 2024 20:53:36 +0200
Subject: [PATCH 29/53] python312Packages.ldap3-bleeding-edge: init at
 2.10.1.1337

Strictly RFC 4510 conforming LDAP V3 client library (bleeding edge)

https://pypi.org/project/ldap3-bleeding-edge/
---
 .../ldap3-bleeding-edge/default.nix           | 43 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/development/python-modules/ldap3-bleeding-edge/default.nix

diff --git a/pkgs/development/python-modules/ldap3-bleeding-edge/default.nix b/pkgs/development/python-modules/ldap3-bleeding-edge/default.nix
new file mode 100644
index 000000000000..23733a9be2fa
--- /dev/null
+++ b/pkgs/development/python-modules/ldap3-bleeding-edge/default.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  buildPythonPackage,
+  cryptography,
+  fetchPypi,
+  gssapi,
+  pyasn1,
+  pycryptodomex,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "ldap3-bleeding-edge";
+  version = "2.10.1.1337";
+  pyproject = true;
+
+  src = fetchPypi {
+    pname = "ldap3_bleeding_edge";
+    inherit version;
+    hash = "sha256-j4hzcqwOONol6YqY9Ldz9YphjPmacFoVyqUnMHW1aZk=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    cryptography
+    gssapi
+    pyasn1
+    pycryptodomex
+  ];
+
+  pythonImportsCheck = [ "ldap3" ];
+
+  # Tests require network access
+  doCheck = false;
+
+  meta = {
+    description = "Strictly RFC 4510 conforming LDAP V3 client library (bleeding edge)";
+    homepage = "https://pypi.org/project/ldap3-bleeding-edge/";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 49045d27c5b8..d3157d6ed4a6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6889,6 +6889,8 @@ self: super: with self; {
 
   ldap3 = callPackage ../development/python-modules/ldap3 { };
 
+  ldap3-bleeding-edge = callPackage ../development/python-modules/ldap3-bleeding-edge { };
+
   ldapdomaindump = callPackage ../development/python-modules/ldapdomaindump { };
 
   ldappool = callPackage ../development/python-modules/ldappool { };

From 916f5e849b1439bafe2aad34970e5d599965ffaf Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 6 Sep 2024 20:55:24 +0200
Subject: [PATCH 30/53] ldeep: 1.0.60 -> 1.0.61

Diff: https://github.com/franc-pentest/ldeep/compare/refs/tags/1.0.60...1.0.61

Changelog: https://github.com/franc-pentest/ldeep/releases/tag/1.0.61
---
 pkgs/tools/security/ldeep/default.nix | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/pkgs/tools/security/ldeep/default.nix b/pkgs/tools/security/ldeep/default.nix
index 84af60fb89b3..76b7de1d91d1 100644
--- a/pkgs/tools/security/ldeep/default.nix
+++ b/pkgs/tools/security/ldeep/default.nix
@@ -1,38 +1,35 @@
-{ lib
-, fetchFromGitHub
-, python3
+{
+  lib,
+  fetchFromGitHub,
+  python3,
 }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "ldeep";
-  version = "1.0.60";
+  version = "1.0.61";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "franc-pentest";
     repo = "ldeep";
     rev = "refs/tags/${version}";
-    hash = "sha256-voj6I93+CTifhuUxmSZxYorbrQqnUUUJbO8WG8oJYEA=";
+    hash = "sha256-2962O/7EqX1lR8rNrtg9hku6O3+2gPtGhT5jDojxBDY=";
   };
 
   pythonRelaxDeps = [
     "cryptography"
   ];
 
-  build-system = with python3.pkgs; [
-    pdm-backend
-  ];
+  build-system = with python3.pkgs; [ pdm-backend ];
 
-  nativeBuildInputs = with python3.pkgs; [
-    cython
-  ];
+  nativeBuildInputs = with python3.pkgs; [ cython ];
 
   dependencies = with python3.pkgs; [
     commandparse
     cryptography
     dnspython
     gssapi
-    ldap3
+    ldap3-bleeding-edge
     oscrypto
     pycryptodome
     pycryptodomex
@@ -44,9 +41,7 @@ python3.pkgs.buildPythonApplication rec {
   # Project has no tests
   doCheck = false;
 
-  pythonImportsCheck = [
-    "ldeep"
-  ];
+  pythonImportsCheck = [ "ldeep" ];
 
   meta = with lib; {
     description = "In-depth LDAP enumeration utility";

From 27f243e37dc51723334979ee2e92aded0872b1b6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 6 Sep 2024 20:56:57 +0200
Subject: [PATCH 31/53] python312Packages.pywerview: 0.6.1 -> 0.7.0

Diff: https://github.com/the-useless-one/pywerview/compare/refs/tags/v0.6.1...v0.7.0

Changelog: https://github.com/the-useless-one/pywerview/releases/tag/v0.7.0
---
 .../python-modules/pywerview/default.nix           | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/pywerview/default.nix b/pkgs/development/python-modules/pywerview/default.nix
index edd1534e6f66..61ba21dc7586 100644
--- a/pkgs/development/python-modules/pywerview/default.nix
+++ b/pkgs/development/python-modules/pywerview/default.nix
@@ -5,7 +5,7 @@
   fetchFromGitHub,
   gssapi,
   impacket,
-  ldap3,
+  ldap3-bleeding-edge,
   lxml,
   pyasn1,
   pycryptodome,
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "pywerview";
-  version = "0.6.1";
+  version = "0.7.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -24,16 +24,16 @@ buildPythonPackage rec {
     owner = "the-useless-one";
     repo = "pywerview";
     rev = "refs/tags/v${version}";
-    hash = "sha256-hsilBqk73txYIlgRtbn/l/kWORMGft7ne5BffchDLPc=";
+    hash = "sha256-G4kcKlb6bq9Vx52MVZ+DCN5k1QcvkoMXm9P959nA1fI=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     beautifulsoup4
     gssapi
     impacket
-    ldap3
+    ldap3-bleeding-edge
     lxml
     pycryptodome
     pyasn1
@@ -46,10 +46,10 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Module for PowerSploit's PowerView support";
-    mainProgram = "pywerview";
     homepage = "https://github.com/the-useless-one/pywerview";
     changelog = "https://github.com/the-useless-one/pywerview/releases/tag/v${version}";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ fab ];
+    mainProgram = "pywerview";
   };
 }

From 9a0be2fd287493c3a22eb90b945db9f63a3d44d6 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Tue, 3 Sep 2024 23:34:56 -0300
Subject: [PATCH 32/53] dotnetCorePackages.fetchNupkg: override skiasharp to
 find fontconfig

---
 pkgs/applications/audio/openutau/default.nix  |  1 -
 .../git-credential-manager/default.nix        |  5 ++--
 .../dotnet/fetch-nupkg/overrides.nix          | 27 ++++++++++++++++++-
 .../be/beatsabermodmanager/package.nix        |  2 --
 pkgs/by-name/bl/blendfarm/package.nix         |  1 -
 pkgs/by-name/kn/knossosnet/package.nix        |  3 +--
 pkgs/by-name/li/libation/package.nix          |  2 --
 pkgs/by-name/lu/lumafly/package.nix           |  2 --
 pkgs/by-name/ne/nexusmods-app/package.nix     |  1 -
 pkgs/by-name/re/retrospy/package.nix          |  2 --
 pkgs/by-name/ry/ryujinx/package.nix           |  2 --
 .../space-station-14-launcher.nix             |  2 --
 pkgs/tools/games/scarab/default.nix           |  2 --
 .../networking/mqttmultimeter/default.nix     |  3 +--
 14 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/pkgs/applications/audio/openutau/default.nix b/pkgs/applications/audio/openutau/default.nix
index 3e16c7b512de..bb5c43f29fb7 100644
--- a/pkgs/applications/audio/openutau/default.nix
+++ b/pkgs/applications/audio/openutau/default.nix
@@ -32,7 +32,6 @@ buildDotnetModule rec {
 
   runtimeDeps = [
     dbus
-    fontconfig
     libICE
     libSM
     libX11
diff --git a/pkgs/applications/version-management/git-credential-manager/default.nix b/pkgs/applications/version-management/git-credential-manager/default.nix
index 592074224f01..fb70c4b71888 100644
--- a/pkgs/applications/version-management/git-credential-manager/default.nix
+++ b/pkgs/applications/version-management/git-credential-manager/default.nix
@@ -5,7 +5,6 @@
 , libX11
 , libICE
 , libSM
-, fontconfig
 , libsecret
 , git
 , git-credential-manager
@@ -36,8 +35,8 @@ buildDotnetModule rec {
   dotnetInstallFlags = [ "--framework" "net8.0" ];
   executables = [ "git-credential-manager" ];
 
-  runtimeDeps = [ fontconfig ]
-    ++ lib.optionals withGuiSupport [ libX11 libICE libSM ]
+  runtimeDeps =
+    lib.optionals withGuiSupport [ libX11 libICE libSM ]
     ++ lib.optional withLibsecretSupport libsecret;
   makeWrapperArgs = [
     "--prefix PATH : ${lib.makeBinPath ([ git ] ++ lib.optionals withGpgSupport [ gnupg pass ])}"
diff --git a/pkgs/build-support/dotnet/fetch-nupkg/overrides.nix b/pkgs/build-support/dotnet/fetch-nupkg/overrides.nix
index f00e41fb1fad..384505a65cd2 100644
--- a/pkgs/build-support/dotnet/fetch-nupkg/overrides.nix
+++ b/pkgs/build-support/dotnet/fetch-nupkg/overrides.nix
@@ -1,4 +1,10 @@
-{ autoPatchelfHook }:
+{
+  autoPatchelfHook,
+  dotnetCorePackages,
+  fontconfig,
+  lib,
+  stdenv,
+}:
 {
   # e.g.
   # "Package.Id" =
@@ -6,4 +12,23 @@
   #   package.overrideAttrs (old: {
   #     buildInputs = old.buildInputs or [ ] ++ [ hello ];
   #   });
+
+  "SkiaSharp.NativeAssets.Linux" =
+    package:
+    package.overrideAttrs (old: {
+      nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ autoPatchelfHook ];
+
+      buildInputs = old.buildInputs or [ ] ++ [ fontconfig ];
+
+      preInstall =
+        old.preInstall or ""
+        + ''
+          cd runtimes
+          for platform in *; do
+            [[ $platform == "${dotnetCorePackages.systemToDotnetRid stdenv.hostPlatform.system}" ]] ||
+              rm -r "$platform"
+          done
+          cd - >/dev/null
+        '';
+    });
 }
diff --git a/pkgs/by-name/be/beatsabermodmanager/package.nix b/pkgs/by-name/be/beatsabermodmanager/package.nix
index 96705c35d345..a44d30f7fa70 100644
--- a/pkgs/by-name/be/beatsabermodmanager/package.nix
+++ b/pkgs/by-name/be/beatsabermodmanager/package.nix
@@ -8,7 +8,6 @@
   libX11,
   libICE,
   libSM,
-  fontconfig,
 
   xdg-utils,
 }:
@@ -42,7 +41,6 @@ buildDotnetModule rec {
     libX11
     libICE
     libSM
-    fontconfig
   ];
 
   # Required for OneClick
diff --git a/pkgs/by-name/bl/blendfarm/package.nix b/pkgs/by-name/bl/blendfarm/package.nix
index badbda23c38a..ba7bfc21af3c 100644
--- a/pkgs/by-name/bl/blendfarm/package.nix
+++ b/pkgs/by-name/bl/blendfarm/package.nix
@@ -83,7 +83,6 @@ buildDotnetModule rec {
     libgdiplus
     glib
     libXrandr
-    fontconfig
   ] ++ lib.optionals stdenv.hostPlatform.isLinux [ blender ];
 
   # there is no "*.so.3" or "*.so.5" in nixpkgs. So ignore the warning
diff --git a/pkgs/by-name/kn/knossosnet/package.nix b/pkgs/by-name/kn/knossosnet/package.nix
index a6a41e20fc73..ab767a89300d 100644
--- a/pkgs/by-name/kn/knossosnet/package.nix
+++ b/pkgs/by-name/kn/knossosnet/package.nix
@@ -1,7 +1,6 @@
 {
   buildDotnetModule
   , fetchFromGitHub
-  , fontconfig
   , lib
   , openal
   , xorg
@@ -23,7 +22,7 @@ buildDotnetModule rec {
   nugetDeps = ./deps.nix;
   executables = [ "Knossos.NET" ];
 
-  runtimeDeps = [ fontconfig openal xorg.libX11 xorg.libICE xorg.libSM ];
+  runtimeDeps = [ openal xorg.libX11 xorg.libICE xorg.libSM ];
 
   meta = with lib; {
     homepage = "https://github.com/KnossosNET/Knossos.NET";
diff --git a/pkgs/by-name/li/libation/package.nix b/pkgs/by-name/li/libation/package.nix
index fc61d7c0d48f..ff736584a33d 100644
--- a/pkgs/by-name/li/libation/package.nix
+++ b/pkgs/by-name/li/libation/package.nix
@@ -13,7 +13,6 @@
   libXcursor,
   libXext,
   libXrandr,
-  fontconfig,
   glew,
   gtk3,
 }:
@@ -55,7 +54,6 @@ buildDotnetModule rec {
     libXcursor
     libXext
     libXrandr
-    fontconfig
     glew
     # For file dialogs
     gtk3
diff --git a/pkgs/by-name/lu/lumafly/package.nix b/pkgs/by-name/lu/lumafly/package.nix
index 14227990c490..676b00cfa646 100644
--- a/pkgs/by-name/lu/lumafly/package.nix
+++ b/pkgs/by-name/lu/lumafly/package.nix
@@ -5,7 +5,6 @@
   dotnetCorePackages,
   zlib,
   icu,
-  fontconfig,
   openssl,
   libX11,
   libICE,
@@ -36,7 +35,6 @@ buildDotnetModule rec {
   runtimeDeps = [
     zlib
     icu
-    fontconfig
     openssl
     libX11
     libICE
diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix
index 68f5dadc393a..a55bb43e0007 100644
--- a/pkgs/by-name/ne/nexusmods-app/package.nix
+++ b/pkgs/by-name/ne/nexusmods-app/package.nix
@@ -63,7 +63,6 @@ buildDotnetModule (finalAttrs: {
   runtimeInputs = [ desktop-file-utils ];
 
   runtimeDeps = [
-    fontconfig
     libICE
     libSM
     libX11
diff --git a/pkgs/by-name/re/retrospy/package.nix b/pkgs/by-name/re/retrospy/package.nix
index a68b08617f43..869b6debfb1a 100644
--- a/pkgs/by-name/re/retrospy/package.nix
+++ b/pkgs/by-name/re/retrospy/package.nix
@@ -4,7 +4,6 @@
 , copyDesktopItems
 , makeDesktopItem
 , lib
-, fontconfig
 , libX11
 , libXcursor
 , libICE
@@ -44,7 +43,6 @@ buildDotnetModule {
   ];
 
   runtimeDeps = [
-    fontconfig
     libX11
     libICE
     libXcursor
diff --git a/pkgs/by-name/ry/ryujinx/package.nix b/pkgs/by-name/ry/ryujinx/package.nix
index 590b7cfc7cce..cbf8e5281008 100644
--- a/pkgs/by-name/ry/ryujinx/package.nix
+++ b/pkgs/by-name/ry/ryujinx/package.nix
@@ -16,7 +16,6 @@
 , libXcursor
 , libXext
 , libXrandr
-, fontconfig
 , glew
 , libGL
 , udev
@@ -61,7 +60,6 @@ buildDotnetModule rec {
     libXcursor
     libXext
     libXrandr
-    fontconfig
     glew
 
     # Headless executable
diff --git a/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix b/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix
index cde4cee0384a..909b57277f61 100644
--- a/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix
+++ b/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix
@@ -13,7 +13,6 @@
 , libXcursor
 , libXext
 , libXrandr
-, fontconfig
 , glew
 , SDL2
 , glfw
@@ -102,7 +101,6 @@ buildDotnetModule rec {
     libXcursor
     libXext
     libXrandr
-    fontconfig
     glew
   ];
 
diff --git a/pkgs/tools/games/scarab/default.nix b/pkgs/tools/games/scarab/default.nix
index 11ec9e7cdd02..e3bce4d7e574 100644
--- a/pkgs/tools/games/scarab/default.nix
+++ b/pkgs/tools/games/scarab/default.nix
@@ -6,7 +6,6 @@
 , libX11
 , libICE
 , libSM
-, fontconfig
 , gtk3
 , copyDesktopItems
 , icoutils
@@ -35,7 +34,6 @@ buildDotnetModule rec {
     libX11
     libICE
     libSM
-    fontconfig
     gtk3
   ];
 
diff --git a/pkgs/tools/networking/mqttmultimeter/default.nix b/pkgs/tools/networking/mqttmultimeter/default.nix
index 1c2c290bef78..a265f1dfa472 100644
--- a/pkgs/tools/networking/mqttmultimeter/default.nix
+++ b/pkgs/tools/networking/mqttmultimeter/default.nix
@@ -4,7 +4,6 @@
 , dotnet-runtime_8
 , buildDotnetModule
 , fetchFromGitHub
-, fontconfig
 , xorg
 , libglvnd
 , makeDesktopItem
@@ -34,7 +33,7 @@ buildDotnetModule rec {
     copyDesktopItems
   ];
 
-  buildInputs = [ stdenv.cc.cc.lib fontconfig ];
+  buildInputs = [ stdenv.cc.cc.lib ];
 
   postInstall = ''
     rm -rf $out/lib/${lib.toLower pname}/runtimes/{*musl*,win*}

From 5b31367e13601a2a2ab3a55ef8bce9dfd1949c27 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Wed, 4 Sep 2024 00:48:59 -0300
Subject: [PATCH 33/53] buildDotnetModule: move into dotnetCorePackages

---
 pkgs/development/compilers/dotnet/default.nix | 1 +
 pkgs/top-level/all-packages.nix               | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix
index fec4583bf558..f963c0603536 100644
--- a/pkgs/development/compilers/dotnet/default.nix
+++ b/pkgs/development/compilers/dotnet/default.nix
@@ -51,6 +51,7 @@ makeScopeWithSplicing' {
       patchNupkgs = callPackage ./patch-nupkgs.nix {};
       nugetPackageHook = callPackage ./nuget-package-hook.nix {};
 
+      buildDotnetModule = callPackage ../../../build-support/dotnet/build-dotnet-module { };
       mkNugetSource = callPackage ../../../build-support/dotnet/make-nuget-source { };
       mkNugetDeps = callPackage ../../../build-support/dotnet/make-nuget-deps { };
       fetchNupkg = callPackage ../../../build-support/dotnet/fetch-nupkg { };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9441405e1666..cce11a14c429 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -878,9 +878,8 @@ with pkgs;
   dotnet-runtime = dotnetCorePackages.runtime_6_0;
   dotnet-aspnetcore = dotnetCorePackages.aspnetcore_6_0;
 
-  buildDotnetModule = callPackage ../build-support/dotnet/build-dotnet-module { };
   nuget-to-nix = callPackage ../build-support/dotnet/nuget-to-nix { };
-  inherit (dotnetCorePackages) mkNugetSource mkNugetDeps;
+  inherit (dotnetCorePackages) buildDotnetModule mkNugetSource mkNugetDeps;
 
   buildDotnetGlobalTool = callPackage ../build-support/dotnet/build-dotnet-global-tool { };
 

From e5cb52bd58b8fb580900e17929d3f2051aad6534 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Fri, 6 Sep 2024 00:12:18 -0300
Subject: [PATCH 34/53] buildDotnetGlobalTool: move into dotnetCorePackages

---
 pkgs/development/compilers/dotnet/default.nix | 2 ++
 pkgs/top-level/all-packages.nix               | 4 +---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix
index f963c0603536..1a2fdc7f8dd1 100644
--- a/pkgs/development/compilers/dotnet/default.nix
+++ b/pkgs/development/compilers/dotnet/default.nix
@@ -52,6 +52,8 @@ makeScopeWithSplicing' {
       nugetPackageHook = callPackage ./nuget-package-hook.nix {};
 
       buildDotnetModule = callPackage ../../../build-support/dotnet/build-dotnet-module { };
+      buildDotnetGlobalTool = callPackage ../../../build-support/dotnet/build-dotnet-global-tool { };
+
       mkNugetSource = callPackage ../../../build-support/dotnet/make-nuget-source { };
       mkNugetDeps = callPackage ../../../build-support/dotnet/make-nuget-deps { };
       fetchNupkg = callPackage ../../../build-support/dotnet/fetch-nupkg { };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cce11a14c429..4c7b2589bb8c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -879,9 +879,7 @@ with pkgs;
   dotnet-aspnetcore = dotnetCorePackages.aspnetcore_6_0;
 
   nuget-to-nix = callPackage ../build-support/dotnet/nuget-to-nix { };
-  inherit (dotnetCorePackages) buildDotnetModule mkNugetSource mkNugetDeps;
-
-  buildDotnetGlobalTool = callPackage ../build-support/dotnet/build-dotnet-global-tool { };
+  inherit (dotnetCorePackages) buildDotnetModule buildDotnetGlobalTool mkNugetSource mkNugetDeps;
 
   fsautocomplete = callPackage ../development/tools/fsautocomplete { };
 

From 2563bd752cd19785ae8431914316cbad118c0aa9 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Thu, 5 Sep 2024 11:09:19 -0300
Subject: [PATCH 35/53] dotnet-sdk-setup-hook: make shell vars local

---
 pkgs/development/compilers/dotnet/dotnet-sdk-setup-hook.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/compilers/dotnet/dotnet-sdk-setup-hook.sh b/pkgs/development/compilers/dotnet/dotnet-sdk-setup-hook.sh
index 5d657eaf3122..4af67889b28b 100644
--- a/pkgs/development/compilers/dotnet/dotnet-sdk-setup-hook.sh
+++ b/pkgs/development/compilers/dotnet/dotnet-sdk-setup-hook.sh
@@ -16,6 +16,7 @@ _linkPackages() {
     local -r src="$1"
     local -r dest="$2"
     local dir
+    local x
 
     for x in "$src"/*/*; do
         dir=$dest/$(basename "$(dirname "$x")")
@@ -39,6 +40,8 @@ createNugetDirs() {
 }
 
 configureNuget() {
+    local x
+
     for x in "${!_nugetInputs[@]}"; do
         if [[ -d $x/share/nuget/packages ]]; then
             addToSearchPathWithCustomDelimiter ";" NUGET_FALLBACK_PACKAGES "$x/share/nuget/packages"

From 6c5a9e5a438cd5f50d41cf21cd05fc50cd427a7e Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Thu, 5 Sep 2024 09:56:14 -0300
Subject: [PATCH 36/53] dotnet-sdk-setup-hook: use temporary symlink dir for
 NUGET_FALLBACK_PACKAGES

Restore operations get extremely slow when there are a lot of paths in
NUGET_FALLBACK_PACKAGES.
---
 pkgs/development/compilers/dotnet/dotnet-sdk-setup-hook.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/dotnet/dotnet-sdk-setup-hook.sh b/pkgs/development/compilers/dotnet/dotnet-sdk-setup-hook.sh
index 4af67889b28b..fccf6b02aaeb 100644
--- a/pkgs/development/compilers/dotnet/dotnet-sdk-setup-hook.sh
+++ b/pkgs/development/compilers/dotnet/dotnet-sdk-setup-hook.sh
@@ -28,8 +28,9 @@ _linkPackages() {
 createNugetDirs() {
     nugetTemp=$PWD/.nuget-temp
     export NUGET_PACKAGES=$nugetTemp/packages
+    export NUGET_FALLBACK_PACKAGES=$nugetTemp/fallback
     nugetSource=$nugetTemp/source
-    mkdir -p "$NUGET_PACKAGES" "$nugetSource"
+    mkdir -p "$NUGET_PACKAGES" "$NUGET_FALLBACK_PACKAGES" "$nugetSource"
 
     dotnet new nugetconfig
     if [[ -z ${keepNugetConfig-} ]]; then
@@ -44,7 +45,7 @@ configureNuget() {
 
     for x in "${!_nugetInputs[@]}"; do
         if [[ -d $x/share/nuget/packages ]]; then
-            addToSearchPathWithCustomDelimiter ";" NUGET_FALLBACK_PACKAGES "$x/share/nuget/packages"
+            _linkPackages "$x/share/nuget/packages" "$NUGET_FALLBACK_PACKAGES"
         fi
 
         if [[ -d $x/share/nuget/source ]]; then

From cc9c59c4780a097ef7b988daeb118269e73d4730 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Wed, 4 Sep 2024 01:18:07 -0300
Subject: [PATCH 37/53] buildDotnetModule: use individual dependencies for
 nugetDeps

---
 doc/languages-frameworks/dotnet.section.md    |  2 +-
 .../build-dotnet-global-tool/default.nix      | 18 ++++++------
 .../dotnet/build-dotnet-module/default.nix    | 28 ++++++++-----------
 .../python-modules/clr-loader/default.nix     |  3 +-
 .../python-modules/pythonnet/default.nix      |  2 +-
 5 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/doc/languages-frameworks/dotnet.section.md b/doc/languages-frameworks/dotnet.section.md
index cdacec1c3a5e..2cbb7ea45d98 100644
--- a/doc/languages-frameworks/dotnet.section.md
+++ b/doc/languages-frameworks/dotnet.section.md
@@ -93,7 +93,7 @@ The `dotnetCorePackages.sdk` contains both a runtime and the full sdk of a given
 To package Dotnet applications, you can use `buildDotnetModule`. This has similar arguments to `stdenv.mkDerivation`, with the following additions:
 
 * `projectFile` is used for specifying the dotnet project file, relative to the source root. These have `.sln` (entire solution) or `.csproj` (single project) file extensions. This can be a list of multiple projects as well. When omitted, will attempt to find and build the solution (`.sln`). If running into problems, make sure to set it to a file (or a list of files) with the `.csproj` extension - building applications as entire solutions is not fully supported by the .NET CLI.
-* `nugetDeps` takes either a path to a `deps.nix` file, or a derivation. The `deps.nix` file can be generated using the script attached to `passthru.fetch-deps`. If the argument is a derivation, it will be used directly and assume it has the same output as `mkNugetDeps`.
+* `nugetDeps` takes either a path to a `deps.nix` file, or a derivation. The `deps.nix` file can be generated using the script attached to `passthru.fetch-deps`. For compatibility, if the argument is a list of derivations, they will be added to `buildInputs`.
 ::: {.note}
 For more detail about managing the `deps.nix` file, see [Generating and updating NuGet dependencies](#generating-and-updating-nuget-dependencies)
 :::
diff --git a/pkgs/build-support/dotnet/build-dotnet-global-tool/default.nix b/pkgs/build-support/dotnet/build-dotnet-global-tool/default.nix
index 466c1972899c..2177000c3627 100644
--- a/pkgs/build-support/dotnet/build-dotnet-global-tool/default.nix
+++ b/pkgs/build-support/dotnet/build-dotnet-global-tool/default.nix
@@ -1,4 +1,4 @@
-{ buildDotnetModule, emptyDirectory, mkNugetDeps, dotnet-sdk }:
+{ buildDotnetModule, emptyDirectory, fetchNupkg, dotnet-sdk }:
 
 { pname
 , version
@@ -23,13 +23,15 @@ buildDotnetModule (args // {
 
   src = emptyDirectory;
 
-  nugetDeps = mkNugetDeps {
-    name = pname;
-    nugetDeps = { fetchNuGet }: [
-      (fetchNuGet { pname = nugetName; inherit version; sha256 = nugetSha256; hash = nugetHash; })
-    ] ++ (nugetDeps fetchNuGet);
-    installable = true;
-  };
+  buildInputs = [
+    (fetchNupkg {
+      pname = nugetName;
+      inherit version;
+      sha256 = nugetSha256;
+      hash = nugetHash;
+      installable = true;
+    })
+  ];
 
   dotnetGlobalTool = true;
 
diff --git a/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/default.nix
index 82e900360ebc..412747733bd6 100644
--- a/pkgs/build-support/dotnet/build-dotnet-module/default.nix
+++ b/pkgs/build-support/dotnet/build-dotnet-module/default.nix
@@ -7,7 +7,7 @@
   writeShellScript,
   makeWrapper,
   dotnetCorePackages,
-  mkNugetDeps,
+  fetchNupkg,
   nuget-to-nix,
   cacert,
   unzip,
@@ -112,16 +112,16 @@ let
       _nugetDeps =
         if (nugetDeps != null) then
           if lib.isDerivation nugetDeps then
+            [ nugetDeps ]
+          else if lib.isList nugetDeps then
             nugetDeps
           else
-            mkNugetDeps {
-              inherit (finalAttrs.finalPackage) name;
-              sourceFile = nugetDeps;
-            }
+            assert (lib.isPath nugetDeps);
+            callPackage nugetDeps { fetchNuGet = fetchNupkg; }
         else
-          throw "Defining the `nugetDeps` attribute is required, as to lock the NuGet dependencies. This file can be generated by running the `passthru.fetch-deps` script.";
+          [ ];
 
-      nugetDepsFile = _nugetDeps.sourceFile;
+      nugetDepsFile = if lib.isPath nugetDeps then nugetDeps else null;
 
       inherit (dotnetCorePackages) systemToDotnetRid;
     in
@@ -183,13 +183,7 @@ let
         yq
       ];
 
-      buildInputs =
-        args.buildInputs or [ ]
-        ++ [
-          dotnet-sdk.packages
-          _nugetDeps
-        ]
-        ++ projectReferences;
+      buildInputs = args.buildInputs or [ ] ++ [ dotnet-sdk.packages ] ++ _nugetDeps ++ projectReferences;
 
       # Parse the version attr into a format acceptable for the Version msbuild property
       # The actual version attr is saved in InformationalVersion, which accepts an arbitrary string
@@ -233,13 +227,13 @@ let
         {
           nugetDeps = _nugetDeps;
         }
-        // lib.optionalAttrs (!lib.isDerivation nugetDeps) {
+        // lib.optionalAttrs (nugetDeps == null || lib.isPath nugetDeps) {
           fetch-deps =
             let
               pkg = finalAttrs.finalPackage.overrideAttrs (
                 old:
                 {
-                  buildInputs = lib.remove _nugetDeps old.buildInputs;
+                  buildInputs = lib.subtractLists _nugetDeps old.buildInputs;
                   keepNugetConfig = true;
                 }
                 // lib.optionalAttrs (runtimeId == null) {
@@ -258,7 +252,7 @@ let
                   # Note that toString is necessary here as it results in the path at
                   # eval time (i.e. to the file in your local Nixpkgs checkout) rather
                   # than the Nix store path of the path after it's been imported.
-                  if lib.isPath nugetDepsFile && !lib.hasPrefix "${builtins.storeDir}/" (toString nugetDepsFile) then
+                  if lib.isPath nugetDeps && !lib.isStorePath nugetDepsFile then
                     toString nugetDepsFile
                   else
                     ''$(mktemp -t "${finalAttrs.pname ? finalAttrs.finalPackage.name}-deps-XXXXXX.nix")'';
diff --git a/pkgs/development/python-modules/clr-loader/default.nix b/pkgs/development/python-modules/clr-loader/default.nix
index 6b3d2c3faa39..583cf34320e4 100644
--- a/pkgs/development/python-modules/clr-loader/default.nix
+++ b/pkgs/development/python-modules/clr-loader/default.nix
@@ -38,8 +38,7 @@ buildPythonPackage {
 
   buildInputs = [
     dotnetCorePackages.sdk_6_0.packages
-    dotnet-build.nugetDeps
-  ];
+  ] ++ dotnet-build.nugetDeps;
 
   nativeBuildInputs = [
     setuptools
diff --git a/pkgs/development/python-modules/pythonnet/default.nix b/pkgs/development/python-modules/pythonnet/default.nix
index 969534e80cef..9119f1a27268 100644
--- a/pkgs/development/python-modules/pythonnet/default.nix
+++ b/pkgs/development/python-modules/pythonnet/default.nix
@@ -37,7 +37,7 @@ buildPythonPackage {
       --replace 'dynamic = ["version"]' 'version = "${version}"'
   '';
 
-  buildInputs = [ dotnet-build.nugetDeps ];
+  buildInputs = dotnet-build.nugetDeps;
 
   nativeBuildInputs = [
     setuptools

From e6c700ed11f9a398930b757449f01753b01d810f Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Wed, 4 Sep 2024 01:18:41 -0300
Subject: [PATCH 38/53] dotnetCorePackages.fetchNupkg: override avalonia.x11 to
 find native libs

---
 pkgs/applications/audio/openutau/default.nix  |  6 ---
 .../git-credential-manager/default.nix        |  8 +--
 .../dotnet/fetch-nupkg/overrides.nix          | 49 +++++++++++++------
 .../be/beatsabermodmanager/package.nix        |  9 ----
 pkgs/by-name/bl/blendfarm/package.nix         |  6 ---
 pkgs/by-name/kn/knossosnet/package.nix        |  3 +-
 pkgs/by-name/li/libation/package.nix          | 14 ------
 pkgs/by-name/lu/lumafly/package.nix           |  6 ---
 pkgs/by-name/ne/nexusmods-app/package.nix     |  9 ----
 pkgs/by-name/re/retrospy/package.nix          | 11 -----
 pkgs/by-name/ry/ryujinx/package.nix           | 12 -----
 .../space-station-14-launcher.nix             | 14 ------
 pkgs/tools/games/scarab/default.nix           |  6 ---
 .../networking/mqttmultimeter/default.nix     |  4 --
 14 files changed, 37 insertions(+), 120 deletions(-)

diff --git a/pkgs/applications/audio/openutau/default.nix b/pkgs/applications/audio/openutau/default.nix
index bb5c43f29fb7..f797215b607b 100644
--- a/pkgs/applications/audio/openutau/default.nix
+++ b/pkgs/applications/audio/openutau/default.nix
@@ -5,9 +5,6 @@
 , dotnetCorePackages
 , dbus
 , fontconfig
-, libICE
-, libSM
-, libX11
 , portaudio
 }:
 
@@ -32,9 +29,6 @@ buildDotnetModule rec {
 
   runtimeDeps = [
     dbus
-    libICE
-    libSM
-    libX11
     portaudio
   ];
 
diff --git a/pkgs/applications/version-management/git-credential-manager/default.nix b/pkgs/applications/version-management/git-credential-manager/default.nix
index fb70c4b71888..c9df6aff549a 100644
--- a/pkgs/applications/version-management/git-credential-manager/default.nix
+++ b/pkgs/applications/version-management/git-credential-manager/default.nix
@@ -2,21 +2,16 @@
 , fetchFromGitHub
 , buildDotnetModule
 , dotnetCorePackages
-, libX11
-, libICE
-, libSM
 , libsecret
 , git
 , git-credential-manager
 , gnupg
 , pass
 , testers
-, withGuiSupport ? true
 , withLibsecretSupport ? true
 , withGpgSupport ? true
 }:
 
-assert withLibsecretSupport -> withGuiSupport;
 buildDotnetModule rec {
   pname = "git-credential-manager";
   version = "2.5.1";
@@ -36,8 +31,7 @@ buildDotnetModule rec {
   executables = [ "git-credential-manager" ];
 
   runtimeDeps =
-    lib.optionals withGuiSupport [ libX11 libICE libSM ]
-    ++ lib.optional withLibsecretSupport libsecret;
+    lib.optional withLibsecretSupport libsecret;
   makeWrapperArgs = [
     "--prefix PATH : ${lib.makeBinPath ([ git ] ++ lib.optionals withGpgSupport [ gnupg pass ])}"
   ];
diff --git a/pkgs/build-support/dotnet/fetch-nupkg/overrides.nix b/pkgs/build-support/dotnet/fetch-nupkg/overrides.nix
index 384505a65cd2..f4bc1976e0eb 100644
--- a/pkgs/build-support/dotnet/fetch-nupkg/overrides.nix
+++ b/pkgs/build-support/dotnet/fetch-nupkg/overrides.nix
@@ -3,7 +3,11 @@
   dotnetCorePackages,
   fontconfig,
   lib,
+  libICE,
+  libSM,
+  libX11,
   stdenv,
+  writeText,
 }:
 {
   # e.g.
@@ -13,22 +17,39 @@
   #     buildInputs = old.buildInputs or [ ] ++ [ hello ];
   #   });
 
+  "Avalonia.X11" =
+    package:
+    package.overrideAttrs (
+      old:
+      lib.optionalAttrs (!stdenv.isDarwin) {
+        setupHook = writeText "setupHook.sh" ''
+          prependToVar dotnetRuntimeDeps \
+            "${lib.getLib libICE}" \
+            "${lib.getLib libSM}" \
+            "${lib.getLib libX11}"
+        '';
+      }
+    );
+
   "SkiaSharp.NativeAssets.Linux" =
     package:
-    package.overrideAttrs (old: {
-      nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ autoPatchelfHook ];
+    package.overrideAttrs (
+      old:
+      lib.optionalAttrs stdenv.isLinux {
+        nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ autoPatchelfHook ];
 
-      buildInputs = old.buildInputs or [ ] ++ [ fontconfig ];
+        buildInputs = old.buildInputs or [ ] ++ [ fontconfig ];
 
-      preInstall =
-        old.preInstall or ""
-        + ''
-          cd runtimes
-          for platform in *; do
-            [[ $platform == "${dotnetCorePackages.systemToDotnetRid stdenv.hostPlatform.system}" ]] ||
-              rm -r "$platform"
-          done
-          cd - >/dev/null
-        '';
-    });
+        preInstall =
+          old.preInstall or ""
+          + ''
+            cd runtimes
+            for platform in *; do
+              [[ $platform == "${dotnetCorePackages.systemToDotnetRid stdenv.hostPlatform.system}" ]] ||
+                rm -r "$platform"
+            done
+            cd - >/dev/null
+          '';
+      }
+    );
 }
diff --git a/pkgs/by-name/be/beatsabermodmanager/package.nix b/pkgs/by-name/be/beatsabermodmanager/package.nix
index a44d30f7fa70..e11f60c39508 100644
--- a/pkgs/by-name/be/beatsabermodmanager/package.nix
+++ b/pkgs/by-name/be/beatsabermodmanager/package.nix
@@ -5,10 +5,6 @@
 
   dotnetCorePackages,
 
-  libX11,
-  libICE,
-  libSM,
-
   xdg-utils,
 }:
 
@@ -37,11 +33,6 @@ buildDotnetModule rec {
 
   nugetDeps = ./deps.nix;
 
-  runtimeDeps = [
-    libX11
-    libICE
-    libSM
-  ];
 
   # Required for OneClick
   makeWrapperArgs = [
diff --git a/pkgs/by-name/bl/blendfarm/package.nix b/pkgs/by-name/bl/blendfarm/package.nix
index ba7bfc21af3c..4eeabc18efaf 100644
--- a/pkgs/by-name/bl/blendfarm/package.nix
+++ b/pkgs/by-name/bl/blendfarm/package.nix
@@ -6,9 +6,6 @@
   dotnetCorePackages,
   xz,
   pcre,
-  libX11,
-  libICE,
-  libSM,
   autoPatchelfHook,
   bintools,
   fixDarwinDylibNames,
@@ -77,9 +74,6 @@ buildDotnetModule rec {
   runtimeDeps = [
     xz
     pcre
-    libX11
-    libICE
-    libSM
     libgdiplus
     glib
     libXrandr
diff --git a/pkgs/by-name/kn/knossosnet/package.nix b/pkgs/by-name/kn/knossosnet/package.nix
index ab767a89300d..7abcb75f3c9a 100644
--- a/pkgs/by-name/kn/knossosnet/package.nix
+++ b/pkgs/by-name/kn/knossosnet/package.nix
@@ -3,7 +3,6 @@
   , fetchFromGitHub
   , lib
   , openal
-  , xorg
 }:
 
 buildDotnetModule rec {
@@ -22,7 +21,7 @@ buildDotnetModule rec {
   nugetDeps = ./deps.nix;
   executables = [ "Knossos.NET" ];
 
-  runtimeDeps = [ openal xorg.libX11 xorg.libICE xorg.libSM ];
+  runtimeDeps = [ openal ];
 
   meta = with lib; {
     homepage = "https://github.com/KnossosNET/Knossos.NET";
diff --git a/pkgs/by-name/li/libation/package.nix b/pkgs/by-name/li/libation/package.nix
index ff736584a33d..b84469c716fb 100644
--- a/pkgs/by-name/li/libation/package.nix
+++ b/pkgs/by-name/li/libation/package.nix
@@ -6,13 +6,6 @@
   dotnetCorePackages,
   wrapGAppsHook3,
 
-  libX11,
-  libICE,
-  libSM,
-  libXi,
-  libXcursor,
-  libXext,
-  libXrandr,
   glew,
   gtk3,
 }:
@@ -47,13 +40,6 @@ buildDotnetModule rec {
 
   runtimeDeps = [
     # For Avalonia UI
-    libX11
-    libICE
-    libSM
-    libXi
-    libXcursor
-    libXext
-    libXrandr
     glew
     # For file dialogs
     gtk3
diff --git a/pkgs/by-name/lu/lumafly/package.nix b/pkgs/by-name/lu/lumafly/package.nix
index 676b00cfa646..c15e290b465c 100644
--- a/pkgs/by-name/lu/lumafly/package.nix
+++ b/pkgs/by-name/lu/lumafly/package.nix
@@ -6,9 +6,6 @@
   zlib,
   icu,
   openssl,
-  libX11,
-  libICE,
-  libSM,
   icoutils,
   copyDesktopItems,
   makeDesktopItem,
@@ -36,9 +33,6 @@ buildDotnetModule rec {
     zlib
     icu
     openssl
-    libX11
-    libICE
-    libSM
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix
index a55bb43e0007..6d07a5b93f9e 100644
--- a/pkgs/by-name/ne/nexusmods-app/package.nix
+++ b/pkgs/by-name/ne/nexusmods-app/package.nix
@@ -7,9 +7,6 @@
   fetchFromGitHub,
   fontconfig,
   lib,
-  libICE,
-  libSM,
-  libX11,
   runCommand,
   pname ? "nexusmods-app",
 }:
@@ -62,12 +59,6 @@ buildDotnetModule (finalAttrs: {
 
   runtimeInputs = [ desktop-file-utils ];
 
-  runtimeDeps = [
-    libICE
-    libSM
-    libX11
-  ];
-
   executables = [ "NexusMods.App" ];
 
   doCheck = true;
diff --git a/pkgs/by-name/re/retrospy/package.nix b/pkgs/by-name/re/retrospy/package.nix
index 869b6debfb1a..a207150e1e47 100644
--- a/pkgs/by-name/re/retrospy/package.nix
+++ b/pkgs/by-name/re/retrospy/package.nix
@@ -4,10 +4,6 @@
 , copyDesktopItems
 , makeDesktopItem
 , lib
-, libX11
-, libXcursor
-, libICE
-, libSM
 , runCommandLocal
 }:
 let
@@ -42,13 +38,6 @@ buildDotnetModule {
     copyDesktopItems
   ];
 
-  runtimeDeps = [
-    libX11
-    libICE
-    libXcursor
-    libSM
-  ];
-
   projectFile = [
     "RetroSpyX/RetroSpyX.csproj"
     "GBPemuX/GBPemuX.csproj"
diff --git a/pkgs/by-name/ry/ryujinx/package.nix b/pkgs/by-name/ry/ryujinx/package.nix
index cbf8e5281008..5ff91a281cd4 100644
--- a/pkgs/by-name/ry/ryujinx/package.nix
+++ b/pkgs/by-name/ry/ryujinx/package.nix
@@ -10,12 +10,6 @@
 , sndio
 , pulseaudio
 , vulkan-loader
-, libICE
-, libSM
-, libXi
-, libXcursor
-, libXext
-, libXrandr
 , glew
 , libGL
 , udev
@@ -54,12 +48,6 @@ buildDotnetModule rec {
     udev
 
     # Avalonia UI
-    libICE
-    libSM
-    libXi
-    libXcursor
-    libXext
-    libXrandr
     glew
 
     # Headless executable
diff --git a/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix b/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix
index 909b57277f61..10dfea3d7dee 100644
--- a/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix
+++ b/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix
@@ -6,13 +6,6 @@
 , iconConvTools
 , copyDesktopItems
 , makeDesktopItem
-, libX11
-, libICE
-, libSM
-, libXi
-, libXcursor
-, libXext
-, libXrandr
 , glew
 , SDL2
 , glfw
@@ -94,13 +87,6 @@ buildDotnetModule rec {
     gdk-pixbuf
 
     # Avalonia UI dependencies.
-    libX11
-    libICE
-    libSM
-    libXi
-    libXcursor
-    libXext
-    libXrandr
     glew
   ];
 
diff --git a/pkgs/tools/games/scarab/default.nix b/pkgs/tools/games/scarab/default.nix
index e3bce4d7e574..02dec25949e0 100644
--- a/pkgs/tools/games/scarab/default.nix
+++ b/pkgs/tools/games/scarab/default.nix
@@ -3,9 +3,6 @@
 , fetchFromGitHub
 , glibc
 , zlib
-, libX11
-, libICE
-, libSM
 , gtk3
 , copyDesktopItems
 , icoutils
@@ -31,9 +28,6 @@ buildDotnetModule rec {
   runtimeDeps = [
     glibc
     zlib
-    libX11
-    libICE
-    libSM
     gtk3
   ];
 
diff --git a/pkgs/tools/networking/mqttmultimeter/default.nix b/pkgs/tools/networking/mqttmultimeter/default.nix
index a265f1dfa472..29990cbc83a8 100644
--- a/pkgs/tools/networking/mqttmultimeter/default.nix
+++ b/pkgs/tools/networking/mqttmultimeter/default.nix
@@ -4,7 +4,6 @@
 , dotnet-runtime_8
 , buildDotnetModule
 , fetchFromGitHub
-, xorg
 , libglvnd
 , makeDesktopItem
 , copyDesktopItems
@@ -41,9 +40,6 @@ buildDotnetModule rec {
 
   runtimeDeps = [
     libglvnd
-    xorg.libSM
-    xorg.libICE
-    xorg.libX11
   ];
 
   desktopItems = makeDesktopItem {

From 14c908cdc9aa64916232ba2684871845747ccdb2 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Fri, 6 Sep 2024 13:37:42 -0300
Subject: [PATCH 39/53] tests.dotnet: add test for supported nugetDeps values

---
 pkgs/test/dotnet/default.nix               |  1 +
 pkgs/test/dotnet/nuget-deps/default.nix    | 44 ++++++++++++++++++++++
 pkgs/test/dotnet/nuget-deps/nuget-deps.nix |  6 +++
 3 files changed, 51 insertions(+)
 create mode 100644 pkgs/test/dotnet/nuget-deps/default.nix
 create mode 100644 pkgs/test/dotnet/nuget-deps/nuget-deps.nix

diff --git a/pkgs/test/dotnet/default.nix b/pkgs/test/dotnet/default.nix
index 72c2f5a64def..601cf5c15e4e 100644
--- a/pkgs/test/dotnet/default.nix
+++ b/pkgs/test/dotnet/default.nix
@@ -5,4 +5,5 @@
   use-dotnet-from-env = lib.recurseIntoAttrs (callPackage ./use-dotnet-from-env { });
   structured-attrs = lib.recurseIntoAttrs (callPackage ./structured-attrs { });
   final-attrs = lib.recurseIntoAttrs (callPackage ./final-attrs { });
+  nuget-deps = lib.recurseIntoAttrs (callPackage ./nuget-deps { });
 }
diff --git a/pkgs/test/dotnet/nuget-deps/default.nix b/pkgs/test/dotnet/nuget-deps/default.nix
new file mode 100644
index 000000000000..bf0e1445e93e
--- /dev/null
+++ b/pkgs/test/dotnet/nuget-deps/default.nix
@@ -0,0 +1,44 @@
+# Tests that `nugetDeps` in buildDotnetModule can handle various types.
+
+{
+  lib,
+  dotnet-sdk,
+  buildPackages, # buildDotnetModule
+  runCommand,
+}:
+
+let
+  inherit (lib)
+    mapAttrs
+    ;
+
+  inherit (buildPackages)
+    emptyDirectory
+    buildDotnetModule
+    ;
+
+in
+mapAttrs
+  (
+    name: nugetDeps:
+    buildDotnetModule {
+      name = "nuget-deps-${name}";
+      unpackPhase = ''
+        runHook preUnpack
+
+        mkdir test
+        cd test
+        dotnet new console -o .
+        ls -l
+
+        runHook postUnpack
+      '';
+      inherit nugetDeps;
+    }
+  )
+  {
+    "null" = null;
+    "file" = ./nuget-deps.nix;
+    "derivation" = emptyDirectory;
+    "list" = [ emptyDirectory ];
+  }
diff --git a/pkgs/test/dotnet/nuget-deps/nuget-deps.nix b/pkgs/test/dotnet/nuget-deps/nuget-deps.nix
new file mode 100644
index 000000000000..dbfecc1b2605
--- /dev/null
+++ b/pkgs/test/dotnet/nuget-deps/nuget-deps.nix
@@ -0,0 +1,6 @@
+# This file was automatically generated by passthru.fetch-deps.
+# Please dont edit it manually, your changes might get overwritten!
+
+{ fetchNuGet }:
+[
+]

From f13dd1c43a10079fcc90fad11eb1570a67da990b Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 6 Sep 2024 10:56:12 +0200
Subject: [PATCH 40/53] dmarc-metrics-exporter: disable flaky tests on darwin

---
 .../prometheus/dmarc-metrics-exporter/default.nix          | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix b/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix
index 33a3998caefd..7b6ef72c7d20 100644
--- a/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix
+++ b/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   python3,
   fetchFromGitHub,
 }:
@@ -42,6 +43,12 @@ python3.pkgs.buildPythonApplication rec {
     requests
   ];
 
+  disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
+    # flaky tests
+    "test_build_info"
+    "test_prometheus_exporter"
+  ];
+
   disabledTestPaths = [
     # require networking
     "dmarc_metrics_exporter/tests/test_e2e.py"

From 13f6e6da35612830da7d4918545102520370bfd3 Mon Sep 17 00:00:00 2001
From: Gabriel Fontes <hi@m7.rs>
Date: Fri, 6 Sep 2024 17:07:41 -0300
Subject: [PATCH 41/53] nixos/matterbridge: add services.matterbridge.package
 option

---
 nixos/modules/services/networking/matterbridge.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/matterbridge.nix b/nixos/modules/services/networking/matterbridge.nix
index cdcb69070dfb..6ba15ba950fb 100644
--- a/nixos/modules/services/networking/matterbridge.nix
+++ b/nixos/modules/services/networking/matterbridge.nix
@@ -19,6 +19,8 @@ in
     services.matterbridge = {
       enable = mkEnableOption "Matterbridge chat platform bridge";
 
+      package = mkPackageOption pkgs "matterbridge" { };
+
       configPath = mkOption {
         type = with types; nullOr str;
         default = null;
@@ -111,7 +113,7 @@ in
       serviceConfig = {
         User = cfg.user;
         Group = cfg.group;
-        ExecStart = "${pkgs.matterbridge}/bin/matterbridge -conf ${matterbridgeConfToml}";
+        ExecStart = "${cfg.package}/bin/matterbridge -conf ${matterbridgeConfToml}";
         Restart = "always";
         RestartSec = "10";
       };

From bf34b9e4329be607bec3b7d26ecad06a3075cb60 Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Wed, 28 Aug 2024 10:46:52 +0200
Subject: [PATCH 42/53] microcode-intel: Add Felix Singer as maintainer

Signed-off-by: Felix Singer <felixsinger@posteo.net>
---
 pkgs/os-specific/linux/microcode/intel.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix
index 8e807b990d3e..7dc26d481adc 100644
--- a/pkgs/os-specific/linux/microcode/intel.nix
+++ b/pkgs/os-specific/linux/microcode/intel.nix
@@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
     description = "Microcode for Intel processors";
     license = licenses.unfreeRedistributableFirmware;
     platforms = platforms.linux;
-    maintainers = [ ];
+    maintainers = with maintainers; [ felixsinger ];
   };
 }

From 9e3da66707792441ca4e7296e5e0a95e2ac7b902 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Sep 2024 22:14:58 +0000
Subject: [PATCH 43/53] openasar: 0-unstable-2024-06-30 ->
 0-unstable-2024-09-06

---
 pkgs/by-name/op/openasar/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/openasar/package.nix b/pkgs/by-name/op/openasar/package.nix
index 0d034ea1b8d1..1f3a1f15ebee 100644
--- a/pkgs/by-name/op/openasar/package.nix
+++ b/pkgs/by-name/op/openasar/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "openasar";
-  version = "0-unstable-2024-06-30";
+  version = "0-unstable-2024-09-06";
 
   src = fetchFromGitHub {
     owner = "GooseMod";
     repo = "OpenAsar";
-    rev = "5c875eb048e96543f1ec711fae522ace5e4a836c";
-    hash = "sha256-dlf4X+2W2GfL2E46ZM35PqpcoKHoZ4fhroOCLpye1D0=";
+    rev = "f92ee8c3dc6b6ff9829f69a1339e0f82a877929c";
+    hash = "sha256-V2oZ0mQbX+DHDZfTj8sV4XS6r9NOmJYHvYOGK6X/+HU=";
   };
 
   postPatch = ''

From 2096346f85ed51d7636c26188099b8b8e0d77707 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Sep 2024 23:02:26 +0000
Subject: [PATCH 44/53] libretro.atari800: unstable-2024-07-25 ->
 unstable-2024-09-06

---
 pkgs/applications/emulators/retroarch/hashes.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json
index 0aa52a28c6c2..0298774ea38e 100644
--- a/pkgs/applications/emulators/retroarch/hashes.json
+++ b/pkgs/applications/emulators/retroarch/hashes.json
@@ -15,10 +15,10 @@
         "src": {
             "owner": "libretro",
             "repo": "libretro-atari800",
-            "rev": "50141a6bf1a069abd86dd8c53aa4031f3f7cfbd1",
-            "hash": "sha256-pS5nvU+2eZ7We0ySN+Te6+Y3uuro5bz2FTPuLgvNCl4="
+            "rev": "72884ccbf9ec8ce7b65d7fc6f44e127e3abdf799",
+            "hash": "sha256-+trOeRe9YJzOfGgtKGb5UGYKf8RVxEc+rxEw+bgFz5M="
         },
-        "version": "unstable-2024-07-25"
+        "version": "unstable-2024-09-06"
     },
     "beetle-gba": {
         "fetcher": "fetchFromGitHub",

From 09f50d0861b75459a288a36b9a14899843e71b36 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Sep 2024 23:28:38 +0000
Subject: [PATCH 45/53] libretro.bsnes: unstable-2024-08-30 ->
 unstable-2024-09-06

---
 pkgs/applications/emulators/retroarch/hashes.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json
index 0aa52a28c6c2..308bced3b949 100644
--- a/pkgs/applications/emulators/retroarch/hashes.json
+++ b/pkgs/applications/emulators/retroarch/hashes.json
@@ -165,10 +165,10 @@
         "src": {
             "owner": "libretro",
             "repo": "bsnes-libretro",
-            "rev": "d47f5d162e879fddf117583e7cc391989359c009",
-            "hash": "sha256-0tVXa+valyBbHFqXGG8jmargBdqgJafLrFuZ4ym7i8I="
+            "rev": "20c55eb6333a11395ba637df8583066483e58cb2",
+            "hash": "sha256-IP00xtxS3wwnQSmYltrX8GEHZX/65xnx2EsmQlE1VZM="
         },
-        "version": "unstable-2024-08-30"
+        "version": "unstable-2024-09-06"
     },
     "bsnes-hd": {
         "fetcher": "fetchFromGitHub",

From b61031ecd71fb618ec4806db53fb318a3fe4f606 Mon Sep 17 00:00:00 2001
From: Pyrox <pyrox@pyrox.dev>
Date: Fri, 6 Sep 2024 20:59:38 -0400
Subject: [PATCH 46/53] uv: 0.4.4 -> 0.4.6

---
 pkgs/by-name/uv/uv/Cargo.lock  | 16 ++++++----------
 pkgs/by-name/uv/uv/package.nix |  4 ++--
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/uv/uv/Cargo.lock b/pkgs/by-name/uv/uv/Cargo.lock
index 3ec23b39a890..852f234bd09a 100644
--- a/pkgs/by-name/uv/uv/Cargo.lock
+++ b/pkgs/by-name/uv/uv/Cargo.lock
@@ -4452,7 +4452,7 @@ checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
 
 [[package]]
 name = "uv"
-version = "0.4.4"
+version = "0.4.6"
 dependencies = [
  "anstream",
  "anyhow",
@@ -4463,6 +4463,8 @@ dependencies = [
  "byteorder",
  "cache-key",
  "clap",
+ "ctrlc",
+ "distribution-filename",
  "distribution-types",
  "etcetera",
  "filetime",
@@ -4511,6 +4513,7 @@ dependencies = [
  "uv-configuration",
  "uv-dispatch",
  "uv-distribution",
+ "uv-extract",
  "uv-fs",
  "uv-git",
  "uv-installer",
@@ -4558,6 +4561,7 @@ dependencies = [
 name = "uv-build"
 version = "0.0.1"
 dependencies = [
+ "anstream",
  "anyhow",
  "distribution-types",
  "fs-err",
@@ -4715,7 +4719,6 @@ dependencies = [
  "distribution-filename",
  "distribution-types",
  "fs-err",
- "install-wheel-rs",
  "itertools 0.13.0",
  "markdown",
  "mimalloc",
@@ -4725,7 +4728,6 @@ dependencies = [
  "pretty_assertions",
  "pypi-types",
  "resvg",
- "rustc-hash",
  "schemars",
  "serde",
  "serde_json",
@@ -4736,20 +4738,14 @@ dependencies = [
  "tracing",
  "tracing-durations-export",
  "tracing-subscriber",
- "uv-build",
  "uv-cache",
  "uv-cli",
  "uv-client",
- "uv-configuration",
- "uv-dispatch",
- "uv-git",
  "uv-installer",
  "uv-macros",
  "uv-options-metadata",
  "uv-python",
- "uv-resolver",
  "uv-settings",
- "uv-types",
  "uv-workspace",
  "walkdir",
 ]
@@ -5209,7 +5205,7 @@ dependencies = [
 
 [[package]]
 name = "uv-version"
-version = "0.4.4"
+version = "0.4.6"
 
 [[package]]
 name = "uv-virtualenv"
diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix
index 7509d5145027..02c6e8ff0385 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -16,14 +16,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "uv";
-  version = "0.4.4";
+  version = "0.4.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     rev = "refs/tags/${version}";
-    hash = "sha256-PhLatO4XeYFrv0DqPc0NlSGXJvLkem0pqxEcoVZddZw=";
+    hash = "sha256-TBAnKVlv6SpPy6DUdq9AQE9qrCNuRiixuy4fMzDi9Yg=";
   };
 
   cargoDeps = rustPlatform.importCargoLock {

From 729d6c49e8442262d4f27ecc3e6adaf828854312 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Sep 2024 07:19:18 +0000
Subject: [PATCH 47/53] gum: 0.14.4 -> 0.14.5

---
 pkgs/applications/misc/gum/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/gum/default.nix b/pkgs/applications/misc/gum/default.nix
index 9ccf6b6edd6f..d5f6bcbd99ca 100644
--- a/pkgs/applications/misc/gum/default.nix
+++ b/pkgs/applications/misc/gum/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "gum";
-  version = "0.14.4";
+  version = "0.14.5";
 
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-kR/DNNWCFj/ott31bcppA2gkpNK5OY+SsjYcQak5CK8=";
+    hash = "sha256-moKirTXziVo6ESOsnTUmPkcdBYL/VHaG226+UfM0xAk=";
   };
 
-  vendorHash = "sha256-pjWaAeBXIBG+g3TPxioIG9Cl4rvEf4QjyinAtCBYSug=";
+  vendorHash = "sha256-wjM2ld4go7OQu6XqsSGurjN09Fd5t9FNLvIzgrZEZ1k=";
 
   nativeBuildInputs = [
     installShellFiles

From 75d4a4b0fbbfdd67b2558afe1c8c19f99b4c462f Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sat, 7 Sep 2024 12:28:11 +0400
Subject: [PATCH 48/53] gum: fix cross compilation

---
 pkgs/applications/misc/gum/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/gum/default.nix b/pkgs/applications/misc/gum/default.nix
index d5f6bcbd99ca..387085165503 100644
--- a/pkgs/applications/misc/gum/default.nix
+++ b/pkgs/applications/misc/gum/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, installShellFiles, fetchFromGitHub }:
+{ lib, stdenv, buildGoModule, installShellFiles, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "gum";
@@ -22,6 +22,7 @@ buildGoModule rec {
   postInstall = ''
     $out/bin/gum man > gum.1
     installManPage gum.1
+  '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     installShellCompletion --cmd gum \
       --bash <($out/bin/gum completion bash) \
       --fish <($out/bin/gum completion fish) \

From bb75c6449c14df916e0506e0f02c86f55f8327b2 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 7 Sep 2024 16:30:18 +0800
Subject: [PATCH 49/53] gnome-flashback: Fix mkSystemdTargetForWm eval

Fixes "attribute 'gnome-flashback' missing".
---
 pkgs/by-name/gn/gnome-flashback/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/gn/gnome-flashback/package.nix b/pkgs/by-name/gn/gnome-flashback/package.nix
index cfd2913d356b..d8dae346f057 100644
--- a/pkgs/by-name/gn/gnome-flashback/package.nix
+++ b/pkgs/by-name/gn/gnome-flashback/package.nix
@@ -202,7 +202,7 @@ stdenv.mkDerivation (finalAttrs: {
       }:
       runCommand "gnome-flashback-${wmName}.target" { } ''
         mkdir -p $out/lib/systemd/user
-        cp -r "${finalAttrs.gnome-flashback}/lib/systemd/user/gnome-session@gnome-flashback-metacity.target.d" \
+        cp -r "${finalAttrs.finalPackage}/lib/systemd/user/gnome-session@gnome-flashback-metacity.target.d" \
           "$out/lib/systemd/user/gnome-session@gnome-flashback-${wmName}.target.d"
       '';
 

From dc1c788778d78aaf5ac31a62de26a66dd81d8884 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 7 Sep 2024 16:33:41 +0800
Subject: [PATCH 50/53] nixos/tests/mate-wayland: Don't enable Pulseaudio

Fixes "Using PipeWire as the sound server conflicts with PulseAudio".
---
 nixos/tests/mate-wayland.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/nixos/tests/mate-wayland.nix b/nixos/tests/mate-wayland.nix
index e5c96d2af747..563f735c803a 100644
--- a/nixos/tests/mate-wayland.nix
+++ b/nixos/tests/mate-wayland.nix
@@ -20,8 +20,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
     };
     services.xserver.desktopManager.mate.enableWaylandSession = true;
 
-    hardware.pulseaudio.enable = true;
-
     # Need to switch to a different GPU driver than the default one (-vga std) so that wayfire can launch:
     virtualisation.qemu.options = [ "-vga none -device virtio-gpu-pci" ];
   };

From edd38d460c9df13f68ce01dacd5547223898d366 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 7 Sep 2024 17:03:20 +0800
Subject: [PATCH 51/53] nixos/tests/mate-wayland: Disable flaky OCR test

Restarting the test helps though. The text is probably too small in size?
---
 nixos/tests/mate-wayland.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/tests/mate-wayland.nix b/nixos/tests/mate-wayland.nix
index 563f735c803a..73f94ababc49 100644
--- a/nixos/tests/mate-wayland.nix
+++ b/nixos/tests/mate-wayland.nix
@@ -39,7 +39,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
       with subtest("Check if MATE session components actually start"):
           for i in ["wayfire", "mate-panel", "mate-wayland.sh", "mate-wayland-components.sh"]:
               machine.wait_until_succeeds(f"pgrep -f {i}")
-          machine.wait_for_text('(Applications|Places|System)')
           # It is expected that this applet doesn't work in Wayland
           machine.wait_for_text('WorkspaceSwitcherApplet')
 

From 9a0e1fe179f002abab21d419ac4ebd8b82a35a01 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Sat, 7 Sep 2024 11:21:45 +0200
Subject: [PATCH 52/53] open-webui: 0.3.19 -> 0.3.20

diff: https://github.com/open-webui/open-webui/compare/v0.3.19..v0.3.20
changelog: https://github.com/open-webui/open-webui/releases/tag/v0.3.20
---
 pkgs/by-name/op/open-webui/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix
index b7f4fc454b13..b04e0f2c8c05 100644
--- a/pkgs/by-name/op/open-webui/package.nix
+++ b/pkgs/by-name/op/open-webui/package.nix
@@ -7,19 +7,19 @@
 }:
 let
   pname = "open-webui";
-  version = "0.3.19";
+  version = "0.3.20";
 
   src = fetchFromGitHub {
     owner = "open-webui";
     repo = "open-webui";
     rev = "refs/tags/v${version}";
-    hash = "sha256-0POrTElR4oze9sypfsJrY8miBVK6JvHRDmzMhqntFA4=";
+    hash = "sha256-bzNwqUrFbU0Llew2den8ETDUDJ7HdGCwvSvbFFhAOFo=";
   };
 
   frontend = buildNpmPackage {
     inherit pname version src;
 
-    npmDepsHash = "sha256-03F9Pz4RWoswdYh9lLEHtg5WitCsrG3JOa2S/RJDtZI=";
+    npmDepsHash = "sha256-ejXQO2dwztyMBDUIlavJzflulXmV938SF5Do0sdQGAY=";
 
     # Disabling `pyodide:fetch` as it downloads packages during `buildPhase`
     # Until this is solved, running python packages from the browser will not work.

From 8bc9a9535daf57acb729ba97296d87a12132afd6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Sep 2024 09:30:40 +0000
Subject: [PATCH 53/53] surrealdb-migrations: 2.0.0-preview.1 ->
 2.0.0-preview.2

---
 .../tools/database/surrealdb-migrations/default.nix         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/database/surrealdb-migrations/default.nix b/pkgs/development/tools/database/surrealdb-migrations/default.nix
index f2db3fad5b00..e2c2e9293d21 100644
--- a/pkgs/development/tools/database/surrealdb-migrations/default.nix
+++ b/pkgs/development/tools/database/surrealdb-migrations/default.nix
@@ -10,7 +10,7 @@
 
 let
   pname = "surrealdb-migrations";
-  version = "2.0.0-preview.1";
+  version = "2.0.0-preview.2";
 in
 rustPlatform.buildRustPackage rec {
   inherit pname version;
@@ -19,10 +19,10 @@ rustPlatform.buildRustPackage rec {
     owner = "Odonno";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-Ijuohu/KgHN5Ux2aWIGJQF9z6vmDPAyE7Sy66zX7nd8=";
+    hash = "sha256-GrgBDuyXnwmaq55LWTnNGsichfoQ+/arSxLhl3ymbDM=";
   };
 
-  cargoHash = "sha256-4YTcWKyVrlgGA1hpoRszB5qn0qa/lizvvGXdfQJoxlc=";
+  cargoHash = "sha256-7AdaUz43GHHhS1WoOD7qT4ZleBXc+Sp2/7/UHcSppTs=";
 
   buildInputs = [ ]
     ++ lib.optionals stdenv.isDarwin [ Security ];