From cb844fda2ed473c1ae2ebd6668a3263a4ced3675 Mon Sep 17 00:00:00 2001
From: Sam <30577766+Samasaur1@users.noreply.github.com>
Date: Wed, 7 May 2025 19:43:54 -0700
Subject: [PATCH 01/45] fishPlugins.macos: 7.0.0 -> 7.0.1

---
 pkgs/shells/fish/plugins/macos.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/fish/plugins/macos.nix b/pkgs/shells/fish/plugins/macos.nix
index 5de963fea81b..efbbbc8bb81f 100644
--- a/pkgs/shells/fish/plugins/macos.nix
+++ b/pkgs/shells/fish/plugins/macos.nix
@@ -6,13 +6,13 @@
 
 buildFishPlugin rec {
   pname = "macos";
-  version = "7.0.0";
+  version = "7.0.1";
 
   src = fetchFromGitHub {
     owner = "halostatue";
     repo = "fish-macos";
     tag = "v${version}";
-    hash = "sha256-o5VBeoA62KRDcnJXdXzllF1FMaSLMW1rxhaRC4rzWrg=";
+    hash = "sha256-E5HfcGEP5YnUXY50eSPPtLxXL9N7nDInlAw91dNehhc=";
   };
 
   meta = {

From 36459b8fe14e44b9f49047198864f860c0177207 Mon Sep 17 00:00:00 2001
From: Sam <30577766+Samasaur1@users.noreply.github.com>
Date: Wed, 7 May 2025 19:43:54 -0700
Subject: [PATCH 02/45] fishPlugins.macos: add updateScript

---
 pkgs/shells/fish/plugins/macos.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/shells/fish/plugins/macos.nix b/pkgs/shells/fish/plugins/macos.nix
index efbbbc8bb81f..0ab5d06e5123 100644
--- a/pkgs/shells/fish/plugins/macos.nix
+++ b/pkgs/shells/fish/plugins/macos.nix
@@ -2,6 +2,7 @@
   lib,
   buildFishPlugin,
   fetchFromGitHub,
+  nix-update-script,
 }:
 
 buildFishPlugin rec {
@@ -15,6 +16,8 @@ buildFishPlugin rec {
     hash = "sha256-E5HfcGEP5YnUXY50eSPPtLxXL9N7nDInlAw91dNehhc=";
   };
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "MacOS functions for Fish";
     homepage = "https://github.com/halostatue/fish-macos";

From 9d1654b9816a582b84a4965b962b8091d5c69106 Mon Sep 17 00:00:00 2001
From: jiriks74 <jiri@stefka.eu>
Date: Mon, 3 Mar 2025 09:45:19 +0100
Subject: [PATCH 03/45] edmarketconnector: init at 5.13.1

- `EDMarketConnector` repository: https://github.com/EDCD/EDMarketConnector

From project's description:
Downloads commodity market and other station data from the game
Elite: Dangerous for use with all popular online and offline trading tools.

It's a helper tool for the game Elite: Dangerous. Since the in game
tools for trading and searching aren't that good the community has to
make their own. This tool pulls the information from game and uploads it
to various databases for other players to use.

- A test for the watchdog python package had to be disabled

The test basically always resulted in a `Too many open files` error:

```
       > ===End Flaky Test Report===
       > =========================== short test summary info ============================
       > FAILED tests/test_inotify_c.py::test_select_fd - OSError: [Errno 24] Too many open files: '/build/pytest-of-nixbld/pytest-0/test_select_fd0/new_file'
       > =========== 1 failed, 162 passed, 3 skipped, 3 deselected in 54.29s ============
```

See https://github.com/gorakhargosh/watchdog/issues/1095
---
 pkgs/by-name/ed/edmarketconnector/package.nix | 63 +++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 pkgs/by-name/ed/edmarketconnector/package.nix

diff --git a/pkgs/by-name/ed/edmarketconnector/package.nix b/pkgs/by-name/ed/edmarketconnector/package.nix
new file mode 100644
index 000000000000..973ff3f43174
--- /dev/null
+++ b/pkgs/by-name/ed/edmarketconnector/package.nix
@@ -0,0 +1,63 @@
+{
+  lib,
+  fetchFromGitHub,
+  stdenv,
+  python3,
+  makeWrapper,
+}:
+let
+  pythonEnv = python3.buildEnv.override {
+    extraLibs = with python3.pkgs; [
+      tkinter
+      requests
+      pillow
+      (watchdog.overrideAttrs {
+        disabledTests = [
+          "test_select_fd" # Avoid `Too many open files` error. See https://github.com/gorakhargosh/watchdog/issues/1095
+        ];
+      })
+      semantic-version
+      psutil
+    ];
+    ignoreCollisions = true;
+  };
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "edmarketconnector";
+  version = "5.13.1";
+
+  src = fetchFromGitHub {
+    owner = "EDCD";
+    repo = "EDMarketConnector";
+    tag = "Release/${finalAttrs.version}";
+    hash = "sha256-50OPbAXrDKodN0o6UibGUmMqQ/accF2/gNHnms+8rOI=";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    runHook preInstallPhase
+
+    mkdir -p $out/share/icons/hicolor/512x512/apps/
+    ln -s ${finalAttrs.src}/io.edcd.EDMarketConnector.png $out/share/icons/hicolor/512x512/apps/io.edcd.EDMarketConnector.png
+
+    mkdir -p "$out/share/applications/"
+    ln -s "${finalAttrs.src}/io.edcd.EDMarketConnector.desktop" "$out/share/applications/"
+
+    makeWrapper ${pythonEnv}/bin/python $out/bin/edmarketconnector \
+      --add-flags "${finalAttrs.src}/EDMarketConnector.py $@"
+
+    runHook postInstallPhase
+  '';
+
+  meta = {
+    homepage = "https://github.com/EDCD/EDMarketConnector";
+    description = "Uploads Elite: Dangerous market data to popular trading tools";
+    longDescription = "Downloads commodity market and other station data from the game Elite: Dangerous for use with all popular online and offline trading tools.";
+    changelog = "https://github.com/EDCD/EDMarketConnector/releases/tag/Release%2F${finalAttrs.version}";
+    license = lib.licenses.gpl2Only;
+    platforms = lib.platforms.x86_64;
+    mainProgram = "edmarketconnector";
+    maintainers = with lib.maintainers; [ jiriks74 ];
+  };
+})

From bc8ee2f85190d32f939c8a6c028d70b9dc326ab7 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Thu, 15 May 2025 01:34:51 -0700
Subject: [PATCH 04/45] llvmPackages_20: 20.1.4 -> 20.1.5

---
 .../compilers/llvm/common/llvm/default.nix           | 12 +++++++++++-
 pkgs/development/compilers/llvm/default.nix          |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix
index d9a6f8087496..fb83f2e70f22 100644
--- a/pkgs/development/compilers/llvm/common/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/common/llvm/default.nix
@@ -294,7 +294,17 @@ stdenv.mkDerivation (
       ++
         lib.optional (lib.versionAtLeast release_version "15")
           # Just like the `llvm-lit-cfg` patch, but for `polly`.
-          (getVersionFile "llvm/polly-lit-cfg-add-libs-to-dylib-path.patch");
+          (getVersionFile "llvm/polly-lit-cfg-add-libs-to-dylib-path.patch")
+      ++
+        lib.optional (lib.versions.major release_version == "20")
+          # https://github.com/llvm/llvm-project/pull/139822 adds a commit which didn't get backported but is necessary for tests.
+          (
+            fetchpatch {
+              url = "https://github.com/llvm/llvm-project/commit/ff2e8f93f6090965e82d799af43f6dfef52baa66.patch";
+              stripLen = 1;
+              hash = "sha256-CZBTZKzi4cYkZhgTB5oXIo1UdEAArg9I4vR/m0upSRk=";
+            }
+          );
 
     nativeBuildInputs =
       [
diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index 8800a6408c01..e88e419132b1 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -31,7 +31,7 @@ let
     "17.0.6".officialRelease.sha256 = "sha256-8MEDLLhocshmxoEBRSKlJ/GzJ8nfuzQ8qn0X/vLA+ag=";
     "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE=";
     "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I=";
-    "20.1.4".officialRelease.sha256 = "sha256-/WomqG2DdnUHwlVsMfpzaK/dhGV3zychfU0wLmihQac=";
+    "20.1.5".officialRelease.sha256 = "sha256-WKfY+VvAsZEEc0xYgF6+MsXDXZz7haMU6bxqmUpaHuQ=";
     "21.0.0-git".gitRelease = {
       rev = "5b91756c0ca7ef4d75c33c2617bfd0f9719907dc";
       rev-version = "21.0.0-unstable-2025-05-11";

From 3b7b7eec1ecfa646a4313b6e61cebbbd79f7fd96 Mon Sep 17 00:00:00 2001
From: Ivan Mincik <ivan.mincik@gmail.com>
Date: Tue, 20 May 2025 09:14:08 +0200
Subject: [PATCH 05/45] qgis: 3.42.2 -> 3.42.3

---
 pkgs/applications/gis/qgis/unwrapped.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix
index 31c9302518a2..d1888bd0ee87 100644
--- a/pkgs/applications/gis/qgis/unwrapped.nix
+++ b/pkgs/applications/gis/qgis/unwrapped.nix
@@ -82,14 +82,14 @@ let
   ];
 in
 mkDerivation rec {
-  version = "3.42.2";
+  version = "3.42.3";
   pname = "qgis-unwrapped";
 
   src = fetchFromGitHub {
     owner = "qgis";
     repo = "QGIS";
     rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
-    hash = "sha256-kWy+FBiqPMt8GLGWSJBQp0uD5l1IE/2KmDGdxKapg78=";
+    hash = "sha256-NZLtifHcJAe0Q08i3nTu4H1fWO9gALCcqjaPwb0t8QM=";
   };
 
   passthru = {

From 7ccae6c5a033280879433906f45d26d1087b8a68 Mon Sep 17 00:00:00 2001
From: Ivan Mincik <ivan.mincik@gmail.com>
Date: Tue, 20 May 2025 09:16:39 +0200
Subject: [PATCH 06/45] qgis-ltr: 3.40.6 -> 3.40.7

---
 pkgs/applications/gis/qgis/unwrapped-ltr.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix
index a6a9cd67e980..893b16403799 100644
--- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix
+++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix
@@ -82,14 +82,14 @@ let
   ];
 in
 mkDerivation rec {
-  version = "3.40.6";
+  version = "3.40.7";
   pname = "qgis-ltr-unwrapped";
 
   src = fetchFromGitHub {
     owner = "qgis";
     repo = "QGIS";
     rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
-    hash = "sha256-pw5XxaGDsyQfeJL582Iic2sg5j8AUPvM+I53YLB4aG4=";
+    hash = "sha256-XC3UVKtOokFH9MDnz7M1+aTfNFVQKGYV2jTThE69jQs=";
   };
 
   passthru = {

From 34bada88632e7bac55078e55568f559c03f6887d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 21 May 2025 15:22:23 +0000
Subject: [PATCH 07/45] apr: 1.7.5 -> 1.7.6

---
 pkgs/development/libraries/apr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix
index 8d55d78c72e6..8ded7258aca7 100644
--- a/pkgs/development/libraries/apr/default.nix
+++ b/pkgs/development/libraries/apr/default.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
   pname = "apr";
-  version = "1.7.5";
+  version = "1.7.6";
 
   src = fetchurl {
     url = "mirror://apache/apr/${pname}-${version}.tar.bz2";
-    hash = "sha256-zQ9dUrmrFwTHIWDF7j7V09TKLfSn+KtWTjyzUrZyMvI=";
+    hash = "sha256-SQMNktJXXac1eRtJbcMi885c/5SUd5uozCjH9Gxd6zI=";
   };
 
   patches = [

From ecb7b2e94037b2260dc155042fbf2db709c6249b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 21 May 2025 16:22:17 +0000
Subject: [PATCH 08/45] snobol4: 2.3.2 -> 2.3.3

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

diff --git a/pkgs/by-name/sn/snobol4/package.nix b/pkgs/by-name/sn/snobol4/package.nix
index 4fda12fcaa52..f148ee5545c6 100644
--- a/pkgs/by-name/sn/snobol4/package.nix
+++ b/pkgs/by-name/sn/snobol4/package.nix
@@ -17,7 +17,7 @@
 
 stdenv.mkDerivation rec {
   pname = "snobol4";
-  version = "2.3.2";
+  version = "2.3.3";
 
   src = fetchurl {
     urls = [
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
       # fallback for when the current version is moved to the old folder
       "https://ftp.regressive.org/snobol4/old/snobol4-${version}.tar.gz"
     ];
-    hash = "sha256-QeMB6d0YDXARfWTzaU+d1U+e2QmjajJYfIvthatorBU=";
+    hash = "sha256-v9UwcdaSg3dvWydk94ZdNUuJ03JWmFShiHjln1c4jtI=";
   };
 
   outputs = [

From d6c56af5139c93026757cf5c3301eb26b6f2af4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Bori?= <theo1.bori@epitech.eu>
Date: Sat, 24 May 2025 13:07:10 +0200
Subject: [PATCH 09/45] taterclient-ddnet: 10.1.2 -> 10.3.0

---
 .../client_log_format_security.patch          | 13 ++++++++++++
 pkgs/by-name/ta/taterclient-ddnet/package.nix | 21 ++++++++++---------
 2 files changed, 24 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/by-name/ta/taterclient-ddnet/client_log_format_security.patch

diff --git a/pkgs/by-name/ta/taterclient-ddnet/client_log_format_security.patch b/pkgs/by-name/ta/taterclient-ddnet/client_log_format_security.patch
new file mode 100644
index 000000000000..9d0c56170162
--- /dev/null
+++ b/pkgs/by-name/ta/taterclient-ddnet/client_log_format_security.patch
@@ -0,0 +1,13 @@
+diff --git a/src/engine/client/client.cpp.orig b/src/engine/client/client.cpp
+index ab70b3c..9e25353 100644
+--- a/src/engine/client/client.cpp.orig
++++ b/src/engine/client/client.cpp
+@@ -4933,7 +4933,7 @@ int main(int argc, const char **argv)
+ 		{
+ 			char aError[2048];
+ 			snprintf(aError, sizeof(aError), "Failed to load config from '%s'.", s_aConfigDomains[ConfigDomain].m_aConfigPath);
+-			log_error("client", aError);
++			log_error("client", "%s", aError);
+ 			pClient->ShowMessageBox("Config File Error", aError);
+ 			PerformAllCleanup();
+ 			return -1;
diff --git a/pkgs/by-name/ta/taterclient-ddnet/package.nix b/pkgs/by-name/ta/taterclient-ddnet/package.nix
index 836ddc58a945..76a01e1b4b62 100644
--- a/pkgs/by-name/ta/taterclient-ddnet/package.nix
+++ b/pkgs/by-name/ta/taterclient-ddnet/package.nix
@@ -26,7 +26,6 @@
   vulkan-loader,
   glslang,
   spirv-tools,
-  gtest,
   glew,
 }:
 let
@@ -34,13 +33,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "taterclient-ddnet";
-  version = "10.1.2";
+  version = "10.3.0";
 
   src = fetchFromGitHub {
     owner = "sjrc6";
     repo = "taterclient-ddnet";
     tag = "V${finalAttrs.version}";
-    hash = "sha256-0N4nzGcmHrWkIFHEREtSBCTHPBE4UI8RmCuRsehX1YU=";
+    hash = "sha256-OEoiUtD87xsXBgAZ65mmfmAJcEvrley3drRX+IJo20s=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
@@ -59,9 +58,6 @@ stdenv.mkDerivation (finalAttrs: {
     python3
   ];
 
-  nativeCheckInputs = [ gtest ];
-  checkInputs = [ gtest ];
-
   buildInputs = [
     curl
     libnotify
@@ -84,6 +80,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
+  patches = [
+    ./client_log_format_security.patch
+  ];
+
   postPatch = ''
     substituteInPlace src/engine/shared/storage.cpp \
       --replace-fail /usr/ $out/
@@ -98,10 +98,11 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeFeature "CLIENT_EXECUTABLE" clientExecutable)
   ];
 
-  doCheck = true;
-  checkTarget = "run_tests";
-
-  __darwinAllowLocalNetworking = true; # for tests
+  # Since we are not building the server executable, the `run_tests` Makefile target
+  # will not be generated.
+  #
+  # See https://github.com/sjrc6/TaterClient-ddnet/blob/V10.3.0/CMakeLists.txt#L3072
+  doCheck = false;
 
   preFixup = lib.optionalString stdenv.hostPlatform.isDarwin ''
     # Upstream links against <prefix>/lib while it installs this library in <prefix>/lib/ddnet

From 2efd5307e4966e12672737101826947b8a02eb25 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 May 2025 23:03:27 +0000
Subject: [PATCH 10/45] ospd-openvas: 22.8.2 -> 22.9.0

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

diff --git a/pkgs/by-name/os/ospd-openvas/package.nix b/pkgs/by-name/os/ospd-openvas/package.nix
index be4f4712b5aa..c4017f2e521e 100644
--- a/pkgs/by-name/os/ospd-openvas/package.nix
+++ b/pkgs/by-name/os/ospd-openvas/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "ospd-openvas";
-  version = "22.8.2";
+  version = "22.9.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "greenbone";
     repo = "ospd-openvas";
     tag = "v${version}";
-    hash = "sha256-UrEcT65SlhJ33QHbAarAuVVSsZlzo/5JxlKSTL7/lsM=";
+    hash = "sha256-09AQQGi9uTlAsy5vEkVaz5T8j2zYnQ7GnzSh5N61VkA=";
   };
 
   pythonRelaxDeps = [

From eb4713a85c618cea5ee204b6163fdd91fc5f39be Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 May 2025 07:36:47 +0000
Subject: [PATCH 11/45] python3Packages.incomfort-client: 0.6.8 -> 0.6.9

---
 pkgs/development/python-modules/incomfort-client/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/incomfort-client/default.nix b/pkgs/development/python-modules/incomfort-client/default.nix
index 8d5e78846855..93601a62abf4 100644
--- a/pkgs/development/python-modules/incomfort-client/default.nix
+++ b/pkgs/development/python-modules/incomfort-client/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "incomfort-client";
-  version = "0.6.8";
+  version = "0.6.9";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "zxdavb";
     repo = "incomfort-client";
     tag = "v${version}";
-    hash = "sha256-hQYgGxGkUyIdQN8oOhicLJXeOxRCREhwiOLO0sPcUfs=";
+    hash = "sha256-hZoEQhlCJ1qXbet5elNOLudPEN15MDtDcwbGhm/auTc=";
   };
 
   build-system = [ poetry-core ];

From 6d72cf3dcd7075100aeb79a37b6801e5551ba185 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 May 2025 09:59:03 +0000
Subject: [PATCH 12/45] sigma-cli: 1.0.5 -> 1.0.6

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

diff --git a/pkgs/by-name/si/sigma-cli/package.nix b/pkgs/by-name/si/sigma-cli/package.nix
index 0b23e7b71ff5..6318020d85c1 100644
--- a/pkgs/by-name/si/sigma-cli/package.nix
+++ b/pkgs/by-name/si/sigma-cli/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "sigma-cli";
-  version = "1.0.5";
+  version = "1.0.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "SigmaHQ";
     repo = "sigma-cli";
     tag = "v${version}";
-    hash = "sha256-ywf7k2RsrAMUrDUv1nxTEixmP+NjtIyuBDhj4l9ZQCE=";
+    hash = "sha256-BINKEptzdfEJPJAfPoYWiDXdmVnG7NYVaQar7dz4Ptk=";
   };
 
   postPatch = ''
@@ -68,7 +68,7 @@ python3.pkgs.buildPythonApplication rec {
   meta = with lib; {
     description = "Sigma command line interface";
     homepage = "https://github.com/SigmaHQ/sigma-cli";
-    changelog = "https://github.com/SigmaHQ/sigma-cli/releases/tag/v${version}";
+    changelog = "https://github.com/SigmaHQ/sigma-cli/releases/tag/${src.tag}";
     license = licenses.lgpl21Plus;
     maintainers = with maintainers; [ fab ];
     mainProgram = "sigma";

From 055f524a04e4c25d220eecea987eeace570824b9 Mon Sep 17 00:00:00 2001
From: Kirill Elagin <kirelagin@gmail.com>
Date: Sun, 25 May 2025 20:28:11 +0200
Subject: [PATCH 13/45] pixelorama: Pin Godot version

---
 pkgs/by-name/pi/pixelorama/package.nix | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pi/pixelorama/package.nix b/pkgs/by-name/pi/pixelorama/package.nix
index 56e25323dc9c..2247cfd5c9d8 100644
--- a/pkgs/by-name/pi/pixelorama/package.nix
+++ b/pkgs/by-name/pi/pixelorama/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  godot_4,
+  godot_4_4,
   nix-update-script,
 }:
 
@@ -16,7 +16,7 @@ let
     presets.${stdenv.hostPlatform.system}
       or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
 
-  godot = godot_4;
+  godot = godot_4_4;
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "pixelorama";
@@ -35,6 +35,17 @@ stdenv.mkDerivation (finalAttrs: {
     godot
   ];
 
+  # Pixelorama is tightly coupled to the version of Godot that it is meant to be built with,
+  # and Godot does not follow semver, they break things in minor releases.
+  preConfigure = ''
+    godot_ver="${lib.versions.majorMinor godot.version}"
+    godot_expected=$(sed -n -E 's@config/features=PackedStringArray\("([0-9]+\.[0-9]+)"\)@\1@p' project.godot)
+    [ "$godot_ver" == "$godot_expected" ] || {
+      echo "Expected Godot version: $godot_expected; found: $godot_ver" >&2
+      exit 1
+    }
+  '';
+
   buildPhase = ''
     runHook preBuild
 

From 091f2c0e218efdf5b44820986af556694b8ab726 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 26 May 2025 01:55:47 +0000
Subject: [PATCH 14/45] fsautocomplete: 0.77.7 -> 0.78.1

---
 pkgs/by-name/fs/fsautocomplete/deps.json   | 36 +++++++++++-----------
 pkgs/by-name/fs/fsautocomplete/package.nix |  4 +--
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/pkgs/by-name/fs/fsautocomplete/deps.json b/pkgs/by-name/fs/fsautocomplete/deps.json
index 92bd7f130850..f3083695459f 100644
--- a/pkgs/by-name/fs/fsautocomplete/deps.json
+++ b/pkgs/by-name/fs/fsautocomplete/deps.json
@@ -61,8 +61,8 @@
   },
   {
     "pname": "fantomas",
-    "version": "7.0.0",
-    "hash": "sha256-v4bXmvjZOYxl5RSIHuqVfDzBQdRz5SrmzZtD6SeEYTY="
+    "version": "7.0.1",
+    "hash": "sha256-2aGD6Kjh83gmssRqqZ/Uihi7VbNqNUelX4otIfCuhTI="
   },
   {
     "pname": "Fantomas.Client",
@@ -76,8 +76,8 @@
   },
   {
     "pname": "fsharp-analyzers",
-    "version": "0.30.0",
-    "hash": "sha256-7oaSwpHAU1opzpz4szLU/gDaJC/ww9eiFkPu0nr4Mj4="
+    "version": "0.31.0",
+    "hash": "sha256-PoAvaXbXsmvVw870UsnqdD20HoBHO7u4bzoaz5DXfzM="
   },
   {
     "pname": "FSharp.Analyzers.Build",
@@ -86,13 +86,13 @@
   },
   {
     "pname": "FSharp.Analyzers.SDK",
-    "version": "0.30.0",
-    "hash": "sha256-UlMSSAQTSSF2hnGOXABpPWZnav6DU3FMtOkJYO/Sl+M="
+    "version": "0.31.0",
+    "hash": "sha256-ws2nu1EyEESFqui/3l4+ucATy0Ag/XjjPvLZprcbC5c="
   },
   {
     "pname": "FSharp.Compiler.Service",
-    "version": "43.9.201",
-    "hash": "sha256-YYo2O873Za3uXXdeOFCkIAToF8Txae1W2d5PuJ3dy/Y="
+    "version": "43.9.300",
+    "hash": "sha256-dBo6juX2cLAAEIlGwRdYrR13dMTtbvBPhyFpUj+Rogc="
   },
   {
     "pname": "FSharp.Control.AsyncSeq",
@@ -106,8 +106,8 @@
   },
   {
     "pname": "FSharp.Core",
-    "version": "9.0.201",
-    "hash": "sha256-38Y0QFg/knogSJtxDVpVXKo5n4zAo8zaffeT6tbhahk="
+    "version": "9.0.300",
+    "hash": "sha256-eBGcd/OwlGuW2009Fb/ym813OWI9tHJXCY6oi4iGOyA="
   },
   {
     "pname": "FSharp.Data.Adaptive",
@@ -206,8 +206,8 @@
   },
   {
     "pname": "Ionide.Analyzers",
-    "version": "0.14.4",
-    "hash": "sha256-yzEao/iNQ11A7WV54cU7OSJTPTvkr+YXaOdrTogy4JA="
+    "version": "0.14.5",
+    "hash": "sha256-0bJGA3+8+FC3C6e1l4j0mrRO2uujQOf2C3Qa+JxkH3o="
   },
   {
     "pname": "Ionide.KeepAChangelog.Tasks",
@@ -221,18 +221,18 @@
   },
   {
     "pname": "Ionide.ProjInfo",
-    "version": "0.70.2",
-    "hash": "sha256-Y606emyiJ+ZgS5NH578WURySaVc/yo2OA7rWbOH57jA="
+    "version": "0.71.1",
+    "hash": "sha256-54LnHaowj5xpUdkI3UgIzNVdxNmVqNCNMiJo8k1LMGI="
   },
   {
     "pname": "Ionide.ProjInfo.FCS",
-    "version": "0.70.2",
-    "hash": "sha256-ufDkvztQZCtGTdegsIFIbixWTvIJwmNwhis2kb2OFU8="
+    "version": "0.71.1",
+    "hash": "sha256-UtAh4f6ee+c0cMkomP0ayo1mOUqWdFwMtBxK/DWioFE="
   },
   {
     "pname": "Ionide.ProjInfo.ProjectSystem",
-    "version": "0.70.2",
-    "hash": "sha256-3C+vn7ROgGWxjaHaACaUENYcAt9jYrnquBebQ2eo1y0="
+    "version": "0.71.1",
+    "hash": "sha256-zSVY/uRc4HoEEB9YDSJtDlDDHdZD+zBca3RrXJaRoBM="
   },
   {
     "pname": "LinkDotNet.StringBuilder",
diff --git a/pkgs/by-name/fs/fsautocomplete/package.nix b/pkgs/by-name/fs/fsautocomplete/package.nix
index 8f13d85916fe..a10fa0a66ed0 100644
--- a/pkgs/by-name/fs/fsautocomplete/package.nix
+++ b/pkgs/by-name/fs/fsautocomplete/package.nix
@@ -9,13 +9,13 @@
 
 buildDotnetModule (finalAttrs: {
   pname = "fsautocomplete";
-  version = "0.77.7";
+  version = "0.78.1";
 
   src = fetchFromGitHub {
     owner = "fsharp";
     repo = "FsAutoComplete";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-eyGWUSAtFT/48QOZ6k7+htLhLjGrc4scgp2VLBu3bcE=";
+    hash = "sha256-l+xC7OXOEE3gSfbsqcTF26/29dsr/cin8moRoaDSKBM=";
   };
 
   nugetDeps = ./deps.json;

From cb9ad1ba7a7c513b944ffd971cdc3f9165a301c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 25 May 2025 18:59:03 -0700
Subject: [PATCH 15/45] flare-signal: 0.16.0 -> 0.16.1

Diff: https://gitlab.com/schmiddi-on-mobile/flare/-/compare/refs/tags/0.16.0...0.16.1

Changelog: https://gitlab.com/schmiddi-on-mobile/flare/-/blob/0.16.1/CHANGELOG.md
---
 pkgs/by-name/fl/flare-signal/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fl/flare-signal/package.nix b/pkgs/by-name/fl/flare-signal/package.nix
index ee902ccce328..7ad1ac892efe 100644
--- a/pkgs/by-name/fl/flare-signal/package.nix
+++ b/pkgs/by-name/fl/flare-signal/package.nix
@@ -22,19 +22,19 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "flare";
-  version = "0.16.0";
+  version = "0.16.1";
 
   src = fetchFromGitLab {
     domain = "gitlab.com";
     owner = "schmiddi-on-mobile";
     repo = "flare";
     tag = finalAttrs.version;
-    hash = "sha256-SasvP3P/QAPqcrJ4L2EO9XlrekGJXv3RjQjj+3VUGxM=";
+    hash = "sha256-5phXBsXi0kbTb4RVzbB4LS9b+S2M3U2l/6QYoSHo114=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-l+ADDPOOfWyVxDdZrMxVWRS0wI69lP+hjAm5PFdCGsM=";
+    hash = "sha256-sI+zV1YW9RhtYRgUWiFKN8Iw9a5qkktOo0hFwyimPI8=";
   };
 
   nativeBuildInputs = [

From 67447091217b3585604d56a338933429d2ad8a9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 25 May 2025 19:04:15 -0700
Subject: [PATCH 16/45] chatty: 0.8.7 -> 0.8.8

Diff: https://gitlab.gnome.org/World/Chatty/-/compare/refs/tags/v0.8.7...0.8.8

Changelog: https://gitlab.gnome.org/World/Chatty/-/blob/v0.8.8/NEWS
---
 pkgs/by-name/ch/chatty/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ch/chatty/package.nix b/pkgs/by-name/ch/chatty/package.nix
index bd93fb4a4853..703286f096b3 100644
--- a/pkgs/by-name/ch/chatty/package.nix
+++ b/pkgs/by-name/ch/chatty/package.nix
@@ -30,14 +30,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "chatty";
-  version = "0.8.7";
+  version = "0.8.8";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "World";
     repo = "Chatty";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-VQgEXegP4SjniueyVQNx6Jt8/cHUpUcHP0yEa1cF00w=";
+    hash = "sha256-pLdl44nLRFLH76499JcaKgXRpf51wqFm174gUa7noKc=";
   };
 
   nativeBuildInputs = [

From d1a95afae637bfe6ef457b411c11bea52eebb851 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 26 May 2025 06:06:47 +0000
Subject: [PATCH 17/45] python3Packages.hepunits: 2.3.5 -> 2.3.6

---
 pkgs/development/python-modules/hepunits/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/hepunits/default.nix b/pkgs/development/python-modules/hepunits/default.nix
index abd89713aa05..7ba808710e94 100644
--- a/pkgs/development/python-modules/hepunits/default.nix
+++ b/pkgs/development/python-modules/hepunits/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "hepunits";
-  version = "2.3.5";
+  version = "2.3.6";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-lDTNLWpyLJSenp4ivQtZWH9pAlvTc1blxwY18bNwNtg=";
+    hash = "sha256-z/wcggQLFbtTBULsl/PB+DquYFDKpMxcGgMJe+vjSTI=";
   };
 
   nativeBuildInputs = [

From 2a199ea713f2d8f12b098b023c102ad1c9c7e27c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 26 May 2025 10:04:05 +0000
Subject: [PATCH 18/45] python3Packages.llama-index: 0.12.36 -> 0.12.37

---
 pkgs/development/python-modules/llama-index-core/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-core/default.nix b/pkgs/development/python-modules/llama-index-core/default.nix
index 3fd53444b66c..c8c0148f37c1 100644
--- a/pkgs/development/python-modules/llama-index-core/default.nix
+++ b/pkgs/development/python-modules/llama-index-core/default.nix
@@ -38,7 +38,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-core";
-  version = "0.12.36";
+  version = "0.12.37";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -47,7 +47,7 @@ buildPythonPackage rec {
     owner = "run-llama";
     repo = "llama_index";
     tag = "v${version}";
-    hash = "sha256-Wfugrzn/7Ihv3WQTNx09OaxeMG9sDk/ZVHQcZlKynRw=";
+    hash = "sha256-M6DiCJZu9mtb8NxzEiBsbpLJmpStNScTtHdr70H7Dvk=";
   };
 
   sourceRoot = "${src.name}/${pname}";

From 884ab2420b39865a7cd2a45a1ff62883ab5ef72e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 26 May 2025 14:31:54 +0200
Subject: [PATCH 19/45] nss_latest: 3.111 -> 3.112

https://github.com/nss-dev/nss/blob/master/doc/rst/releases/nss_3_112.rst
---
 pkgs/development/libraries/nss/latest.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/nss/latest.nix b/pkgs/development/libraries/nss/latest.nix
index 95438a3c12c2..a933a6428bc9 100644
--- a/pkgs/development/libraries/nss/latest.nix
+++ b/pkgs/development/libraries/nss/latest.nix
@@ -5,6 +5,6 @@
 #       Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert
 
 import ./generic.nix {
-  version = "3.111";
-  hash = "sha256-GFtoSvLF5nAwBIiMa9CeEl5geAOK60gG2tjuQFubgYs=";
+  version = "3.112";
+  hash = "sha256-GqMCEGuFg48iOzYwRDjNjSzyy/UJY8gf26k5DqqHlus=";
 }

From 0092d4d3c6130681e0cca4983efab7651f00c38a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 26 May 2025 12:50:45 +0000
Subject: [PATCH 20/45] python3Packages.aider-chat: 0.83.1 -> 0.83.2

---
 pkgs/development/python-modules/aider-chat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aider-chat/default.nix b/pkgs/development/python-modules/aider-chat/default.nix
index 3d961c34a4fd..c320215ef204 100644
--- a/pkgs/development/python-modules/aider-chat/default.nix
+++ b/pkgs/development/python-modules/aider-chat/default.nix
@@ -125,7 +125,7 @@ let
     d.stopwords
   ]);
 
-  version = "0.83.1";
+  version = "0.83.2";
   aider-chat = buildPythonPackage {
     pname = "aider-chat";
     inherit version;
@@ -138,7 +138,7 @@ let
       owner = "Aider-AI";
       repo = "aider";
       tag = "v${version}";
-      hash = "sha256-2OHPqsS1znl7G4Z8mu8oKHNPdDr4YmSfGzXLylTgooE=";
+      hash = "sha256-fVysmaB2jGS2XJlxyFIdJmQShzxz2q4TQf8zNuCT2GE=";
     };
 
     pythonRelaxDeps = true;

From c3c09acbaa38eb61d236045f914809d0c41745a0 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Mon, 26 May 2025 16:21:00 +0200
Subject: [PATCH 21/45] labelImg: add missing `distutils` runtime dependency

---
 pkgs/by-name/la/labelImg/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/la/labelImg/package.nix b/pkgs/by-name/la/labelImg/package.nix
index b61092095590..739ee325fd95 100644
--- a/pkgs/by-name/la/labelImg/package.nix
+++ b/pkgs/by-name/la/labelImg/package.nix
@@ -27,6 +27,7 @@ python3Packages.buildPythonApplication rec {
     })
   ];
   propagatedBuildInputs = with python3Packages; [
+    distutils
     pyqt5
     lxml
   ];

From 9d4bcc0e9c4ea51b9a670631d3f5ce0eb91991b7 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Mon, 26 May 2025 16:26:16 +0200
Subject: [PATCH 22/45] labelImg: update repository URL

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

diff --git a/pkgs/by-name/la/labelImg/package.nix b/pkgs/by-name/la/labelImg/package.nix
index 739ee325fd95..ab931c835c15 100644
--- a/pkgs/by-name/la/labelImg/package.nix
+++ b/pkgs/by-name/la/labelImg/package.nix
@@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec {
   pname = "labelImg";
   version = "1.8.6";
   src = fetchFromGitHub {
-    owner = "tzutalin";
+    owner = "HumanSignal";
     repo = "labelImg";
     rev = "v${version}";
     hash = "sha256-RJxCtiDOePajlrjy9cpKETSKsWlH/Dlu1iFMj2aO4XU=";
@@ -44,9 +44,9 @@ python3Packages.buildPythonApplication rec {
   meta = with lib; {
     description = "Graphical image annotation tool and label object bounding boxes in images";
     mainProgram = "labelImg";
-    homepage = "https://github.com/tzutalin/labelImg";
     license = licenses.mit;
     platforms = platforms.linux;
     maintainers = [ maintainers.cmcdragonkai ];
+    homepage = "https://github.com/HumanSignal/labelImg";
   };
 }

From acdc56953883a3e806e5f6c45b8b1c968a0eb5e9 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Mon, 26 May 2025 16:26:42 +0200
Subject: [PATCH 23/45] labelImg: use `src.tag`

---
 pkgs/by-name/la/labelImg/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/la/labelImg/package.nix b/pkgs/by-name/la/labelImg/package.nix
index ab931c835c15..280bb02d1b75 100644
--- a/pkgs/by-name/la/labelImg/package.nix
+++ b/pkgs/by-name/la/labelImg/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "HumanSignal";
     repo = "labelImg";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-RJxCtiDOePajlrjy9cpKETSKsWlH/Dlu1iFMj2aO4XU=";
   };
   nativeBuildInputs = with python3Packages; [

From 5bc0591cec19c440ce3a4c66479ce0b75e4d561b Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Mon, 26 May 2025 16:26:56 +0200
Subject: [PATCH 24/45] labelImg: cleanup

---
 pkgs/by-name/la/labelImg/package.nix | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/la/labelImg/package.nix b/pkgs/by-name/la/labelImg/package.nix
index 280bb02d1b75..9a6b6d033be0 100644
--- a/pkgs/by-name/la/labelImg/package.nix
+++ b/pkgs/by-name/la/labelImg/package.nix
@@ -8,16 +8,19 @@
 python3Packages.buildPythonApplication rec {
   pname = "labelImg";
   version = "1.8.6";
+
   src = fetchFromGitHub {
     owner = "HumanSignal";
     repo = "labelImg";
     tag = "v${version}";
     hash = "sha256-RJxCtiDOePajlrjy9cpKETSKsWlH/Dlu1iFMj2aO4XU=";
   };
+
   nativeBuildInputs = with python3Packages; [
     pyqt5
     qt5.wrapQtAppsHook
   ];
+
   patches = [
     # fixes https://github.com/heartexlabs/labelImg/issues/838
     # can be removed after next upstream version bump
@@ -26,27 +29,33 @@ python3Packages.buildPythonApplication rec {
       hash = "sha256-BmbnJS95RBfoNQT0E6JDJ/IZfBa+tv1C69+RVOSFdRA=";
     })
   ];
-  propagatedBuildInputs = with python3Packages; [
+
+  dependencies = with python3Packages; [
     distutils
     pyqt5
     lxml
   ];
+
   preBuild = ''
     make qt5py3
   '';
+
   postInstall = ''
-    cp libs/resources.py $out/${python3Packages.python.sitePackages}/libs
+    install -Dm644 libs/resources.py $out/${python3Packages.python.sitePackages}/libs
   '';
+
   dontWrapQtApps = true;
+
   preFixup = ''
     makeWrapperArgs+=("''${qtWrapperArgs[@]}")
   '';
-  meta = with lib; {
+
+  meta = {
     description = "Graphical image annotation tool and label object bounding boxes in images";
     mainProgram = "labelImg";
-    license = licenses.mit;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.cmcdragonkai ];
     homepage = "https://github.com/HumanSignal/labelImg";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.cmcdragonkai ];
   };
 }

From f0b02bea3d9a340c1df3a7c80ab79b6ab9f23c48 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 26 May 2025 17:26:45 +0200
Subject: [PATCH 25/45] iperf3: 3.18 -> 3.19

---
 pkgs/tools/networking/iperf/3.nix | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/pkgs/tools/networking/iperf/3.nix b/pkgs/tools/networking/iperf/3.nix
index ba0b473a24cc..a40da0378205 100644
--- a/pkgs/tools/networking/iperf/3.nix
+++ b/pkgs/tools/networking/iperf/3.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   pname = "iperf";
-  version = "3.18";
+  version = "3.19";
 
   src = fetchurl {
     url = "https://downloads.es.net/pub/iperf/iperf-${version}.tar.gz";
-    hash = "sha256-wGGBdVFDMedmUiUA4gyUv7KTtEJOsn1yB/tCe4jSC6s=";
+    hash = "sha256-BAFh2hVV7HQRqdgRkQSYMO83cX1CmpTubPCEJhjg4pw=";
   };
 
   buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isLinux [ lksctp-tools ];
@@ -24,23 +24,13 @@ stdenv.mkDerivation rec {
     "man"
   ];
 
-  patches =
-    [
-      # Patch to exit with 0 on SIGTERM, i.e. stop service cleanly under
-      # systemd. Will be part of the next release.
-      (fetchpatch {
-        url = "https://github.com/esnet/iperf/commit/4bab9bc39d08069976c519868fefa11c35f6c3f0.patch";
-        name = "exit-with-0-on-sigterm.patch";
-        hash = "sha256-klW5UzPckJuZ/1Lx0hXJkGK+NyaqSn5AndBT4P+uajw=";
-      })
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isMusl [
-      (fetchpatch {
-        url = "https://git.alpinelinux.org/aports/plain/main/iperf3/remove-pg-flags.patch?id=7f979fc51ae31d5c695d8481ba84a4afc5080efb";
-        name = "remove-pg-flags.patch";
-        sha256 = "0z3zsmf7ln08rg1mmzl8s8jm5gp8x62f5cxiqcmi8dcs2nsxwgbi";
-      })
-    ];
+  patches = lib.optionals stdenv.hostPlatform.isMusl [
+    (fetchpatch {
+      url = "https://git.alpinelinux.org/aports/plain/main/iperf3/remove-pg-flags.patch?id=7f979fc51ae31d5c695d8481ba84a4afc5080efb";
+      name = "remove-pg-flags.patch";
+      sha256 = "0z3zsmf7ln08rg1mmzl8s8jm5gp8x62f5cxiqcmi8dcs2nsxwgbi";
+    })
+  ];
 
   postInstall = ''
     ln -s $out/bin/iperf3 $out/bin/iperf

From 3a7b2ee4ed05bb06430f1d7d268c53cd18905711 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 26 May 2025 16:11:21 +0000
Subject: [PATCH 26/45] python3Packages.xarray-einstats: 0.8.0 -> 0.9.0

---
 pkgs/development/python-modules/xarray-einstats/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/xarray-einstats/default.nix b/pkgs/development/python-modules/xarray-einstats/default.nix
index d769bb080fe7..d0ea9f9022ed 100644
--- a/pkgs/development/python-modules/xarray-einstats/default.nix
+++ b/pkgs/development/python-modules/xarray-einstats/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "xarray-einstats";
-  version = "0.8.0";
+  version = "0.9.0";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "arviz-devs";
     repo = "xarray-einstats";
     tag = "v${version}";
-    hash = "sha256-XvxsyH8cwsA9B36uhM1Pr5XaNd0d0/nEamA4axdJe24=";
+    hash = "sha256-0FhoiKagEwxdqLWJyucjiTjjHdYZB6RMIfy2xBFAm4I=";
   };
 
   build-system = [ flit-core ];

From a7e0838d75b93f222ab96ce5ea5c074a1b4d2b6c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 26 May 2025 17:28:46 +0000
Subject: [PATCH 27/45] python3Packages.publicsuffixlist: 1.0.2.20250521 ->
 1.0.2.20250523

---
 pkgs/development/python-modules/publicsuffixlist/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix
index c3b2e4f2d183..2e9b44f5c676 100644
--- a/pkgs/development/python-modules/publicsuffixlist/default.nix
+++ b/pkgs/development/python-modules/publicsuffixlist/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "publicsuffixlist";
-  version = "1.0.2.20250521";
+  version = "1.0.2.20250523";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-iQWEhXvCHN1HTWzM9z4r43HCD7noRPyIWtvdlX6ZCCk=";
+    hash = "sha256-68T4kTmN7PBhf3fla7zkm5dSHLKp9jMJMSuLiFZAmzc=";
   };
 
   build-system = [ setuptools ];

From 9612a687810f32ec3457f6106f773a150e2a30c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Kvapil?= <git@viluon.me>
Date: Mon, 26 May 2025 19:38:14 +0200
Subject: [PATCH 28/45] craftos-pc: add missing dependency

---
 pkgs/by-name/cr/craftos-pc/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/cr/craftos-pc/package.nix b/pkgs/by-name/cr/craftos-pc/package.nix
index 24ea3494efcf..dd30359091d1 100644
--- a/pkgs/by-name/cr/craftos-pc/package.nix
+++ b/pkgs/by-name/cr/craftos-pc/package.nix
@@ -13,6 +13,7 @@
   libpng,
   pngpp,
   libwebp,
+  libX11,
 }:
 
 let
@@ -55,6 +56,7 @@ stdenv.mkDerivation rec {
     libpng
     pngpp
     libwebp
+    libX11
   ];
   strictDeps = true;
 

From 89c37a0096ce980cfff77680f3a9526a22baaa9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Kvapil?= <git@viluon.me>
Date: Mon, 26 May 2025 19:38:25 +0200
Subject: [PATCH 29/45] craftos-pc: add maintainer

---
 pkgs/by-name/cr/craftos-pc/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/cr/craftos-pc/package.nix b/pkgs/by-name/cr/craftos-pc/package.nix
index dd30359091d1..8d0843d074de 100644
--- a/pkgs/by-name/cr/craftos-pc/package.nix
+++ b/pkgs/by-name/cr/craftos-pc/package.nix
@@ -116,6 +116,7 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [
       siraben
       tomodachi94
+      viluon
     ];
     mainProgram = "craftos";
   };

From 4d243ac17f6496434c010c393b2b9ecc37581a67 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 26 May 2025 18:59:38 +0000
Subject: [PATCH 30/45] vscode-extensions.shopify.ruby-lsp: 0.9.24 -> 0.9.26

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 84678c9b97fd..a4c835990663 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -4381,8 +4381,8 @@ let
         mktplcRef = {
           publisher = "shopify";
           name = "ruby-lsp";
-          version = "0.9.24";
-          hash = "sha256-nlPqdn7tOQhr4Z/8N0aHAnkqKtYrpQCzwRGsseT8K5g=";
+          version = "0.9.26";
+          hash = "sha256-DKtrXdCRLZn7GzOGkp3mrH5Y5me5cE9NqpWTWCv8ZqY=";
         };
         meta = {
           description = "VS Code plugin for connecting with the Ruby LSP";

From 5c03c6538b664b1e007deeb8b4ce8043db4b5df2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 20 May 2025 23:45:55 +0200
Subject: [PATCH 31/45] python313Packages.dissect-cstruct: 4.3 -> 4.5

Changelog: https://github.com/fox-it/dissect.cstruct/releases/tag/4.5
---
 .../python-modules/dissect-cstruct/default.nix    | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/dissect-cstruct/default.nix b/pkgs/development/python-modules/dissect-cstruct/default.nix
index c438acfab79d..7b27df5d45c5 100644
--- a/pkgs/development/python-modules/dissect-cstruct/default.nix
+++ b/pkgs/development/python-modules/dissect-cstruct/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
   setuptools,
   setuptools-scm,
   pytestCheckHook,
@@ -11,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "dissect-cstruct";
-  version = "4.3";
+  version = "4.5";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -20,17 +19,9 @@ buildPythonPackage rec {
     owner = "fox-it";
     repo = "dissect.cstruct";
     tag = version;
-    hash = "sha256-Y6maLjugnso3cc9zyiZ/6AdrftYAAImYNBDXPJdTuWc=";
+    hash = "sha256-2n7y6nHt7gJtJeJIKpobiC7A+dnD6O/o+psinfOnvT8=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "fix-test_types_enum.patch";
-      url = "https://github.com/fox-it/dissect.cstruct/commit/b6c73136828fc2ae59b51d1f68529002d7c37131.diff";
-      hash = "sha256-hicMolFu/qAw9QkOyug4PNm2Do2PxuXNXPB+/JHOaFg=";
-    })
-  ];
-
   build-system = [
     setuptools
     setuptools-scm
@@ -43,7 +34,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Dissect module implementing a parser for C-like structures";
     homepage = "https://github.com/fox-it/dissect.cstruct";
-    changelog = "https://github.com/fox-it/dissect.cstruct/releases/tag/${version}";
+    changelog = "https://github.com/fox-it/dissect.cstruct/releases/tag/${src.tag}";
     license = licenses.agpl3Only;
     maintainers = with maintainers; [ fab ];
   };

From b134f3148fb2b457f547842f173e34767d4d969f Mon Sep 17 00:00:00 2001
From: Marc Fontaine <MarcFontaine@users.noreply.github.com>
Date: Mon, 26 May 2025 21:21:10 +0200
Subject: [PATCH 32/45] nixos/postgrest: fix typo in name of configuration
 options (#411197)

The config-file key is 'server-unix-socket-mode', not 'service-unix-socket-mode'.
---
 nixos/modules/services/databases/postgrest.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/databases/postgrest.nix b/nixos/modules/services/databases/postgrest.nix
index e9e03089a8b2..5cd90db3609a 100644
--- a/nixos/modules/services/databases/postgrest.nix
+++ b/nixos/modules/services/databases/postgrest.nix
@@ -247,7 +247,7 @@ in
 
     # Since we're using DynamicUser, we can't add the e.g. nginx user to
     # a postgrest group, so the unix socket must be world-readable to make it useful.
-    services.postgrest.settings.service-unix-socket-mode = "666";
+    services.postgrest.settings.server-unix-socket-mode = "666";
 
     systemd.services.postgrest = {
       description = "PostgREST";

From 1a08674e838d36c2ab1826c17e378ad7cbce3b97 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 20 May 2025 23:56:33 +0200
Subject: [PATCH 33/45] python313Packages.dissect-util: 3.19 -> 3.21

Changelog: https://github.com/fox-it/dissect.util/releases/tag/3.21
---
 pkgs/development/python-modules/dissect-util/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dissect-util/default.nix b/pkgs/development/python-modules/dissect-util/default.nix
index 47a824d3638b..babe6356b0c6 100644
--- a/pkgs/development/python-modules/dissect-util/default.nix
+++ b/pkgs/development/python-modules/dissect-util/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "dissect-util";
-  version = "3.19";
+  version = "3.21";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "fox-it";
     repo = "dissect.util";
     tag = version;
-    hash = "sha256-z/dYYC3s4R7j2c5HBFlAStcur2AS57AOYndsRlj/Htw=";
+    hash = "sha256-DCe1V3ZQxr2uQ5L4Lucqu0E1jVo7P6cEwC+4tuBmmqI=";
   };
 
   nativeBuildInputs = [
@@ -31,6 +31,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "dissect.util" ];
 
+  disabledTests = [
+    # File handling issue
+    "test_cpio_formats"
+  ];
+
   meta = with lib; {
     description = "Dissect module implementing various utility functions for the other Dissect modules";
     mainProgram = "dump-nskeyedarchiver";

From c3c28da4cea4dac1a1d138ffc494f26da82d5e0f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 21 May 2025 00:14:58 +0200
Subject: [PATCH 34/45] python313Packages.dissect-etl: disable failing tests

---
 pkgs/development/python-modules/dissect-etl/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/python-modules/dissect-etl/default.nix b/pkgs/development/python-modules/dissect-etl/default.nix
index 696f1e67fba0..3d04c3652f39 100644
--- a/pkgs/development/python-modules/dissect-etl/default.nix
+++ b/pkgs/development/python-modules/dissect-etl/default.nix
@@ -40,6 +40,12 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "dissect.etl" ];
 
+  disabledTests = [
+    # Invalid header magic
+    "test_sqlite"
+    "test_empty"
+  ];
+
   meta = with lib; {
     description = "Dissect module implementing a parser for Event Trace Log (ETL) files";
     homepage = "https://github.com/fox-it/dissect.etl";

From 58d2510e00f1eeda5107ffede1e5699ee7569b39 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 20 May 2025 23:46:51 +0200
Subject: [PATCH 35/45] python313Packages.dissect-esedb: 3.15 -> 3.16

Diff: https://github.com/fox-it/dissect.esedb/compare/refs/tags/3.15...refs/tags/3.16

Changelog: https://github.com/fox-it/dissect.esedb/releases/tag/3.16
---
 pkgs/development/python-modules/dissect-esedb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dissect-esedb/default.nix b/pkgs/development/python-modules/dissect-esedb/default.nix
index 2695c6ed9a2e..6f1de7253e33 100644
--- a/pkgs/development/python-modules/dissect-esedb/default.nix
+++ b/pkgs/development/python-modules/dissect-esedb/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "dissect-esedb";
-  version = "3.15";
+  version = "3.16";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "fox-it";
     repo = "dissect.esedb";
     tag = version;
-    hash = "sha256-FuJZambygHBBDxmHk2bZ3oJiuB4ca9aduSXqxiBQWIA=";
+    hash = "sha256-jLv62/3U89sbmcHAA2YYwVPLlLj85nMn4PRE565ppw4=";
   };
 
   nativeBuildInputs = [

From e7020c956f46eadd6c81225709ece83110df62e9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 21 May 2025 01:02:45 +0200
Subject: [PATCH 36/45] python313Packages.dissect-sql: 3.10 -> 3.11

Changelog: https://github.com/fox-it/dissect.sql/releases/tag/3.11
---
 .../python-modules/dissect-sql/default.nix           | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/dissect-sql/default.nix b/pkgs/development/python-modules/dissect-sql/default.nix
index 7769a9035ff4..ec328ece8891 100644
--- a/pkgs/development/python-modules/dissect-sql/default.nix
+++ b/pkgs/development/python-modules/dissect-sql/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "dissect-sql";
-  version = "3.10";
+  version = "3.11";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "fox-it";
     repo = "dissect.sql";
     tag = version;
-    hash = "sha256-mhZvvPmREBY29U31POH8OfktVdNqNpQVIICPBin5WyI=";
+    hash = "sha256-1rIsG4TUv7JkNMiyGCbEEnnp2RccP8QksE91p3z1zjY=";
   };
 
   build-system = [
@@ -38,10 +38,16 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "dissect.sql" ];
 
+  disabledTests = [
+    # Invalid header magic
+    "test_sqlite"
+    "test_empty"
+  ];
+
   meta = with lib; {
     description = "Dissect module implementing a parsers for the SQLite database file format";
     homepage = "https://github.com/fox-it/dissect.sql";
-    changelog = "https://github.com/fox-it/dissect.sql/releases/tag/${version}";
+    changelog = "https://github.com/fox-it/dissect.sql/releases/tag/${src.tag}";
     license = licenses.agpl3Only;
     maintainers = with maintainers; [ fab ];
   };

From 63a699bb88aaadd2da6b49e61ddd4cd34b8d2e6f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 21 May 2025 00:56:19 +0200
Subject: [PATCH 37/45] python313Packages.dissect-volume: 3.13 -> 3.15

Changelog: https://github.com/fox-it/dissect.volume/releases/tag/3.15
---
 .../python-modules/dissect-volume/default.nix  | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/dissect-volume/default.nix b/pkgs/development/python-modules/dissect-volume/default.nix
index 658006309fa6..0ec6bc843f4a 100644
--- a/pkgs/development/python-modules/dissect-volume/default.nix
+++ b/pkgs/development/python-modules/dissect-volume/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "dissect-volume";
-  version = "3.13";
+  version = "3.15";
   pyproject = true;
 
   disabled = pythonOlder "3.13";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "fox-it";
     repo = "dissect.volume";
     tag = version;
-    hash = "sha256-uTbXvJ8lP4ir9rTToDGYXD837Z1fzi+Eh6cASg+jxdc=";
+    hash = "sha256-QxIZg0svKBHp7uVsK4S40oDBOxFudSHBzi6I2iloiok=";
   };
 
   build-system = [
@@ -40,13 +40,23 @@ buildPythonPackage rec {
 
   disabledTests = [
     # gzip.BadGzipFile: Not a gzipped file
+    "test_apm"
+    "test_bsd"
+    "test_bsd64"
     "test_ddf_read"
     "test_dm_thin"
-    "test_lvm"
+    "test_gpt_4k"
+    "test_gpt_esxi_no_name_xff"
+    "test_gpt_esxi"
+    "test_gpt"
+    "test_hybrid_gpt"
     "test_lvm_mirro"
     "test_lvm_thin"
     "test_lvm"
+    "test_lvm"
+    "test_mbr"
     "test_md_raid0_zones"
+    "test_md_raid1_multiple_disks"
     "test_md_read"
     "test_vinum"
   ];
@@ -54,7 +64,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Dissect module implementing various utility functions for the other Dissect modules";
     homepage = "https://github.com/fox-it/dissect.volume";
-    changelog = "https://github.com/fox-it/dissect.volume/releases/tag/${version}";
+    changelog = "https://github.com/fox-it/dissect.volume/releases/tag/${src.tag}";
     license = licenses.agpl3Only;
     maintainers = with maintainers; [ fab ];
   };

From 3afc9d7bb2c78472c90b87ac9964335de3f64c5f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 20 May 2025 23:46:51 +0200
Subject: [PATCH 38/45] python313Packages.dissect-esedb: 3.15 -> 3.16

Diff: https://github.com/fox-it/dissect.esedb/compare/refs/tags/3.15...refs/tags/3.16

Changelog: https://github.com/fox-it/dissect.esedb/releases/tag/3.16
---
 pkgs/development/python-modules/dissect-esedb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dissect-esedb/default.nix b/pkgs/development/python-modules/dissect-esedb/default.nix
index 2695c6ed9a2e..6f1de7253e33 100644
--- a/pkgs/development/python-modules/dissect-esedb/default.nix
+++ b/pkgs/development/python-modules/dissect-esedb/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "dissect-esedb";
-  version = "3.15";
+  version = "3.16";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "fox-it";
     repo = "dissect.esedb";
     tag = version;
-    hash = "sha256-FuJZambygHBBDxmHk2bZ3oJiuB4ca9aduSXqxiBQWIA=";
+    hash = "sha256-jLv62/3U89sbmcHAA2YYwVPLlLj85nMn4PRE565ppw4=";
   };
 
   nativeBuildInputs = [

From e2833acefc33729fa390610ed75dc0e9a85995c6 Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Mon, 26 May 2025 22:03:21 +0200
Subject: [PATCH 39/45] Revert "stalwart-mail: use system jemalloc" (#411201)

---
 pkgs/by-name/st/stalwart-mail/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix
index b8aaa8bb7dc6..a6aea418ca01 100644
--- a/pkgs/by-name/st/stalwart-mail/package.nix
+++ b/pkgs/by-name/st/stalwart-mail/package.nix
@@ -9,7 +9,6 @@
   sqlite,
   foundationdb,
   zstd,
-  rust-jemalloc-sys,
   stdenv,
   nix-update-script,
   nixosTests,
@@ -44,7 +43,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     openssl
     sqlite
     zstd
-    rust-jemalloc-sys
   ] ++ lib.optionals (stdenv.hostPlatform.isLinux && withFoundationdb) [ foundationdb ];
 
   # Issue: https://github.com/stalwartlabs/mail-server/issues/1104

From 8dbb549c8b915534f25b74df5ce77390a70e06b9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 20 May 2025 23:47:24 +0200
Subject: [PATCH 40/45] python313Packages.dissect-ole: 3.10 -> 3.11

Diff: https://github.com/fox-it/dissect.ole/compare/refs/tags/3.10...refs/tags/3.11

Changelog: https://github.com/fox-it/dissect.ole/releases/tag/3.11
---
 pkgs/development/python-modules/dissect-ole/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dissect-ole/default.nix b/pkgs/development/python-modules/dissect-ole/default.nix
index dcba6927bf4a..468154a21ea5 100644
--- a/pkgs/development/python-modules/dissect-ole/default.nix
+++ b/pkgs/development/python-modules/dissect-ole/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "dissect-ole";
-  version = "3.10";
+  version = "3.11";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "fox-it";
     repo = "dissect.ole";
     tag = version;
-    hash = "sha256-BGJnKL27Sz5CS+PEVK6AeXBuzYpLSA8qR9sz7qeOIWc=";
+    hash = "sha256-KdqEZxZ2V3AKHgpHfXmnw4sh+P8ZPOMvbRq0xENwiX8=";
   };
 
   build-system = [

From 04024abdda114d6c731b3eea245ef1f0c018dd4a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 20 May 2025 23:59:21 +0200
Subject: [PATCH 41/45] python313Packages.dissect-jffs: 1.4 -> 1.5

Diff: https://github.com/fox-it/dissect.jffs/compare/refs/tags/1.4...refs/tags/1.5

Changelog: https://github.com/fox-it/dissect.jffs/releases/tag/1.5
---
 pkgs/development/python-modules/dissect-jffs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dissect-jffs/default.nix b/pkgs/development/python-modules/dissect-jffs/default.nix
index 2498b00420ef..7cd6d1598edb 100644
--- a/pkgs/development/python-modules/dissect-jffs/default.nix
+++ b/pkgs/development/python-modules/dissect-jffs/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "dissect-jffs";
-  version = "1.4";
+  version = "1.5";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "fox-it";
     repo = "dissect.jffs";
     tag = version;
-    hash = "sha256-U8tQbCOMdudpsct72QHqKXd2QL99eqpfOJ/QHVUpcIk=";
+    hash = "sha256-HXGmZZd+fYnOCEpffdZe9dOLJS3jY7dIrb6rmhgbYyw=";
   };
 
   nativeBuildInputs = [

From 68357544ec7f310dbfaa8bb822013bf980d95011 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 21 May 2025 00:56:19 +0200
Subject: [PATCH 42/45] python313Packages.dissect-volume: 3.13 -> 3.15

Changelog: https://github.com/fox-it/dissect.volume/releases/tag/3.15
---
 .../python-modules/dissect-volume/default.nix  | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/dissect-volume/default.nix b/pkgs/development/python-modules/dissect-volume/default.nix
index 658006309fa6..0ec6bc843f4a 100644
--- a/pkgs/development/python-modules/dissect-volume/default.nix
+++ b/pkgs/development/python-modules/dissect-volume/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "dissect-volume";
-  version = "3.13";
+  version = "3.15";
   pyproject = true;
 
   disabled = pythonOlder "3.13";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "fox-it";
     repo = "dissect.volume";
     tag = version;
-    hash = "sha256-uTbXvJ8lP4ir9rTToDGYXD837Z1fzi+Eh6cASg+jxdc=";
+    hash = "sha256-QxIZg0svKBHp7uVsK4S40oDBOxFudSHBzi6I2iloiok=";
   };
 
   build-system = [
@@ -40,13 +40,23 @@ buildPythonPackage rec {
 
   disabledTests = [
     # gzip.BadGzipFile: Not a gzipped file
+    "test_apm"
+    "test_bsd"
+    "test_bsd64"
     "test_ddf_read"
     "test_dm_thin"
-    "test_lvm"
+    "test_gpt_4k"
+    "test_gpt_esxi_no_name_xff"
+    "test_gpt_esxi"
+    "test_gpt"
+    "test_hybrid_gpt"
     "test_lvm_mirro"
     "test_lvm_thin"
     "test_lvm"
+    "test_lvm"
+    "test_mbr"
     "test_md_raid0_zones"
+    "test_md_raid1_multiple_disks"
     "test_md_read"
     "test_vinum"
   ];
@@ -54,7 +64,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Dissect module implementing various utility functions for the other Dissect modules";
     homepage = "https://github.com/fox-it/dissect.volume";
-    changelog = "https://github.com/fox-it/dissect.volume/releases/tag/${version}";
+    changelog = "https://github.com/fox-it/dissect.volume/releases/tag/${src.tag}";
     license = licenses.agpl3Only;
     maintainers = with maintainers; [ fab ];
   };

From e98656cb48de4ce1adf4b58c0dda963765faea62 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Mon, 26 May 2025 20:54:44 +0000
Subject: [PATCH 43/45] ty: 0.0.1-alpha.6 -> 0.0.1-alpha.7

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

diff --git a/pkgs/by-name/ty/ty/package.nix b/pkgs/by-name/ty/ty/package.nix
index 79ab77df9ab4..1f8526f61419 100644
--- a/pkgs/by-name/ty/ty/package.nix
+++ b/pkgs/by-name/ty/ty/package.nix
@@ -14,14 +14,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ty";
-  version = "0.0.1-alpha.6";
+  version = "0.0.1-alpha.7";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "ty";
     tag = finalAttrs.version;
     fetchSubmodules = true;
-    hash = "sha256-0/Vzc5N4w23dcRLSWMn/hcgtx3dOpJagPBCiNjCT3mI=";
+    hash = "sha256-aonCRtXi9MZWhZO3SjMxAxsTm8iZZdrm36psGArFz/I=";
   };
 
   # For Darwin platforms, remove the integration test for file notifications,
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoBuildFlags = [ "--package=ty" ];
 
-  cargoHash = "sha256-p3D2sHMyeQY6hZsX17REidyofuQsIkunGLP8IrO1+8A=";
+  cargoHash = "sha256-pYv99huRgqcFcnkMkfFoejmZmVkb9q/VVlYfylPXo4o=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 9f8d45af8c33a23e33c04772afaf0d23bb39fe96 Mon Sep 17 00:00:00 2001
From: Dustin Frisch <fooker@lab.sh>
Date: Thu, 22 May 2025 16:04:11 +0200
Subject: [PATCH 44/45] perses: init at 0.51.0-rc.0

---
 pkgs/by-name/pe/perses/package.nix            | 130 ++++++++++++++++++
 .../pe/perses/plugin-path-config.patch        |  13 ++
 pkgs/by-name/pe/perses/plugins.nix            |  79 +++++++++++
 pkgs/by-name/pe/perses/update.sh              |  35 +++++
 4 files changed, 257 insertions(+)
 create mode 100644 pkgs/by-name/pe/perses/package.nix
 create mode 100644 pkgs/by-name/pe/perses/plugin-path-config.patch
 create mode 100644 pkgs/by-name/pe/perses/plugins.nix
 create mode 100755 pkgs/by-name/pe/perses/update.sh

diff --git a/pkgs/by-name/pe/perses/package.nix b/pkgs/by-name/pe/perses/package.nix
new file mode 100644
index 000000000000..7db0debadcb2
--- /dev/null
+++ b/pkgs/by-name/pe/perses/package.nix
@@ -0,0 +1,130 @@
+{
+  lib,
+  fetchFromGitHub,
+  fetchNpmDeps,
+  fetchurl,
+  buildGoModule,
+  npmHooks,
+  nodejs,
+  turbo,
+  linkFarm,
+}:
+
+let
+  # Create a plugins-archive to be embedded into the perses package similar to
+  # what $src/scripts/install_plugin.go does
+  pluginsArchive = linkFarm "perses-plugin-archive" (
+    lib.mapAttrsToList (name: plugin: {
+      name = "${name}-${plugin.version}.tar.gz";
+      path = fetchurl {
+        inherit (plugin) url hash;
+      };
+    }) (import ./plugins.nix)
+  );
+
+in
+buildGoModule (finalAttrs: {
+  pname = "perses";
+  version = "0.51.0-rc.0";
+
+  src = fetchFromGitHub {
+    owner = "perses";
+    repo = "perses";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-ts/GqBASja+IbZAKWMtExeVyFs6Q76iI9o6AKWZlp9Y=";
+  };
+
+  outputs = [
+    "out"
+    "cue"
+  ];
+
+  nativeBuildInputs = [
+    npmHooks.npmConfigHook
+    nodejs
+    turbo
+  ];
+
+  npmDeps = fetchNpmDeps {
+    inherit (finalAttrs) version src;
+    pname = "${finalAttrs.pname}-ui";
+    sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}";
+    hash = "sha256-a3bkk8IDfxi5nbRqu4WgYZ9bDr5my11HV4a72THclNw=";
+  };
+
+  npmRoot = "ui";
+
+  overrideModAttrs = oldAttrs: {
+    nativeBuildInputs = lib.remove npmHooks.npmConfigHook oldAttrs.nativeBuildInputs;
+    preBuild = null;
+  };
+
+  vendorHash = "sha256-DJAWmeuRPA2pII2RQZNF37n/QNmw2wDUtDpATMqkSJ8=";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X github.com/prometheus/common/version.Version=${finalAttrs.version}"
+    "-X github.com/prometheus/common/version.Revision=${finalAttrs.src.tag}"
+    "-X github.com/prometheus/common/version.Branch=${finalAttrs.src.tag}"
+    "-X github.com/prometheus/common/version.Date=1970-01-01"
+    "-X github.com/perses/perses/pkg/model/api/config.DefaultPluginPath=/run/perses/plugins"
+    "-X github.com/perses/perses/pkg/model/api/config.DefaultArchivePluginPath=${pluginsArchive}"
+  ];
+
+  subPackages = [
+    "cmd/percli"
+    "cmd/perses"
+  ];
+
+  patches = [
+    # This patch allows to override the default config paths using linker constants above
+    # See https://github.com/perses/perses/issues/2947
+    ./plugin-path-config.patch
+  ];
+
+  prePatch = ''
+    patchShebangs .
+  '';
+
+  preBuild = ''
+    pushd "$npmRoot"
+    npm run build
+    popd
+
+    go generate ./internal/api
+
+    ./scripts/compress_assets.sh
+  '';
+
+  postInstall = ''
+    cp -r cue "$cue"
+  '';
+
+  doInstallCheck = true;
+  installCheckPhase = ''
+    runHook preInstallCheck
+
+    $out/bin/percli help > /dev/null
+
+    $out/bin/perses --help 2> /dev/null
+
+    runHook postInstallCheck
+  '';
+
+  passthru = {
+    updateScript = ./update.sh;
+
+    inherit pluginsArchive;
+  };
+
+  meta = {
+    description = "The CNCF sandbox for observability visualisation";
+    homepage = "https://perses.dev/";
+    changelog = "https://github.com/perses/perses/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fooker ];
+    platforms = lib.platforms.unix;
+    mainProgram = "perses";
+  };
+})
diff --git a/pkgs/by-name/pe/perses/plugin-path-config.patch b/pkgs/by-name/pe/perses/plugin-path-config.patch
new file mode 100644
index 000000000000..ab54855c02f7
--- /dev/null
+++ b/pkgs/by-name/pe/perses/plugin-path-config.patch
@@ -0,0 +1,13 @@
+diff --git a/pkg/model/api/config/plugin.go b/pkg/model/api/config/plugin.go
+index 9ece1ced..603c6b0b 100644
+--- a/pkg/model/api/config/plugin.go
++++ b/pkg/model/api/config/plugin.go
+@@ -17,7 +17,7 @@ import (
+ 	"os"
+ )
+ 
+-const (
++var (
+ 	DefaultPluginPath                   = "plugins"
+ 	DefaultPluginPathInContainer        = "/etc/perses/plugins"
+ 	DefaultArchivePluginPath            = "plugins-archive"
diff --git a/pkgs/by-name/pe/perses/plugins.nix b/pkgs/by-name/pe/perses/plugins.nix
new file mode 100644
index 000000000000..7d185e160554
--- /dev/null
+++ b/pkgs/by-name/pe/perses/plugins.nix
@@ -0,0 +1,79 @@
+# This file has been autogenerated by update.sh
+# Do not edit this file manually.
+{
+  "BarChart" = {
+    version = "0.6.1";
+    url = "https://github.com/perses/plugins/releases/download/barchart/v0.6.1/BarChart-0.6.1.tar.gz";
+    hash = "sha256-A5p46sZfzzS6ss3wNJFTyI8N4YAPVev5+rmakbM1n1g=";
+  };
+  "GaugeChart" = {
+    version = "0.6.0";
+    url = "https://github.com/perses/plugins/releases/download/gaugechart/v0.6.0/GaugeChart-0.6.0.tar.gz";
+    hash = "sha256-Ug/GzdlRZjIbio72F/fWquIkg7xqTLf5y1gW9IoXl7g=";
+  };
+  "Markdown" = {
+    version = "0.7.0";
+    url = "https://github.com/perses/plugins/releases/download/markdown/v0.7.0/Markdown-0.7.0.tar.gz";
+    hash = "sha256-KGlmEMUirjbwvirIT5Alt6Rsxk/2TIxspa2ikG6AJ7Y=";
+  };
+  "PieChart" = {
+    version = "0.6.0";
+    url = "https://github.com/perses/plugins/releases/download/piechart/v0.6.0/PieChart-0.6.0.tar.gz";
+    hash = "sha256-AseYkh7Vl1TQJbOPwuMmCvKQls79fIQHQb7Gq6yZIUE=";
+  };
+  "Prometheus" = {
+    version = "0.51.0-beta.2";
+    url = "https://github.com/perses/plugins/releases/download/prometheus/v0.51.0-beta.2/Prometheus-0.51.0-beta.2.tar.gz";
+    hash = "sha256-PUsaZyycDDNaIIhBPIjxnucij9yYZP2TxsX2GvqUTVo=";
+  };
+  "ScatterChart" = {
+    version = "0.6.0";
+    url = "https://github.com/perses/plugins/releases/download/scatterchart/v0.6.0/ScatterChart-0.6.0.tar.gz";
+    hash = "sha256-M1g/EWL5P/jSeTYMGTShuD+AavqK9vJkLeOjYX+dP3c=";
+  };
+  "StatChart" = {
+    version = "0.6.0";
+    url = "https://github.com/perses/plugins/releases/download/statchart/v0.6.0/StatChart-0.6.0.tar.gz";
+    hash = "sha256-lxT2Zimo62i6dLR01uuEgcYs55LLlqyuXIv0DGZlAaM=";
+  };
+  "StaticListVariable" = {
+    version = "0.3.0";
+    url = "https://github.com/perses/plugins/releases/download/staticlistvariable/v0.3.0/StaticListVariable-0.3.0.tar.gz";
+    hash = "sha256-1PmMDuWIq7ALV8DqqL+XJilkfGV2qXVOy9ZMTQrzRq8=";
+  };
+  "StatusHistoryChart" = {
+    version = "0.6.0";
+    url = "https://github.com/perses/plugins/releases/download/statushistorychart/v0.6.0/StatusHistoryChart-0.6.0.tar.gz";
+    hash = "sha256-+U5IIZME3FXACIh3S725tuCdbTzlVRUrU9LFSldnMiI=";
+  };
+  "Table" = {
+    version = "0.6.0";
+    url = "https://github.com/perses/plugins/releases/download/table/v0.6.0/Table-0.6.0.tar.gz";
+    hash = "sha256-pndqD5lrwXe66GiaC+NQgFJiaSJasldpmgwrnEAFmJU=";
+  };
+  "Tempo" = {
+    version = "0.51.0-beta.2";
+    url = "https://github.com/perses/plugins/releases/download/tempo/v0.51.0-beta.2/Tempo-0.51.0-beta.2.tar.gz";
+    hash = "sha256-p1ey0we7ncsnoIcCNhlmzp3NRNrxtayTKruJCuR50gw=";
+  };
+  "TimeSeriesChart" = {
+    version = "0.6.0";
+    url = "https://github.com/perses/plugins/releases/download/timeserieschart/v0.6.0/TimeSeriesChart-0.6.0.tar.gz";
+    hash = "sha256-6inzw4W7lakhbmVDkrgA8uwI6MLiVuk1xbiy904y6Ig=";
+  };
+  "TimeSeriesTable" = {
+    version = "0.6.0";
+    url = "https://github.com/perses/plugins/releases/download/timeseriestable/v0.6.0/TimeSeriesTable-0.6.0.tar.gz";
+    hash = "sha256-bkVhkfRZXGgKZGrQ9crag92jFFiRxZaZOb/UyBTyWGM=";
+  };
+  "TraceTable" = {
+    version = "0.6.0";
+    url = "https://github.com/perses/plugins/releases/download/tracetable/v0.6.0/TraceTable-0.6.0.tar.gz";
+    hash = "sha256-u8/NW23rGX2sAyuVoL7pH1WFYOhcdMFlzE4qMvMBYgE=";
+  };
+  "TracingGanttChart" = {
+    version = "0.6.0";
+    url = "https://github.com/perses/plugins/releases/download/tracingganttchart/v0.6.0/TracingGanttChart-0.6.0.tar.gz";
+    hash = "sha256-R1U/Uq5QPVQWBe24IKovRXCsCyuUmATBcnqxRuRD+Aw=";
+  };
+}
diff --git a/pkgs/by-name/pe/perses/update.sh b/pkgs/by-name/pe/perses/update.sh
new file mode 100755
index 000000000000..8c0948f24e75
--- /dev/null
+++ b/pkgs/by-name/pe/perses/update.sh
@@ -0,0 +1,35 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p nix-update yq
+
+set -euo pipefail
+
+nix-update "${UPDATE_NIX_ATTR_PATH}" --version=unstable
+
+src="$(nix-build -A "${UPDATE_NIX_ATTR_PATH}".src --no-out-link)"
+
+(
+  echo "# This file has been autogenerated by update.sh"
+  echo "# Do not edit this file manually."
+
+  echo "{"
+
+  yq -r '.[]|[.name, .version] | @tsv' < "${src}/scripts/plugin/plugin.yaml" \
+  | while IFS=$'\t' read -r name version; do
+    echo "  \"${name}\" = {"
+
+    echo "    version = \"${version}\";"
+
+    url="https://github.com/perses/plugins/releases/download/${name,,}/v${version}/${name}-${version}.tar.gz"
+    echo "    url = \"${url}\";"
+
+    hash="$(nix-prefetch-url "${url}" --name "${UPDATE_NIX_PNAME}-${name,,}-${version}.tar.gz")"
+    hash="$(nix hash convert --hash-algo sha256 "${hash}")"
+
+    echo "    hash = \"${hash}\";"
+
+    echo "  };"
+  done
+
+  echo "}"
+) > "$(dirname "${BASH_SOURCE[0]}")/plugins.nix"
+

From 3587619b1a188ba20cb94a71b27b2f9776c44128 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Mon, 26 May 2025 19:14:41 +1000
Subject: [PATCH 45/45] nix-eval-jobs: 2.28.1 -> 2.29.0

Diff: https://github.com/nix-community/nix-eval-jobs/compare/v2.28.1...v2.29.0
---
 pkgs/tools/package-management/nix-eval-jobs/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix-eval-jobs/default.nix b/pkgs/tools/package-management/nix-eval-jobs/default.nix
index 03d6989c2a8c..8d282bc88be7 100644
--- a/pkgs/tools/package-management/nix-eval-jobs/default.nix
+++ b/pkgs/tools/package-management/nix-eval-jobs/default.nix
@@ -13,13 +13,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "nix-eval-jobs";
-  version = "2.28.1";
+  version = "2.29.0";
 
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-QuSt8PsB1huFQVXeSASfbXX0r5hmEFLNgYX4dpKewWs=";
+    hash = "sha256-AJ22q6yWc1hPkqssXMxQqD6QUeJ6hbx52xWHhKsmuP0=";
   };
 
   buildInputs = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a47316c3b36d..c712af0ee6aa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16461,7 +16461,7 @@ with pkgs;
   nixosOptionsDoc = attrs: (import ../../nixos/lib/make-options-doc) ({ inherit pkgs lib; } // attrs);
 
   nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs {
-    nix = nixVersions.nix_2_28;
+    nix = nixVersions.nix_2_29;
   };
 
   nix-delegate = haskell.lib.compose.justStaticExecutables haskellPackages.nix-delegate;