From 940142dd3d716e3a72336967f2e516147a5d2cda Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Apr 2026 21:54:36 +0000
Subject: [PATCH 01/97] goffice: 0.10.59 -> 0.10.61

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

diff --git a/pkgs/by-name/go/goffice/package.nix b/pkgs/by-name/go/goffice/package.nix
index c4b32ac0115e..c766983d0ce7 100644
--- a/pkgs/by-name/go/goffice/package.nix
+++ b/pkgs/by-name/go/goffice/package.nix
@@ -21,7 +21,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "goffice";
-  version = "0.10.59";
+  version = "0.10.61";
 
   outputs = [
     "out"
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/goffice/${lib.versions.majorMinor finalAttrs.version}/goffice-${finalAttrs.version}.tar.xz";
-    hash = "sha256-sI9xczJVlLcfu+pHajC1sxIMPa3/XAom0UDk5SSRZiI=";
+    hash = "sha256-VYWX/Zylm5P/VidQIY0efqjsPI0O1qXMCWqnFe+QmhU=";
   };
 
   nativeBuildInputs = [

From 0b75800b8d123cf0232a2b1659de75f3f885e71c Mon Sep 17 00:00:00 2001
From: Liam Gilligan <liamdgilligan@gmail.com>
Date: Mon, 11 May 2026 16:08:01 -0700
Subject: [PATCH 02/97] jextract: unstable-2025-05-08 -> 0-unstable-2025-11-12

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

diff --git a/pkgs/by-name/je/jextract/package.nix b/pkgs/by-name/je/jextract/package.nix
index 49eeb4063551..109d3ebb3b14 100644
--- a/pkgs/by-name/je/jextract/package.nix
+++ b/pkgs/by-name/je/jextract/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation {
   pname = "jextract";
-  version = "unstable-2025-05-08";
+  version = "0-unstable-2025-11-12";
 
   src = fetchFromGitHub {
     owner = "openjdk";
     repo = "jextract";
-    rev = "ab6b30fd189e33a52d366846202f2e9b9b280142";
-    hash = "sha256-cFXQo/DpjOuuW+HCP2G9HiOqdgVmmyPd3IXCB9X+w6M=";
+    rev = "91fc954c46fac907cae6cd1417d835208c9df150";
+    hash = "sha256-RAK7A0BCFaYe/q1nCdvXk091bhSj9DKxg2uQfABk4eo=";
   };
 
   nativeBuildInputs = [

From 2765671b0fd65cf0fffe53b4aa2e78e4231e68f4 Mon Sep 17 00:00:00 2001
From: Thomas Butter <tbutter@gmail.com>
Date: Fri, 15 May 2026 19:11:03 +0000
Subject: [PATCH 03/97] elastix: 5.2.0 -> 5.3.1

---
 pkgs/by-name/el/elastix/package.nix | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/el/elastix/package.nix b/pkgs/by-name/el/elastix/package.nix
index 6874a93a18f9..d78c27b82beb 100644
--- a/pkgs/by-name/el/elastix/package.nix
+++ b/pkgs/by-name/el/elastix/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "elastix";
-  version = "5.2.0";
+  version = "5.3.1";
 
   src = fetchFromGitHub {
     owner = "SuperElastix";
     repo = "elastix";
     tag = finalAttrs.version;
-    hash = "sha256-edUMj8sjku8EVYaktteIDS+ouaN3kg+CXQCeSWKlLDI=";
+    hash = "sha256-WV3iIqYJ7c5tl4LopnEVEOG//JoxVW0tW90K6MNhcAA=";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -22,6 +22,18 @@ stdenv.mkDerivation (finalAttrs: {
 
   doCheck = !stdenv.hostPlatform.isDarwin; # usual dynamic linker issues
 
+  # Fails due to numerical tolerance issues
+  # 24/94 Test #24: elastix_run_example_COMPARE_IM ...................................***Failed    0.16 sec
+  # There are 9210 pixels with difference larger than 5, while 50 are allowed!
+  # 39/94 Test #39: elastix_run_3DCT_lung.MI.bspline.ASGD.001_COMPARE_TP .............***Failed    0.29 sec
+  # Computed difference: 2.86242 / 824.534 = 0.00347156
+  # Allowed  difference: 0.001
+  checkPhase = ''
+    runHook preCheck
+    ctest -E "(COMPARE_IM|COMPARE_TP)"
+    runHook postCheck
+  '';
+
   meta = {
     homepage = "https://elastix.dev";
     description = "Image registration toolkit based on ITK";

From 9018df7015f7fc6f46d8d98d8bcc5abc0fef75bd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 19 May 2026 22:02:49 +0000
Subject: [PATCH 04/97] freetds: 1.5.6 -> 1.5.18

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

diff --git a/pkgs/by-name/fr/freetds/package.nix b/pkgs/by-name/fr/freetds/package.nix
index 8cb3422685b1..cdefc7c8b115 100644
--- a/pkgs/by-name/fr/freetds/package.nix
+++ b/pkgs/by-name/fr/freetds/package.nix
@@ -15,11 +15,11 @@ assert odbcSupport -> unixodbc != null;
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "freetds";
-  version = "1.5.6";
+  version = "1.5.18";
 
   src = fetchurl {
     url = "https://www.freetds.org/files/stable/freetds-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-2twI5prvFFI/2u4JFw1Z2vG2QT6NWFjQnJSWZ0ugjFc=";
+    hash = "sha256-ayyLk7nufIOFXa90XeWHh5ADLxTbruVT2DqdIRuE3Us=";
   };
 
   patches = [

From 4a16f9129a3e2c4595bd9e2e90879e2284878dfe Mon Sep 17 00:00:00 2001
From: Shogo Takata <peshogo@gmail.com>
Date: Tue, 19 May 2026 07:34:38 +0900
Subject: [PATCH 05/97] sv-lang: 9.1 -> 11.0; sv-lang_9: init at 9.1

Different versions of sv-lang are not compatible, so packages depending
on this package need a specific version. The original sv-lang (v9.1)
becomes sv-lang_9.
---
 pkgs/by-name/ci/circt/package.nix     |  4 +-
 pkgs/by-name/sv/sv-lang/package.nix   | 12 ++---
 pkgs/by-name/sv/sv-lang_9/package.nix | 70 +++++++++++++++++++++++++++
 pkgs/by-name/ve/veridian/package.nix  |  6 +--
 4 files changed, 79 insertions(+), 13 deletions(-)
 create mode 100644 pkgs/by-name/sv/sv-lang_9/package.nix

diff --git a/pkgs/by-name/ci/circt/package.nix b/pkgs/by-name/ci/circt/package.nix
index f855bf648c17..925a98b3fbf8 100644
--- a/pkgs/by-name/ci/circt/package.nix
+++ b/pkgs/by-name/ci/circt/package.nix
@@ -9,7 +9,7 @@
   ninja,
   lit,
   z3,
-  sv-lang,
+  sv-lang_9, # update sv-lang version here according to upstream requirements
   fmt,
   boost,
   mimalloc,
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
     boost
     fmt
     mimalloc
-    sv-lang
+    sv-lang_9
   ];
 
   cmakeFlags = [
diff --git a/pkgs/by-name/sv/sv-lang/package.nix b/pkgs/by-name/sv/sv-lang/package.nix
index 8ab3836fc923..2f49a2bbbead 100644
--- a/pkgs/by-name/sv/sv-lang/package.nix
+++ b/pkgs/by-name/sv/sv-lang/package.nix
@@ -13,21 +13,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sv-lang";
-  version = "9.1";
+  version = "11.0";
 
   src = fetchFromGitHub {
     owner = "MikePopoloski";
     repo = "slang";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-IfRh6F6vA+nFa+diPKD2aMv9kRbvVIY80IqX0d+d5JA=";
+    hash = "sha256-popHzwX0qwv2POAl7/qX3e//OwJRXGtSl9xogpSn2LI=";
   };
 
-  postPatch = ''
-    substituteInPlace external/CMakeLists.txt --replace-fail \
-      'set(mimalloc_min_version "2.2")' \
-      'set(mimalloc_min_version "${lib.versions.majorMinor mimalloc.version}")'
-  '';
-
   cmakeFlags = [
     # fix for https://github.com/NixOS/nixpkgs/issues/144170
     "-DCMAKE_INSTALL_INCLUDEDIR=include"
@@ -36,6 +30,8 @@ stdenv.mkDerivation (finalAttrs: {
     "-DSLANG_INCLUDE_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}"
   ];
 
+  __structuredAttrs = true;
+
   nativeBuildInputs = [
     cmake
     python3
diff --git a/pkgs/by-name/sv/sv-lang_9/package.nix b/pkgs/by-name/sv/sv-lang_9/package.nix
new file mode 100644
index 000000000000..00097262e32b
--- /dev/null
+++ b/pkgs/by-name/sv/sv-lang_9/package.nix
@@ -0,0 +1,70 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  boost,
+  catch2_3,
+  cmake,
+  ninja,
+  fmt,
+  mimalloc,
+  python3,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "sv-lang";
+  version = "9.1";
+
+  src = fetchFromGitHub {
+    owner = "MikePopoloski";
+    repo = "slang";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-IfRh6F6vA+nFa+diPKD2aMv9kRbvVIY80IqX0d+d5JA=";
+  };
+
+  postPatch = ''
+    substituteInPlace external/CMakeLists.txt --replace-fail \
+      'set(mimalloc_min_version "2.2")' \
+      'set(mimalloc_min_version "${lib.versions.majorMinor mimalloc.version}")'
+  '';
+
+  cmakeFlags = [
+    # fix for https://github.com/NixOS/nixpkgs/issues/144170
+    "-DCMAKE_INSTALL_INCLUDEDIR=include"
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+
+    "-DSLANG_INCLUDE_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}"
+  ];
+
+  __structuredAttrs = true;
+
+  nativeBuildInputs = [
+    cmake
+    python3
+    ninja
+  ];
+
+  strictDeps = true;
+
+  buildInputs = [
+    boost
+    fmt
+    mimalloc
+    # though only used in tests, cmake will complain its absence when configuring
+    catch2_3
+  ];
+
+  # TODO: a mysterious linker error occurs when building the unittests on darwin.
+  # The error occurs when using catch2_3 in nixpkgs, not when fetching catch2_3 using CMake
+  doCheck = !stdenv.hostPlatform.isDarwin;
+
+  meta = {
+    description = "SystemVerilog compiler and language services";
+    homepage = "https://github.com/MikePopoloski/slang";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ sharzy ];
+    mainProgram = "slang";
+    platforms = lib.platforms.all;
+    broken = stdenv.hostPlatform.isDarwin;
+  };
+})
diff --git a/pkgs/by-name/ve/veridian/package.nix b/pkgs/by-name/ve/veridian/package.nix
index d487f1923d58..27735dbeaee0 100644
--- a/pkgs/by-name/ve/veridian/package.nix
+++ b/pkgs/by-name/ve/veridian/package.nix
@@ -10,7 +10,7 @@
   boost,
   fmt,
   openssl,
-  sv-lang,
+  sv-lang_9, # update sv-lang version here according to upstream requirements
   mimalloc,
 
   verible,
@@ -43,7 +43,7 @@ rustPlatform.buildRustPackage {
     boost
     fmt
     openssl
-    sv-lang
+    sv-lang_9
     mimalloc
   ];
 
@@ -69,7 +69,7 @@ rustPlatform.buildRustPackage {
     OPENSSL_NO_VENDOR = "1";
     RUSTFLAGS = "-C link-args=-lmimalloc";
     # this is needed so that veridian doesn't try to build the sv-lang package itself
-    SLANG_INSTALL_PATH = sv-lang;
+    SLANG_INSTALL_PATH = sv-lang_9;
   };
 
   passthru = {

From 9510666e6ccae838bf57ac4b265803335e87bd3d Mon Sep 17 00:00:00 2001
From: Shogo Takata <peshogo@gmail.com>
Date: Tue, 19 May 2026 07:37:13 +0900
Subject: [PATCH 06/97] sv-lang_10: init at 10.0

Introduces sv-lang version 10.
Needed by circt for its slang frontend in newer versions. Includes a
patch to install BS_thread_pool.hpp when SLANG_USE_THREADS is enabled.
---
 pkgs/by-name/sv/sv-lang_10/package.nix | 77 ++++++++++++++++++++++++++
 1 file changed, 77 insertions(+)
 create mode 100644 pkgs/by-name/sv/sv-lang_10/package.nix

diff --git a/pkgs/by-name/sv/sv-lang_10/package.nix b/pkgs/by-name/sv/sv-lang_10/package.nix
new file mode 100644
index 000000000000..15b0d2259c89
--- /dev/null
+++ b/pkgs/by-name/sv/sv-lang_10/package.nix
@@ -0,0 +1,77 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchpatch,
+  boost,
+  catch2_3,
+  cmake,
+  ninja,
+  fmt,
+  mimalloc,
+  python3,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "sv-lang";
+  version = "10.0";
+
+  src = fetchFromGitHub {
+    owner = "MikePopoloski";
+    repo = "slang";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-rw+DztENuY+DiAhQR2oNN/dQJzrcP5neF3LoWnqri+c=";
+  };
+
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/MikePopoloski/slang/commit/0e2094e3570f399c4bedff8c7cf342812b50d909.patch";
+      hash = "sha256-Evx5HJk8fH3QoBXM5BE3tmdJVnblVTkxLMTNIRLOt/c=";
+    })
+  ];
+
+  postPatch = ''
+    substituteInPlace external/CMakeLists.txt --replace-fail \
+      'set(mimalloc_min_version "2.2")' \
+      'set(mimalloc_min_version "${lib.versions.majorMinor mimalloc.version}")'
+  '';
+
+  cmakeFlags = [
+    "-DCMAKE_INSTALL_INCLUDEDIR=include"
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+    "-DSLANG_INCLUDE_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}"
+    # CIRCT disables threading to avoid a race condition in BS::thread_pool:
+    # https://github.com/llvm/circt/blob/firtool-1.147.0/CMakeLists.txt#L579
+    # This may be parameterized if other packages depend on this package.
+    "-DSLANG_USE_THREADS=OFF"
+  ];
+
+  __structuredAttrs = true;
+
+  nativeBuildInputs = [
+    cmake
+    python3
+    ninja
+  ];
+
+  strictDeps = true;
+
+  buildInputs = [
+    boost
+    fmt
+    mimalloc
+    catch2_3
+  ];
+
+  doCheck = !stdenv.hostPlatform.isDarwin;
+
+  meta = {
+    description = "SystemVerilog compiler and language services";
+    homepage = "https://github.com/MikePopoloski/slang";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ sharzy ];
+    mainProgram = "slang";
+    platforms = lib.platforms.all;
+    broken = stdenv.hostPlatform.isDarwin;
+  };
+})

From ad1e6fbd58fcf94ff7197cd617ba2d94809bee35 Mon Sep 17 00:00:00 2001
From: Shogo Takata <peshogo@gmail.com>
Date: Tue, 19 May 2026 07:39:01 +0900
Subject: [PATCH 07/97] circt: 1.140.0 -> 1.147.0

Updates circt to 1.147.0.
---
 pkgs/by-name/ci/circt/circt-llvm.nix |  4 +++-
 pkgs/by-name/ci/circt/package.nix    | 17 +++++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ci/circt/circt-llvm.nix b/pkgs/by-name/ci/circt/circt-llvm.nix
index 706171fcd5de..48b2a38c0262 100644
--- a/pkgs/by-name/ci/circt/circt-llvm.nix
+++ b/pkgs/by-name/ci/circt/circt-llvm.nix
@@ -14,6 +14,8 @@ stdenv.mkDerivation {
 
   requiredSystemFeatures = [ "big-parallel" ];
 
+  __structuredAttrs = true;
+
   nativeBuildInputs = [
     cmake
     ninja
@@ -33,7 +35,7 @@ stdenv.mkDerivation {
     # Based on utils/build-llvm.sh
     (lib.cmakeBool "BUILD_SHARED_LIBS" true)
     (lib.cmakeBool "LLVM_BUILD_EXAMPLES" false)
-    (lib.cmakeBool "LLVM_ENABLE_ASSERTIONS" true)
+    (lib.cmakeBool "LLVM_ENABLE_ASSERTIONS" false) # Conflicts with nixpkgs hardening options
     (lib.cmakeBool "LLVM_ENABLE_BINDINGS" false)
     (lib.cmakeBool "LLVM_ENABLE_OCAMLDOC" false)
     (lib.cmakeFeature "LLVM_ENABLE_PROJECTS" "mlir")
diff --git a/pkgs/by-name/ci/circt/package.nix b/pkgs/by-name/ci/circt/package.nix
index 925a98b3fbf8..fdfc8496d016 100644
--- a/pkgs/by-name/ci/circt/package.nix
+++ b/pkgs/by-name/ci/circt/package.nix
@@ -9,7 +9,7 @@
   ninja,
   lit,
   z3,
-  sv-lang_9, # update sv-lang version here according to upstream requirements
+  sv-lang_10, # update sv-lang version here according to upstream requirements
   fmt,
   boost,
   mimalloc,
@@ -27,17 +27,19 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "circt";
-  version = "1.140.0";
+  version = "1.147.0";
   src = fetchFromGitHub {
     owner = "llvm";
     repo = "circt";
     tag = "firtool-${finalAttrs.version}";
-    hash = "sha256-oitdYNGsEyraQqouOt9srfbDgVGFOAGZMdcf/rjnx5Q=";
+    hash = "sha256-rtnvahI7EzUJXE80X3XPWjjDD/6f9BPmZ7S97Lstuhw=";
     fetchSubmodules = true;
   };
 
   requiredSystemFeatures = [ "big-parallel" ];
 
+  __structuredAttrs = true;
+
   nativeBuildInputs = [
     cmake
     ninja
@@ -53,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
     boost
     fmt
     mimalloc
-    sv-lang_9
+    sv-lang_10
   ];
 
   cmakeFlags = [
@@ -110,18 +112,21 @@ stdenv.mkDerivation (finalAttrs: {
   postPatch = ''
     patchShebangs tools/circt-test
 
+    # Replace slang references to match the package in nixpkgs
     substituteInPlace \
       lib/Tools/circt-verilog-lsp-server/VerilogServerImpl/CMakeLists.txt \
       lib/Conversion/ImportVerilog/CMakeLists.txt \
+      unittests/Conversion/ImportVerilog/CMakeLists.txt \
       --replace-fail "slang_slang" "slang::slang"
-  '';
 
-  preConfigure = ''
+    # Patch shebang in test mlir files
     find ./test -name '*.mlir' -exec sed -i 's|/usr/bin/env|${coreutils}/bin/env|g' {} \;
+
     # circt uses git to check its version, but when cloned on nix it can't access git.
     # So this hard codes the version.
     substituteInPlace cmake/modules/GenVersionFile.cmake \
       --replace-fail "unknown git version" "${finalAttrs.src.rev}"
+
     # Increase timeout on tests because some were failing on hydra.
     # Using `replace-warn` so it doesn't break when upstream changes the timeout.
     substituteInPlace integration_test/CMakeLists.txt \

From fa9569b67f46d9e8eec53bedc64b55718b228526 Mon Sep 17 00:00:00 2001
From: Eduardo Fortes <eduardofortesr@gmail.com>
Date: Sun, 24 May 2026 16:58:58 -0300
Subject: [PATCH 08/97] irpf: 2026-1.2 -> 2026-1.3

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

diff --git a/pkgs/by-name/ir/irpf/package.nix b/pkgs/by-name/ir/irpf/package.nix
index c0f62e8f5ce5..219d98f0d49b 100644
--- a/pkgs/by-name/ir/irpf/package.nix
+++ b/pkgs/by-name/ir/irpf/package.nix
@@ -17,7 +17,7 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "irpf";
-  version = "2026-1.2";
+  version = "2026-1.3";
 
   # https://www.gov.br/receitafederal/pt-br/centrais-de-conteudo/download/pgd/dirpf
   # Para outros sistemas operacionais -> Multi
@@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     in
     fetchzip {
       url = "https://downloadirpf.receita.fazenda.gov.br/irpf/${year}/irpf/arquivos/IRPF${finalAttrs.version}.zip";
-      hash = "sha256-Zw/QtmbINCV1VPz52KCxam+WFgkh8Kjz1v0e7oVeZCs=";
+      hash = "sha256-5CX+HaIfQRoeWQHvXTGBhqRAaCM7UH2Duq8+6+3Ai7o=";
     };
 
   nativeBuildInputs = [

From a20e8da678e5f2a6afd77b9271c2ca3e88b397a1 Mon Sep 17 00:00:00 2001
From: rorosen <robert.rose@mailbox.org>
Date: Mon, 25 May 2026 10:57:53 +0200
Subject: [PATCH 09/97] k3s_1_33: 1.33.11+k3s1 -> 1.33.12+k3s1

https://github.com/k3s-io/k3s/releases/tag/v1.33.12%2Bk3s1
---
 .../cluster/k3s/1_33/images-versions.json     | 24 +++++++++----------
 .../networking/cluster/k3s/1_33/versions.nix  | 10 ++++----
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json
index 0a4911e9c460..8ba5e8386b80 100644
--- a/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json
+++ b/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json
@@ -1,26 +1,26 @@
 {
   "airgap-images-amd64-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.11%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
-    "sha256": "234a24f45c7d767cd850a7265257d4d2d7c2cc5ac3ca8e67a94f359766ec547d"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.12%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
+    "sha256": "6a29f795a718e0b7a11b81b4f8a342764a90b78a83a57ad6e1b90d81c3718290"
   },
   "airgap-images-amd64-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.11%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
-    "sha256": "71cd029a49fae4893970132b0136b217b133de4dbb4ba0107f3b82ec4867734d"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.12%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
+    "sha256": "1ec9755fbe791b710b176c12f66160e19b31605345c92f3b5916176976f813a8"
   },
   "airgap-images-arm-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.11%2Bk3s1/k3s-airgap-images-arm.tar.gz",
-    "sha256": "41ceeb0249f8d53cbf3ead7ff70374c292c121f991af0e3a491ff66d48a99d41"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.12%2Bk3s1/k3s-airgap-images-arm.tar.gz",
+    "sha256": "893e395bbee35745e32aaa4e421aaf0c88e685739edc5658f9bf573a95a86782"
   },
   "airgap-images-arm-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.11%2Bk3s1/k3s-airgap-images-arm.tar.zst",
-    "sha256": "4d826c3f62a3d58f6da34e4369c4a64f0997b2c963423e1890e5bda70e55dc6b"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.12%2Bk3s1/k3s-airgap-images-arm.tar.zst",
+    "sha256": "1613727aaa8ae55a1a597a2914faf9ab909a710e175a26b4652754b25ab01337"
   },
   "airgap-images-arm64-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.11%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
-    "sha256": "5c5f6d62105b620cda23099b63146d3cb8698e437a2c0c8e770a17578b174eeb"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.12%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
+    "sha256": "5fa48235a216c9dfcaefcd344597d221adf16aa583a0ca9d9b4094e4c9c1ef5f"
   },
   "airgap-images-arm64-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.11%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
-    "sha256": "e4ca9bf05aab34f10fa792f894ab214aeaac30be31b6d91918b036216d753efa"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.12%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
+    "sha256": "ec56b324e405a3990b9ee16b5aa39bfb636ce88a127869685c042944caf38835"
   }
 }
diff --git a/pkgs/applications/networking/cluster/k3s/1_33/versions.nix b/pkgs/applications/networking/cluster/k3s/1_33/versions.nix
index deddf3a824dd..57f04c1c12c8 100644
--- a/pkgs/applications/networking/cluster/k3s/1_33/versions.nix
+++ b/pkgs/applications/networking/cluster/k3s/1_33/versions.nix
@@ -1,8 +1,8 @@
 {
-  k3sVersion = "1.33.11+k3s1";
-  k3sCommit = "c532325bce6b1fa03be983cca3a8b4b84eea72a6";
-  k3sRepoSha256 = "1gzpazgi0bhqp4bqlp1s7gxqlh2wq2s8n31khy83kdhz22i6dipb";
-  k3sVendorHash = "sha256-rFH0Z66J6NHP+iscHDsr5rDkVLLkXeVuXTlT9hEhubw=";
+  k3sVersion = "1.33.12+k3s1";
+  k3sCommit = "35e4874312bcfd643320c7f7cb225f7063cb9e4e";
+  k3sRepoSha256 = "1md7w6n9iz3nk63rnf4ahs66d2vg3gfc5frksar2iw3kcv99bhmc";
+  k3sVendorHash = "sha256-O0HIcCzrKGR8NkMoDfaD1wPbAttHt0kEpVjr/kOLMu8=";
   chartVersions = import ./chart-versions.nix;
   imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
   k3sRootVersion = "0.15.0";
@@ -17,5 +17,5 @@
   flannelPluginVersion = "v1.9.0-flannel1";
   kubeRouterVersion = "v2.6.3-k3s1";
   criDockerdVersion = "v0.3.19-k3s2";
-  helmJobVersion = "v0.9.17-build20260422";
+  helmJobVersion = "v0.10.0-build20260513";
 }

From 4c6be6dbad8e8efc6ea11c5bda9b73ff3fbcc548 Mon Sep 17 00:00:00 2001
From: rorosen <robert.rose@mailbox.org>
Date: Mon, 25 May 2026 14:00:36 +0200
Subject: [PATCH 10/97] k3s_1_34: 1.34.7+k3s1 -> 1.34.8+k3s1

https://github.com/k3s-io/k3s/releases/tag/v1.34.8%2Bk3s1
---
 .../cluster/k3s/1_34/images-versions.json     | 24 +++++++++----------
 .../networking/cluster/k3s/1_34/versions.nix  | 10 ++++----
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/networking/cluster/k3s/1_34/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_34/images-versions.json
index 2fe43688f83b..08b82fbac7a7 100644
--- a/pkgs/applications/networking/cluster/k3s/1_34/images-versions.json
+++ b/pkgs/applications/networking/cluster/k3s/1_34/images-versions.json
@@ -1,26 +1,26 @@
 {
   "airgap-images-amd64-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.7%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
-    "sha256": "4c81d96db507206816c341e79c113692d9f6c1515d0f2cd82f3c95376f09e7f3"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.8%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
+    "sha256": "2a5f910bb31b8674dff61f55a242b8dacb553894a50d66ea3c2dbf4ec8931345"
   },
   "airgap-images-amd64-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.7%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
-    "sha256": "1d98b5f32c85ae41371851e6c14b81bdb8960177b28ccd1deda55c1a05586704"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.8%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
+    "sha256": "c1a261f664a58664aab975ba5c861d872c825d4f8ccc391c649283bf2c1663cf"
   },
   "airgap-images-arm-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.7%2Bk3s1/k3s-airgap-images-arm.tar.gz",
-    "sha256": "da9fb4db5e14d8ebaf173718f1df8ed68c80f56ea725e5c7b19c0c2b216f538a"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.8%2Bk3s1/k3s-airgap-images-arm.tar.gz",
+    "sha256": "a14b0421af4e4afe70010886cf66eb99b2cb48e1f810269bae47dad5c8bbc2c7"
   },
   "airgap-images-arm-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.7%2Bk3s1/k3s-airgap-images-arm.tar.zst",
-    "sha256": "9880d9f56c5ec9b61714aa27caab365b237f51ec272e27cfc3bfead5ae60eeee"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.8%2Bk3s1/k3s-airgap-images-arm.tar.zst",
+    "sha256": "b6dba85a8470f95ab2a57658bb5ac2adfcf3e3c0634501e7b87d6904f32308d6"
   },
   "airgap-images-arm64-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.7%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
-    "sha256": "7702e62ebf167bdc9d8f4b3eda18544339c839f456746389d8fceea8be379d3e"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.8%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
+    "sha256": "dbb6f771024fbf07a85d57fb77d43a59a4cd712684e819dd31f9633088c3f99e"
   },
   "airgap-images-arm64-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.7%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
-    "sha256": "4c9514a2874c592813285fac36ff6a9f7e65febc426af73a7ac3ececa1804d6d"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.8%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
+    "sha256": "984dc4a2050e1bde1b57ac8a07ce6639a56151a3b57cee0616220bc680c65041"
   }
 }
diff --git a/pkgs/applications/networking/cluster/k3s/1_34/versions.nix b/pkgs/applications/networking/cluster/k3s/1_34/versions.nix
index 4bf854dfc96c..1d2e8503b87a 100644
--- a/pkgs/applications/networking/cluster/k3s/1_34/versions.nix
+++ b/pkgs/applications/networking/cluster/k3s/1_34/versions.nix
@@ -1,8 +1,8 @@
 {
-  k3sVersion = "1.34.7+k3s1";
-  k3sCommit = "757f14939dd335fb5d7a839a9980382da9cdedf7";
-  k3sRepoSha256 = "0f4mp23hnn5w5km0ymj66vpjjdh6m0xkrs87lfpm0gf2j9ba1vn5";
-  k3sVendorHash = "sha256-MrWZp43SVKWboUs3RasZXBmZD3dDYWWZewKbXkJvsiA=";
+  k3sVersion = "1.34.8+k3s1";
+  k3sCommit = "fb21251ee14ffbec9a2ba5d8ff25a7aa1221fbe3";
+  k3sRepoSha256 = "18f2mhhn7nz8lri1qbjja5nfjncsadra9wrqxxgprfg5lx7fi3a2";
+  k3sVendorHash = "sha256-jikPQgyQ4ApWPF+iHYjL7H6ccWcC1x/JEABluJyzmfs=";
   chartVersions = import ./chart-versions.nix;
   imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
   k3sRootVersion = "0.15.0";
@@ -17,5 +17,5 @@
   flannelPluginVersion = "v1.9.0-flannel1";
   kubeRouterVersion = "v2.6.3-k3s1";
   criDockerdVersion = "v0.3.19-k3s3";
-  helmJobVersion = "v0.9.17-build20260422";
+  helmJobVersion = "v0.10.0-build20260513";
 }

From 0ea2b9edddf52e6b029b69541ca1ce9fdc0439aa Mon Sep 17 00:00:00 2001
From: rorosen <robert.rose@mailbox.org>
Date: Mon, 25 May 2026 14:12:16 +0200
Subject: [PATCH 11/97] k3s_1_35: 1.35.4+k3s1 -> 1.35.5+k3s1

https://github.com/k3s-io/k3s/releases/tag/v1.35.5%2Bk3s1
---
 .../cluster/k3s/1_35/images-versions.json     | 24 +++++++++----------
 .../networking/cluster/k3s/1_35/versions.nix  | 10 ++++----
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/networking/cluster/k3s/1_35/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_35/images-versions.json
index 0e51b2dc552c..d2675277bd54 100644
--- a/pkgs/applications/networking/cluster/k3s/1_35/images-versions.json
+++ b/pkgs/applications/networking/cluster/k3s/1_35/images-versions.json
@@ -1,26 +1,26 @@
 {
   "airgap-images-amd64-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.4%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
-    "sha256": "cb7609c41885b65452fd8e4b5ad4621e39ef31a1894c9b416e2ca369aea673bd"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.5%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
+    "sha256": "b25863ba596e81ee773b462edc1b7ee26e80ff8e675c983115464372713237ac"
   },
   "airgap-images-amd64-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.4%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
-    "sha256": "2740585f773e1461b2a5b9976a1291a7a554b85f4538228e34cc67b03f690ca5"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.5%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
+    "sha256": "c1a261f664a58664aab975ba5c861d872c825d4f8ccc391c649283bf2c1663cf"
   },
   "airgap-images-arm-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.4%2Bk3s1/k3s-airgap-images-arm.tar.gz",
-    "sha256": "ef1366c55b9ee109a8452d9fdeb3d5cfc00927e0f24f227ff57ec0e54b34f7ae"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.5%2Bk3s1/k3s-airgap-images-arm.tar.gz",
+    "sha256": "5b9fc436d67f0ca941084c512715f2ea21e6c66732144145788f1403ffd6c082"
   },
   "airgap-images-arm-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.4%2Bk3s1/k3s-airgap-images-arm.tar.zst",
-    "sha256": "b09ebf9407e9c2901f13d4921304d83abf9bbd4e1222fb5a2a6d91ac9622a2e3"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.5%2Bk3s1/k3s-airgap-images-arm.tar.zst",
+    "sha256": "1613727aaa8ae55a1a597a2914faf9ab909a710e175a26b4652754b25ab01337"
   },
   "airgap-images-arm64-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.4%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
-    "sha256": "6bba0489d0b1ac542a9fcca64a6cf367ae6423f6e17478cca40f0ea4cfd01d31"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.5%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
+    "sha256": "bc085e02004382b15413e98457079e2a0a3d8f18b3c9a4a58917f1bc6064ea29"
   },
   "airgap-images-arm64-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.4%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
-    "sha256": "3ddac18185a554b42d53e79d80954ca7841ce48f511afe75fdf8485e0d88efe7"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.5%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
+    "sha256": "0bf33db3b0595166f1c36a6780ebd789343f50f23a4d61157519ada4d002919d"
   }
 }
diff --git a/pkgs/applications/networking/cluster/k3s/1_35/versions.nix b/pkgs/applications/networking/cluster/k3s/1_35/versions.nix
index 00fb9d2f8a9b..b9f0c59bf1ad 100644
--- a/pkgs/applications/networking/cluster/k3s/1_35/versions.nix
+++ b/pkgs/applications/networking/cluster/k3s/1_35/versions.nix
@@ -1,8 +1,8 @@
 {
-  k3sVersion = "1.35.4+k3s1";
-  k3sCommit = "5dc8fe6894219e2156c2ba82b1bee84cad674694";
-  k3sRepoSha256 = "0ilsxhfnn30h0lfajn6awz396g7ygm9n2syzsf09k0g1mv741gib";
-  k3sVendorHash = "sha256-PzRBM5cSCF3cGIEdvUrQ4x4PyV7rBpMZVP+tYJDH6oo=";
+  k3sVersion = "1.35.5+k3s1";
+  k3sCommit = "6a4781ad53ee5cad273bedcd9462ae36ac97d798";
+  k3sRepoSha256 = "1m6sy7p5v3kkg66mzsna9c4d1f7ly843ii42zmb2a26vxa0dicx3";
+  k3sVendorHash = "sha256-czE0ZJ9yWc3VSuPqjy4V+ViBGPriluMPmUK5aTk4DmY=";
   chartVersions = import ./chart-versions.nix;
   imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
   k3sRootVersion = "0.15.0";
@@ -17,5 +17,5 @@
   flannelPluginVersion = "v1.9.0-flannel1";
   kubeRouterVersion = "v2.6.3-k3s1";
   criDockerdVersion = "v0.3.19-k3s3";
-  helmJobVersion = "v0.9.17-build20260422";
+  helmJobVersion = "v0.10.0-build20260513";
 }

From f1a7b5ea4bd874227899f4c1e3f1583fd38e2d57 Mon Sep 17 00:00:00 2001
From: rorosen <robert.rose@mailbox.org>
Date: Mon, 25 May 2026 14:29:17 +0200
Subject: [PATCH 12/97] k3s_1_36: 1.36.0+k3s1 -> 1.36.1+k3s1

https://github.com/k3s-io/k3s/releases/tag/v1.36.1%2Bk3s1
---
 .../cluster/k3s/1_36/images-versions.json     | 24 +++++++++----------
 .../networking/cluster/k3s/1_36/versions.nix  | 10 ++++----
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/networking/cluster/k3s/1_36/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_36/images-versions.json
index e44898e22284..28aed9e04b27 100644
--- a/pkgs/applications/networking/cluster/k3s/1_36/images-versions.json
+++ b/pkgs/applications/networking/cluster/k3s/1_36/images-versions.json
@@ -1,26 +1,26 @@
 {
   "airgap-images-amd64-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.36.0%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
-    "sha256": "1b6dbb5cebc30c3218a5910a6c0503d2cd9a92a8c494d323c12c181d8d90e525"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.36.1%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
+    "sha256": "8aad05e71764f08eae8d4db9e5d42d892dce39c9eb79206514c4ee03f4293db1"
   },
   "airgap-images-amd64-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.36.0%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
-    "sha256": "1d98b5f32c85ae41371851e6c14b81bdb8960177b28ccd1deda55c1a05586704"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.36.1%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
+    "sha256": "72cf836bfcf8f9af2de88102b69129d297b77a60243895a7ac4bc47d77a65079"
   },
   "airgap-images-arm-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.36.0%2Bk3s1/k3s-airgap-images-arm.tar.gz",
-    "sha256": "d7ad1e1cb378e4638a92cee9358390b047adfc4c2d5f8fcb1247903c900255e2"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.36.1%2Bk3s1/k3s-airgap-images-arm.tar.gz",
+    "sha256": "639f155016f956764b212a1671a6e090100016505b34d3f45e76513fdd93cb5f"
   },
   "airgap-images-arm-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.36.0%2Bk3s1/k3s-airgap-images-arm.tar.zst",
-    "sha256": "9880d9f56c5ec9b61714aa27caab365b237f51ec272e27cfc3bfead5ae60eeee"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.36.1%2Bk3s1/k3s-airgap-images-arm.tar.zst",
+    "sha256": "4b16cc7a17bac0957db9df4ad937ce52792a696b0eb60944b52eb65447a0d1fa"
   },
   "airgap-images-arm64-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.36.0%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
-    "sha256": "2807168a82c3f9657540ac272afa186e6cf360cb068c35e5cad2e9447a8947a1"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.36.1%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
+    "sha256": "bc84f7965ef5f3a7e45e9f79f1090ef066fdd9bdb96d476c5d37cb13d0c2935b"
   },
   "airgap-images-arm64-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.36.0%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
-    "sha256": "65959cea20b4448096f6cd36e84b567dace2bf14f54c577de90c0b93ca559d2a"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.36.1%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
+    "sha256": "174e1e7cf8493ea8fb2550231de3e93fc2f3cec27f977236fd7ab90a18680eed"
   }
 }
diff --git a/pkgs/applications/networking/cluster/k3s/1_36/versions.nix b/pkgs/applications/networking/cluster/k3s/1_36/versions.nix
index aa02f8d37bba..a0c220c4ca8c 100644
--- a/pkgs/applications/networking/cluster/k3s/1_36/versions.nix
+++ b/pkgs/applications/networking/cluster/k3s/1_36/versions.nix
@@ -1,8 +1,8 @@
 {
-  k3sVersion = "1.36.0+k3s1";
-  k3sCommit = "09347304fd829ba8e9378bb16fe20bacba939e27";
-  k3sRepoSha256 = "1qdwqbfngxxzfjcq263lfhrp8khv6mi2a9yw06v0jswh41r42m3c";
-  k3sVendorHash = "sha256-Qli3CgKlUBhc8fwIJVB/89QH/jYXHn2K7y491BEj0Sk=";
+  k3sVersion = "1.36.1+k3s1";
+  k3sCommit = "a9663261a7ff40522542485a6b2f81916b6d72f9";
+  k3sRepoSha256 = "0788034bw5pl8ikfb16fvdhl8a3dhhfasrbafir6s9fb8q9h3z4z";
+  k3sVendorHash = "sha256-jX/qoRhVLZy/25fdhp5NOiRSGEatV/acBbSpjhutAzU=";
   chartVersions = import ./chart-versions.nix;
   imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
   k3sRootVersion = "0.15.0";
@@ -17,5 +17,5 @@
   flannelPluginVersion = "v1.9.0-flannel1";
   kubeRouterVersion = "v2.6.3-k3s1";
   criDockerdVersion = "v0.3.19-k3s5";
-  helmJobVersion = "v0.9.17-build20260422";
+  helmJobVersion = "v0.10.0-build20260513";
 }

From 44e4971df51f8492c9f3bbb3b1dc2786e75dd30c Mon Sep 17 00:00:00 2001
From: SkohTV <contact@skoh.dev>
Date: Mon, 25 May 2026 11:06:34 -0400
Subject: [PATCH 13/97] python3Packages.virtualenv-clone: migrate to pyproject

---
 .../python-modules/virtualenv-clone/default.nix            | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/virtualenv-clone/default.nix b/pkgs/development/python-modules/virtualenv-clone/default.nix
index cceee784a234..3333a15c6dfc 100644
--- a/pkgs/development/python-modules/virtualenv-clone/default.nix
+++ b/pkgs/development/python-modules/virtualenv-clone/default.nix
@@ -4,12 +4,13 @@
   fetchFromGitHub,
   virtualenv,
   pytestCheckHook,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "virtualenv-clone";
   version = "0.5.7";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "edwardgeorge";
@@ -18,6 +19,8 @@ buildPythonPackage rec {
     hash = "sha256-qrN74IwLRqiVPxU8gVhdiM34yBmiS/5ot07uroYPDVw=";
   };
 
+  build-system = [ setuptools ];
+
   postPatch = ''
     substituteInPlace tests/__init__.py \
       --replace-fail "'virtualenv'" "'${virtualenv}/bin/virtualenv'" \
@@ -35,7 +38,7 @@ buildPythonPackage rec {
         "pth = '$(mktemp -d)/test_fixup_pth_file.pth'"
   '';
 
-  propagatedBuildInputs = [ virtualenv ];
+  dependencies = [ virtualenv ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 

From 081558516516f004d9fc4022e1352f2a8c8077a6 Mon Sep 17 00:00:00 2001
From: SkohTV <contact@skoh.dev>
Date: Mon, 25 May 2026 11:07:18 -0400
Subject: [PATCH 14/97] python3Packages.virtualenv-clone: modernize

---
 .../python-modules/virtualenv-clone/default.nix        | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/virtualenv-clone/default.nix b/pkgs/development/python-modules/virtualenv-clone/default.nix
index 3333a15c6dfc..b9dc5c5736a5 100644
--- a/pkgs/development/python-modules/virtualenv-clone/default.nix
+++ b/pkgs/development/python-modules/virtualenv-clone/default.nix
@@ -7,7 +7,7 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "virtualenv-clone";
   version = "0.5.7";
   pyproject = true;
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "edwardgeorge";
     repo = "virtualenv-clone";
-    rev = version;
+    tag = finalAttrs.version;
     hash = "sha256-qrN74IwLRqiVPxU8gVhdiM34yBmiS/5ot07uroYPDVw=";
   };
 
@@ -23,11 +23,11 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace tests/__init__.py \
-      --replace-fail "'virtualenv'" "'${virtualenv}/bin/virtualenv'" \
+      --replace-fail "'virtualenv'" "'${lib.getExe virtualenv}'" \
       --replace-fail "'3.9', '3.10']" "'3.9', '3.10', '3.11', '3.12', '3.13', '3.14']" # if the Python version used isn't in this list, tests fail
 
     substituteInPlace tests/test_virtualenv_sys.py \
-      --replace-fail "'virtualenv'" "'${virtualenv}/bin/virtualenv'"
+      --replace-fail "'virtualenv'" "'${lib.getExe virtualenv}'"
 
     # PermissionError: [Errno 13] Permission denied: '/tmp/test_fixup_pth_file.pth'
     # Unable to reproduce.
@@ -49,4 +49,4 @@ buildPythonPackage rec {
     license = lib.licenses.mit;
     maintainers = [ ];
   };
-}
+})

From 0f29fb61da5c654e4f0a0128f53c9882e4261862 Mon Sep 17 00:00:00 2001
From: SkohTV <contact@skoh.dev>
Date: Mon, 25 May 2026 11:07:48 -0400
Subject: [PATCH 15/97] python3Packages.virtualenv-clone: adopt

---
 pkgs/development/python-modules/virtualenv-clone/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/virtualenv-clone/default.nix b/pkgs/development/python-modules/virtualenv-clone/default.nix
index b9dc5c5736a5..1549193592aa 100644
--- a/pkgs/development/python-modules/virtualenv-clone/default.nix
+++ b/pkgs/development/python-modules/virtualenv-clone/default.nix
@@ -47,6 +47,6 @@ buildPythonPackage (finalAttrs: {
     description = "Script to clone virtualenvs";
     mainProgram = "virtualenv-clone";
     license = lib.licenses.mit;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ skohtv ];
   };
 })

From aa74ca8c8a8199cf9e4af86e93f7126ab2d1e25a Mon Sep 17 00:00:00 2001
From: SkohTV <contact@skoh.dev>
Date: Mon, 25 May 2026 20:44:53 -0400
Subject: [PATCH 16/97] python3Packages.virtualenv-clone: add changelog

---
 pkgs/development/python-modules/virtualenv-clone/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/virtualenv-clone/default.nix b/pkgs/development/python-modules/virtualenv-clone/default.nix
index 1549193592aa..4181a1b5047d 100644
--- a/pkgs/development/python-modules/virtualenv-clone/default.nix
+++ b/pkgs/development/python-modules/virtualenv-clone/default.nix
@@ -46,6 +46,7 @@ buildPythonPackage (finalAttrs: {
     homepage = "https://github.com/edwardgeorge/virtualenv-clone";
     description = "Script to clone virtualenvs";
     mainProgram = "virtualenv-clone";
+    changelog = "https://github.com/edwardgeorge/virtualenv-clone/blob/${finalAttrs.src.tag}/changelog.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ skohtv ];
   };

From d90af5fb0a2c853e44f6b2cd42be6f59431c4100 Mon Sep 17 00:00:00 2001
From: 2kybe3 <kybe@kybe.xyz>
Date: Tue, 26 May 2026 09:52:45 +0200
Subject: [PATCH 17/97] pid1: 0.1.3 -> 0.1.6

diff: https://github.com/fpco/pid1-rs/compare/v0.1.3...v0.1.6
changelog: https://github.com/fpco/pid1-rs/blob/v0.1.6/CHANGELOG.md
---
 pkgs/by-name/pi/pid1/package.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/pi/pid1/package.nix b/pkgs/by-name/pi/pid1/package.nix
index 129884cd60ce..330cd6520ca7 100644
--- a/pkgs/by-name/pi/pid1/package.nix
+++ b/pkgs/by-name/pi/pid1/package.nix
@@ -6,20 +6,26 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "pid1";
-  version = "0.1.3";
+  version = "0.1.6";
+
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "fpco";
     repo = "pid1-rs";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-2dnQj3AQxedyq1YvHKt+lVXNEtuB5sMRSCqX9YeifzI=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-edxDCVEVg4s2RF3wjiUjQ4wfusFM3COUTl5nsCH4ScE=";
   };
 
-  cargoHash = "sha256-ldHtmbLoSFVxb0B3Oj21UOFNSXwu8xAPhpE8jBqOwr4=";
+  cargoHash = "sha256-mXZszLmIOEq3ZL6cJhrhBCi0bHNgbKG6gr6Rf4iFvEM=";
+
+  # all tests require docker env
+  doCheck = false;
 
   meta = {
     description = "Signal handling and zombie reaping for PID1 process";
     homepage = "https://github.com/fpco/pid1-rs";
+    changelog = "https://github.com/fpco/pid1-rs/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ psibi ];
     mainProgram = "pid1";

From 8f4fcd064fcdc7821a5390f44782a2433576cf6b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 May 2026 12:40:20 +0000
Subject: [PATCH 18/97] snapraid: 14.4 -> 14.5

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

diff --git a/pkgs/by-name/sn/snapraid/package.nix b/pkgs/by-name/sn/snapraid/package.nix
index f47a04578e50..1de2854dd754 100644
--- a/pkgs/by-name/sn/snapraid/package.nix
+++ b/pkgs/by-name/sn/snapraid/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "snapraid";
-  version = "14.4";
+  version = "14.5";
 
   src = fetchFromGitHub {
     owner = "amadvance";
     repo = "snapraid";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-zkKdJwRcOmrSWX7CHHTAlL2GYbVjLkNVFficBum86F8=";
+    hash = "sha256-Krd39k3yfoKhvcMzOYkOhoNKE/eL7jc3/RaWN1ZuwG0=";
   };
 
   env.VERSION = finalAttrs.version;

From 76bac12323dbfca3c7b62ad1a1ef7576d56735f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 27 May 2026 16:57:34 +0200
Subject: [PATCH 19/97] 
 home-assistant-custom-lovelace-modules.tankerkoenig-card: init at 1.7.2

---
 .../tankerkoenig-card/package.nix             | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 pkgs/servers/home-assistant/custom-lovelace-modules/tankerkoenig-card/package.nix

diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/tankerkoenig-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/tankerkoenig-card/package.nix
new file mode 100644
index 000000000000..eedc146d672c
--- /dev/null
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/tankerkoenig-card/package.nix
@@ -0,0 +1,36 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+}:
+
+buildNpmPackage (finalAttrs: {
+  pname = "tankerkoenig-card";
+  version = "1.7.2";
+
+  src = fetchFromGitHub {
+    owner = "timmaurice";
+    repo = "lovelace-tankerkoenig-card";
+    tag = finalAttrs.version;
+    hash = "sha256-XBgroe7DT8fAaRkwcI5VU69jt1NnPiTcbjQovmrc200=";
+  };
+
+  npmDepsHash = "sha256-Bcu0K4SSDUyYFgYqk1HdjJA6jJSAO7Z53sUOEihv2T4=";
+
+  installPhase = ''
+    runHook preInstall
+
+    install ./dist/tankerkoenig-card.js -Dt $out
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Lovelace card to display German fuel prices from Tankerkönig";
+    homepage = "https://github.com/timmaurice/lovelace-tankerkoenig-card";
+    changelog = "https://github.com/timmaurice/lovelace-tankerkoenig-card/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ SuperSandro2000 ];
+    platforms = lib.platforms.all;
+  };
+})

From 40f502d12df0feee728c51d655c16f0fd25c00c4 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Fri, 29 May 2026 01:39:01 +0200
Subject: [PATCH 20/97] lomiri-qt6.qqc2-suru-style: init at 0.20230630

---
 pkgs/desktops/lomiri/default.nix              |  2 +-
 .../lomiri/qml/qqc2-suru-style/default.nix    | 65 ++++++++++++++++---
 2 files changed, 57 insertions(+), 10 deletions(-)

diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix
index 7fb27d2d29c1..830934908149 100644
--- a/pkgs/desktops/lomiri/default.nix
+++ b/pkgs/desktops/lomiri/default.nix
@@ -38,6 +38,7 @@ let
       };
       lomiri-ui-extras = callPackage ./qml/lomiri-ui-extras { };
       lomiri-ui-toolkit = callPackage ./qml/lomiri-ui-toolkit { };
+      qqc2-suru-style = callPackage ./qml/qqc2-suru-style { };
 
       #### Services
       biometryd = callPackage ./services/biometryd { };
@@ -90,7 +91,6 @@ let
       lomiri-notifications = callPackage ./qml/lomiri-notifications { };
       lomiri-push-qml = callPackage ./qml/lomiri-push-qml { };
       lomiri-settings-components = callPackage ./qml/lomiri-settings-components { };
-      qqc2-suru-style = callPackage ./qml/qqc2-suru-style { };
 
       #### Services
       hfd-service = callPackage ./services/hfd-service { };
diff --git a/pkgs/desktops/lomiri/qml/qqc2-suru-style/default.nix b/pkgs/desktops/lomiri/qml/qqc2-suru-style/default.nix
index 809cceec9006..02a489678f25 100644
--- a/pkgs/desktops/lomiri/qml/qqc2-suru-style/default.nix
+++ b/pkgs/desktops/lomiri/qml/qqc2-suru-style/default.nix
@@ -2,12 +2,24 @@
   stdenv,
   lib,
   fetchFromGitLab,
+  fetchpatch,
   gitUpdater,
+  cmake,
   qmake,
+  qtbase,
   qtdeclarative,
-  qtquickcontrols2,
+
+  # Qt5-only
+  qtgraphicaleffects ? null,
+  qtquickcontrols2 ? null,
+
+  # Qt6-only
+  qt5compat ? null,
 }:
 
+let
+  withQt6 = lib.strings.versionAtLeast qtbase.version "6";
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "qqc2-suru-style";
   version = "0.20230630";
@@ -19,16 +31,51 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-kAgHsNWwUWxHg26bTMmlq8m9DR4+ob4pl/oUX7516hM=";
   };
 
-  # QMake can't find Qt modules from buildInputs
-  strictDeps = false;
-
-  nativeBuildInputs = [ qmake ];
-
-  buildInputs = [
-    qtdeclarative
-    qtquickcontrols2
+  patches = [
+    # https://gitlab.com/ubports/development/core/qqc2-suru-style/-/merge_requests/69
+    # Remove when version > 0.20230630
+    (fetchpatch {
+      name = "0001-qqc2-suru-style-Qt6-port.patch";
+      url = "https://gitlab.com/ubports/development/core/qqc2-suru-style/-/commit/30b662113900ce2a4e27a0647e439ffdba5fd609.patch";
+      hash = "sha256-RCXEhDUgMqi+oeY313hXOVTr3rGiyF/Mqe/Uf4+YaBU=";
+    })
   ];
 
+  postPatch = ''
+    substituteInPlace qqc2-suru/suru.pri \
+      --replace-fail '$$[QT_INSTALL_QML]' "$out/${qtbase.qtQmlPrefix}"
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail \
+        "\''${CMAKE_INSTALL_LIBDIR}/qt\''${QT_MAJOR_VERSION}/qml" \
+        '${qtbase.qtQmlPrefix}'
+  '';
+
+  # QMake can't find Qt modules from buildInputs
+  strictDeps = withQt6;
+
+  nativeBuildInputs = lib.optionals (!withQt6) [ qmake ] ++ lib.optionals withQt6 [ cmake ];
+
+  propagatedBuildInputs = [
+    qtdeclarative
+  ]
+  ++ lib.optionals (!withQt6) [
+    # Qt6: Deprecated, moved to core5compat
+    qtgraphicaleffects
+
+    # Qt6: Folded into qtdeclarative
+    qtquickcontrols2
+  ]
+  ++ lib.optionals withQt6 [
+    # Not ported away from qtgraphicaleffects yet
+    qt5compat
+  ];
+
+  cmakeFlags = [
+    (lib.strings.cmakeFeature "QT_VERSION_MAJOR" (lib.versions.major qtbase.version))
+  ];
+
+  # QML plugin
   dontWrapQtApps = true;
 
   passthru.updateScript = gitUpdater { };

From de294ca3ebbcee905d4fb04421f2fb759eb56afa Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Wed, 29 Apr 2026 16:07:57 +0200
Subject: [PATCH 21/97] lomiri-qt6.morph-browser: Enable QQC2 Suru style

---
 .../1501-Re-enable-Suru-style-in-Qt6.patch    | 73 +++++++++++++++++++
 .../applications/morph-browser/default.nix    | 12 +--
 2 files changed, 80 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/desktops/lomiri/applications/morph-browser/1501-Re-enable-Suru-style-in-Qt6.patch

diff --git a/pkgs/desktops/lomiri/applications/morph-browser/1501-Re-enable-Suru-style-in-Qt6.patch b/pkgs/desktops/lomiri/applications/morph-browser/1501-Re-enable-Suru-style-in-Qt6.patch
new file mode 100644
index 000000000000..967680104f23
--- /dev/null
+++ b/pkgs/desktops/lomiri/applications/morph-browser/1501-Re-enable-Suru-style-in-Qt6.patch
@@ -0,0 +1,73 @@
+From babdb3f2eabd0bb9a713817bd8cec6320160a53f Mon Sep 17 00:00:00 2001
+From: OPNA2608 <opna2608@protonmail.com>
+Date: Wed, 29 Apr 2026 15:37:31 +0200
+Subject: [PATCH 1/2] src/app: Re-enable Suru style in Qt6
+
+---
+ src/app/browserapplication.cpp          | 12 +++---------
+ src/app/qml-qt6/ContentExportDialog.qml |  8 --------
+ 2 files changed, 3 insertions(+), 17 deletions(-)
+
+diff --git a/src/app/browserapplication.cpp b/src/app/browserapplication.cpp
+index 0bd70309..98a50bac 100644
+--- a/src/app/browserapplication.cpp
++++ b/src/app/browserapplication.cpp
+@@ -193,21 +193,15 @@ bool BrowserApplication::initialize(const QString& qmlFileSubPath
+         qputenv("UBUNTU_WEBVIEW_DEVTOOLS_PORT", devtoolsPort.toUtf8());
+     }
+ 
+-    // FIXME re-enable Suru theme once it is available for Qt 6
+-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+     // set suru style
+     if (qgetenv("QT_QUICK_CONTROLS_STYLE") == QString())
+     {
++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+         qputenv("QT_QUICK_CONTROLS_STYLE", "Suru");
+-    }
+ #else
+-    // This is a bit of a hack, as we don't seem to have a way to set QQC2 style
+-    // per-Qt-version...
+-    if (qgetenv("QT_QUICK_CONTROLS_STYLE") == "Suru")
+-    {
+-        qunsetenv("QT_QUICK_CONTROLS_STYLE");
+-    }
++        qputenv("QT_QUICK_CONTROLS_STYLE", "QtQuick.Controls.Suru");
+ #endif
++    }
+ 
+     const char* uri = "webbrowsercommon.private";
+     qmlRegisterSingletonType<BrowserUtils>(uri, 0, 1, "BrowserUtils", BrowserUtils_singleton_factory);
+diff --git a/src/app/qml-qt6/ContentExportDialog.qml b/src/app/qml-qt6/ContentExportDialog.qml
+index 08aac589..c90b4880 100644
+--- a/src/app/qml-qt6/ContentExportDialog.qml
++++ b/src/app/qml-qt6/ContentExportDialog.qml
+@@ -21,9 +21,7 @@ import Lomiri.Components
+ import Lomiri.Components.Popups
+ import Lomiri.Content 2.0
+ import QtQuick.Controls 2.5 as QQC2
+-/* FIXME: re-enable once Suru has been ported to Qt 6
+ import QtQuick.Controls.Suru 2.2
+-*/
+ 
+ import webbrowsercommon.private 0.1
+ 
+@@ -57,16 +55,10 @@ QQC2.Dialog {
+     closePolicy: QQC2.Popup.CloseOnEscape | QQC2.Popup.CloseOnPressOutside
+     modal: true
+ 
+-    /* FIXME: re-enable once Suru has been ported to Qt 6
+     QQC2.Overlay.modal: Rectangle {
+         color: Suru.overlayColor
+         Behavior on opacity { NumberAnimation { duration: Suru.animations.FastDuration } }
+     }
+-    */
+-    QQC2.Overlay.modal: Rectangle {
+-        color: Qt.rgba(0, 0, 0, 0.85)
+-        Behavior on opacity { NumberAnimation { duration: 165 } }
+-    }
+ 
+     function openDialog(_downloadPath, _contentType, _mimeType, _downloadURL, _fileName){
+         path = _downloadPath
+-- 
+2.51.2
+
diff --git a/pkgs/desktops/lomiri/applications/morph-browser/default.nix b/pkgs/desktops/lomiri/applications/morph-browser/default.nix
index 346d7b05cf01..8b7866bba648 100644
--- a/pkgs/desktops/lomiri/applications/morph-browser/default.nix
+++ b/pkgs/desktops/lomiri/applications/morph-browser/default.nix
@@ -15,7 +15,7 @@
   lomiri-ui-toolkit,
   mesa,
   pkg-config,
-  qqc2-suru-style ? null,
+  qqc2-suru-style,
   qt5compat ? null,
   qtbase,
   qtdeclarative,
@@ -50,6 +50,11 @@ stdenv.mkDerivation (finalAttrs: {
     "doc"
   ];
 
+  patches = [
+    # https://gitlab.com/ubports/development/core/morph-browser/-/merge_requests/626
+    ./1501-Re-enable-Suru-style-in-Qt6.patch
+  ];
+
   postPatch = ''
     substituteInPlace src/Morph/CMakeLists.txt \
       --replace-fail '/usr/lib/''${CMAKE_LIBRARY_ARCHITECTURE}/qt''${QT_VERSION_MAJOR}/qml' "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}"
@@ -90,12 +95,9 @@ stdenv.mkDerivation (finalAttrs: {
     lomiri-content-hub
     lomiri-ui-extras
     lomiri-ui-toolkit
+    qqc2-suru-style
   ]
   ++ lib.optionals (!withQt6) [
-    # Not ported to Qt6 yet, explicitly disabled in the Qt6 build
-    # https://gitlab.com/ubports/development/core/morph-browser/-/blob/4f20c943e78694818d1b80b5563bd89901230e75/src/app/browserapplication.cpp#L196
-    qqc2-suru-style
-
     # Folded into qtdeclarative in Qt6
     qtquickcontrols2
 

From d95db34ef9ae6640bdc359964acc6b1d057e37a9 Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Fri, 29 May 2026 11:21:17 +0200
Subject: [PATCH 22/97] varnish60: drop

uses EOL pcre, complicates our handling inside Nixpkgs.
There are much newer versions available.
---
 .../services/web-servers/varnish/default.nix  | 17 ++----
 nixos/tests/all-tests.nix                     |  4 --
 nixos/tests/varnish.nix                       | 30 ++++-------
 pkgs/servers/varnish/default.nix              | 40 ++------------
 pkgs/servers/varnish/digest.nix               | 52 -------------------
 pkgs/servers/varnish/dynamic.nix              | 41 ---------------
 pkgs/servers/varnish/modules.nix              |  4 --
 pkgs/servers/varnish/packages.nix             | 16 ------
 pkgs/top-level/aliases.nix                    |  2 +
 pkgs/top-level/all-packages.nix               |  2 -
 10 files changed, 18 insertions(+), 190 deletions(-)
 delete mode 100644 pkgs/servers/varnish/digest.nix
 delete mode 100644 pkgs/servers/varnish/dynamic.nix

diff --git a/nixos/modules/services/web-servers/varnish/default.nix b/nixos/modules/services/web-servers/varnish/default.nix
index 3d6a41498a70..853db01f0204 100644
--- a/nixos/modules/services/web-servers/varnish/default.nix
+++ b/nixos/modules/services/web-servers/varnish/default.nix
@@ -21,20 +21,9 @@ let
   # Varnish has very strong opinions and very complicated code around handling
   # the stateDir. After a lot of back and forth, we decided that we a)
   # do not want a configurable option here, as most of the handling depends
-  # on the version and the compile time options. Putting everything into
-  # /var/run (RAM backed) is absolutely recommended by Varnish anyways.
-  # We do need to pay attention to the version-dependend variations, though!
-  stateDir =
-    if
-      (lib.versionOlder cfg.package.version "7")
-    # Remove after Varnish 6.0 is gone. In 6.0 varnishadm always appends the
-    # hostname (by default) and can't be nudged to not use any name. This has
-    # long changed by 7.5 and can be used without the host name.
-    then
-      "/var/run/varnish/${config.networking.hostName}"
-    # Newer varnish uses this:
-    else
-      "/var/run/varnishd";
+  # on the compile time options. Putting everything into /var/run (RAM backed)
+  # is absolutely recommended by Varnish anyways.
+  stateDir = "/var/run/varnishd";
 
   # from --help:
   #   -a [<name>=]address[:port][,proto] # HTTP listen address and port
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index f9ecf72845ed..1705979363a3 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1757,10 +1757,6 @@ in
   utils = import ./utils { inherit runTest; };
   uwsgi = runTest ./uwsgi.nix;
   v2ray = runTest ./v2ray.nix;
-  varnish60 = runTest {
-    imports = [ ./varnish.nix ];
-    _module.args.package = pkgs.varnish60;
-  };
   varnish80 = runTest {
     imports = [ ./varnish.nix ];
     _module.args.package = pkgs.varnish80;
diff --git a/nixos/tests/varnish.nix b/nixos/tests/varnish.nix
index e90420d1334e..a234765aed63 100644
--- a/nixos/tests/varnish.nix
+++ b/nixos/tests/varnish.nix
@@ -3,12 +3,7 @@ let
   testPath = pkgs.hello;
 
   # Same stateDir logic as in nixos/modules/services/web-servers/varnish/default.nix
-  stateDir =
-    hostName:
-    if (pkgs.lib.versionOlder package.version "7") then
-      "/var/run/varnish/${hostName}"
-    else
-      "/var/run/varnishd";
+  stateDir = "/var/run/varnishd";
 in
 {
   name = "varnish";
@@ -46,14 +41,11 @@ in
               proto = "PROXY";
             }
             {
-              address = "${stateDir config.networking.hostName}/client.http.sock";
+              address = "/var/run/varnishd/client.http.sock";
               user = "varnish";
               group = "varnish";
               mode = "660";
             }
-          ]
-          ++ lib.optionals (lib.versionAtLeast package.version "7.3") [
-            # Support added in 7.3.0
             { address = "@asdf"; }
           ];
           config = ''
@@ -78,17 +70,13 @@ in
               assertion = lib.hasInfix pattern cmdline;
               message = "Address argument `${pattern}` missing in commandline `${cmdline}`.";
             })
-            (
-              [
-                " -a 0.0.0.0:80,HTTP "
-                " -a proxyport=0.0.0.0:8080,PROXY "
-                " -a ${stateDir config.networking.hostName}/client.http.sock,HTTP,user=varnish,group=varnish,mode=660 "
-                " -a 0.0.0.0:81 "
-              ]
-              ++ lib.optionals (lib.versionAtLeast package.version "7.3") [
-                " -a @asdf,HTTP "
-              ]
-            );
+            [
+              " -a 0.0.0.0:80,HTTP "
+              " -a proxyport=0.0.0.0:8080,PROXY "
+              " -a /var/run/varnishd/client.http.sock,HTTP,user=varnish,group=varnish,mode=660 "
+              " -a 0.0.0.0:81 "
+              " -a @asdf,HTTP "
+            ];
       };
 
     client =
diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index 14b9ccde0eb6..1c7d0a8b6d7f 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -2,9 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  fetchpatch2,
   buildPackages,
-  pcre,
   pcre2,
   jemalloc,
   libunwind,
@@ -51,9 +49,8 @@ let
         readline
         libedit
         python3
+        pcre2
       ]
-      ++ lib.optional (lib.versionOlder version "7") pcre
-      ++ lib.optional (lib.versionAtLeast version "7") pcre2
       ++ lib.optional stdenv.hostPlatform.isDarwin libunwind
       ++ lib.optional stdenv.hostPlatform.isLinux jemalloc;
 
@@ -67,33 +64,9 @@ let
 
       buildFlags = [ "localstatedir=/var/run" ];
 
-      patches =
-        lib.optionals
-          (stdenv.hostPlatform.isDarwin && lib.versionAtLeast version "7.7" && lib.versionOlder version "8.0")
-          [
-            # Fix VMOD section attribute on macOS
-            # Unreleased commit on master
-            (fetchpatch2 {
-              url = "https://github.com/varnishcache/varnish-cache/commit/a95399f5b9eda1bfdba6ee6406c30a1ed0720167.patch";
-              hash = "sha256-T7DIkmnq0O+Cr9DTJS4/rOtg3J6PloUo8jHMWoUZYYk=";
-            })
-            # Fix endian.h compatibility on macOS
-            # PR: https://github.com/varnishcache/varnish-cache/pull/4339
-            ./patches/0001-fix-endian-h-compatibility-on-macos.patch
-          ]
-        ++ lib.optionals (stdenv.hostPlatform.isDarwin && lib.versionOlder version "7.6") [
-          # Fix duplicate OS_CODE definitions on macOS
-          # PR: https://github.com/varnishcache/varnish-cache/pull/4347
-          ./patches/0002-fix-duplicate-os-code-definitions-on-macos.patch
-        ];
-
-      postPatch =
-        lib.optionalString (lib.versionOlder version "8.0") ''
-          substituteInPlace bin/varnishtest/vtc_main.c --replace-fail /bin/rm "${coreutils}/bin/rm"
-        ''
-        + lib.optionalString (lib.versionAtLeast version "8.0") ''
-          substituteInPlace bin/varnishtest/vtest2/src/vtc_main.c --replace-fail /bin/rm "${coreutils}/bin/rm"
-        '';
+      postPatch = ''
+        substituteInPlace bin/varnishtest/vtest2/src/vtc_main.c --replace-fail /bin/rm "${coreutils}/bin/rm"
+      '';
 
       postConfigure = lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
         # prevent cache invalidation
@@ -152,11 +125,6 @@ let
     };
 in
 {
-  # EOL (LTS) TBA
-  varnish60 = common {
-    version = "6.0.18";
-    hash = "sha256-AULWbT0Mz/12TOcsa6vkiJGmwNIb+lxKJMyyvqo1x/A=";
-  };
   # EOL 2026-09-15
   varnish80 = common {
     version = "8.0.2";
diff --git a/pkgs/servers/varnish/digest.nix b/pkgs/servers/varnish/digest.nix
deleted file mode 100644
index fcf4dde38249..000000000000
--- a/pkgs/servers/varnish/digest.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  autoreconfHook,
-  pkg-config,
-  varnish,
-  libmhash,
-  docutils,
-  coreutils,
-  version,
-  sha256,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "${varnish.name}-digest";
-  inherit version;
-
-  src = fetchFromGitHub {
-    owner = "varnish";
-    repo = "libvmod-digest";
-    rev = version;
-    inherit sha256;
-  };
-
-  nativeBuildInputs = [
-    autoreconfHook
-    pkg-config
-    docutils
-  ];
-  buildInputs = [
-    varnish
-    libmhash
-  ];
-
-  postPatch = ''
-    substituteInPlace autogen.sh  --replace "''${dataroot}/aclocal"                  "${varnish.dev}/share/aclocal"
-    substituteInPlace Makefile.am --replace "''${LIBVARNISHAPI_DATAROOTDIR}/aclocal" "${varnish.dev}/share/aclocal"
-  '';
-
-  configureFlags = [ "VMOD_DIR=$(out)/lib/varnish/vmods" ];
-
-  env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=deprecated-declarations" ];
-
-  doCheck = true;
-
-  meta = {
-    description = "Digest and HMAC vmod";
-    homepage = "https://github.com/varnish/libvmod-digest";
-    inherit (varnish.meta) license platforms;
-  };
-}
diff --git a/pkgs/servers/varnish/dynamic.nix b/pkgs/servers/varnish/dynamic.nix
deleted file mode 100644
index b366fb466efb..000000000000
--- a/pkgs/servers/varnish/dynamic.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  autoreconfHook,
-  pkg-config,
-  varnish,
-  docutils,
-  version,
-  sha256,
-}:
-
-stdenv.mkDerivation {
-  pname = "${varnish.name}-dynamic";
-  inherit version;
-
-  src = fetchFromGitHub {
-    owner = "nigoroll";
-    repo = "libvmod-dynamic";
-    rev = "v${version}";
-    inherit sha256;
-  };
-
-  nativeBuildInputs = [
-    pkg-config
-    docutils
-    autoreconfHook
-    varnish.python
-  ];
-  buildInputs = [ varnish ];
-  postPatch = ''
-    substituteInPlace Makefile.am --replace "''${LIBVARNISHAPI_DATAROOTDIR}/aclocal" "${varnish.dev}/share/aclocal"
-  '';
-  configureFlags = [ "VMOD_DIR=$(out)/lib/varnish/vmods" ];
-
-  meta = {
-    description = "Dynamic director similar to the DNS director from Varnish 3";
-    homepage = "https://github.com/nigoroll/libvmod-dynamic";
-    inherit (varnish.meta) license platforms;
-  };
-}
diff --git a/pkgs/servers/varnish/modules.nix b/pkgs/servers/varnish/modules.nix
index 557032cfc976..8bebcf348ea2 100644
--- a/pkgs/servers/varnish/modules.nix
+++ b/pkgs/servers/varnish/modules.nix
@@ -51,10 +51,6 @@ let
     };
 in
 {
-  modules15 = common {
-    version = "0.15.1";
-    hash = "sha256-Et/iWOk2FWJBDOpKjNXm4Nh5i1SU4zVPaID7kh+Uj9M=";
-  };
   modules27 = common {
     version = "0.27.0";
     hash = "sha256-1hE+AKsC6Td+Al7LFN6bgPicU8dtWd3A8PP7VKZLvYM=";
diff --git a/pkgs/servers/varnish/packages.nix b/pkgs/servers/varnish/packages.nix
index f5d6ffb1afb8..7fd75b4f45ea 100644
--- a/pkgs/servers/varnish/packages.nix
+++ b/pkgs/servers/varnish/packages.nix
@@ -1,25 +1,9 @@
 {
   callPackages,
-  callPackage,
-  varnish60,
   varnish80,
   lib,
 }:
 {
-  varnish60Packages = lib.recurseIntoAttrs rec {
-    varnish = varnish60;
-    modules = (callPackages ./modules.nix { inherit varnish; }).modules15;
-    digest = callPackage ./digest.nix {
-      inherit varnish;
-      version = "libvmod-digest-1.0.2";
-      sha256 = "0jwkqqalydn0pwfdhirl5zjhbc3hldvhh09hxrahibr72fgmgpbx";
-    };
-    dynamic = callPackage ./dynamic.nix {
-      inherit varnish;
-      version = "0.4";
-      sha256 = "1n94slrm6vn3hpymfkla03gw9603jajclg84bjhwb8kxsk3rxpmk";
-    };
-  };
   varnish80Packages = lib.recurseIntoAttrs rec {
     varnish = varnish80;
     modules = (callPackages ./modules.nix { inherit varnish; }).modules27;
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index aadc6a1d69f3..2f9e017002ce 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2175,6 +2175,8 @@ mapAliases {
   valum = throw "'valum' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
   vamp.vampSDK = throw "'vamp.vampSDK' has been renamed to/replaced by 'vamp-plugin-sdk'"; # Converted to throw 2025-10-27
   vapoursynth-nnedi3 = throw "'vapoursynth-nnedi3' has been removed per upstream. Use vapoursynth-znedi3 instead."; # Added 2026-04-20
+  varnish60 = throw "varnish 6.0 has been removed as it used unmaintaned dependencies. Please upgrade to 'varnish80' or 'vinyl-cache_9'."; # Added 2026-05-29
+  varnish60Packages = throw "varnish 6.0 has been removed as it used unmaintained dependencies.  Please upgrade to 'varnish80' or 'vinyl-cache_9'."; # Added 2026-05-29
   varnish77 = throw "varnish 7.7 is EOL. Please upgrade to 'varnish80' or 'vinyl-cache_9'."; # Added 2026-05-01
   varnish77Packages = throw "varnish 7.7 is EOL. Please upgrade to 'varnish80' or 'vinyl-cache_9'."; # Added 2026-05-01
   vaultwarden-vault = throw "'vaultwarden-vault' has been renamed to/replaced by 'vaultwarden.webvault'"; # Converted to throw 2025-10-27
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4f2b40617728..1580b9ebe086 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3402,11 +3402,9 @@ with pkgs;
   unzipNLS = lowPrio (unzip.override { enableNLS = true; });
 
   inherit (callPackages ../servers/varnish { })
-    varnish60
     varnish80
     ;
   inherit (callPackages ../servers/varnish/packages.nix { })
-    varnish60Packages
     varnish80Packages
     ;
   varnishPackages = varnish80Packages;

From 955fd93583d75e2783b9ed465781aada20a259a0 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Fri, 22 May 2026 11:30:41 +0200
Subject: [PATCH 23/97] dutctl: init at 0-unstable-2026-05-21

Assisted-By: nix-init
Assisted-By: Claude Sonnet 4.6 and MiniMax M2.5 (passthru tests)
---
 pkgs/by-name/du/dutctl/package.nix | 62 ++++++++++++++++++++++++
 pkgs/by-name/du/dutctl/test.nix    | 78 ++++++++++++++++++++++++++++++
 2 files changed, 140 insertions(+)
 create mode 100644 pkgs/by-name/du/dutctl/package.nix
 create mode 100644 pkgs/by-name/du/dutctl/test.nix

diff --git a/pkgs/by-name/du/dutctl/package.nix b/pkgs/by-name/du/dutctl/package.nix
new file mode 100644
index 000000000000..7b10aa2cb912
--- /dev/null
+++ b/pkgs/by-name/du/dutctl/package.nix
@@ -0,0 +1,62 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  nix-update-script,
+
+  # tests
+  callPackage,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "dutctl";
+  version = "0-unstable-2026-05-21";
+
+  src = fetchFromGitHub {
+    owner = "BlindspotSoftware";
+    repo = "dutctl";
+    rev = "710bbcd16264e62af932698a229f9be2f83f6286";
+    hash = "sha256-SJfnUUo5vmmwa8qFLY4KaVyjyVnlEcVqLU1Yo3PjWug=";
+  };
+
+  vendorHash = "sha256-vOBz9gi/cnUJ04ns1ZOgfNqzbVBE3Fd3oOfV04VSmFQ=";
+
+  ldflags = [
+    "-s"
+  ];
+
+  passthru = {
+    updateScript = nix-update-script {
+      extraArgs = [ "--version=branch" ];
+    };
+
+    tests = callPackage ./test.nix {
+      dutctl = finalAttrs.finalPackage;
+    };
+  };
+
+  __structuredAttrs = true;
+
+  meta = {
+    description = "Unified device management for open firmware development";
+    longDescription = ''
+      dutctl stands for "Device-under-Test Control" and is an open-source
+      command-line utility and service ecosystem for managing development and
+      test devices in firmware environments.
+
+      By providing a unified interface to interact with boards and test
+      fixtures across platforms, dutctl eliminates the fragmentation of device
+      management tools that has long plagued firmware workflows.
+
+      The project features remote device control, command streaming,
+      multi-architecture testing, and a flexible plugin architecture for
+      extensibility.
+    '';
+    homepage = "https://github.com/BlindspotSoftware/dutctl";
+    changelog = "https://github.com/BlindspotSoftware/dutctl/blob/${finalAttrs.src.rev}/CHANGELOG.md";
+    mainProgram = "dutctl";
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ eljamm ];
+    teams = with lib.teams; [ ngi ];
+  };
+})
diff --git a/pkgs/by-name/du/dutctl/test.nix b/pkgs/by-name/du/dutctl/test.nix
new file mode 100644
index 000000000000..481335ecd44a
--- /dev/null
+++ b/pkgs/by-name/du/dutctl/test.nix
@@ -0,0 +1,78 @@
+{
+  runCommand,
+  writeScriptBin,
+  expect,
+
+  dutctl,
+}:
+let
+  dutctl-test =
+    runCommand "test-dutctl-basic"
+      {
+        nativeBuildInputs = [
+          dutctl
+          interactive-repeat-test
+        ];
+      }
+      ''
+        cfg="${dutctl.src}/contrib/dutagent-cfg-example.yaml"
+
+        # start agent
+        dutagent -a localhost:1024 -c "$cfg" &
+        agent_pid=$!
+        trap 'kill "$agent_pid" 2>/dev/null || true' EXIT
+
+        # wait for agent to become ready
+        for i in $(seq 1 10); do
+          dutctl list 2>/dev/null | grep -q device1 && break
+          [ "$i" -eq 10 ] && { echo "FAIL: agent timed out"; exit 1; }
+          sleep 1
+        done
+        echo "PASS: agent ready"
+
+        # verify device status
+        dutctl device1 status > status.out
+        grep -q "Hello from dummy status module" status.out
+        echo "PASS: device1 status"
+
+        # run interactive repeat test
+        repeat-test
+
+        touch $out
+      '';
+
+  interactive-repeat-test = writeScriptBin "repeat-test" ''
+    #!${expect}/bin/expect -f
+
+    spawn dutctl device2 repeat
+
+    expect {
+      "Hello from dummy repeat module!" {}
+      timeout { puts "FAIL: no greeting"; exit 1 }
+    }
+
+    send "hello\r"
+    expect {
+      "hello" {}
+      timeout { puts "FAIL: no echo"; exit 1 }
+    }
+
+    send "stop now\r"
+    expect {
+      "Oh no! Can only handle one word per line." {}
+      timeout { puts "FAIL: no termination msg"; exit 1 }
+    }
+
+    # wait for the process to finish and collect its exit code
+    expect eof
+    lassign [wait] pid spawnid os_error exit_code
+
+    if {$exit_code != 0} {
+      puts "FAIL: exit $exit_code"
+      exit 1
+    }
+
+    puts "PASS: interactive repeat"
+  '';
+in
+dutctl-test

From 25bdb504c576b9c313ba5275eabc4d71109b1094 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 29 May 2026 12:29:13 +0000
Subject: [PATCH 24/97] whisper-cpp-vulkan: 1.8.4 -> 1.8.5

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

diff --git a/pkgs/by-name/wh/whisper-cpp/package.nix b/pkgs/by-name/wh/whisper-cpp/package.nix
index 7d031fe3a93d..9684826bb140 100644
--- a/pkgs/by-name/wh/whisper-cpp/package.nix
+++ b/pkgs/by-name/wh/whisper-cpp/package.nix
@@ -81,13 +81,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "whisper-cpp";
-  version = "1.8.4";
+  version = "1.8.5";
 
   src = fetchFromGitHub {
     owner = "ggml-org";
     repo = "whisper.cpp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-YCuWKDKlrhbx+t3t2kDpAwuKt4rkipDsOXO6uqIU/W0=";
+    hash = "sha256-wZYSk0IVCL8bt00HVo6iqXS31GZJ2C8Z2be6wiMs7l8=";
   };
 
   # The upstream download script tries to download the models to the

From b9d4b037e2ab92b53ab4ffdf2729630949162cfc Mon Sep 17 00:00:00 2001
From: Marc Jakobi <marc@jakobi.dev>
Date: Fri, 29 May 2026 19:10:57 +0200
Subject: [PATCH 25/97] luaPackages.vicious: 2.6.0 -> 2.7.1

---
 pkgs/top-level/lua-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 91ba3125b977..cf7245ead857 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -262,13 +262,13 @@ rec {
     { fetchFromGitHub }:
     stdenv.mkDerivation rec {
       pname = "vicious";
-      version = "2.6.0";
+      version = "2.7.1";
 
       src = fetchFromGitHub {
         owner = "vicious-widgets";
         repo = "vicious";
         rev = "v${version}";
-        sha256 = "sha256-VlJ2hNou2+t7eSyHmFkC2xJ92OH/uJ/ewYHkFLQjUPQ=";
+        sha256 = "sha256-G4uXVV352IuD5/xDdJiLjWceUTEX18nv5nzVF9ga0i0=";
       };
 
       buildInputs = [ lua ];

From ebbe530dcd4c07493930b9e840be4aee5298cdbf Mon Sep 17 00:00:00 2001
From: Jeremy Fleischman <me@jfly.fyi>
Date: Fri, 29 May 2026 16:48:46 -0700
Subject: [PATCH 26/97] nixos/docuseal: update `extraConfig` docs with link to
 upstream documentation

It took me a while to find this page, I thought it would be nice to save
others some time.
---
 nixos/modules/services/web-apps/docuseal.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/web-apps/docuseal.nix b/nixos/modules/services/web-apps/docuseal.nix
index 64467666df18..d0a468f53a14 100644
--- a/nixos/modules/services/web-apps/docuseal.nix
+++ b/nixos/modules/services/web-apps/docuseal.nix
@@ -56,6 +56,8 @@ in
       default = { };
       description = ''
         Extra environment variables to pass to DocuSeal services.
+
+        Refer to <https://www.docuseal.com/docs/configuring-docuseal-via-environment-variables>.
       '';
     };
 

From 1c935b9fd9580a44c80643e36e7f6b6e69b4e753 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 24 Jun 2025 15:46:25 +0100
Subject: [PATCH 27/97] lib/systems: drop `gnu64_simplekernel`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This was unused apart from a commented‐out test, and we’re moving
away from specifying kernel configuration in the platform structure.
---
 lib/systems/examples.nix    | 1 -
 lib/systems/platforms.nix   | 4 ----
 pkgs/test/cross/default.nix | 1 -
 3 files changed, 6 deletions(-)

diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index 14693ca44e97..18c954ffc06e 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -155,7 +155,6 @@ rec {
   gnu64 = {
     config = "x86_64-unknown-linux-gnu";
   };
-  gnu64_simplekernel = gnu64 // platforms.pc_simplekernel; # see test/cross/default.nix
   gnu32 = {
     config = "i686-unknown-linux-gnu";
   };
diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix
index b80ed1efc8e8..ae78b4edc9d4 100644
--- a/lib/systems/platforms.nix
+++ b/lib/systems/platforms.nix
@@ -18,10 +18,6 @@ rec {
     };
   };
 
-  pc_simplekernel = lib.recursiveUpdate pc {
-    linux-kernel.autoModules = false;
-  };
-
   ##
   ## POWER
   ##
diff --git a/pkgs/test/cross/default.nix b/pkgs/test/cross/default.nix
index e26f375ac5c9..c5320f72a4bc 100644
--- a/pkgs/test/cross/default.nix
+++ b/pkgs/test/cross/default.nix
@@ -188,7 +188,6 @@ let
     pkgs.pkgsMusl.stdenv
     pkgs.pkgsLLVM.stdenv
     pkgs.pkgsStatic.bash
-    #pkgs.pkgsCross.gnu64_simplekernel.bash   # https://github.com/NixOS/nixpkgs/issues/264989
     pkgs.pkgsCross.arm-embedded.stdenv
     pkgs.pkgsCross.sheevaplug.stdenv # for armv5tel
     pkgs.pkgsCross.raspberryPi.stdenv # for armv6l

From a449f0cb10a2550823d2f6336481c19f5e18ecd6 Mon Sep 17 00:00:00 2001
From: Tobias Langendorf <junglerobba@jngl.one>
Date: Sat, 30 May 2026 09:45:20 +0200
Subject: [PATCH 28/97] tmux-sessionizer: 0.6.0 -> 0.6.1

git added to nativeCheckInputs because tests now require a git
executable.
---
 pkgs/by-name/tm/tmux-sessionizer/package.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tm/tmux-sessionizer/package.nix b/pkgs/by-name/tm/tmux-sessionizer/package.nix
index ee100a6377d7..fbf09f182422 100644
--- a/pkgs/by-name/tm/tmux-sessionizer/package.nix
+++ b/pkgs/by-name/tm/tmux-sessionizer/package.nix
@@ -6,19 +6,20 @@
   rustPlatform,
   stdenv,
   versionCheckHook,
+  git,
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tmux-sessionizer";
-  version = "0.6.0";
+  version = "0.6.1";
 
   src = fetchFromGitHub {
     owner = "jrmoulton";
     repo = "tmux-sessionizer";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-pRf381gxyf4leoEfSZKb5foVYYdVEsxuaTU27mbd46o=";
+    hash = "sha256-u2PfLFwqO+VFPWeFumrAJWZjK9JMZF/v0pB0uJ8jfq8=";
   };
 
-  cargoHash = "sha256-AJqlzLr6MDFfPssSFMxslxFFuPVxoQGcuG7sZeu+8pg=";
+  cargoHash = "sha256-YVR1m1cosymAKgcsgxSA/iIIF+AJfA92Ibapw0AMfoE=";
 
   nativeInstallCheckInputs = [
     versionCheckHook
@@ -31,6 +32,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     installShellFiles
   ];
 
+  nativeCheckInputs = [
+    git
+  ];
+
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     installShellCompletion --cmd tms \
       --bash <(COMPLETE=bash $out/bin/tms) \

From fbc0399ef77cd17e690b18e398ca574bfd5a9b74 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 30 May 2026 07:52:22 +0000
Subject: [PATCH 29/97] python3Packages.synchronicity: 0.12.2 -> 0.12.3

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

diff --git a/pkgs/development/python-modules/synchronicity/default.nix b/pkgs/development/python-modules/synchronicity/default.nix
index 27952183d50f..5ce1539f0da4 100644
--- a/pkgs/development/python-modules/synchronicity/default.nix
+++ b/pkgs/development/python-modules/synchronicity/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "synchronicity";
-  version = "0.12.2";
+  version = "0.12.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "modal-labs";
     repo = "synchronicity";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-RJyqQX1leo3Qx6dyp8lMGaWxaML7zFvKjG6fE13t8do=";
+    hash = "sha256-zqZaW/CX7PELh+PzC/2ofNUiWP2Enm/kg2uELQUSmk0=";
   };
 
   build-system = [ hatchling ];

From 92d2fb3fc6ab7d317b8f94791c4a9f0b9c358d23 Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Sat, 30 May 2026 20:47:48 +0200
Subject: [PATCH 30/97] ctx7: install {plugins,rules,skills} to output

Also adds `__structuredAttrs` and `strictDeps` attributes.
---
 pkgs/by-name/ct/ctx7/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/ct/ctx7/package.nix b/pkgs/by-name/ct/ctx7/package.nix
index dd23e634e3b1..2d1ae96149eb 100644
--- a/pkgs/by-name/ct/ctx7/package.nix
+++ b/pkgs/by-name/ct/ctx7/package.nix
@@ -18,6 +18,9 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "ctx7";
   version = "0.4.4";
 
+  __structuredAttrs = true;
+  strictDeps = true;
+
   src = fetchFromGitHub {
     owner = "upstash";
     repo = "context7";
@@ -61,6 +64,8 @@ stdenv.mkDerivation (finalAttrs: {
     makeWrapper ${nodejs}/bin/node $out/bin/ctx7 \
       --add-flags "$out/lib/ctx7/dist/index.js"
 
+    cp -R $src/{plugins,rules,skills} $out
+
     runHook postInstall
   '';
 

From a77249f3975129d05ba9973f82aa0dd164aba79c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 12 Sep 2025 22:36:52 +0200
Subject: [PATCH 31/97] python313Packages.ecoji: init at 0.1.1

Encode and decode data as emojis

https://pypi.org/project/ecoji/
---
 .../python-modules/ecoji/default.nix          | 31 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/python-modules/ecoji/default.nix

diff --git a/pkgs/development/python-modules/ecoji/default.nix b/pkgs/development/python-modules/ecoji/default.nix
new file mode 100644
index 000000000000..a1bfabf7da0a
--- /dev/null
+++ b/pkgs/development/python-modules/ecoji/default.nix
@@ -0,0 +1,31 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  pytestCheckHook,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "ecoji";
+  version = "0.1.1";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-lmWyVF1z6gtODJiXzGV134rn3DlGqCrJ1i2y8UcTmpw=";
+  };
+
+  build-system = [ setuptools ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "ecoji" ];
+
+  meta = {
+    description = "Encode and decode data as emojis";
+    homepage = "https://pypi.org/project/ecoji/";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2803ff10fc33..8032b07f35f0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4936,6 +4936,8 @@ self: super: with self; {
 
   ecoaliface = callPackage ../development/python-modules/ecoaliface { };
 
+  ecoji = callPackage ../development/python-modules/ecoji { };
+
   ecos = callPackage ../development/python-modules/ecos { };
 
   ecpy = callPackage ../development/python-modules/ecpy { };

From 93f2de3f86f2274e7633859f9c4ec5bb00d15e98 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 30 May 2026 10:29:07 +0200
Subject: [PATCH 32/97] python3Packages.zalgolib: init at 0.2.2

Python library for Zalgo

https://pypi.org/project/zalgolib
---
 .../python-modules/zalgolib/default.nix       | 31 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/python-modules/zalgolib/default.nix

diff --git a/pkgs/development/python-modules/zalgolib/default.nix b/pkgs/development/python-modules/zalgolib/default.nix
new file mode 100644
index 000000000000..bc0e728108be
--- /dev/null
+++ b/pkgs/development/python-modules/zalgolib/default.nix
@@ -0,0 +1,31 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "zalgolib";
+  version = "0.2.2";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit (finalAttrs) pname version;
+    hash = "sha256-ne2gT5OBoKkNZP70DjUZSE8n2HNvdgb/PSLdDrF+fs0=";
+  };
+
+  build-system = [ setuptools ];
+
+  # Module has no test
+  doCheck = false;
+
+  pythonImportsCheck = [ "zalgolib" ];
+
+  meta = {
+    description = "Python library for Zalgo";
+    homepage = "https://pypi.org/project/zalgolib";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2803ff10fc33..35e98b00890e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21870,6 +21870,8 @@ self: super: with self; {
 
   zadnegoale = callPackage ../development/python-modules/zadnegoale { };
 
+  zalgolib = callPackage ../development/python-modules/zalgolib { };
+
   zamg = callPackage ../development/python-modules/zamg { };
 
   zammad-py = callPackage ../development/python-modules/zammad-py { };

From 7df2a7d2344207f1f97d7a8cd111f67809c3150b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 30 May 2026 22:51:46 +0200
Subject: [PATCH 33/97] python3Packages.iamdata: 0.1.202605291 -> 0.1.202605301

Diff: https://github.com/cloud-copilot/iam-data-python/compare/v0.1.202605291...v0.1.202605301

Changelog: https://github.com/cloud-copilot/iam-data-python/releases/tag/v0.1.202605301
---
 pkgs/development/python-modules/iamdata/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix
index a76632dab092..b27d977a4255 100644
--- a/pkgs/development/python-modules/iamdata/default.nix
+++ b/pkgs/development/python-modules/iamdata/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "iamdata";
-  version = "0.1.202605291";
+  version = "0.1.202605301";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cloud-copilot";
     repo = "iam-data-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-d6u9qm6m5e6TumkBEzWgXaFCQ5I6VvXWyHlny2auYCQ=";
+    hash = "sha256-lg+1G+QuXUJF3xhaVMPjRfVpMZ7wCUfdc+uD4oyxeXc=";
   };
 
   __darwinAllowLocalNetworking = true;

From 5c79652454f22e731bc5114ea31f72e118354c41 Mon Sep 17 00:00:00 2001
From: Ian Mitchell <mitchell.ian.2001@gmail.com>
Date: Sat, 30 May 2026 17:29:27 -0400
Subject: [PATCH 34/97] maintainers: add pretentiousUsername

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3ba4d5a2bd35..a9e25ca89b70 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -22147,6 +22147,12 @@
     githubId = 246631;
     keys = [ { fingerprint = "3E46 7EF1 54AA A1D0 C7DF  A694 E45C B17F 1940 CA52"; } ];
   };
+  pretentiousUsername = {
+    name = "Ian Mitchell";
+    email = "mitchell.ian.2001@gmail.com";
+    github = "pretentiousUsername";
+    githubId = 94192644;
+  };
   priegger = {
     email = "philipp@riegger.name";
     github = "priegger";

From f23311b62d111d87006b0270a1f25cdf1d6619f0 Mon Sep 17 00:00:00 2001
From: Ian Mitchell <mitchell.ian.2001@gmail.com>
Date: Sat, 30 May 2026 17:30:30 -0400
Subject: [PATCH 35/97] supercollider: add pretentiousUsername as maintainer

---
 pkgs/development/interpreters/supercollider/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix
index 24a047691af6..b1534f8c25aa 100644
--- a/pkgs/development/interpreters/supercollider/default.nix
+++ b/pkgs/development/interpreters/supercollider/default.nix
@@ -124,7 +124,9 @@ stdenv.mkDerivation rec {
     description = "Programming language for real time audio synthesis";
     homepage = "https://supercollider.github.io";
     changelog = "https://github.com/supercollider/supercollider/blob/Version-${version}/CHANGELOG.md";
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [
+      pretentiousUsername
+    ];
     license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.linux;
   };

From 7026693330a9d4d1b37735e1bf9fe7eb23911300 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Sat, 30 May 2026 14:51:18 -0700
Subject: [PATCH 36/97] wml: migrate to pcre2

Upstream Link: https://github.com/thewml/website-meta-language/commit/673e78b37887f4d40c422759d634913c52e7334d

Tracking Link: https://github.com/NixOS/nixpkgs/issues/356387

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/wm/wml/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/wm/wml/package.nix b/pkgs/by-name/wm/wml/package.nix
index a2f0346c40c2..6539b55b6f95 100644
--- a/pkgs/by-name/wm/wml/package.nix
+++ b/pkgs/by-name/wm/wml/package.nix
@@ -5,7 +5,7 @@
   lynx,
   makeBinaryWrapper,
   ncurses,
-  pcre,
+  pcre2,
   perl,
   perlPackages,
   stdenv,
@@ -31,13 +31,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "wml";
-  version = "2.32.0-unstable-2025-12-23";
+  version = "2.32.0-unstable-2026-05-08";
 
   src = fetchFromGitHub {
     owner = "thewml";
     repo = "website-meta-language";
-    rev = "de200ecef0b2a64553799b1d83dfa65580d0bc16";
-    hash = "sha256-okeDaCX4Pp5qVFfHmaz+keagX6vgzFTtGoiim/pW6IA=";
+    rev = "673e78b37887f4d40c422759d634913c52e7334d";
+    hash = "sha256-rAxVha2Y16tEF+rLqebbAgBVPNrxYhNhvXnQ6/Oq1bg=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/src";
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = perlDeps ++ [
     ncurses
-    pcre
+    pcre2
     perl
   ];
 

From fa68abab8a43549d3eb8972388277ed5b8a79081 Mon Sep 17 00:00:00 2001
From: Philip White <philip@0xfff.me>
Date: Sat, 30 May 2026 16:47:45 -0700
Subject: [PATCH 37/97] mise: fix darwin build

---
 pkgs/by-name/mi/mise/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/mi/mise/package.nix b/pkgs/by-name/mi/mise/package.nix
index 21984c27b8d5..a3a2d9f7f06f 100644
--- a/pkgs/by-name/mi/mise/package.nix
+++ b/pkgs/by-name/mi/mise/package.nix
@@ -86,6 +86,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
   # some tests access the same folders, don't test in parallel to avoid race conditions
   dontUseCargoParallelTests = true;
 
+  # HTTP tests use mock servers that bind to localhost. Without this, darwin builds fail.
+  __darwinAllowLocalNetworking = true;
+
   postInstall = ''
     installManPage ./man/man1/mise.1
 

From 4d2ba9ac3d3c51907a4182b37d5fc244c9e2d82b Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Sun, 31 May 2026 02:28:08 +0200
Subject: [PATCH 38/97] harper: 2.3.0 -> 2.3.1

Changelog: https://github.com/Automattic/harper/releases/tag/v2.3.1
Diff: https://github.com/Automattic/harper/compare/v2.3.0...v2.3.1
---
 pkgs/by-name/ha/harper/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix
index 3a1043c03b78..a9863cd6929e 100644
--- a/pkgs/by-name/ha/harper/package.nix
+++ b/pkgs/by-name/ha/harper/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "harper";
-  version = "2.3.0";
+  version = "2.3.1";
 
   src = fetchFromGitHub {
     owner = "Automattic";
     repo = "harper";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-cTJ6qehT2XuEBTiRESSAmJWXEvTnimqiFEhV9q4DyTc=";
+    hash = "sha256-VergVNMhFGhXhVAPhyc7Nsz3ezAGGrYljaNpIoOBQEw=";
   };
 
-  cargoHash = "sha256-NPtDUt5IaAw4ZWQQUAdLTLEFJ4MMbe4yPE04Ui0aN3k=";
+  cargoHash = "sha256-KK4294N/v91dKccbKc1hdCLtqIRQlzT1G2At06RlCyk=";
 
   cargoBuildFlags = [
     "--package=harper-cli"

From 14afdab9a289f6e5f1e985cdd1200d61a6911f02 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 31 May 2026 02:26:49 +0000
Subject: [PATCH 39/97] flexget: 3.19.21 -> 3.19.22

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

diff --git a/pkgs/by-name/fl/flexget/package.nix b/pkgs/by-name/fl/flexget/package.nix
index 67c1a2c45bcd..1b1d781d6777 100644
--- a/pkgs/by-name/fl/flexget/package.nix
+++ b/pkgs/by-name/fl/flexget/package.nix
@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "flexget";
-  version = "3.19.21";
+  version = "3.19.22";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Flexget";
     repo = "Flexget";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-rwG+D1XE6Am5B2gt8iOyaTrfwRV1dCvkAj5BeQeX4cw=";
+    hash = "sha256-ozYtwDWN5FwUoZZrbrT4h9YPfmzw2xNx6ivFSlIVOiw=";
   };
 
   pythonRelaxDeps = true;

From eea220815ccba965603226b1733661cb64cb46e0 Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Sat, 30 May 2026 23:05:15 -0400
Subject: [PATCH 40/97] analyze-build: drop RossSmyth from maintainers

---
 pkgs/by-name/an/analyze-build/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/an/analyze-build/package.nix b/pkgs/by-name/an/analyze-build/package.nix
index e2635e19452f..ade71f80790f 100644
--- a/pkgs/by-name/an/analyze-build/package.nix
+++ b/pkgs/by-name/an/analyze-build/package.nix
@@ -40,7 +40,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
       asl20
       llvm-exception
     ];
-    maintainers = with lib.maintainers; [ RossSmyth ];
+    maintainers = [ ];
     platforms = lib.intersectLists python3.meta.platforms clang-unwrapped.meta.platforms;
   };
 })

From eb1603a992e32fa99a86583f81fb309d90abcf30 Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Sat, 30 May 2026 23:05:49 -0400
Subject: [PATCH 41/97] catt: drop RossSmyth from maintainers

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

diff --git a/pkgs/by-name/ca/catt/package.nix b/pkgs/by-name/ca/catt/package.nix
index 00554fb8ed32..3cb3aa427faa 100644
--- a/pkgs/by-name/ca/catt/package.nix
+++ b/pkgs/by-name/ca/catt/package.nix
@@ -36,7 +36,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     homepage = "https://github.com/skorokithakis/catt";
     changelog = "https://github.com/skorokithakis/catt/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.bsd2;
-    maintainers = [ lib.maintainers.RossSmyth ];
+    maintainers = [ ];
     mainProgram = "catt";
   };
 })

From 4da5fcf42bcbff5507c610ed2418f9e04de60f81 Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Sat, 30 May 2026 23:06:38 -0400
Subject: [PATCH 42/97] idris2: drop RossSmyth from maintainers

---
 pkgs/by-name/id/idris2/unwrapped.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/id/idris2/unwrapped.nix b/pkgs/by-name/id/idris2/unwrapped.nix
index d932f720ba31..dc6bb9bb3a48 100644
--- a/pkgs/by-name/id/idris2/unwrapped.nix
+++ b/pkgs/by-name/id/idris2/unwrapped.nix
@@ -166,7 +166,6 @@ stdenv.mkDerivation (finalAttrs: {
       fabianhjr
       wchresta
       mattpolzin
-      RossSmyth
     ];
     platforms = lib.platforms.all;
   };

From 1067d50b3b55b8143c0eda2a992d968eded05f21 Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Sat, 30 May 2026 23:07:09 -0400
Subject: [PATCH 43/97] intercept-build: drop RossSmyth from maintainers

---
 pkgs/by-name/in/intercept-build/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/in/intercept-build/package.nix b/pkgs/by-name/in/intercept-build/package.nix
index 4e35f8baedfd..8946e0d110f0 100644
--- a/pkgs/by-name/in/intercept-build/package.nix
+++ b/pkgs/by-name/in/intercept-build/package.nix
@@ -33,6 +33,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
       asl20
       llvm-exception
     ];
-    maintainers = with lib.maintainers; [ RossSmyth ];
+    maintainers = [ ];
   };
 })

From cf1d80fcbd8bbd38b9cd24d517cf9a9c377a0a1d Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Sat, 30 May 2026 23:07:35 -0400
Subject: [PATCH 44/97] jerryscript: drop RossSmyth from maintainers

---
 pkgs/by-name/je/jerryscript/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/je/jerryscript/package.nix b/pkgs/by-name/je/jerryscript/package.nix
index 0dcec30c9627..4d2e8a4b8475 100644
--- a/pkgs/by-name/je/jerryscript/package.nix
+++ b/pkgs/by-name/je/jerryscript/package.nix
@@ -105,7 +105,6 @@ stdenv.mkDerivation (finalAttrs: {
       "libjerry-port"
     ];
     maintainers = with lib.maintainers; [
-      RossSmyth
       wishstudio
     ];
   };

From 6593302ae6905c94bb47e879b592acce6d1dd5e0 Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Sat, 30 May 2026 23:08:09 -0400
Subject: [PATCH 45/97] picolibc: drop RossSmyth from maintainers

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

diff --git a/pkgs/by-name/pi/picolibc/package.nix b/pkgs/by-name/pi/picolibc/package.nix
index 40c4c5c84990..0243c1e0f797 100644
--- a/pkgs/by-name/pi/picolibc/package.nix
+++ b/pkgs/by-name/pi/picolibc/package.nix
@@ -218,7 +218,7 @@ stdenv.mkDerivation (finalAttrs: {
         licenses.bsd2
         licenses.bsd3
       ];
-      maintainers = [ maintainers.RossSmyth ];
+      maintainers = [ ];
       # https://github.com/picolibc/picolibc/tree/db4d0fe5952d5ecd714781e3212d4086d970735a?tab=readme-ov-file#supported-architectures
       platforms = lib.platforms.all;
     };

From ca4ad4f6feee3ec0b95b50e786cdb1f95c52d15c Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Sat, 30 May 2026 23:09:26 -0400
Subject: [PATCH 46/97] python3Packages.libear: drop RossSmyth from maintainers

---
 pkgs/development/python-modules/libear/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/libear/default.nix b/pkgs/development/python-modules/libear/default.nix
index 19f831be9f9f..1e721038604c 100644
--- a/pkgs/development/python-modules/libear/default.nix
+++ b/pkgs/development/python-modules/libear/default.nix
@@ -32,6 +32,6 @@ buildPythonPackage rec {
       asl20
       llvm-exception
     ];
-    maintainers = with lib.maintainers; [ RossSmyth ];
+    maintainers = [ ];
   };
 }

From 23a5aff59c1435e5e44ddb4171fa19a0c89fde66 Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Sat, 30 May 2026 23:09:49 -0400
Subject: [PATCH 47/97] python3Packages.libscanbuild: drop RossSmyth from
 maintainers

---
 pkgs/development/python-modules/libscanbuild/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/libscanbuild/default.nix b/pkgs/development/python-modules/libscanbuild/default.nix
index 987e806e9ebf..447b39fc0b92 100644
--- a/pkgs/development/python-modules/libscanbuild/default.nix
+++ b/pkgs/development/python-modules/libscanbuild/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
       asl20
       llvm-exception
     ];
-    maintainers = with lib.maintainers; [ RossSmyth ];
+    maintainers = [ ];
   };
 }

From 7d561e215afb136bb78767734dbca06321f31d32 Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Sat, 30 May 2026 23:10:18 -0400
Subject: [PATCH 48/97] rescript-language-server: drop RossSmyth from
 maintainers

---
 pkgs/by-name/re/rescript-language-server/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/re/rescript-language-server/package.nix b/pkgs/by-name/re/rescript-language-server/package.nix
index b03be0306020..50854367dbbd 100644
--- a/pkgs/by-name/re/rescript-language-server/package.nix
+++ b/pkgs/by-name/re/rescript-language-server/package.nix
@@ -73,6 +73,6 @@ buildNpmPackage (finalAttrs: {
     license = lib.licenses.mit;
     # https://github.com/rescript-lang/rescript-vscode/blob/1.62.0/CONTRIBUTING.md?plain=1#L186
     platforms = with lib.platforms; linux ++ darwin ++ windows ++ freebsd;
-    maintainers = with lib.maintainers; [ RossSmyth ];
+    maintainers = [ ];
   };
 })

From 9ea9f44ea2298be59ea2eab719344dd56e6c9d12 Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Sat, 30 May 2026 23:10:46 -0400
Subject: [PATCH 49/97] scan-build-py: drop RossSmyth from maintainers

---
 pkgs/by-name/sc/scan-build-py/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/sc/scan-build-py/package.nix b/pkgs/by-name/sc/scan-build-py/package.nix
index 3868586dd7b0..d898993e1109 100644
--- a/pkgs/by-name/sc/scan-build-py/package.nix
+++ b/pkgs/by-name/sc/scan-build-py/package.nix
@@ -40,7 +40,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
       asl20
       llvm-exception
     ];
-    maintainers = with lib.maintainers; [ RossSmyth ];
+    maintainers = [ ];
     platforms = lib.intersectLists python3.meta.platforms clang-unwrapped.meta.platforms;
   };
 })

From 45a41fc6f1c9b7fb5f7b74802f6b7a7dc2df6b05 Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Sat, 30 May 2026 23:11:16 -0400
Subject: [PATCH 50/97] television: drop RossSmyth from maintainers

---
 pkgs/by-name/te/television/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/te/television/package.nix b/pkgs/by-name/te/television/package.nix
index 79e01553cf1c..295b086e0106 100644
--- a/pkgs/by-name/te/television/package.nix
+++ b/pkgs/by-name/te/television/package.nix
@@ -106,7 +106,6 @@ let
       maintainers = with lib.maintainers; [
         louis-thevenet
         getchoo
-        RossSmyth
       ];
     };
   });

From 2d6a1ab28953ccf2f3ad5f9881788c1e3a52477b Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Sat, 30 May 2026 23:11:42 -0400
Subject: [PATCH 51/97] wuffs: drop RossSmtyh from maintainers

---
 pkgs/by-name/wu/wuffs/package.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/by-name/wu/wuffs/package.nix b/pkgs/by-name/wu/wuffs/package.nix
index b297fac4ac73..525c00ecf30c 100644
--- a/pkgs/by-name/wu/wuffs/package.nix
+++ b/pkgs/by-name/wu/wuffs/package.nix
@@ -80,8 +80,7 @@ buildGoModule (finalAttrs: {
       mit
       asl20
     ];
-    maintainers = with lib.maintainers; [
-      RossSmyth
+    maintainers = [
     ];
   };
 })

From 774088477ac0d4b3a1989172e4513ac245ccb05b Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Sat, 30 May 2026 23:12:04 -0400
Subject: [PATCH 52/97] xwin: drop RossSmyth from maintainers

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

diff --git a/pkgs/by-name/xw/xwin/package.nix b/pkgs/by-name/xw/xwin/package.nix
index d1cf0bcb63ad..1e2363bb3f69 100644
--- a/pkgs/by-name/xw/xwin/package.nix
+++ b/pkgs/by-name/xw/xwin/package.nix
@@ -55,7 +55,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       lib.licenses.mit
       lib.licenses.asl20
     ];
-    maintainers = with lib.maintainers; [ RossSmyth ];
+    maintainers = [ ];
     platforms = with lib.platforms; linux ++ darwin ++ windows;
   };
 })

From 6fe92b848c793870135db4b1c59b5bb456890f40 Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Sat, 30 May 2026 23:12:34 -0400
Subject: [PATCH 53/97] zeno: drop RossSmyth from maintainers

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

diff --git a/pkgs/by-name/ze/zeno/package.nix b/pkgs/by-name/ze/zeno/package.nix
index 55f969baaf5f..34eef77b3bdc 100644
--- a/pkgs/by-name/ze/zeno/package.nix
+++ b/pkgs/by-name/ze/zeno/package.nix
@@ -36,6 +36,6 @@ buildGoModule (finalAttrs: {
     changelog = "https://github.com/internetarchive/Zeno/releases/tag/v${finalAttrs.version}";
     mainProgram = "Zeno";
     license = lib.licenses.agpl3Only;
-    maintainers = [ lib.maintainers.RossSmyth ];
+    maintainers = [ ];
   };
 })

From 5790d464932bc833aa16c341ba19f0ef76d41546 Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Sat, 30 May 2026 23:32:11 -0400
Subject: [PATCH 54/97] msedit: drop RossSmyth from maintainers

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

diff --git a/pkgs/by-name/ms/msedit/package.nix b/pkgs/by-name/ms/msedit/package.nix
index 3319b3e30d9a..12a301fc8170 100644
--- a/pkgs/by-name/ms/msedit/package.nix
+++ b/pkgs/by-name/ms/msedit/package.nix
@@ -69,7 +69,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/microsoft/edit";
     changelog = "https://github.com/microsoft/edit/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ RossSmyth ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
   };
 })

From be2b077d2bbc37433619868df8f83f15d969078a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 31 May 2026 04:00:39 +0000
Subject: [PATCH 55/97] ha-mqtt-discoverable-cli: 0.23.0 -> 0.25.2

---
 pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix b/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix
index dbc629f50251..1d1f1d929679 100644
--- a/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix
+++ b/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "ha-mqtt-discoverable-cli";
-  version = "0.23.0";
+  version = "0.25.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "unixorn";
     repo = "ha-mqtt-discoverable-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-QxqhLtB3FC8zFUa67surP+P5RK9sb57OmdlnSWd9Kew=";
+    hash = "sha256-NCCpx5+EL2JEWzN6M+a9c643PObQzfEuTHKvkljBmjU=";
   };
 
   pythonRelaxDeps = [ "ha-mqtt-discoverable" ];

From 75a5948de53b292ef9aab5c618864619264cb112 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 31 May 2026 06:33:59 +0000
Subject: [PATCH 56/97] python3Packages.python-gitlab: 8.2.0 -> 8.4.0

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

diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix
index d12718bdb970..b07f5ac32a0e 100644
--- a/pkgs/development/python-modules/python-gitlab/default.nix
+++ b/pkgs/development/python-modules/python-gitlab/default.nix
@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "python-gitlab";
-  version = "8.2.0";
+  version = "8.4.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "python_gitlab";
     inherit version;
-    hash = "sha256-3odNxTjbbc60iSn0yPtV1gZN0Zyz/9rREAGQ+DXFtnQ=";
+    hash = "sha256-828g7D8JE487EgiTlJQfTb5aQHAhvtcbcKBLvdN7inQ=";
   };
 
   build-system = [ setuptools ];

From 6646f1d7268a01475f7c1f913a1237115faa4cb9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 31 May 2026 08:13:25 +0000
Subject: [PATCH 57/97] circup: 3.0.1 -> 3.0.3

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

diff --git a/pkgs/by-name/ci/circup/package.nix b/pkgs/by-name/ci/circup/package.nix
index c41b450fa5e8..c4e68297787e 100644
--- a/pkgs/by-name/ci/circup/package.nix
+++ b/pkgs/by-name/ci/circup/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "circup";
-  version = "3.0.1";
+  version = "3.0.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "adafruit";
     repo = "circup";
     tag = finalAttrs.version;
-    hash = "sha256-vxgMdH9Tz1VOA3ccey5/arw3zeqvgCJJu7IlVoi1OIQ=";
+    hash = "sha256-ycQdeAw/7R+yNn+2IMHprNI9JTml/uT6tEPk5R2Bl38=";
   };
 
   pythonRelaxDeps = [ "semver" ];

From 2cfff20ff31338762144ad11235691be37a2389d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 31 May 2026 09:03:42 +0000
Subject: [PATCH 58/97] poutine: 1.1.5 -> 1.1.6

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

diff --git a/pkgs/by-name/po/poutine/package.nix b/pkgs/by-name/po/poutine/package.nix
index c313188deb53..002e80ad53f1 100644
--- a/pkgs/by-name/po/poutine/package.nix
+++ b/pkgs/by-name/po/poutine/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "poutine";
-  version = "1.1.5";
+  version = "1.1.6";
 
   src = fetchFromGitHub {
     owner = "boostsecurityio";
     repo = "poutine";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-9Gyxwcm45301zmMJWYPwzMPdJwBNsDLXKkmuJHBWZt8=";
+    hash = "sha256-jiIjim17x9Q6e5+XSR6xHYg/VOJILfCeLRXdEopQwKE=";
   };
 
   vendorHash = "sha256-Ktsk01YqBHVZDOu+Xp1p3sVDwqozl35iLYbVavpiWq0=";

From 2149c4333dfeda24050ca9a575e8e227424b04bb Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Sun, 31 May 2026 10:17:53 +0100
Subject: [PATCH 59/97] ifuse: 1.1.4+date=2022-04-04 -> 1.2.1

Diff: https://github.com/libimobiledevice/ifuse/compare/6f5b8e410f9615b3369ca5eb5367745e13d83b92...6f5b8e410f9615b3369ca5eb5367745e13d83b92
---
 pkgs/by-name/if/ifuse/package.nix | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/if/ifuse/package.nix b/pkgs/by-name/if/ifuse/package.nix
index 677f72cfa172..9fff0c411f0e 100644
--- a/pkgs/by-name/if/ifuse/package.nix
+++ b/pkgs/by-name/if/ifuse/package.nix
@@ -4,20 +4,24 @@
   fetchFromGitHub,
   autoreconfHook,
   pkg-config,
-  fuse,
+  fuse3,
   usbmuxd,
   libimobiledevice,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "ifuse";
-  version = "1.1.4+date=2022-04-04";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "libimobiledevice";
     repo = "ifuse";
-    rev = "6f5b8e410f9615b3369ca5eb5367745e13d83b92";
-    hash = "sha256-KbuJLS2BWua9DnhLv2KtsQObin0PQwXQwEdgi3lSAPk=";
+    tag = finalAttrs.version;
+    hash = "sha256-STMELfxbWf2W6NKKqBxgbQLZpYXv9N0cDLgHho5PRYM=";
+  };
+
+  env = {
+    VER = finalAttrs.version;
   };
 
   nativeBuildInputs = [
@@ -26,7 +30,7 @@ stdenv.mkDerivation {
   ];
 
   buildInputs = [
-    fuse
+    fuse3
     usbmuxd
     libimobiledevice
   ];
@@ -45,4 +49,4 @@ stdenv.mkDerivation {
     maintainers = [ ];
     mainProgram = "ifuse";
   };
-}
+})

From 093a1867549ff6b4df8f0ec6aef4acb746c06f19 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 31 May 2026 11:34:58 +0000
Subject: [PATCH 60/97] gotty: 1.7.2 -> 1.8.0

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

diff --git a/pkgs/by-name/go/gotty/package.nix b/pkgs/by-name/go/gotty/package.nix
index 999a5acbbf4b..84f9a903ab85 100644
--- a/pkgs/by-name/go/gotty/package.nix
+++ b/pkgs/by-name/go/gotty/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "gotty";
-  version = "1.7.2";
+  version = "1.8.0";
 
   src = fetchFromGitHub {
     owner = "sorenisanerd";
     repo = "gotty";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-zdVwK/+vJmPAgvgQZB63t1M7DbaCvgln7m95u98D9ds=";
+    sha256 = "sha256-+ZcFKMx9wfty3DIgN9lb9N9CZaZfO76VwvuzWR9yrvo=";
   };
 
   vendorHash = "sha256-MvNCq1kWhfVJz4h6G0yAwJd8Z4xRtcu2WjeEhoTW5L8=";

From 69b97f5a25471521acc7837f73e3b0367a6386ee Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 31 May 2026 14:26:48 +0000
Subject: [PATCH 61/97] rns: 1.2.9 -> 1.3.4

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

diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix
index 16321b419863..204bdc4b8312 100644
--- a/pkgs/development/python-modules/rns/default.nix
+++ b/pkgs/development/python-modules/rns/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "rns";
-  version = "1.2.9";
+  version = "1.3.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "markqvist";
     repo = "Reticulum";
     tag = finalAttrs.version;
-    hash = "sha256-2BkUMeov6T0jWaFb7vnLcYga3PilGpsJsuooxhpx0Ko=";
+    hash = "sha256-rhZfkSV2OtCVPbUyTrYry2lwIeSfz3JnX+mVTkZt+Rc=";
   };
 
   patches = [

From d8b0173614d625033c308e5fb35b301f310716b7 Mon Sep 17 00:00:00 2001
From: Vladyslav Pekker <agilesteel@gmail.com>
Date: Sun, 31 May 2026 13:04:37 -0300
Subject: [PATCH 62/97] bloop: 2.0.19 -> 2.1.0

---
 pkgs/by-name/bl/bloop/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/bl/bloop/package.nix b/pkgs/by-name/bl/bloop/package.nix
index 6ffe0c9dbb03..d5421084db2e 100644
--- a/pkgs/by-name/bl/bloop/package.nix
+++ b/pkgs/by-name/bl/bloop/package.nix
@@ -11,7 +11,7 @@
 
 stdenv.mkDerivation rec {
   pname = "bloop";
-  version = "2.0.19";
+  version = "2.1.0";
 
   platform =
     if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 then
@@ -42,11 +42,11 @@ stdenv.mkDerivation rec {
     url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-${platform}";
     sha256 =
       if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 then
-        "sha256-HyjsBpSoek56no+19rZtjih+/Deu1NO9bwjMBz44B2U="
+        "sha256-yZEN3w2pvCmDRcvwE3KjUaJOVbUSDvVthMmlRSY2cSY="
       else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then
-        "sha256-mYPqqyO3wXKUVYSueHYteJd3z/nNCfP0LxvEQdg+oT8="
+        "sha256-U1rPA1h0xVjAsuDFfaFvy7n6L+yRNKgqS9OQYvZH8MM="
       else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then
-        "sha256-Yf/oECDSR9FN/rxz2hkBlvMCK0BtLFRBR0VagLaqivc="
+        "sha256-1MO14ChMnn/cDSEl1qiwDhzgX3pQjsSN8ksp4WkPDMk="
       else
         throw "unsupported platform";
   };

From 5e01071e74cb6c4dbd657bc4445edf8d9a93ac52 Mon Sep 17 00:00:00 2001
From: Vladyslav Pekker <agilesteel@gmail.com>
Date: Sun, 31 May 2026 13:07:48 -0300
Subject: [PATCH 63/97] liquibase: 5.0.2 -> 5.0.3

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

diff --git a/pkgs/by-name/li/liquibase/package.nix b/pkgs/by-name/li/liquibase/package.nix
index f5693eb176b7..02924c7c7d11 100644
--- a/pkgs/by-name/li/liquibase/package.nix
+++ b/pkgs/by-name/li/liquibase/package.nix
@@ -26,11 +26,11 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "liquibase";
-  version = "5.0.2";
+  version = "5.0.3";
 
   src = fetchurl {
     url = "https://github.com/liquibase/liquibase/releases/download/v${finalAttrs.version}/liquibase-${finalAttrs.version}.tar.gz";
-    hash = "sha256-EDVr6p3FeGilf8OviK1HH1An1nrR9fyIqcIiFAHLriM=";
+    hash = "sha256-hlqrORvpy+P+4iRhOS1dKap2ZSWWWYsUcAo/XwXJ4rc=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From fa7bcbc4c8d9440ac410fb9955b0596184d770f3 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sun, 31 May 2026 18:17:32 +0200
Subject: [PATCH 64/97] adguardian: 1.6.1 -> 1.7.0

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/ad/adguardian/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ad/adguardian/package.nix b/pkgs/by-name/ad/adguardian/package.nix
index dc17cd128191..83c7c52b21a1 100644
--- a/pkgs/by-name/ad/adguardian/package.nix
+++ b/pkgs/by-name/ad/adguardian/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "adguardian";
-  version = "1.6.1";
+  version = "1.7.0";
   __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "Lissy93";
     repo = "AdGuardian-Term";
     tag = finalAttrs.version;
-    hash = "sha256-jqjdYkB48ggLsmKlwiehkGHZ6EJhJYXGuVmZH7R0MlE=";
+    hash = "sha256-GXGABTBX4Cot558ML0quD8GDU3RWj0BoZ8Ib/SbuWmg=";
   };
 
-  cargoHash = "sha256-ON3txhOQVuI3Th8FZ7yC4sd7L1fpYCD6XyIHbH5/Q4k=";
+  cargoHash = "sha256-JJDMrRJVs67EMcGTK75tdU+FhdkiF3RswrZ0fOWrG/U=";
 
   meta = {
     description = "Terminal-based, real-time traffic monitoring and statistics for your AdGuard Home instance";

From d8a01b87ae4390d76d503974b3be79cfec2b03be Mon Sep 17 00:00:00 2001
From: Sergei Volkov <taranarmo@gmail.com>
Date: Tue, 12 May 2026 11:58:17 +0200
Subject: [PATCH 65/97] databricks-cli: 0.290.2 -> 1.1.0

---
 doc/release-notes/rl-2611.section.md       |  2 ++
 pkgs/by-name/da/databricks-cli/package.nix | 19 ++++++++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/doc/release-notes/rl-2611.section.md b/doc/release-notes/rl-2611.section.md
index 7aa7fd8f5b6c..8077925d042d 100644
--- a/doc/release-notes/rl-2611.section.md
+++ b/doc/release-notes/rl-2611.section.md
@@ -10,6 +10,8 @@
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
 
+- `databricks-cli` has been updated from `0.290.2` to `1.x.x`, the first major release. OAuth tokens for interactive logins (`auth_type = databricks-cli`) are now stored in the OS-native secure store by default (Secret Service on Linux) instead of `~/.databricks/token-cache.json`; cached tokens from older versions are not migrated, so run `databricks auth login` once per profile after upgrading. To keep the previous file-backed storage, set `DATABRICKS_AUTH_STORAGE=plaintext` or add `auth_storage = plaintext` under `[__settings__]` in `~/.databrickscfg`. Additionally, the `vector_search_endpoints` DABs resource renamed `min_qps` to `target_qps` (and the `vector-search-endpoints` command renamed `--min-qps` to `--target-qps`). See the [upstream changelog](https://github.com/databricks/cli/blob/main/CHANGELOG.md) for details.
+
 - `hurl` has been updated to `8.x.x` which has some breaking changes. See [upstream changelog](https://github.com/Orange-OpenSource/hurl/releases/tag/8.0.0) for details.
 - `python3Packages.django-health-check` has been updated to major version 4. See its [migration guide](https://codingjoe.dev/django-health-check/migrate-to-v4/) and [changelog](https://github.com/codingjoe/django-health-check/releases/tag/4.0.0) for breaking changes.
 
diff --git a/pkgs/by-name/da/databricks-cli/package.nix b/pkgs/by-name/da/databricks-cli/package.nix
index dc930df6dd71..34f41e29083b 100644
--- a/pkgs/by-name/da/databricks-cli/package.nix
+++ b/pkgs/by-name/da/databricks-cli/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "databricks-cli";
-  version = "0.290.2";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "databricks";
     repo = "cli";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-kIliLlOd6/1lddWK3VtxoXvP30SajDWB6zVO4gKe9Fo=";
+    hash = "sha256-MMVwypMxnFBYVlBmuJ2KWwfL1hXuro5BH7V5wrgl3lc=";
   };
 
   # Otherwise these tests fail asserting that the version is 0.0.0-dev
@@ -25,7 +25,7 @@ buildGoModule (finalAttrs: {
       --replace-fail "cli/0.0.0-dev" "cli/${finalAttrs.version}"
   '';
 
-  vendorHash = "sha256-8PJ2M5L8DkL4ydtUQbw0wKvt+5rVYbOAAGvURkSMm/o=";
+  vendorHash = "sha256-OK7P+0pBaL/sn+iTrVr0m3EuqA/Pssp19JRKo6nGipk=";
 
   excludedPackages = [
     "bundle/internal"
@@ -33,6 +33,12 @@ buildGoModule (finalAttrs: {
     "integration"
     "tools/testrunner"
     "tools/testmask"
+    "cmd/auth"
+    "cmd/root"
+    "cmd/labs/project"
+    "libs/auth"
+    "libs/databrickscfg"
+    "libs/hostmetadata"
   ];
 
   ldflags = [
@@ -49,14 +55,17 @@ buildGoModule (finalAttrs: {
       # Need network
       "TestConsistentDatabricksSdkVersion"
       "TestTerraformArchiveChecksums"
-      "TestExpandPipelineGlobPaths"
+      "TestExpandGlobPathsInPipelines"
       "TestRelativePathTranslationDefault"
       "TestRelativePathTranslationOverride"
       "TestWorkspaceVerifyProfileForHost"
       "TestWorkspaceVerifyProfileForHost/default_config_file_with_match"
       "TestWorkspaceResolveProfileFromHost"
       "TestWorkspaceResolveProfileFromHost/no_config_file"
-      "TestBundleConfigureDefault"
+      "TestWorkspaceClientNormalizesHostBeforeProfileResolution"
+      "TestClearWorkspaceClient"
+      "TestValidateFolderPermissions"
+      "TestFilesToSync"
       # Use uv venv which doesn't work with nix
       # https://github.com/astral-sh/uv/issues/4450
       "TestVenvSuccess"

From db04c2fc425f4e244ff60507da9147836c3f8093 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 31 May 2026 16:53:41 +0000
Subject: [PATCH 66/97] wayle: 0.4.1 -> 0.6.0

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

diff --git a/pkgs/by-name/wa/wayle/package.nix b/pkgs/by-name/wa/wayle/package.nix
index 2cf3af213b01..fd8d608c04ba 100644
--- a/pkgs/by-name/wa/wayle/package.nix
+++ b/pkgs/by-name/wa/wayle/package.nix
@@ -21,7 +21,7 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wayle";
-  version = "0.4.1";
+  version = "0.6.0";
 
   __structuredAttrs = true;
   strictDeps = true;
@@ -30,10 +30,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "wayle-rs";
     repo = "wayle";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gTvjGvS9jWijB7xVMTZZkltGfqreKtXanZlt1ZgFiC4=";
+    hash = "sha256-AOHehdowgxEV1b+CwrAhJsUqxQnARIGZPWMRcdH0h+U=";
   };
 
-  cargoHash = "sha256-iMtX/MNPzjXJG9ebDDdyQrLeqmW9idoty1vjhGLjT/E=";
+  cargoHash = "sha256-4PUXJwUP5h/ggZQbY78BdqMh5oZes1XCeWuT2/S94Z4=";
 
   nativeBuildInputs = [
     copyDesktopItems

From b959d6bab52d0a668d467dd88e53256fedd912f4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 31 May 2026 16:58:14 +0000
Subject: [PATCH 67/97] vicinae: 0.21.0 -> 0.21.3

---
 pkgs/by-name/vi/vicinae/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/vi/vicinae/package.nix b/pkgs/by-name/vi/vicinae/package.nix
index acf2fea0f7f3..ae2ee689bc32 100644
--- a/pkgs/by-name/vi/vicinae/package.nix
+++ b/pkgs/by-name/vi/vicinae/package.nix
@@ -21,23 +21,23 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "vicinae";
-  version = "0.21.0";
+  version = "0.21.3";
 
   src = fetchFromGitHub {
     owner = "vicinaehq";
     repo = "vicinae";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-F034G8DctTGGi1ijekwkaXE4w5WZqHt2Hvvu8hqRfJE=";
+    hash = "sha256-MDx66Kf8TOdszkxlLUzEscvISkYZLcXuGU8Y6Ke0tqs=";
   };
 
   apiDeps = fetchNpmDeps {
     src = "${finalAttrs.src}/src/typescript/api";
-    hash = "sha256-lIXhMBJHujs6d9fXEK8Q+sfjkKyFJEMEtKrQorkfPeU=";
+    hash = "sha256-Ki/l3PiBY3R0Bzd6leqx2OxA7c+jckjr+YD4GHHaSqI=";
   };
 
   extensionManagerDeps = fetchNpmDeps {
     src = "${finalAttrs.src}/src/typescript/extension-manager";
-    hash = "sha256-gpbS6MIHOSuHIfd4zDEB4EcMi9LHk9tPdnxwT0S0nbA=";
+    hash = "sha256-6Kz7I8cGm1lnGPOI/gju3t5/imnbBFlDEKzWar5O770=";
   };
 
   cmakeFlags = lib.mapAttrsToList lib.cmakeFeature {

From 8b0e5474619eeb4e0b3db738b20638d1862df454 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20=C8=98erb=C4=83nescu?= <daniel@serbanescu.dk>
Date: Sun, 31 May 2026 19:00:45 +0200
Subject: [PATCH 68/97] tgpt: 2.11.0 -> 2.11.1

---
 pkgs/by-name/tg/tgpt/package.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/tg/tgpt/package.nix b/pkgs/by-name/tg/tgpt/package.nix
index d910398fa553..2bdbd8481e44 100644
--- a/pkgs/by-name/tg/tgpt/package.nix
+++ b/pkgs/by-name/tg/tgpt/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "tgpt";
-  version = "2.11.0";
+  version = "2.11.1";
 
   src = fetchFromGitHub {
     owner = "aandrew-me";
     repo = "tgpt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-mEzTvurjG/58qgNtJie7Iy6rSkiu2VbDIu1MiyrcEyo=";
+    hash = "sha256-FsLJXJBPg9Lz5iOcoIMkcs8zH4hkSWKjlIU0MLjL4k0=";
   };
 
-  vendorHash = "sha256-Xilu4wzDkwf15LmVH0Pkk91/nDisUu66aPP0JvT4ldo=";
+  vendorHash = "sha256-MV86fp6684lBhFrqYXJCf1OguftncVVb/1wEPgvaOYc=";
 
   buildInputs = [ libx11 ];
 
@@ -28,7 +28,6 @@ buildGoModule (finalAttrs: {
   preCheck = ''
     # Remove test which need network access
     rm src/providers/koboldai/koboldai_test.go
-    rm src/providers/phind/phind_test.go
   '';
 
   meta = {

From 2743dd7d29cbeeb2117508015c931691b8be2309 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Sun, 31 May 2026 19:16:08 +0200
Subject: [PATCH 69/97] maliit-framework: drop unused pcre dependency

---
 pkgs/by-name/ma/maliit-framework/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/ma/maliit-framework/package.nix b/pkgs/by-name/ma/maliit-framework/package.nix
index 54e06bafac77..98fccb280877 100644
--- a/pkgs/by-name/ma/maliit-framework/package.nix
+++ b/pkgs/by-name/ma/maliit-framework/package.nix
@@ -12,7 +12,6 @@
   libselinux,
   libsepol,
   libthai,
-  pcre,
   util-linux,
   wayland,
   libxtst,
@@ -46,7 +45,6 @@ stdenv.mkDerivation {
     libselinux
     libsepol
     libthai
-    pcre
     util-linux
     wayland
     libxdmcp

From 529db3b43075b8649a3b28776094260c0013e747 Mon Sep 17 00:00:00 2001
From: aoli-al <aoli.al@hotmail.com>
Date: Sun, 31 May 2026 13:17:59 -0400
Subject: [PATCH 70/97] jetbrains-jdk: reuse version+build

---
 .../compilers/jetbrains-jdk/default.nix           | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix
index 58b655bdf220..de8cc7002efb 100644
--- a/pkgs/development/compilers/jetbrains-jdk/default.nix
+++ b/pkgs/development/compilers/jetbrains-jdk/default.nix
@@ -21,19 +21,20 @@ let
       url = "https://raw.githubusercontent.com/GNOME/gtk/${rev}/gdk/wayland/protocol/gtk-shell.xml";
       hash = hash;
     };
+  # To get the new tag:
+  # git clone https://github.com/jetbrains/jetbrainsruntime
+  # cd jetbrainsruntime
+  # git tag --points-at [revision]
+  # Look for the line that starts with jbr-
+  javaVersion = "25.0.2";
+  build = "329.72";
 in
 callPackage ./common.nix
   {
     inherit jdk debugBuild withJcef;
   }
   {
-    # To get the new tag:
-    # git clone https://github.com/jetbrains/jetbrainsruntime
-    # cd jetbrainsruntime
-    # git tag --points-at [revision]
-    # Look for the line that starts with jbr-
-    javaVersion = "25.0.2";
-    build = "329.72";
+    inherit javaVersion build;
     # run `git log -1 --pretty=%ct` in jdk repo for new value on update
     sourceDateEpoch = 1769205294;
     srcHash = "sha256-K4Izbij+1YO4UERHS0mwGKZX/VtIaxyNPZD068Vf99Q=";

From 16cc0e12732d7679149710a9d6ad8b7bda54e1c9 Mon Sep 17 00:00:00 2001
From: aoli-al <aoli.al@hotmail.com>
Date: Thu, 30 Apr 2026 17:17:59 -0400
Subject: [PATCH 71/97] jetbrains-jdk: 25.0.2b329.72 -> 25.0.2b432.48

---
 pkgs/development/compilers/jetbrains-jdk/default.nix | 8 ++++----
 pkgs/development/compilers/jetbrains-jdk/jcef.nix    | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix
index de8cc7002efb..e4d9b77491a0 100644
--- a/pkgs/development/compilers/jetbrains-jdk/default.nix
+++ b/pkgs/development/compilers/jetbrains-jdk/default.nix
@@ -27,7 +27,7 @@ let
   # git tag --points-at [revision]
   # Look for the line that starts with jbr-
   javaVersion = "25.0.2";
-  build = "329.72";
+  build = "432.48";
 in
 callPackage ./common.nix
   {
@@ -36,14 +36,14 @@ callPackage ./common.nix
   {
     inherit javaVersion build;
     # run `git log -1 --pretty=%ct` in jdk repo for new value on update
-    sourceDateEpoch = 1769205294;
-    srcHash = "sha256-K4Izbij+1YO4UERHS0mwGKZX/VtIaxyNPZD068Vf99Q=";
+    sourceDateEpoch = 1777242155;
+    srcHash = "sha256-BKyvBUKtg+JbZNuH/RZY87eJng6Eyd6L3cOwcOgOx/Y=";
     homePath = "${jetbrains.jdk}/lib/openjdk";
     jcefPackage = jetbrains.jcef;
     extraBuildPhase = ''
       cp -r ${gtk-protocols.out} gtk-shell.xml
     '';
-    vendorVersionString = "nix/JBR-25.0.2-b329.72${if withJcef then "-jcef" else ""}";
+    vendorVersionString = "nix/JBR-${javaVersion}-b${build}${if withJcef then "-jcef" else ""}";
     extraConfigureFlags = [
       "--with-wayland-protocols=${wayland-protocols.out}/share/wayland-protocols"
     ];
diff --git a/pkgs/development/compilers/jetbrains-jdk/jcef.nix b/pkgs/development/compilers/jetbrains-jdk/jcef.nix
index 7e9eb75e2e91..54eb462eef4c 100644
--- a/pkgs/development/compilers/jetbrains-jdk/jcef.nix
+++ b/pkgs/development/compilers/jetbrains-jdk/jcef.nix
@@ -92,11 +92,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "jcef-jetbrains";
-  rev = "a492f5c1bbe877d2f58d4b066d0a1c89ab579b84";
+  rev = "97d05cdf1720586ebfff5d4bc6e15a6a533eb21e";
   # This is the commit number
   # Currently from the branch: https://github.com/JetBrains/jcef/tree/261
   # Run `git rev-list --count HEAD`
-  version = "1131";
+  version = "1156";
 
   nativeBuildInputs = [
     cmake
@@ -126,7 +126,7 @@ stdenv.mkDerivation rec {
     owner = "jetbrains";
     repo = "jcef";
     inherit rev;
-    hash = "sha256-c1gJu6gogALx3viLi9saLvqOn+zS9jCpWizB2g1Xa/g=";
+    hash = "sha256-31WV6vYp0zIf6EkccQTeiggCRtQnDOg8/4J2q6axiGs=";
   };
 
   # Find the hash in tools/buildtools/linux64/clang-format.sha1

From 571fc23e7f0f5ac7ebe8ed22facb8299d676ebd6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 31 May 2026 17:21:42 +0000
Subject: [PATCH 72/97] terraform-providers.rootlyhq_rootly: 5.15.1 -> 5.16.0

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index e1ba93afe62a..0ad8d13aee4a 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1139,13 +1139,13 @@
     "vendorHash": "sha256-WpI4OZ7BUVgHwQY+7ct+K6CnwXFFuiRbI+iTFSJ8a5A="
   },
   "rootlyhq_rootly": {
-    "hash": "sha256-LHj+dwiGGycdKff1M8cGxJIG56yBj2EgcUIW4bLUuFc=",
+    "hash": "sha256-lGd864ugC5hfgN86ByEIJhjkMJVCPDNCKzoXx6pKjS0=",
     "homepage": "https://registry.terraform.io/providers/rootlyhq/rootly",
     "owner": "rootlyhq",
     "repo": "terraform-provider-rootly",
-    "rev": "v5.15.1",
+    "rev": "v5.16.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-CMJKYzvOrWhsidv83KbYtKcKE6D170MR86JnzWpR0/c="
+    "vendorHash": "sha256-QVZBQ7Ir8iEUaJo0yXFNp8rInIcbp9qw70UDJ3NAgRM="
   },
   "rundeck_rundeck": {
     "hash": "sha256-g8unbz8+UGLiAOJju6E2bLkygvZgHkv173PdMDefmrc=",

From f9ab7c3ac19b11c17d5740ea42ea9bcb53dd2778 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Sun, 31 May 2026 19:26:15 +0200
Subject: [PATCH 73/97] lightspark: drop unused pcre dependency

---
 pkgs/by-name/li/lightspark/package.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/lightspark/package.nix b/pkgs/by-name/li/lightspark/package.nix
index 470213675bea..62539355e3e7 100644
--- a/pkgs/by-name/li/lightspark/package.nix
+++ b/pkgs/by-name/li/lightspark/package.nix
@@ -8,7 +8,6 @@
   zlib,
   ffmpeg,
   glew,
-  pcre,
   rtmpdump,
   cairo,
   boost,
@@ -28,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "lightspark";
     repo = "lightspark";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-2+Kmwj2keCMR7UbKbY6UvrkX4CnW61elres8ltiZuUg=";
   };
 
@@ -46,7 +45,6 @@ stdenv.mkDerivation (finalAttrs: {
     zlib
     ffmpeg
     glew
-    pcre
     rtmpdump
     cairo
     boost

From ca947fca92c9d228450aacf6ed61cd503d6ff2a1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 31 May 2026 17:41:22 +0000
Subject: [PATCH 74/97] terraform-providers.vinyldns_vinyldns: 0.10.3 -> 0.11.0

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index e1ba93afe62a..dceb792915a8 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1445,13 +1445,13 @@
     "vendorHash": "sha256-chDZVBd7tb1VsfTXcWz7j29LzHpUnJpXKRFAyqxnR8s="
   },
   "vinyldns_vinyldns": {
-    "hash": "sha256-ow+o9fRw/t2i4N65zuVFbfPb68ZUcJfNB5ARYqRTsIs=",
+    "hash": "sha256-/M+HFMDeKpIzzdn04TkMxriVeE6vvORRiqonxF38B9Q=",
     "homepage": "https://registry.terraform.io/providers/vinyldns/vinyldns",
     "owner": "vinyldns",
     "repo": "terraform-provider-vinyldns",
-    "rev": "v0.10.3",
+    "rev": "v0.11.0",
     "spdx": "Apache-2.0",
-    "vendorHash": "sha256-B4W8rzWHucYqA0HXrMrtKQ91ZfFAgcxHqFMvMnVuGfk="
+    "vendorHash": "sha256-G3OCHFeCUCN5YUusxGNx+xnbpYoA2F+uGdpEn70ExN8="
   },
   "vmware_avi": {
     "hash": "sha256-OPmsbEI9NgzolQSLH/OKJq8a7gvYfWNk1VVz+J9F0JA=",

From 07dac6be25b7b038bc033fec10dca5e5375df2b1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 31 May 2026 18:02:58 +0000
Subject: [PATCH 75/97] all-the-package-names: 2.0.2452 -> 2.0.2460

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

diff --git a/pkgs/by-name/al/all-the-package-names/package.nix b/pkgs/by-name/al/all-the-package-names/package.nix
index 0d0765e57161..d498ceaa639c 100644
--- a/pkgs/by-name/al/all-the-package-names/package.nix
+++ b/pkgs/by-name/al/all-the-package-names/package.nix
@@ -7,16 +7,16 @@
 
 buildNpmPackage rec {
   pname = "all-the-package-names";
-  version = "2.0.2452";
+  version = "2.0.2460";
 
   src = fetchFromGitHub {
     owner = "nice-registry";
     repo = "all-the-package-names";
     tag = "v${version}";
-    hash = "sha256-LNBEp1jGUxJ2cuIeXIx7+FMPkeLZP2XcTOkP0I3o5zw=";
+    hash = "sha256-Sp2I3rukIzvXibd00TqlvuqlZnRGdQNsCiDSv+e38Xc=";
   };
 
-  npmDepsHash = "sha256-ZOtL9GDQASZhNGQdhdJv+rGLscidzfCdmwVkDfyHmGo=";
+  npmDepsHash = "sha256-IHpFhf09+477yvfvoSpzs9WAY8djEXThrM3yUhhNrBQ=";
 
   passthru.updateScript = nix-update-script { };
 

From e61c361883c877144a2d990b1bac4d8a1592ec93 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 31 May 2026 18:07:10 +0000
Subject: [PATCH 76/97] python3Packages.python-roborock: 5.12.0 -> 5.14.0

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

diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix
index 34f860deabfa..cf262e14980a 100644
--- a/pkgs/development/python-modules/python-roborock/default.nix
+++ b/pkgs/development/python-modules/python-roborock/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "python-roborock";
-  version = "5.12.0";
+  version = "5.14.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Python-roborock";
     repo = "python-roborock";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-v4hONQ3EmpenjnAVKm8YMrynVyxtduefN5oqGW9MoE0=";
+    hash = "sha256-SqFU7hhcykP/VSSiPLQPi62iAkgcSw6vwmXq+FpIt9w=";
   };
 
   pythonRelaxDeps = [

From 85ac6ca0889be22cde3a573ce69b29be9666ef21 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sat, 16 May 2026 14:08:21 +0200
Subject: [PATCH 77/97] maintainers: drop ttuegel

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 ci/OWNERS                                              | 10 +++++-----
 maintainers/maintainer-list.nix                        |  6 ------
 nixos/tests/sddm.nix                                   |  4 ++--
 pkgs/applications/display-managers/sddm/unwrapped.nix  |  1 -
 pkgs/applications/networking/dropbox/default.nix       |  2 +-
 pkgs/by-name/ar/arpack/package.nix                     |  1 -
 pkgs/by-name/at/ats2/package.nix                       |  1 -
 pkgs/by-name/au/audacious-bare/package.nix             |  1 -
 pkgs/by-name/bi/biber/package.nix                      |  2 +-
 pkgs/by-name/cl/clementine/package.nix                 |  2 +-
 pkgs/by-name/cm/cmake/package.nix                      |  4 +---
 pkgs/by-name/es/es/package.nix                         |  4 +---
 pkgs/by-name/fr/freetype/package.nix                   |  2 +-
 pkgs/by-name/gr/grantlee/package.nix                   |  2 +-
 pkgs/by-name/hp/hplip/package.nix                      |  2 +-
 pkgs/by-name/io/iosevka/package.nix                    |  1 -
 pkgs/by-name/ip/ipe/package.nix                        |  2 +-
 pkgs/by-name/js/jsoncpp/package.nix                    |  2 +-
 pkgs/by-name/li/libdbusmenu-qt5/package.nix            |  2 +-
 pkgs/by-name/li/libfm/package.nix                      |  2 +-
 pkgs/by-name/li/libxkbcommon_8/package.nix             |  3 +--
 pkgs/by-name/me/media-player-info/package.nix          |  2 +-
 pkgs/by-name/me/menu-cache/package.nix                 |  2 +-
 pkgs/by-name/op/openlibm/package.nix                   |  2 +-
 pkgs/by-name/op/openslp/package.nix                    |  2 +-
 pkgs/by-name/op/openspecfun/package.nix                |  2 +-
 pkgs/by-name/ot/otfcc/package.nix                      |  2 +-
 pkgs/by-name/pc/pcmanfm/package.nix                    |  2 +-
 pkgs/by-name/po/postiats-utilities/package.nix         |  2 +-
 pkgs/by-name/qu/quassel/package.nix                    |  2 +-
 pkgs/by-name/ru/rubber/package.nix                     |  1 -
 pkgs/by-name/so/source-sans-pro/package.nix            |  2 +-
 pkgs/by-name/so/source-sans/package.nix                |  2 +-
 pkgs/by-name/so/source-serif-pro/package.nix           |  2 +-
 pkgs/by-name/so/source-serif/package.nix               |  2 +-
 pkgs/by-name/su/suitesparse/package.nix                |  2 +-
 pkgs/by-name/ta/taglib/package.nix                     |  2 +-
 pkgs/by-name/ta/taglib_1/package.nix                   |  2 +-
 pkgs/by-name/ua/ua/package.nix                         |  2 +-
 pkgs/by-name/vc/vcsh/package.nix                       |  1 -
 pkgs/by-name/vo/vobsub2srt/package.nix                 |  2 +-
 pkgs/by-name/z3/z3/package.nix                         |  1 -
 pkgs/data/fonts/lohit-fonts/default.nix                |  1 -
 pkgs/development/haskell-modules/hoogle.nix            |  2 +-
 pkgs/development/libraries/gstreamer/core/default.nix  |  1 -
 pkgs/development/libraries/kde-frameworks/default.nix  |  1 -
 pkgs/development/libraries/kdsoap/default.nix          |  2 +-
 pkgs/development/libraries/pcre2/default.nix           |  2 +-
 pkgs/development/libraries/polkit-qt-1/default.nix     |  2 +-
 pkgs/development/libraries/poppler/default.nix         |  2 +-
 pkgs/development/libraries/qca/default.nix             |  2 +-
 pkgs/development/libraries/qt-5/modules/qtbase.nix     |  1 -
 pkgs/development/libraries/qt-5/qtModule.nix           |  1 -
 .../libraries/science/math/openblas/default.nix        |  2 +-
 pkgs/tools/inputmethods/ibus/default.nix               |  2 +-
 55 files changed, 46 insertions(+), 70 deletions(-)

diff --git a/ci/OWNERS b/ci/OWNERS
index 08e4c7e4238f..21863a95841b 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -277,15 +277,15 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
 /lib/licenses @alyssais @emilazy @jopejoe1
 
 # Qt
-/pkgs/development/libraries/qt-5 @K900 @NickCao @SuperSandro2000 @ttuegel
-/pkgs/development/libraries/qt-6 @K900 @NickCao @SuperSandro2000 @ttuegel
+/pkgs/development/libraries/qt-5 @K900 @NickCao @SuperSandro2000
+/pkgs/development/libraries/qt-6 @K900 @NickCao @SuperSandro2000
 
 # KDE Frameworks 5
-/pkgs/development/libraries/kde-frameworks @K900 @NickCao @SuperSandro2000 @ttuegel
+/pkgs/development/libraries/kde-frameworks @K900 @NickCao @SuperSandro2000
 
 # KDE / Plasma 6
-/pkgs/kde @K900 @NickCao @SuperSandro2000 @ttuegel
-/maintainers/scripts/kde @K900 @NickCao @SuperSandro2000 @ttuegel
+/pkgs/kde @K900 @NickCao @SuperSandro2000
+/maintainers/scripts/kde @K900 @NickCao @SuperSandro2000
 
 # PostgreSQL and related stuff
 /pkgs/by-name/po/postgresqlTestHook @NixOS/postgres
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index f17a21790904..484a7b229503 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -28388,12 +28388,6 @@
     githubId = 77488956;
     name = "Timothy Tschnitzel";
   };
-  ttuegel = {
-    email = "ttuegel@mailbox.org";
-    github = "ttuegel";
-    githubId = 563054;
-    name = "Thomas Tuegel";
-  };
   tu-maurice = {
     email = "valentin.gehrke+nixpkgs@zom.bi";
     github = "tu-maurice";
diff --git a/nixos/tests/sddm.nix b/nixos/tests/sddm.nix
index 4a3b1321b7d6..ad51e63570e9 100644
--- a/nixos/tests/sddm.nix
+++ b/nixos/tests/sddm.nix
@@ -34,8 +34,8 @@
     { lib, ... }:
     {
       name = "sddm-autologin";
-      meta = with lib.maintainers; {
-        maintainers = [ ttuegel ];
+      meta = {
+        maintainers = [ ];
       };
 
       nodes.machine = {
diff --git a/pkgs/applications/display-managers/sddm/unwrapped.nix b/pkgs/applications/display-managers/sddm/unwrapped.nix
index 64296db0c33d..f8638fccd149 100644
--- a/pkgs/applications/display-managers/sddm/unwrapped.nix
+++ b/pkgs/applications/display-managers/sddm/unwrapped.nix
@@ -112,7 +112,6 @@ stdenv.mkDerivation (finalAttrs: {
     description = "QML based X11 display manager";
     homepage = "https://github.com/sddm/sddm";
     maintainers = with lib.maintainers; [
-      ttuegel
       k900
     ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index 521a530f3f00..2e399f026162 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -114,7 +114,7 @@ buildFHSEnv {
     description = "Online stored folders (daemon version)";
     homepage = "https://www.dropbox.com/";
     license = lib.licenses.unfree;
-    maintainers = with lib.maintainers; [ ttuegel ];
+    maintainers = [ ];
     platforms = [ "x86_64-linux" ];
     mainProgram = "dropbox";
   };
diff --git a/pkgs/by-name/ar/arpack/package.nix b/pkgs/by-name/ar/arpack/package.nix
index 494e0c0db673..74ac1f449b58 100644
--- a/pkgs/by-name/ar/arpack/package.nix
+++ b/pkgs/by-name/ar/arpack/package.nix
@@ -93,7 +93,6 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Collection of Fortran77 subroutines to solve large scale eigenvalue problems";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [
-      ttuegel
       dotlambda
     ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/at/ats2/package.nix b/pkgs/by-name/at/ats2/package.nix
index 47ceaca68994..ea804a173894 100644
--- a/pkgs/by-name/at/ats2/package.nix
+++ b/pkgs/by-name/at/ats2/package.nix
@@ -77,7 +77,6 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [
       thoughtpolice
-      ttuegel
       bbarker
     ];
   };
diff --git a/pkgs/by-name/au/audacious-bare/package.nix b/pkgs/by-name/au/audacious-bare/package.nix
index 1facef24df22..26db7531e2fe 100644
--- a/pkgs/by-name/au/audacious-bare/package.nix
+++ b/pkgs/by-name/au/audacious-bare/package.nix
@@ -51,7 +51,6 @@ stdenv.mkDerivation rec {
     mainProgram = "audacious";
     maintainers = with lib.maintainers; [
       ramkromberg
-      ttuegel
       thiagokokada
     ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/bi/biber/package.nix b/pkgs/by-name/bi/biber/package.nix
index a194682bcd7b..c1e5efd3b58b 100644
--- a/pkgs/by-name/bi/biber/package.nix
+++ b/pkgs/by-name/bi/biber/package.nix
@@ -73,7 +73,7 @@ perlPackages.buildPerlModule {
     description = "Backend for BibLaTeX";
     license = biberSource.meta.license;
     platforms = lib.platforms.unix;
-    maintainers = [ lib.maintainers.ttuegel ];
+    maintainers = [ ];
     mainProgram = "biber";
   };
 }
diff --git a/pkgs/by-name/cl/clementine/package.nix b/pkgs/by-name/cl/clementine/package.nix
index 672eb96a2b53..c4b29ef4bb63 100644
--- a/pkgs/by-name/cl/clementine/package.nix
+++ b/pkgs/by-name/cl/clementine/package.nix
@@ -151,6 +151,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.linux;
     mainProgram = "clementine";
-    maintainers = with lib.maintainers; [ ttuegel ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/cm/cmake/package.nix b/pkgs/by-name/cm/cmake/package.nix
index 0f116ddd80e9..af7a9c13d064 100644
--- a/pkgs/by-name/cm/cmake/package.nix
+++ b/pkgs/by-name/cm/cmake/package.nix
@@ -205,9 +205,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     changelog = "https://cmake.org/cmake/help/v${lib.versions.majorMinor finalAttrs.version}/release/${lib.versions.majorMinor finalAttrs.version}.html";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [
-      ttuegel
-    ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
     mainProgram = "cmake";
     broken = (qt5UI && stdenv.hostPlatform.isDarwin);
diff --git a/pkgs/by-name/es/es/package.nix b/pkgs/by-name/es/es/package.nix
index a3cb8f51ba2c..f3f8cac014f0 100644
--- a/pkgs/by-name/es/es/package.nix
+++ b/pkgs/by-name/es/es/package.nix
@@ -39,9 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     homepage = "http://wryun.github.io/es-shell/";
     license = lib.licenses.publicDomain;
-    maintainers = with lib.maintainers; [
-      ttuegel
-    ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
   };
 
diff --git a/pkgs/by-name/fr/freetype/package.nix b/pkgs/by-name/fr/freetype/package.nix
index 6146ce0d8cc1..76ffe6324cf2 100644
--- a/pkgs/by-name/fr/freetype/package.nix
+++ b/pkgs/by-name/fr/freetype/package.nix
@@ -148,6 +148,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.gpl2Plus; # or the FreeType License (BSD + advertising clause)
     platforms = lib.platforms.all;
     pkgConfigModules = [ "freetype2" ];
-    maintainers = with lib.maintainers; [ ttuegel ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/gr/grantlee/package.nix b/pkgs/by-name/gr/grantlee/package.nix
index a32612b986e7..fac0814c1492 100644
--- a/pkgs/by-name/gr/grantlee/package.nix
+++ b/pkgs/by-name/gr/grantlee/package.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
       and the design of Django is reused in Grantlee.'';
 
     homepage = "https://github.com/steveire/grantlee";
-    maintainers = [ lib.maintainers.ttuegel ];
+    maintainers = [ ];
     license = lib.licenses.lgpl21;
     inherit (qt5.qtbase.meta) platforms;
   };
diff --git a/pkgs/by-name/hp/hplip/package.nix b/pkgs/by-name/hp/hplip/package.nix
index 0d2668a79dd9..0c06677b14f5 100644
--- a/pkgs/by-name/hp/hplip/package.nix
+++ b/pkgs/by-name/hp/hplip/package.nix
@@ -358,6 +358,6 @@ python3Packages.buildPythonApplication {
           gpl2Plus
         ];
     platforms = lib.attrNames hplipPlatforms;
-    maintainers = with lib.maintainers; [ ttuegel ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/io/iosevka/package.nix b/pkgs/by-name/io/iosevka/package.nix
index 11db7ce5dee8..0c117faed086 100644
--- a/pkgs/by-name/io/iosevka/package.nix
+++ b/pkgs/by-name/io/iosevka/package.nix
@@ -147,7 +147,6 @@ buildNpmPackage rec {
     license = lib.licenses.ofl;
     platforms = lib.platforms.all;
     maintainers = with lib.maintainers; [
-      ttuegel
       lunik1
     ];
   };
diff --git a/pkgs/by-name/ip/ipe/package.nix b/pkgs/by-name/ip/ipe/package.nix
index e72d1455778e..48e6dfc8decc 100644
--- a/pkgs/by-name/ip/ipe/package.nix
+++ b/pkgs/by-name/ip/ipe/package.nix
@@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: {
       It supports making small figures for inclusion into LaTeX-documents
       as well as presentations in PDF.
     '';
-    maintainers = with lib.maintainers; [ ttuegel ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/js/jsoncpp/package.nix b/pkgs/by-name/js/jsoncpp/package.nix
index b2961ed1516f..dc3d94b78260 100644
--- a/pkgs/by-name/js/jsoncpp/package.nix
+++ b/pkgs/by-name/js/jsoncpp/package.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://github.com/open-source-parsers/jsoncpp";
     description = "C++ library for interacting with JSON";
-    maintainers = with lib.maintainers; [ ttuegel ];
+    maintainers = [ ];
     license = lib.licenses.mit;
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/li/libdbusmenu-qt5/package.nix b/pkgs/by-name/li/libdbusmenu-qt5/package.nix
index 6006818ae947..126c89c91404 100644
--- a/pkgs/by-name/li/libdbusmenu-qt5/package.nix
+++ b/pkgs/by-name/li/libdbusmenu-qt5/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://launchpad.net/libdbusmenu-qt";
     description = "Provides a Qt implementation of the DBusMenu spec";
-    maintainers = [ lib.maintainers.ttuegel ];
+    maintainers = [ ];
     inherit (libsForQt5.qtbase.meta) platforms;
     license = lib.licenses.lgpl2;
   };
diff --git a/pkgs/by-name/li/libfm/package.nix b/pkgs/by-name/li/libfm/package.nix
index d2adc4e3ccaa..4ef3af6c21d4 100644
--- a/pkgs/by-name/li/libfm/package.nix
+++ b/pkgs/by-name/li/libfm/package.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://blog.lxde.org/category/pcmanfm/";
     license = lib.licenses.lgpl21Plus;
     description = "Glib-based library for file management";
-    maintainers = with lib.maintainers; [ ttuegel ];
+    maintainers = [ ];
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 })
diff --git a/pkgs/by-name/li/libxkbcommon_8/package.nix b/pkgs/by-name/li/libxkbcommon_8/package.nix
index 364e08c46186..caed48e59c02 100644
--- a/pkgs/by-name/li/libxkbcommon_8/package.nix
+++ b/pkgs/by-name/li/libxkbcommon_8/package.nix
@@ -96,8 +96,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://xkbcommon.org";
     changelog = "https://github.com/xkbcommon/libxkbcommon/blob/xkbcommon-${finalAttrs.version}/NEWS.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [
-      ttuegel
+    maintainers = [
     ];
     mainProgram = "xkbcli";
     platforms = with lib.platforms; unix;
diff --git a/pkgs/by-name/me/media-player-info/package.nix b/pkgs/by-name/me/media-player-info/package.nix
index 65202e6e3f5b..acd071feadd8 100644
--- a/pkgs/by-name/me/media-player-info/package.nix
+++ b/pkgs/by-name/me/media-player-info/package.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Repository of data files describing media player capabilities";
     homepage = "https://www.freedesktop.org/wiki/Software/media-player-info/";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ ttuegel ];
+    maintainers = [ ];
     platforms = with lib.platforms; linux;
   };
 })
diff --git a/pkgs/by-name/me/menu-cache/package.nix b/pkgs/by-name/me/menu-cache/package.nix
index 85ee7b390a16..1fa0e80dff11 100644
--- a/pkgs/by-name/me/menu-cache/package.nix
+++ b/pkgs/by-name/me/menu-cache/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Library to read freedesktop.org menu files";
     homepage = "https://github.com/lxde/menu-cache";
     license = lib.licenses.lgpl21Plus;
-    maintainers = [ lib.maintainers.ttuegel ];
+    maintainers = [ ];
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 })
diff --git a/pkgs/by-name/op/openlibm/package.nix b/pkgs/by-name/op/openlibm/package.nix
index 9aad235689c4..255f8de3f1b0 100644
--- a/pkgs/by-name/op/openlibm/package.nix
+++ b/pkgs/by-name/op/openlibm/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "High quality system independent, portable, open source libm implementation";
     homepage = "https://openlibm.org/";
     license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.ttuegel ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/op/openslp/package.nix b/pkgs/by-name/op/openslp/package.nix
index b17ff1c59678..7186fb216958 100644
--- a/pkgs/by-name/op/openslp/package.nix
+++ b/pkgs/by-name/op/openslp/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://www.openslp.org/";
     description = "Open-source implementation of the IETF Service Location Protocol";
-    maintainers = with lib.maintainers; [ ttuegel ];
+    maintainers = [ ];
     license = lib.licenses.bsd3;
     platforms = lib.platforms.all;
     # never built on aarch64-darwin since first introduction in nixpkgs
diff --git a/pkgs/by-name/op/openspecfun/package.nix b/pkgs/by-name/op/openspecfun/package.nix
index 17150dc037d5..960a0c61ad9a 100644
--- a/pkgs/by-name/op/openspecfun/package.nix
+++ b/pkgs/by-name/op/openspecfun/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Collection of special mathematical functions";
     homepage = "https://github.com/JuliaLang/openspecfun";
     license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.ttuegel ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/ot/otfcc/package.nix b/pkgs/by-name/ot/otfcc/package.nix
index 6f7b69697197..8b02a2f266c7 100644
--- a/pkgs/by-name/ot/otfcc/package.nix
+++ b/pkgs/by-name/ot/otfcc/package.nix
@@ -43,6 +43,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/caryll/otfcc";
     license = lib.licenses.asl20;
     platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ ttuegel ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/pc/pcmanfm/package.nix b/pkgs/by-name/pc/pcmanfm/package.nix
index 5c55366879e7..ed916d3ffb9b 100644
--- a/pkgs/by-name/pc/pcmanfm/package.nix
+++ b/pkgs/by-name/pc/pcmanfm/package.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://blog.lxde.org/category/pcmanfm/";
     license = lib.licenses.gpl2Plus;
     description = "File manager with GTK interface";
-    maintainers = [ lib.maintainers.ttuegel ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
     mainProgram = "pcmanfm";
   };
diff --git a/pkgs/by-name/po/postiats-utilities/package.nix b/pkgs/by-name/po/postiats-utilities/package.nix
index c4483426e120..f601055440b9 100644
--- a/pkgs/by-name/po/postiats-utilities/package.nix
+++ b/pkgs/by-name/po/postiats-utilities/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/Hibou57/PostiATS-Utilities";
     license = lib.licenses.bsd2;
     platforms = lib.platforms.linux;
-    maintainers = [ lib.maintainers.ttuegel ];
+    maintainers = [ ];
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/qu/quassel/package.nix b/pkgs/by-name/qu/quassel/package.nix
index 27ce28dbf961..9feaac5b1806 100644
--- a/pkgs/by-name/qu/quassel/package.nix
+++ b/pkgs/by-name/qu/quassel/package.nix
@@ -95,7 +95,7 @@ stdenv.mkDerivation rec {
       as WeeChat, but graphical (based on Qt4/KDE4 or Qt5/KF5).
     '';
     license = lib.licenses.gpl3;
-    maintainers = with lib.maintainers; [ ttuegel ];
+    maintainers = [ ];
     mainProgram =
       if monolithic then
         "quassel"
diff --git a/pkgs/by-name/ru/rubber/package.nix b/pkgs/by-name/ru/rubber/package.nix
index 0d2936191ea4..d2c56b3eda7c 100644
--- a/pkgs/by-name/ru/rubber/package.nix
+++ b/pkgs/by-name/ru/rubber/package.nix
@@ -58,7 +58,6 @@ pypkgs.buildPythonApplication (finalAttrs: {
     license = lib.licenses.gpl2Plus;
     homepage = "https://gitlab.com/latex-rubber/rubber";
     maintainers = with lib.maintainers; [
-      ttuegel
       peterhoeg
     ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/so/source-sans-pro/package.nix b/pkgs/by-name/so/source-sans-pro/package.nix
index fe0020d3b2dd..648c0100c015 100644
--- a/pkgs/by-name/so/source-sans-pro/package.nix
+++ b/pkgs/by-name/so/source-sans-pro/package.nix
@@ -33,6 +33,6 @@ stdenvNoCC.mkDerivation rec {
     description = "Sans serif font family for user interface environments (version of Source Sans before being renamed)";
     license = lib.licenses.ofl;
     platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [ ttuegel ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/so/source-sans/package.nix b/pkgs/by-name/so/source-sans/package.nix
index 4164f6a45cb9..22e3539ff6a2 100644
--- a/pkgs/by-name/so/source-sans/package.nix
+++ b/pkgs/by-name/so/source-sans/package.nix
@@ -28,6 +28,6 @@ stdenvNoCC.mkDerivation rec {
     description = "Sans serif font family for user interface environments";
     license = lib.licenses.ofl;
     platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [ ttuegel ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/so/source-serif-pro/package.nix b/pkgs/by-name/so/source-serif-pro/package.nix
index 761430c55b49..9eab64c81c0a 100644
--- a/pkgs/by-name/so/source-serif-pro/package.nix
+++ b/pkgs/by-name/so/source-serif-pro/package.nix
@@ -33,6 +33,6 @@ stdenvNoCC.mkDerivation rec {
     description = "Typeface for setting text in many sizes, weights, and languages. Designed to complement Source Sans";
     license = lib.licenses.ofl;
     platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [ ttuegel ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/so/source-serif/package.nix b/pkgs/by-name/so/source-serif/package.nix
index 10d5173a4e99..b9643d8e50dc 100644
--- a/pkgs/by-name/so/source-serif/package.nix
+++ b/pkgs/by-name/so/source-serif/package.nix
@@ -28,6 +28,6 @@ stdenvNoCC.mkDerivation rec {
     description = "Typeface for setting text in many sizes, weights, and languages. Designed to complement Source Sans";
     license = lib.licenses.ofl;
     platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [ ttuegel ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/su/suitesparse/package.nix b/pkgs/by-name/su/suitesparse/package.nix
index 4cb0c4260e6c..761fec746167 100644
--- a/pkgs/by-name/su/suitesparse/package.nix
+++ b/pkgs/by-name/su/suitesparse/package.nix
@@ -114,7 +114,7 @@ effectiveStdenv.mkDerivation rec {
       gpl2Plus
       lgpl21Plus
     ];
-    maintainers = with lib.maintainers; [ ttuegel ];
+    maintainers = [ ];
     platforms = with lib.platforms; unix;
   };
 }
diff --git a/pkgs/by-name/ta/taglib/package.nix b/pkgs/by-name/ta/taglib/package.nix
index 4d1e30b71e26..7c6b2fca01b5 100644
--- a/pkgs/by-name/ta/taglib/package.nix
+++ b/pkgs/by-name/ta/taglib/package.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
       lgpl21Only
       mpl11
     ];
-    maintainers = with lib.maintainers; [ ttuegel ];
+    maintainers = [ ];
     pkgConfigModules = [
       "taglib"
       "taglib_c"
diff --git a/pkgs/by-name/ta/taglib_1/package.nix b/pkgs/by-name/ta/taglib_1/package.nix
index 219cb617f7c7..72ced5301a8b 100644
--- a/pkgs/by-name/ta/taglib_1/package.nix
+++ b/pkgs/by-name/ta/taglib_1/package.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
       lgpl21Only
       mpl11
     ];
-    maintainers = with lib.maintainers; [ ttuegel ];
+    maintainers = [ ];
     pkgConfigModules = [
       "taglib"
       "taglib_c"
diff --git a/pkgs/by-name/ua/ua/package.nix b/pkgs/by-name/ua/ua/package.nix
index e2a3340cc2ab..3f40a1acb406 100644
--- a/pkgs/by-name/ua/ua/package.nix
+++ b/pkgs/by-name/ua/ua/package.nix
@@ -35,6 +35,6 @@ buildGoModule {
     homepage = "https://github.com/sloonz/ua";
     license = lib.licenses.isc;
     description = "Universal Aggregator";
-    maintainers = with lib.maintainers; [ ttuegel ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/vc/vcsh/package.nix b/pkgs/by-name/vc/vcsh/package.nix
index a0a31822353b..fc141b1777b4 100644
--- a/pkgs/by-name/vc/vcsh/package.nix
+++ b/pkgs/by-name/vc/vcsh/package.nix
@@ -50,7 +50,6 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/RichiH/vcsh/blob/v${finalAttrs.version}/changelog";
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [
-      ttuegel
       alerque
     ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/vo/vobsub2srt/package.nix b/pkgs/by-name/vo/vobsub2srt/package.nix
index 753617b8ad91..f0381d13e084 100644
--- a/pkgs/by-name/vo/vobsub2srt/package.nix
+++ b/pkgs/by-name/vo/vobsub2srt/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
     description = "Converts VobSub subtitles into SRT subtitles";
     license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.unix;
-    maintainers = [ lib.maintainers.ttuegel ];
+    maintainers = [ ];
     mainProgram = "vobsub2srt";
   };
 }
diff --git a/pkgs/by-name/z3/z3/package.nix b/pkgs/by-name/z3/z3/package.nix
index 8051e68562cb..30a177ebc7a4 100644
--- a/pkgs/by-name/z3/z3/package.nix
+++ b/pkgs/by-name/z3/z3/package.nix
@@ -178,7 +178,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [
       thoughtpolice
-      ttuegel
       numinit
     ];
     pkgConfigModules = lib.optionals useCmakeBuild [ "z3" ];
diff --git a/pkgs/data/fonts/lohit-fonts/default.nix b/pkgs/data/fonts/lohit-fonts/default.nix
index 58c83ec56640..8a00810589c7 100644
--- a/pkgs/data/fonts/lohit-fonts/default.nix
+++ b/pkgs/data/fonts/lohit-fonts/default.nix
@@ -131,7 +131,6 @@ let
         homepage = "https://pagure.io/lohit";
         maintainers = [
           lib.maintainers.mathnerd314
-          lib.maintainers.ttuegel
         ];
         # Set a non-zero priority to allow easy overriding of the
         # fontconfig configuration files.
diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix
index 877fb974c887..eb8ecf2d0ea9 100644
--- a/pkgs/development/haskell-modules/hoogle.nix
+++ b/pkgs/development/haskell-modules/hoogle.nix
@@ -144,6 +144,6 @@ buildPackages.stdenv.mkDerivation (finalAttrs: {
     description = "Local Hoogle database";
     platforms = ghc.meta.platforms;
     hydraPlatforms = with lib.platforms; none;
-    maintainers = with lib.maintainers; [ ttuegel ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix
index 4bf0b650b0b9..05409199e303 100644
--- a/pkgs/development/libraries/gstreamer/core/default.nix
+++ b/pkgs/development/libraries/gstreamer/core/default.nix
@@ -157,7 +157,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [
       tmarkus
-      ttuegel
     ];
   };
 })
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index 702a7f53b745..98dcca16d9f5 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -32,7 +32,6 @@
 
 let
   maintainers = with lib.maintainers; [
-    ttuegel
     nyanloutre
   ];
   license = with lib.licenses; [
diff --git a/pkgs/development/libraries/kdsoap/default.nix b/pkgs/development/libraries/kdsoap/default.nix
index fd1d957fe076..ed3385434696 100644
--- a/pkgs/development/libraries/kdsoap/default.nix
+++ b/pkgs/development/libraries/kdsoap/default.nix
@@ -54,6 +54,6 @@ stdenv.mkDerivation rec {
       gpl3
       lgpl21
     ];
-    maintainers = [ lib.maintainers.ttuegel ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix
index 88d6cedb39f5..72bdfea351c2 100644
--- a/pkgs/development/libraries/pcre2/default.nix
+++ b/pkgs/development/libraries/pcre2/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     homepage = "https://www.pcre.org/";
     description = "Perl Compatible Regular Expressions";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ ttuegel ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
     pkgConfigModules = [
       "libpcre2-posix"
diff --git a/pkgs/development/libraries/polkit-qt-1/default.nix b/pkgs/development/libraries/polkit-qt-1/default.nix
index 7d1d8a9d9e92..6282a4df8daf 100644
--- a/pkgs/development/libraries/polkit-qt-1/default.nix
+++ b/pkgs/development/libraries/polkit-qt-1/default.nix
@@ -29,7 +29,7 @@ mkDerivation rec {
 
   meta = {
     description = "Qt wrapper around PolKit";
-    maintainers = with lib.maintainers; [ ttuegel ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index 686d4a3715e3..42995b15d25c 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -188,7 +188,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = with lib.licenses; [ gpl2Plus ];
     platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [ ttuegel ];
+    maintainers = [ ];
     teams = [ lib.teams.freedesktop ];
     pkgConfigModules = [
       "poppler"
diff --git a/pkgs/development/libraries/qca/default.nix b/pkgs/development/libraries/qca/default.nix
index 6c70f1858c9c..c6fa19a0033f 100644
--- a/pkgs/development/libraries/qca/default.nix
+++ b/pkgs/development/libraries/qca/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Qt Cryptographic Architecture";
     homepage = "https://invent.kde.org/libraries/qca";
-    maintainers = with lib.maintainers; [ ttuegel ];
+    maintainers = [ ];
     license = lib.licenses.lgpl21Plus;
     platforms = with lib.platforms; unix;
   };
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
index 1be9cf974bbe..c1e05d0a8b62 100644
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -603,7 +603,6 @@ stdenv.mkDerivation (
         ];
         maintainers = with lib.maintainers; [
           qknight
-          ttuegel
           bkchr
         ];
         pkgConfigModules = [
diff --git a/pkgs/development/libraries/qt-5/qtModule.nix b/pkgs/development/libraries/qt-5/qtModule.nix
index d37e11aa9efe..db3519cdda51 100644
--- a/pkgs/development/libraries/qt-5/qtModule.nix
+++ b/pkgs/development/libraries/qt-5/qtModule.nix
@@ -116,7 +116,6 @@ mkDerivation (
       ];
       maintainers = with maintainers; [
         qknight
-        ttuegel
         bkchr
       ];
       platforms = platforms.unix;
diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index 6274578cfcdf..9d5d2b4449fd 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -337,7 +337,7 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.bsd3;
     homepage = "https://github.com/OpenMathLib/OpenBLAS";
     platforms = lib.attrNames configs;
-    maintainers = with lib.maintainers; [ ttuegel ];
+    maintainers = [ ];
     pkgConfigModules = [
       "openblas"
       "blas"
diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix
index 4437b30dc434..8e8502ff557a 100644
--- a/pkgs/tools/inputmethods/ibus/default.nix
+++ b/pkgs/tools/inputmethods/ibus/default.nix
@@ -238,6 +238,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.lgpl21Plus;
     platforms = lib.platforms.linux;
     mainProgram = "ibus";
-    maintainers = with lib.maintainers; [ ttuegel ];
+    maintainers = [ ];
   };
 })

From c83e320aa2684e4783c82a06e8bcb19083d606d0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 31 May 2026 18:29:42 +0000
Subject: [PATCH 78/97] typesetter: 0.13.1 -> 0.13.3

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

diff --git a/pkgs/by-name/ty/typesetter/package.nix b/pkgs/by-name/ty/typesetter/package.nix
index 05e449d16f92..a6c2ffa42211 100644
--- a/pkgs/by-name/ty/typesetter/package.nix
+++ b/pkgs/by-name/ty/typesetter/package.nix
@@ -30,19 +30,19 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "typesetter";
-  version = "0.13.1";
+  version = "0.13.3";
   __structuredAttrs = true;
 
   src = fetchFromCodeberg {
     owner = "haydn";
     repo = "typesetter";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-emYFnPfDdip3ELCf7JC2+mZna8d2K2Xk3HsiF4x/nJg=";
+    hash = "sha256-J9s0PRnU7FHE8cvLuk/izW8zKjAuWQ9pcfvop+sLzoc=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-zBchG/uLvImV2UGD1TNdowrYO0yiSpzblwF4AvUzZl4=";
+    hash = "sha256-0akosKshUW03+9Pz9ISk+IY4cWFZywHlpme0E7gn+2E=";
   };
 
   strictDeps = true;

From 660e636cd27f05b4431a079e6288ab2b70dd000d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 31 May 2026 18:39:39 +0000
Subject: [PATCH 79/97] home-assistant-custom-components.bodymiscale: 2026.5.5
 -> 2026.5.6

---
 .../home-assistant/custom-components/bodymiscale/package.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/bodymiscale/package.nix b/pkgs/servers/home-assistant/custom-components/bodymiscale/package.nix
index 26a43f5c1321..76a7492c91a6 100644
--- a/pkgs/servers/home-assistant/custom-components/bodymiscale/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/bodymiscale/package.nix
@@ -9,13 +9,13 @@
 buildHomeAssistantComponent rec {
   owner = "dckiller51";
   domain = "bodymiscale";
-  version = "2026.5.5";
+  version = "2026.5.6";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = domain;
     rev = version;
-    hash = "sha256-O+6+aUmMULEv+Xmh/Gw8iHfSrJkUZ8h0SHvOsQFjpFw=";
+    hash = "sha256-IUGQrUVaDw4XlxFGzYsSeg4Y1UxQgbOECL6OiB3cdsg=";
   };
 
   dependencies = [

From ba561b7cd55e3d8225ce6ea1d0af2cbd91877bf3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 31 May 2026 18:49:47 +0000
Subject: [PATCH 80/97] terraform-providers.metio_migadu: 2026.5.14 ->
 2026.5.28

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index e1ba93afe62a..fc00004f1b12 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -905,13 +905,13 @@
     "vendorHash": "sha256-t4dbDJNjEQ6/u+/6zqk2Sdd3LVn/L2BCJujpiLdGc58="
   },
   "metio_migadu": {
-    "hash": "sha256-WpJj2k+ZUjImbvLwXExaUO0Q1wn/QioTERzf5eQZqrU=",
+    "hash": "sha256-q+7tTBMxqGlN6GyosnL70/qGtnwueWr1n+WI5BhnV4E=",
     "homepage": "https://registry.terraform.io/providers/metio/migadu",
     "owner": "metio",
     "repo": "terraform-provider-migadu",
-    "rev": "2026.5.14",
+    "rev": "2026.5.28",
     "spdx": "0BSD",
-    "vendorHash": "sha256-wpQ+2hV6lEKAJByJCh6SZSDF9CQ46IjiC7JRz0+NvwI="
+    "vendorHash": "sha256-ap1+0luy/9OQYNkYh1Aj+2LPMt7JdhKNn0ENrQMz3Uk="
   },
   "mongey_kafka": {
     "hash": "sha256-rTa6c7jAMH027V7h/yUGVGz6TS0PDdObilxU0Vpr6FI=",

From 148b4d78c2763b90287de479f8a3bc36d7065484 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 31 May 2026 18:53:02 +0000
Subject: [PATCH 81/97] python3Packages.synchronicity: cleanup

---
 .../python-modules/synchronicity/default.nix  | 33 ++++++++++++++-----
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/synchronicity/default.nix b/pkgs/development/python-modules/synchronicity/default.nix
index 5ce1539f0da4..4b5a0f5c8f22 100644
--- a/pkgs/development/python-modules/synchronicity/default.nix
+++ b/pkgs/development/python-modules/synchronicity/default.nix
@@ -3,38 +3,55 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
-  gevent,
+
+  # build-system
   hatchling,
+
+  # dependencies
+  typing-extensions,
+
+  # optional-dependencies
+  sigtools,
+
+  # tests
   mypy,
   pytest-asyncio,
   pytest-markdown-docs,
   pytestCheckHook,
   pythonOlder,
-  sigtools,
-  typing-extensions,
+  gevent,
 }:
 
 buildPythonPackage (finalAttrs: {
   pname = "synchronicity";
   version = "0.12.3";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "modal-labs";
     repo = "synchronicity";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-zqZaW/CX7PELh+PzC/2ofNUiWP2Enm/kg2uELQUSmk0=";
   };
 
-  build-system = [ hatchling ];
-  dependencies = [ typing-extensions ];
-  optional-dependencies.compile = [ sigtools ];
+  build-system = [
+    hatchling
+  ];
+
+  dependencies = [
+    typing-extensions
+  ];
+
+  optional-dependencies = {
+    compile = [ sigtools ];
+  };
 
   nativeCheckInputs = [
     mypy
-    pytestCheckHook
     pytest-asyncio
     pytest-markdown-docs
+    pytestCheckHook
     sigtools
   ]
   ++ lib.optionals (pythonOlder "3.13") [

From b4f45e65da9397edbb1b51b012a2a49629158efb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 31 May 2026 19:38:03 +0000
Subject: [PATCH 82/97] python3Packages.pypck: 0.9.11 -> 0.9.12

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

diff --git a/pkgs/development/python-modules/pypck/default.nix b/pkgs/development/python-modules/pypck/default.nix
index a29be058ac9a..c84a20c45cb8 100644
--- a/pkgs/development/python-modules/pypck/default.nix
+++ b/pkgs/development/python-modules/pypck/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pypck";
-  version = "0.9.11";
+  version = "0.9.12";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "alengwenus";
     repo = "pypck";
     tag = finalAttrs.version;
-    hash = "sha256-XULSgnVp7uIob/tL8zqszTBTdxMY4QIeIBruO2Augnc=";
+    hash = "sha256-h7y7LYQg9VZxRUu8m1zV0rV6q3rldxe4TSmLJhTkFGM=";
   };
 
   postPatch = ''

From 4eff3206a03abf634d8ed86340c4c5c14d980868 Mon Sep 17 00:00:00 2001
From: Marc Jakobi <marc@jakobi.dev>
Date: Fri, 29 May 2026 19:12:45 +0200
Subject: [PATCH 83/97] luaPackages.vicious: build with luarocks

---
 maintainers/scripts/luarocks-packages.csv     |  1 +
 .../lua-modules/generated-packages.nix        | 30 ++++++++++++++++
 pkgs/development/lua-modules/overrides.nix    | 13 +++++++
 pkgs/top-level/lua-packages.nix               | 36 -------------------
 4 files changed, 44 insertions(+), 36 deletions(-)

diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv
index 19a5a74f9e07..51583b8e2b6f 100644
--- a/maintainers/scripts/luarocks-packages.csv
+++ b/maintainers/scripts/luarocks-packages.csv
@@ -176,6 +176,7 @@ tree-sitter-norg-meta,,,,,,
 tree-sitter-orgmode,,,,,5.1,
 utf8,,,,,,
 tree-sitter-teal,,,,,,
+vicious,,,,,,
 vstruct,,,,,,
 vusted,,,,,,
 xml2lua,,,,,,teto
diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index fbbeb8a2d405..0291e2740366 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -6357,6 +6357,36 @@ final: prev: {
     }
   ) { };
 
+  vicious = callPackage (
+    {
+      buildLuarocksPackage,
+      fetchurl,
+      fetchzip,
+      luaOlder,
+    }:
+    buildLuarocksPackage {
+      pname = "vicious";
+      version = "2.7.1-3";
+      knownRockspec =
+        (fetchurl {
+          url = "mirror://luarocks/vicious-2.7.1-4.rockspec";
+          sha256 = "1yvc9mbalsyrqysxkc1lf92ki5gzizn79y2azyavmgjwljif6lfi";
+        }).outPath;
+      src = fetchzip {
+        url = "https://github.com/vicious-widgets/vicious/archive/refs/tags/v2.7.1.zip";
+        sha256 = "0bfj3bc1gmbwwvpwkmqp658iwrwdifc78hzwwy1qpn7rbmarg2qv";
+      };
+
+      disabled = luaOlder "5.1";
+
+      meta = {
+        homepage = "https://vicious.rtfd.io";
+        license = lib.licenses.gpl2Plus;
+        description = "Modular widget library for the \"awesome\" window manager";
+      };
+    }
+  ) { };
+
   vstruct = callPackage (
     {
       buildLuarocksPackage,
diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix
index c8d4f7c39424..aa47a9ec9a49 100644
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@@ -1300,6 +1300,19 @@ in
     '';
   };
 
+  vicious = prev.vicious.overrideAttrs (old: {
+    meta = (old.meta or { }) // {
+      changelog = "https://github.com/vicious-widgets/vicious/blob/v${old.version}/CHANGELOG.rst";
+      maintainers = with lib.maintainers; [
+        makefu
+        mic92
+        mrcjkb
+        McSinyx
+      ];
+      platforms = lib.platforms.linux;
+    };
+  });
+
   vstruct = prev.vstruct.overrideAttrs (old: {
     meta = (old.meta or { }) // {
       broken = luaOlder "5.1" || luaAtLeast "5.4";
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index cf7245ead857..aed979e7a5d5 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -257,40 +257,4 @@ rec {
   };
 
   readline = callPackage ../development/lua-modules/readline { inherit (pkgs) readline; };
-
-  vicious = callPackage (
-    { fetchFromGitHub }:
-    stdenv.mkDerivation rec {
-      pname = "vicious";
-      version = "2.7.1";
-
-      src = fetchFromGitHub {
-        owner = "vicious-widgets";
-        repo = "vicious";
-        rev = "v${version}";
-        sha256 = "sha256-G4uXVV352IuD5/xDdJiLjWceUTEX18nv5nzVF9ga0i0=";
-      };
-
-      buildInputs = [ lua ];
-
-      installPhase = ''
-        mkdir -p $out/lib/lua/${lua.luaversion}/
-        cp -r . $out/lib/lua/${lua.luaversion}/vicious/
-        printf "package.path = '$out/lib/lua/${lua.luaversion}/?/init.lua;' ..  package.path\nreturn require((...) .. '.init')\n" > $out/lib/lua/${lua.luaversion}/vicious.lua
-      '';
-
-      meta = {
-        description = "Modular widget library for the awesome window manager";
-        homepage = "https://vicious.readthedocs.io";
-        changelog = "https://vicious.readthedocs.io/changelog.html";
-        license = lib.licenses.gpl2Plus;
-        maintainers = with lib.maintainers; [
-          makefu
-          mic92
-          McSinyx
-        ];
-        platforms = lib.platforms.linux;
-      };
-    }
-  ) { };
 }

From 09b3335ed413b92aee347ae7295ce314658ada32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 31 May 2026 12:32:28 -0700
Subject: [PATCH 84/97] gegl: 0.4.68 -> 0.4.70

Diff: https://gitlab.gnome.org/GNOME/gegl/-/compare/GEGL_0_4_68...GEGL_0_4_70
---
 pkgs/by-name/ge/gegl/package.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ge/gegl/package.nix b/pkgs/by-name/ge/gegl/package.nix
index b9251fd7ed4e..e922e210584b 100644
--- a/pkgs/by-name/ge/gegl/package.nix
+++ b/pkgs/by-name/ge/gegl/package.nix
@@ -37,7 +37,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gegl";
-  version = "0.4.68";
+  version = "0.4.70";
 
   outputs = [
     "out"
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor finalAttrs.version}/gegl-${finalAttrs.version}.tar.xz";
-    hash = "sha256-UAIwm5pwEmBljos6YVQP1Wc4h875mDOOGZJSSjOyOuM=";
+    hash = "sha256-R/UNnDrs03XetIwR6/6tUtFi5PwWKks9RGGCd/H67AI=";
   };
 
   nativeBuildInputs = [
@@ -107,8 +107,6 @@ stdenv.mkDerivation (finalAttrs: {
     # Disabled due to multiple vulnerabilities, see
     # https://github.com/NixOS/nixpkgs/pull/73586
     "-Djasper=disabled"
-    # Selecting platform default is broken by -Dauto_features.
-    "-Drelocatable=disabled"
   ]
   ++ lib.optionals (!withLuaJIT) [
     "-Dlua=disabled"

From c73983785d6ba68da483b943442848ea45debf78 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 31 May 2026 22:25:21 +0200
Subject: [PATCH 85/97] apt-cacher-ng: fuse -> fuse3

---
 pkgs/by-name/ap/apt-cacher-ng/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ap/apt-cacher-ng/package.nix b/pkgs/by-name/ap/apt-cacher-ng/package.nix
index c6acb16e156d..02b66e0e81ce 100644
--- a/pkgs/by-name/ap/apt-cacher-ng/package.nix
+++ b/pkgs/by-name/ap/apt-cacher-ng/package.nix
@@ -5,7 +5,7 @@
   cmake,
   doxygen,
   fetchurl,
-  fuse,
+  fuse3,
   libevent,
   xz,
   openssl,
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   buildInputs = [
     bzip2
-    fuse
+    fuse3
     libevent
     xz
     openssl

From 15e9f0f6c271ec12ca9e704f00ff2b3f8718f4d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 31 May 2026 13:25:52 -0700
Subject: [PATCH 86/97] babl: remove -Drelocatable-bundle=no

---
 pkgs/by-name/ba/babl/package.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/by-name/ba/babl/package.nix b/pkgs/by-name/ba/babl/package.nix
index 75fe2176ff4c..1e44a08ce840 100644
--- a/pkgs/by-name/ba/babl/package.nix
+++ b/pkgs/by-name/ba/babl/package.nix
@@ -46,9 +46,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   mesonFlags = [
     "-Dprefix-dev=${placeholder "dev"}"
-    # On Linux, this would be disabled by default but we have -Dauto_features=enabled.
-    # Disable it on other platforms too, since I cannot test it there.
-    "-Drelocatable-bundle=no"
   ]
   ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
     # Docs are opt-out in native but opt-in in cross builds.

From 5e37564db5068b3c9aec2cff01b5c25a2673dff3 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sun, 31 May 2026 14:29:27 -0600
Subject: [PATCH 87/97] boxfs: drop

Depends on unsupported fuse2 and unmaintained upstream.
---
 .../bo/boxfs/libapp-include-ctype.diff        | 11 ---
 pkgs/by-name/bo/boxfs/package.nix             | 81 -------------------
 pkgs/by-name/bo/boxfs/use-stdbool.patch       | 18 -----
 .../bo/boxfs/work-around-API-borkage.patch    | 23 ------
 pkgs/top-level/aliases.nix                    |  1 +
 5 files changed, 1 insertion(+), 133 deletions(-)
 delete mode 100644 pkgs/by-name/bo/boxfs/libapp-include-ctype.diff
 delete mode 100644 pkgs/by-name/bo/boxfs/package.nix
 delete mode 100644 pkgs/by-name/bo/boxfs/use-stdbool.patch
 delete mode 100644 pkgs/by-name/bo/boxfs/work-around-API-borkage.patch

diff --git a/pkgs/by-name/bo/boxfs/libapp-include-ctype.diff b/pkgs/by-name/bo/boxfs/libapp-include-ctype.diff
deleted file mode 100644
index ab0492165e86..000000000000
--- a/pkgs/by-name/bo/boxfs/libapp-include-ctype.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/libapp/libapp/app.c b/libapp/libapp/app.c
-index 0188795..f9f1cfa 100644
---- a/libapp/libapp/app.c
-+++ b/libapp/libapp/app.c
-@@ -1,5 +1,6 @@
- #include "app.h"
- 
-+#include <ctype.h>
- #include <stdlib.h>
- #include <string.h>
- #include <libgen.h>
diff --git a/pkgs/by-name/bo/boxfs/package.nix b/pkgs/by-name/bo/boxfs/package.nix
deleted file mode 100644
index 2d9ca8313878..000000000000
--- a/pkgs/by-name/bo/boxfs/package.nix
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  curl,
-  fuse,
-  libxml2,
-  pkg-config,
-}:
-
-let
-  srcs = {
-    boxfs2 = fetchFromGitHub {
-      sha256 = "10af1l3sjnh25shmq5gdnpyqk4vrq7i1zklv4csf1n2nrahln8j8";
-      rev = "d7018b0546d2dae956ae3da3fb95d2f63fa6d3ff";
-      repo = "boxfs2";
-      owner = "drotiro";
-    };
-    libapp = fetchFromGitHub {
-      sha256 = "1p2sbxiranan2n2xsfjkp3c6r2vcs57ds6qvjv4crs1yhxr7cp00";
-      rev = "febebe2bc0fb88d57bdf4eb4a2a54c9eeda3f3d8";
-      repo = "libapp";
-      owner = "drotiro";
-    };
-    libjson = fetchFromGitHub {
-      sha256 = "1vhss3gq44nl61fbnh1l3qzwvz623gwhfgykf1lf1p31rjr7273w";
-      rev = "75a7f50fca2c667bc5f32cdd6dd98f2b673f6657";
-      repo = "libjson";
-      owner = "vincenthz";
-    };
-  };
-in
-stdenv.mkDerivation {
-  pname = "boxfs";
-  version = "2-20150109";
-
-  src = srcs.boxfs2;
-
-  prePatch = with srcs; ''
-    substituteInPlace Makefile --replace "git pull" "true"
-    cp -a --no-preserve=mode ${libapp} libapp
-    cp -a --no-preserve=mode ${libjson} libjson
-  '';
-  patches = [
-    ./work-around-API-borkage.patch
-    ./libapp-include-ctype.diff
-    ./use-stdbool.patch
-  ];
-
-  buildInputs = [
-    curl
-    fuse
-    libxml2
-  ];
-  nativeBuildInputs = [ pkg-config ];
-
-  buildFlags = [
-    "static"
-    "CC=${stdenv.cc.targetPrefix}cc"
-  ]
-  ++ lib.optional stdenv.hostPlatform.isDarwin "CFLAGS=-D_BSD_SOURCE";
-
-  installPhase = ''
-    mkdir -p $out/bin
-    install boxfs boxfs-init $out/bin
-  '';
-
-  meta = {
-    description = "FUSE file system for box.com accounts";
-    longDescription = ''
-      Store files on box.com (an account is required). The first time you run
-      boxfs, you will need to complete the authentication (oauth2) process and
-      grant access to your box.com account. Just follow the instructions on
-      the terminal and in your browser. When you've done using your files,
-      unmount the file system with `fusermount -u mountpoint`.
-    '';
-    homepage = "https://github.com/drotiro/boxfs2";
-    license = lib.licenses.gpl3;
-    platforms = lib.platforms.unix;
-  };
-}
diff --git a/pkgs/by-name/bo/boxfs/use-stdbool.patch b/pkgs/by-name/bo/boxfs/use-stdbool.patch
deleted file mode 100644
index 9177886eadc3..000000000000
--- a/pkgs/by-name/bo/boxfs/use-stdbool.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/tmp/orig_base.h b/libapp/libapp/base.h
-index 7d8abdb..2f42b03 100644
---- a/tmp/orig_base.h
-+++ b/libapp/libapp/base.h
-@@ -1,12 +1,7 @@
- #ifndef APP_BASE_H
- #define APP_BASE_H
- 
--#ifndef __cplusplus
--typedef enum {
--        false = 0,
--        true = 1
--} bool;
--#endif
-+#include <stdbool.h>
- 
- #define ASSERT(clause) if( !clause) { fprintf(stderr, "Assertion '%s' failed at %s:%d\n", #clause, __FILE__, __LINE__ ); exit(-1); }
- 
diff --git a/pkgs/by-name/bo/boxfs/work-around-API-borkage.patch b/pkgs/by-name/bo/boxfs/work-around-API-borkage.patch
deleted file mode 100644
index a473111e7aa5..000000000000
--- a/pkgs/by-name/bo/boxfs/work-around-API-borkage.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/boxapi.c b/boxapi.c
-index 4964273..e4b7404 100644
---- a/boxapi.c
-+++ b/boxapi.c
-@@ -29,6 +29,7 @@
- #include <curl/curl.h>
- 
- #include <libxml/hash.h>
-+#include <libxml/parser.h>
- 
- #include <libapp/app.h>
- /* Building blocks for OpenBox api endpoints
-@@ -38,8 +39,8 @@
- //    AUTH
- #define API_KEY_VAL "f9ss11y2w0hg5r04jsidxlhk4pil28cf"
- #define API_SECRET  "r3ZHAIhsOL2FoHjgERI9xf74W5skIM0w"
--#define API_OAUTH_URL "https://app.box.com/api/oauth2/" //"https://www.box.com/api/oauth2/"
--#define API_OAUTH_AUTHORIZE API_OAUTH_URL "authorize?response_type=code&client_id=" API_KEY_VAL /*"&redirect_uri=http%3A//localhost"*/
-+#define API_OAUTH_URL "https://api.box.com/oauth2/" //"https://www.box.com/api/oauth2/"
-+#define API_OAUTH_AUTHORIZE "https://app.box.com/api/oauth2/authorize?response_type=code&client_id=" API_KEY_VAL /*"&redirect_uri=http%3A//localhost"*/
- #define API_OAUTH_TOKEN     API_OAUTH_URL "token"
- //    CALLS
- #define API_ENDPOINT	"https://api.box.com/2.0/"
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6d6659140d42..088afc9a806b 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -405,6 +405,7 @@ mapAliases {
   boost177 = throw "Boost 1.77 has been removed as it is obsolete and no longer used by anything in Nixpkgs"; # Added 2026-04-20
   botan2 = throw "botan2 has been removed as it is EOL"; # Added 2025-10-20
   bower2nix = throw "bower2nix has been removed as bower was removed. It is recommended to migrate to yarn."; # Added 2025-09-17
+  boxfs = throw "'boxfs' has been removed, as it depends on unsupported fuse2 and unmaintained upstream"; # Added 2026-05-30
   brasero-original = throw "'brasero-original' has been renamed to/replaced by 'brasero-unwrapped'"; # Converted to throw 2025-10-27
   breads-ad = throw "'breads-ad' has been removed because its source is no longer available"; # Added 2025-12-20
   break-time = throw "'break-time' has been removed because it is not maintained upstream and has insecure dependencies."; # Added 2025-12-01

From 6f4343f71631ab45bb2682d035ad77723b17a3cf Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 31 May 2026 22:37:03 +0200
Subject: [PATCH 88/97] mhddfs: rip

contributes to #526161 , it has not been tested if the package builds with fuse3
---
 .../mh/mhddfs/fix-format-security-error.patch | 12 -----
 pkgs/by-name/mh/mhddfs/package.nix            | 48 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 3 files changed, 1 insertion(+), 60 deletions(-)
 delete mode 100644 pkgs/by-name/mh/mhddfs/fix-format-security-error.patch
 delete mode 100644 pkgs/by-name/mh/mhddfs/package.nix

diff --git a/pkgs/by-name/mh/mhddfs/fix-format-security-error.patch b/pkgs/by-name/mh/mhddfs/fix-format-security-error.patch
deleted file mode 100644
index 35e58cf0ce9e..000000000000
--- a/pkgs/by-name/mh/mhddfs/fix-format-security-error.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- mhddfs-0.1.39/src/usage.c.old	2017-02-28 15:00:25.435438622 +0100
-+++ mhddfs-0.1.39/src/usage.c	2017-02-28 15:00:33.847454958 +0100
-@@ -43,7 +43,7 @@
- 		"\n"
- 		" see fusermount(1) for information about other options\n"
- 		"";
--	fprintf(to, usage);
-+	fputs(usage, to);
- 	if (to==stdout) exit(0);
- 	exit(-1);
- }
-
diff --git a/pkgs/by-name/mh/mhddfs/package.nix b/pkgs/by-name/mh/mhddfs/package.nix
deleted file mode 100644
index 702c8157f35c..000000000000
--- a/pkgs/by-name/mh/mhddfs/package.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  fuse,
-  pkg-config,
-  attr,
-  uthash,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "mhddfs";
-  version = "0.1.39";
-
-  src = fetchurl {
-    url = "https://mhddfs.uvw.ru/downloads/mhddfs_${finalAttrs.version}.tar.gz";
-    sha256 = "14ggmh91vv69fp2qpz0nxp0hprlw2wsijss2k2485hb0ci4cabvh";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [
-    fuse
-    attr
-    uthash
-  ];
-
-  patches = [
-    ./fix-format-security-error.patch
-  ];
-
-  postPatch = ''
-    substituteInPlace src/main.c --replace "attr/xattr.h" "sys/xattr.h"
-    substituteInPlace src/tools.c --replace "attr/xattr.h" "sys/xattr.h"
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp mhddfs $out/bin/
-  '';
-
-  meta = {
-    homepage = "https://mhddfs.uvw.ru/";
-    description = "Combines a several mount points into the single one";
-    license = lib.licenses.gpl3;
-    maintainers = [ lib.maintainers.makefu ];
-    mainProgram = "mhddfs";
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6d6659140d42..9a512e154b34 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1431,6 +1431,7 @@ mapAliases {
   metaBuildEnv = throw "'metaBuildEnv' has been removed, due to it being ancient unmaintained software"; # Added 2026-02-11
   meteo = throw "'meteo' has been removed as it was unmaintained and depends on deprecated webkitgtk_4_0"; # Added 2025-10-09
   metersLv2 = warnAlias "'metersLv2' has been renamed to 'meters-lv2'" meters-lv2; # Added 2026-02-08
+  mhddfs = throw "'mhddfs' has been removed because upstream marked it as unmaintained on 2015-03-17. Consider using 'mergerfs' as potential alternative"; # Added 2026-05-31
   microcodeAmd = throw "'microcodeAmd' has been renamed to/replaced by 'microcode-amd'"; # Converted to throw 2025-10-27
   microcodeIntel = throw "'microcodeIntel' has been renamed to/replaced by 'microcode-intel'"; # Converted to throw 2025-10-27
   microsoft_gsl = throw "'microsoft_gsl' has been renamed to/replaced by 'microsoft-gsl'"; # Converted to throw 2025-10-27

From cda4c4890dcc397be9ec8970c7178c4015629528 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 31 May 2026 20:45:16 +0000
Subject: [PATCH 89/97] deja: 0.2.6 -> 0.2.7

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

diff --git a/pkgs/by-name/de/deja/package.nix b/pkgs/by-name/de/deja/package.nix
index 608420c820d0..3a99ebfa2cea 100644
--- a/pkgs/by-name/de/deja/package.nix
+++ b/pkgs/by-name/de/deja/package.nix
@@ -7,13 +7,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "deja";
-  version = "0.2.6";
+  version = "0.2.7";
   __structuredAttrs = true;
   src = fetchFromGitHub {
     owner = "Giammarco-Ferranti";
     repo = "deja";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xxbClKhhSwo+jUjAZ2gS4yOS5sSI76dfPpDzA3qdV18=";
+    hash = "sha256-HHD9x7oM9b0Bt9QhtMhirwobW/o/zjiCVPCFKTn838g=";
   };
 
   vendorHash = "sha256-KmLdMK94cGOXMPJwWS6NgLB5OiNmJbszHdnLzauqJm8=";

From 0d4497ad337bfa277dc47280d16cc97d1d66957a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 31 May 2026 20:53:05 +0000
Subject: [PATCH 90/97] python3Packages.weaviate-client: 4.21.0 -> 4.21.2

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

diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix
index 0588073bf039..0d9b5973218b 100644
--- a/pkgs/development/python-modules/weaviate-client/default.nix
+++ b/pkgs/development/python-modules/weaviate-client/default.nix
@@ -30,7 +30,7 @@
 
 buildPythonPackage rec {
   pname = "weaviate-client";
-  version = "4.21.0";
+  version = "4.21.2";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     owner = "weaviate";
     repo = "weaviate-python-client";
     tag = "v${version}";
-    hash = "sha256-nGYslKyIQWAwhu5Fa23jXtgBN9q4jjrmBhWv4EO3Vn8=";
+    hash = "sha256-ZynGooTKuZWjzxVB7By7LiafyRmFlYfh+JyzfXYeJog=";
   };
 
   pythonRelaxDeps = [

From 503f9721c9dad50374dba0c1f2e2fc0b7597a36a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 31 May 2026 20:56:11 +0000
Subject: [PATCH 91/97] python3Packages.samsungtvws: 3.0.4 -> 3.0.5

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

diff --git a/pkgs/development/python-modules/samsungtvws/default.nix b/pkgs/development/python-modules/samsungtvws/default.nix
index 1e47746047a2..25bbd308bcf8 100644
--- a/pkgs/development/python-modules/samsungtvws/default.nix
+++ b/pkgs/development/python-modules/samsungtvws/default.nix
@@ -26,14 +26,14 @@
 
 buildPythonPackage rec {
   pname = "samsungtvws";
-  version = "3.0.4";
+  version = "3.0.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "xchwarze";
     repo = "samsung-tv-ws-api";
     tag = "v${version}";
-    hash = "sha256-wQujnvIvq15k7GGIc5FSQFk90kcaxvXbpo4DZAESX58=";
+    hash = "sha256-8DDxon6ZGP0dToYxa2ZkvKl+1aFpvS1Zs+w7Hsozwdw=";
   };
 
   build-system = [ setuptools ];

From 57c5a92067bf16705978c69704acba1678db0f0f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 31 May 2026 21:11:40 +0000
Subject: [PATCH 92/97] cargo-pgrx: 0.18.0 -> 0.18.1

---
 pkgs/development/tools/rust/cargo-pgrx/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-pgrx/default.nix b/pkgs/development/tools/rust/cargo-pgrx/default.nix
index 0379bd23a3db..0df2a3cb14b3 100644
--- a/pkgs/development/tools/rust/cargo-pgrx/default.nix
+++ b/pkgs/development/tools/rust/cargo-pgrx/default.nix
@@ -62,9 +62,9 @@ in
   # Not to be used with buildPgrxExtension, where it should be pinned.
   # When you make an extension use the latest version, *copy* this to a separate pinned attribute.
   cargo-pgrx = generic {
-    version = "0.18.0";
-    hash = "sha256-sBezVDNnyqFQwvFm/CkhlY1zm7Ii2NQPeTfoUQu55e0=";
-    cargoHash = "sha256-/miOlhZ87fnKT1f+XVaWK4xAzHje8OGVlYl4iU0Sf34=";
+    version = "0.18.1";
+    hash = "sha256-4/FKpiMm3MedrmJwXf9NMkzTGQyZuU2GYQ4ZIif3YDE=";
+    cargoHash = "sha256-4hQL06ZRykZDeVJMYeBSw50jUPlBVh+J5FfyF1hTlNc=";
   };
 }
 // lib.mapAttrs (_: generic) (import ./pinned.nix)

From 94adca7d6768bdb64e3a6f0821a23538366a5901 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 1 Jun 2026 01:22:07 +0200
Subject: [PATCH 93/97] buildHomeAssistantComponent: migrate from format to
 pyproject

---
 .../servers/home-assistant/build-custom-component/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/build-custom-component/default.nix b/pkgs/servers/home-assistant/build-custom-component/default.nix
index 92fd9093eb9d..98fe5115a14d 100644
--- a/pkgs/servers/home-assistant/build-custom-component/default.nix
+++ b/pkgs/servers/home-assistant/build-custom-component/default.nix
@@ -26,12 +26,12 @@ lib.extendMkDerivation {
       owner,
       domain,
       version,
-      format ? "other",
       ...
     }@args:
     {
       pname = "${owner}/${domain}";
-      inherit version format;
+      inherit version;
+      pyproject = false;
 
       installPhase = ''
         runHook preInstall

From c730f4967b648439ca3e2b42b8e30cf0f90cd4b4 Mon Sep 17 00:00:00 2001
From: IogaMaster <iogamastercode@gmail.com>
Date: Sun, 31 May 2026 17:32:58 -0600
Subject: [PATCH 94/97] wlogout: add iogamaster to maintainers

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

diff --git a/pkgs/by-name/wl/wlogout/package.nix b/pkgs/by-name/wl/wlogout/package.nix
index 1dcacdf2bcdb..fdf770a63fe7 100644
--- a/pkgs/by-name/wl/wlogout/package.nix
+++ b/pkgs/by-name/wl/wlogout/package.nix
@@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/ArtsyMacaw/wlogout/releases/tag/${finalAttrs.src.rev}";
     license = with lib.licenses; [ mit ];
     mainProgram = "wlogout";
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ iogamaster ];
     inherit (wayland.meta) platforms;
   };
 })

From 56df934b66ce8fe239a1ed4d14992b6b1a00d4e8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 1 Jun 2026 01:33:58 +0200
Subject: [PATCH 95/97] python3Packages.pydantic-graph: 1.103.0 -> 1.104.0

https://github.com/pydantic/pydantic-ai/compare/v1.103.0...v1.104.0
---
 pkgs/development/python-modules/pydantic-graph/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pydantic-graph/default.nix b/pkgs/development/python-modules/pydantic-graph/default.nix
index 0ff62acf21b6..8768eee9de1e 100644
--- a/pkgs/development/python-modules/pydantic-graph/default.nix
+++ b/pkgs/development/python-modules/pydantic-graph/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pydantic-graph";
-  version = "1.103.0";
+  version = "1.104.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pydantic";
     repo = "pydantic-ai";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-eWusMERC1yZ/BltZPcYkrBGpbdG0EyWZVwYDqMLD/kY=";
+    hash = "sha256-8oIOCR958L0eW7UY4cZtCsQkZNtQNGVqwoNAHzjltvY=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/pydantic_graph";

From 1264f141c22fd3b90bf7941353b47d5c3f965cf9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 1 Jun 2026 01:36:44 +0200
Subject: [PATCH 96/97] python3Packages.pydantic-ai-slim: 1.103.0 -> 1.104.0

---
 pkgs/development/python-modules/pydantic-ai-slim/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pydantic-ai-slim/default.nix b/pkgs/development/python-modules/pydantic-ai-slim/default.nix
index 6e86318529ef..baab17d69c65 100644
--- a/pkgs/development/python-modules/pydantic-ai-slim/default.nix
+++ b/pkgs/development/python-modules/pydantic-ai-slim/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pydantic-ai-slim";
-  version = "1.103.0";
+  version = "1.104.0";
   pyproject = true;
 
   src = fetchFromGitHub {

From 5f85796ab70f9a6ac935b366065d4565288947ac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 31 May 2026 23:56:57 +0000
Subject: [PATCH 97/97] python3Packages.telnetlib3: 4.0.3 -> 4.0.4

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

diff --git a/pkgs/development/python-modules/telnetlib3/default.nix b/pkgs/development/python-modules/telnetlib3/default.nix
index 91df7c300cc6..ab8ea1b60a98 100644
--- a/pkgs/development/python-modules/telnetlib3/default.nix
+++ b/pkgs/development/python-modules/telnetlib3/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "telnetlib3";
-  version = "4.0.3";
+  version = "4.0.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jquast";
     repo = "telnetlib3";
     tag = finalAttrs.version;
-    hash = "sha256-eSgyIGRi8MQly7VmeKBVGHdqGWjBYdUNqjvX3sh8g9g=";
+    hash = "sha256-sOQcVCSPCuz0SEDnTQc30fXAfUyWvkt+j9Fe700Q0Qo=";
   };
 
   build-system = [ hatchling ];