From 518612c2c9cfb007db431f341081339e0cfabcdf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 10 Dec 2025 11:56:17 +0000
Subject: [PATCH 001/100] ignition: 2.1.2 -> 2.2.0

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

diff --git a/pkgs/by-name/ig/ignition/package.nix b/pkgs/by-name/ig/ignition/package.nix
index 04a492eb0ca8..539d463b7fae 100644
--- a/pkgs/by-name/ig/ignition/package.nix
+++ b/pkgs/by-name/ig/ignition/package.nix
@@ -20,14 +20,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ignition";
-  version = "2.1.2";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "flattool";
     repo = "ignition";
     tag = finalAttrs.version;
     fetchSubmodules = true;
-    hash = "sha256-BqlzxrsbukfkwRIUTN5eaJPRC/dWSWUieDKIqnePZl4=";
+    hash = "sha256-GDoF6NcFzMGzvYYoHwSctLlXCqsbfnUFdT9AIGcUkIQ=";
   };
 
   patches = [

From e43b26e59fa7ed617fac54e300355cc75d78b912 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Dec 2025 15:29:35 +0000
Subject: [PATCH 002/100] polarity: latest-unstable-2025-12-09 ->
 latest-unstable-2025-12-17

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

diff --git a/pkgs/by-name/po/polarity/package.nix b/pkgs/by-name/po/polarity/package.nix
index 37cd10f63cea..b1d502c8ceba 100644
--- a/pkgs/by-name/po/polarity/package.nix
+++ b/pkgs/by-name/po/polarity/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "polarity";
-  version = "latest-unstable-2025-12-09";
+  version = "latest-unstable-2025-12-17";
 
   src = fetchFromGitHub {
     owner = "polarity-lang";
     repo = "polarity";
-    rev = "fde43ec216e70022bcc6d637249c5ef093b73aaf";
-    hash = "sha256-Kd1MMxdrTbV8M8h1MW4REsGf+ehLvb8bXm9OzwGqUDA=";
+    rev = "54db456e28778d98d78d671868bfd58b34da18c2";
+    hash = "sha256-YQAU8flTL5Yr9ZZYe2GWwtYWKLPmB+TXZ1JHVnAmJds=";
   };
 
-  cargoHash = "sha256-Upnm79E7pwoZR/13TnDob0Hbd3GNixtbB8gbrkLYGFQ=";
+  cargoHash = "sha256-sOnlMAdDB1RVMQGyCD4mNa7EV++PeKrD5dDK1hG9VkM=";
 
   passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
 

From 71e707789d8710430a86606e002374da1ad0c496 Mon Sep 17 00:00:00 2001
From: Kirill Radzikhovskyy <kirillrdy@gmail.com>
Date: Tue, 30 Dec 2025 15:13:01 +1100
Subject: [PATCH 003/100] nixos/suricata: avoid IFD in config generation

---
 .../services/networking/suricata/default.nix  | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/services/networking/suricata/default.nix b/nixos/modules/services/networking/suricata/default.nix
index 8c14b84e3f84..8619109ac452 100644
--- a/nixos/modules/services/networking/suricata/default.nix
+++ b/nixos/modules/services/networking/suricata/default.nix
@@ -32,18 +32,18 @@ in
     configFile = mkOption {
       type = types.path;
       visible = false;
-      default = pkgs.writeTextFile {
-        name = "suricata.yaml";
-        text = ''
-          %YAML 1.1
-          ---
-          ${builtins.readFile (
-            yaml.generate "suricata-settings-raw.yaml" (
+      default =
+        pkgs.runCommand "suricata.yaml"
+          {
+            settingsYaml = yaml.generate "suricata-settings-raw.yaml" (
               filterAttrsRecursive (name: value: value != null) cfg.settings
-            )
-          )}
-        '';
-      };
+            );
+          }
+          ''
+            echo "%YAML 1.1" > $out
+            echo "---" >> $out
+            cat $settingsYaml >> $out
+          '';
       description = ''
         Configuration file for suricata.
 

From 2cd3a813aa65aa1dc6eeefb07b2fb0fdc81d5918 Mon Sep 17 00:00:00 2001
From: Justin Restivo <justin@restivo.me>
Date: Wed, 31 Dec 2025 09:00:23 -0500
Subject: [PATCH 004/100] librenms: fix composerVendor hash

sha256-OYQsgwbxsXsOM+sn0mJcABtyXVQAKBa6/ghfbZR1jX4= -> sha256-lCDBz0+VUTlvH371WRCPBh8NFWn6BTVS6BPMQM621dE=
---
 pkgs/by-name/li/librenms/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/li/librenms/package.nix b/pkgs/by-name/li/librenms/package.nix
index b64650b23675..9b25dbf09364 100644
--- a/pkgs/by-name/li/librenms/package.nix
+++ b/pkgs/by-name/li/librenms/package.nix
@@ -36,7 +36,7 @@ phpPackage.buildComposerProject2 rec {
     hash = "sha256-SzDSeWTnsXy274H2mkGIHOsW26EoL7aony7Xcb+e+h4=";
   };
 
-  vendorHash = "sha256-OYQsgwbxsXsOM+sn0mJcABtyXVQAKBa6/ghfbZR1jX4=";
+  vendorHash = "sha256-lCDBz0+VUTlvH371WRCPBh8NFWn6BTVS6BPMQM621dE=";
 
   php = phpPackage;
 

From c3967d78ad3b22669a45a89de296ccdbd4c2ba55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Roche?= <jfroche@pyxel.be>
Date: Wed, 31 Dec 2025 16:42:35 +0100
Subject: [PATCH 005/100] privoxy: 3.0.34 -> 4.0.0

Privoxy 3.0.34 fails with the GCC update
(https://github.com/NixOS/nixpkgs/pull/471587).

Privoxy 4.0.0 seems to build and work fine.

See https://github.com/NixOS/nixpkgs/issues/475479
---
 pkgs/tools/networking/privoxy/default.nix | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/networking/privoxy/default.nix b/pkgs/tools/networking/privoxy/default.nix
index 4ce3c3892425..646eef378047 100644
--- a/pkgs/tools/networking/privoxy/default.nix
+++ b/pkgs/tools/networking/privoxy/default.nix
@@ -16,22 +16,13 @@
 stdenv.mkDerivation rec {
 
   pname = "privoxy";
-  version = "3.0.34";
+  version = "4.0.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/ijbswa/Sources/${version}%20%28stable%29/${pname}-${version}-stable-src.tar.gz";
-    sha256 = "sha256-5sy8oWVvTmFrRlf4UU4zpw9ml+nXKUNWV3g5Mio8XSw=";
+    sha256 = "sha256-wI4roASTBwF7+dimPdKg37lqoM3rNK4Ad3bmPrpiom8=";
   };
 
-  # Patch to fix socks4 and socks4a support under glibc's source fortification
-  # (enabled by default since glibc 2.38-0)
-  patches = [
-    (fetchpatch {
-      url = "https://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=19d7684ca10f6c1279568aa19e9a9da2276851f1";
-      sha256 = "sha256-bCb0RUVrWeGfqZYFHXDEEx+76xiNyVqehtLvk9C1j+4=";
-    })
-  ];
-
   nativeBuildInputs = [
     autoreconfHook
     w3m

From 1c80e33424890566fc95e7cb1486c0b36b520fba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 31 Dec 2025 07:37:52 -0800
Subject: [PATCH 006/100] newsboat: 2.41 -> 2.42

Diff: https://github.com/newsboat/newsboat/compare/r2.41...r2.42

Changelog: https://github.com/newsboat/newsboat/blob/r2.42/CHANGELOG.md
---
 pkgs/by-name/ne/newsboat/package.nix | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/ne/newsboat/package.nix b/pkgs/by-name/ne/newsboat/package.nix
index 477fdd0d8a7f..a2e87e041013 100644
--- a/pkgs/by-name/ne/newsboat/package.nix
+++ b/pkgs/by-name/ne/newsboat/package.nix
@@ -3,7 +3,6 @@
   stdenv,
   rustPlatform,
   fetchFromGitHub,
-  fetchpatch,
   cargo,
   rustc,
   stfl,
@@ -22,32 +21,20 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "newsboat";
-  version = "2.41";
+  version = "2.42";
 
   src = fetchFromGitHub {
     owner = "newsboat";
     repo = "newsboat";
     tag = "r${finalAttrs.version}";
-    hash = "sha256-LhEhbK66OYwAD/pel81N7Hgh/xEvnFR8GlZzgqZIe5M=";
+    hash = "sha256-ZBqYxAX2jPaRycdw7BbhySt2uviICadT/5Z5WZqsqJM=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-CyhyzNw2LXwIVf/SX2rQRvEex5LmjZfZKgCe88jthz0=";
+    hash = "sha256-T6zBr3LoOkPLVkBvfhUdqs7iF2I6fRTZo+uMsrnv+5g=";
   };
 
-  # fix macOS build
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/newsboat/newsboat/commit/4139a0ba1ec87e442ef1408823b07fc739742f9d.patch";
-      hash = "sha256-zdtdpUQGATq/9w+hAY/Va9Ob95c8VT2D9aKFmAF+O0c=";
-    })
-    (fetchpatch {
-      url = "https://github.com/newsboat/newsboat/commit/4eb748b6b6b63acddb3582e012442e519e8704ea.patch";
-      hash = "sha256-A/0WbuMIapTsLoziUPr95ZctIr2hW7JOJSdMVaWayYI=";
-    })
-  ];
-
   # allow other ncurses versions on Darwin
   postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
     substituteInPlace config.sh --replace-fail "ncurses5.4" "ncurses"

From fb2da64e8dc2e7885072316c8be6ac72361dbbf7 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Thu, 1 Jan 2026 23:03:23 +0100
Subject: [PATCH 007/100] ain: add hythera as maintainer

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

diff --git a/pkgs/by-name/ai/ain/package.nix b/pkgs/by-name/ai/ain/package.nix
index ef36ab1eecc5..09dd552fc908 100644
--- a/pkgs/by-name/ai/ain/package.nix
+++ b/pkgs/by-name/ai/ain/package.nix
@@ -31,7 +31,7 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/jonaslu/ain";
     changelog = "https://github.com/jonaslu/ain/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ hythera ];
     mainProgram = "ain";
   };
 })

From 7c8618f950ccb930dde5f2c21af4130f9a50ea6f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 2 Jan 2026 04:55:26 +0000
Subject: [PATCH 008/100] python3Packages.geodatasets: 2025.12.1 -> 2026.1.0

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

diff --git a/pkgs/development/python-modules/geodatasets/default.nix b/pkgs/development/python-modules/geodatasets/default.nix
index bc28feb9d265..6fb9f9b65af8 100644
--- a/pkgs/development/python-modules/geodatasets/default.nix
+++ b/pkgs/development/python-modules/geodatasets/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "geodatasets";
-  version = "2025.12.1";
+  version = "2026.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "geopandas";
     repo = "geodatasets";
     tag = version;
-    hash = "sha256-r5dHWJ6HH6capBOXg/pgeHXPmzLPvXLD27u7AELdIaU=";
+    hash = "sha256-fLhlXuqcArMb0PtFCKKqL78Z5A/j33Fzov8fg7PGvaQ=";
   };
 
   build-system = [ setuptools-scm ];

From 840fa156a89e222490e8f50eab38fda3cad1357b Mon Sep 17 00:00:00 2001
From: 7c6f434c <7c6f434c@mail.ru>
Date: Fri, 2 Jan 2026 05:47:13 +0100
Subject: [PATCH 009/100] uim: 1.8.9-unstable-2024-12-09 -> 1.9.6

---
 pkgs/by-name/ui/uim/package.nix | 36 +++++++++++++--------------------
 1 file changed, 14 insertions(+), 22 deletions(-)

diff --git a/pkgs/by-name/ui/uim/package.nix b/pkgs/by-name/ui/uim/package.nix
index 03209bb6df75..36e96c610829 100644
--- a/pkgs/by-name/ui/uim/package.nix
+++ b/pkgs/by-name/ui/uim/package.nix
@@ -1,10 +1,10 @@
 {
   lib,
   stdenv,
-  fetchFromGitHub,
+  fetchurl,
   shared-mime-info,
   autoconf,
-  automake,
+  automake116x,
   intltool,
   libtool,
   pkg-config,
@@ -42,6 +42,10 @@
   libeb ? null,
 }:
 
+let
+  automake = automake116x;
+in
+
 assert withGtk2 -> gtk2 != null;
 assert withGtk3 -> gtk3 != null;
 
@@ -53,17 +57,15 @@ assert withFFI -> libffi != null;
 assert withMisc -> libeb != null;
 
 stdenv.mkDerivation (finalAttrs: {
-  # Includes multiple GCC 14 related fixes, and other bugs. Last 1.8.9 release
-  # was in August 2022 - too long ago.
-  version = "1.8.9-unstable-2024-12-09";
+  version = "1.9.6";
   pname = "uim";
 
-  src = fetchFromGitHub {
-    owner = "uim";
-    repo = "uim";
-    rev = "b6803aa7ea433f92855284ec832aeff957c63904";
-    fetchSubmodules = true;
-    hash = "sha256-7Ng9IPF6xN1Zb9uEacq7SUhpJc1jWzneVSbbjyqL6g4=";
+  src = fetchurl {
+    url = "https://github.com/uim/uim/releases/download/${finalAttrs.version}/uim-${finalAttrs.version}.tar.bz2";
+    hash = "sha256-Z/Dl+kKSpTPtxvmLhC32DFMaic+C0DNqThq3IgKrjIM=";
+    meta = {
+      homepage = "https://github.com/uim/uim/";
+    };
   };
 
   nativeBuildInputs = [
@@ -105,17 +107,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   postPatch = ''
     patchShebangs *.sh */*.sh */*/*.sh
-
-    # configure sigscheme in maintainer mode or else some function tables won't get autogenerated
-    substituteInPlace configure.ac \
-      --replace-fail \
-        "--with-master-pkg=uim --enable-conf=uim" \
-        "--enable-maintainer-mode --with-master-pkg=uim --enable-conf=uim"
-
-    # generate ./configure files
-    (cd sigscheme/libgcroots; ./autogen.sh)
-    (cd sigscheme; ./autogen.sh)
-    ./autogen.sh
+    cp replace/*.h uim
   '';
 
   patches = [

From bb9d89b1f65b99e2e8ba8e3a6499389a5210c550 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 2 Jan 2026 21:51:58 +0000
Subject: [PATCH 010/100] python3Packages.flax: skip failing tests

---
 pkgs/development/python-modules/flax/default.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/development/python-modules/flax/default.nix b/pkgs/development/python-modules/flax/default.nix
index 7ad8ea62a125..9e9a91f0fd70 100644
--- a/pkgs/development/python-modules/flax/default.nix
+++ b/pkgs/development/python-modules/flax/default.nix
@@ -107,6 +107,18 @@ buildPythonPackage rec {
 
     # AssertionError: nnx_model.kernel.value.sharding = NamedSharding(...
     "test_linen_to_nnx_metadata"
+
+    # AssertionError: 'Linear_0' not found in State({})
+    "test_compact_basic"
+    # KeyError: 'intermediates'
+    "test_linen_submodule"
+    "test_pure_nnx_submodule"
+    # KeyError: 'counts
+    "test_mutable_state"
+    # AttributeError: 'Top' object has no attribute '_pytree__state'. Did you mean: '_pytree__flatten'?
+    "test_shared_modules"
+    # AttributeError: 'MLP' object has no attribute 'scope
+    "test_transforms"
   ];
 
   passthru = {

From fddf575328160a58ed1e1a47ddc547a0e2237c0f Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 2 Jan 2026 22:09:04 +0000
Subject: [PATCH 011/100] python3Packages.outlines: relax outlines-core dep

---
 pkgs/development/python-modules/outlines/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/outlines/default.nix b/pkgs/development/python-modules/outlines/default.nix
index eed4b70dc26d..c954547e11ec 100644
--- a/pkgs/development/python-modules/outlines/default.nix
+++ b/pkgs/development/python-modules/outlines/default.nix
@@ -58,6 +58,9 @@ buildPythonPackage rec {
     setuptools-scm
   ];
 
+  pythonRelaxDeps = [
+    "outlines_core"
+  ];
   dependencies = [
     cloudpickle
     datasets

From 85bff5fc41918a94e3bd16502ec313cc72824bd4 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 2 Jan 2026 01:19:13 +0000
Subject: [PATCH 012/100] python3Packages.timm: skip failing test on
 python>=3.14

---
 .../python-modules/timm/default.nix            | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/timm/default.nix b/pkgs/development/python-modules/timm/default.nix
index a820c4871d02..f3b6b2acc884 100644
--- a/pkgs/development/python-modules/timm/default.nix
+++ b/pkgs/development/python-modules/timm/default.nix
@@ -3,6 +3,7 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
+  pythonAtLeast,
 
   # build-system
   pdm-backend,
@@ -50,12 +51,17 @@ buildPythonPackage rec {
 
   enabledTestPaths = [ "tests" ];
 
-  disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
-    # torch._dynamo.exc.BackendCompilerFailed: backend='inductor' raised:
-    # CppCompileError: C++ compile error
-    # OpenMP support not found.
-    "test_kron"
-  ];
+  disabledTests =
+    lib.optionals (pythonAtLeast "3.14") [
+      # RuntimeError: torch.compile is not supported on Python 3.14+
+      "test_kron"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      # torch._dynamo.exc.BackendCompilerFailed: backend='inductor' raised:
+      # CppCompileError: C++ compile error
+      # OpenMP support not found.
+      "test_kron"
+    ];
 
   disabledTestPaths = [
     # Takes too long and also tries to download models

From ee5f4d126813565b5baad46a3b500f5848e3443d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 2 Jan 2026 23:11:26 +0000
Subject: [PATCH 013/100] arping: 2.27 -> 2.28

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

diff --git a/pkgs/by-name/ar/arping/package.nix b/pkgs/by-name/ar/arping/package.nix
index 2423e9e9696f..41f7170c1f46 100644
--- a/pkgs/by-name/ar/arping/package.nix
+++ b/pkgs/by-name/ar/arping/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "arping";
-  version = "2.27";
+  version = "2.28";
 
   src = fetchFromGitHub {
     owner = "ThomasHabets";
     repo = "arping";
     tag = "arping-${version}";
-    hash = "sha256-GfIH38LWSayaFXIxi3M3QDkkoYzJoAHMK+hvQgXL1iQ=";
+    hash = "sha256-SS4z/aGu1qpTG1k4Cbj1TlC2kHRrP+7HRQyrIX2Xc/E=";
   };
 
   nativeBuildInputs = [

From ec987240e1028360a81d98f651c58a66e4c1ee7f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 2 Jan 2026 23:21:56 +0000
Subject: [PATCH 014/100] python3Packages.http-message-signatures: 1.0.0 ->
 1.0.1

---
 .../python-modules/http-message-signatures/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/http-message-signatures/default.nix b/pkgs/development/python-modules/http-message-signatures/default.nix
index a778ae9a62ba..b36233551bb6 100644
--- a/pkgs/development/python-modules/http-message-signatures/default.nix
+++ b/pkgs/development/python-modules/http-message-signatures/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "http-message-signatures";
-  version = "1.0.0";
+  version = "1.0.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "pyauth";
     repo = "http-message-signatures";
     tag = "v${version}";
-    hash = "sha256-vPZeAS3hR7Bmj2FtME+V9WU3TViBndrBb9GLkdMVh2Q=";
+    hash = "sha256-c5zwH28FFbEmLfL4nBBE2S1YEbwicoJo3UAYn/0zXEM=";
   };
 
   build-system = [

From d2a14392d6b9d45629be51c196c4989b93673c9e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 2 Jan 2026 23:22:46 +0000
Subject: [PATCH 015/100] python3Packages.bthome-ble: 3.19.0 -> 3.19.1

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

diff --git a/pkgs/development/python-modules/bthome-ble/default.nix b/pkgs/development/python-modules/bthome-ble/default.nix
index 4462812d9d28..593fc14383a7 100644
--- a/pkgs/development/python-modules/bthome-ble/default.nix
+++ b/pkgs/development/python-modules/bthome-ble/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "bthome-ble";
-  version = "3.19.0";
+  version = "3.19.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = "bthome-ble";
     tag = "v${version}";
-    hash = "sha256-x82SiZT1NEKlHiAcwcbj/IVcXszXbbOF4ngXVg6bDZ4=";
+    hash = "sha256-h1Kd2qtz9YdRf0uZC+dmvmmAkDoKYIBzyouUswnIldQ=";
   };
 
   build-system = [ poetry-core ];

From ef09f899b31b0217b38fa1fed720158e5dd43df7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 3 Jan 2026 02:02:53 +0000
Subject: [PATCH 016/100] kubedock: 0.20.0 -> 0.20.1

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

diff --git a/pkgs/by-name/ku/kubedock/package.nix b/pkgs/by-name/ku/kubedock/package.nix
index 2425950c4b38..4028e509201b 100644
--- a/pkgs/by-name/ku/kubedock/package.nix
+++ b/pkgs/by-name/ku/kubedock/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "kubedock";
-  version = "0.20.0";
+  version = "0.20.1";
 
   src = fetchFromGitHub {
     owner = "joyrex2001";
     repo = "kubedock";
     rev = version;
-    hash = "sha256-6I4fIaFtA4WjYQ0RO9tniUGH1p6hnYcazj6VNOyElLg=";
+    hash = "sha256-ZwNixOeBuyuFT0Hfl3USfArhmyIPHFP0fTbiztTSPOA=";
   };
 
   vendorHash = "sha256-QLiu014QowDqebDCXSxOH2TPHUG2d+34mlnbo3NdafA=";

From 4d23848ad079731a650f663e8a6b1e6b87079938 Mon Sep 17 00:00:00 2001
From: linsui <36977733+linsui@users.noreply.github.com>
Date: Sat, 8 Feb 2025 21:25:39 +0800
Subject: [PATCH 017/100] nixos/speechd: add config

---
 .../services/accessibility/speechd.nix        | 61 +++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/nixos/modules/services/accessibility/speechd.nix b/nixos/modules/services/accessibility/speechd.nix
index ff98c363fc29..fc8920e70820 100644
--- a/nixos/modules/services/accessibility/speechd.nix
+++ b/nixos/modules/services/accessibility/speechd.nix
@@ -7,9 +7,11 @@
 let
   cfg = config.services.speechd;
   inherit (lib)
+    mapAttrs'
     mkEnableOption
     mkIf
     mkPackageOption
+    mkOption
     ;
 in
 {
@@ -17,13 +19,72 @@ in
     # FIXME: figure out how to deprecate this EXTREMELY CAREFULLY
     # default guessed conservatively in ../misc/graphical-desktop.nix
     enable = mkEnableOption "speech-dispatcher speech synthesizer daemon";
+
     package = mkPackageOption pkgs "speechd" { };
+
+    config = mkOption {
+      type = with lib.types; nullOr lines;
+      default = null;
+      description = ''
+        System wide configuration file for Speech Dispatcher. This will be used if no user configuration file is found.
+      '';
+      example = ''
+        AddModule "module_name" "module_binary" "module_config"
+      '';
+    };
+
+    modules = mkOption {
+      type = with lib.types; submodule { freeformType = attrsOf lines; };
+      default = { };
+      description = ''
+        Configuration files of output modules.
+      '';
+      example = {
+        generic-epos = ''
+          AddVoice        "cs"  "male1"   "kadlec"
+          AddVoice        "sk"  "male1"   "bob"
+        '';
+      };
+    };
+
+    clients = mkOption {
+      type = with lib.types; submodule { freeformType = attrsOf lines; };
+      default = { };
+      description = ''
+        Client specific configuration.
+      '';
+      example = {
+        emacs = ''
+          BeginClient "emacs:*"
+          # Example:
+          #   DefaultPunctuationMode "some"
+          EndClient
+        '';
+      };
+    };
   };
 
   config = mkIf cfg.enable {
     environment = {
       systemPackages = [ cfg.package ];
+
+      etc =
+        if cfg.config == null then
+          { speech-dispatcher.source = "${cfg.package}/etc/speech-dispatcher"; }
+        else
+          {
+            "speech-dispatcher/speechd.conf".text = cfg.config;
+          }
+          // (mapAttrs' (name: value: {
+            name = "speech-dispatcher/modules/${name}.conf";
+            value.text = value;
+          }) cfg.modules)
+          // (mapAttrs' (name: value: {
+            name = "speech-dispatcher/clients/${name}.conf";
+            value.text = value;
+          }) cfg.clients);
     };
+
     systemd.packages = [ cfg.package ];
     # have to set `wantedBy` since `systemd.packages` ignores `[Install]`
     systemd.user.sockets.speech-dispatcher.wantedBy = [ "sockets.target" ];

From fb15c2a899960f5b84ffb29bdcf1df286bbcf8a0 Mon Sep 17 00:00:00 2001
From: 7c6f434c <7c6f434c@mail.ru>
Date: Sat, 3 Jan 2026 13:38:08 +0100
Subject: [PATCH 018/100] ccl: 1.12.2 -> 1.13

---
 pkgs/development/compilers/ccl/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix
index c5f4418e7c62..bfa830112008 100644
--- a/pkgs/development/compilers/ccl/default.nix
+++ b/pkgs/development/compilers/ccl/default.nix
@@ -14,7 +14,7 @@ let
     # TODO: there are also FreeBSD and Windows versions
     x86_64-linux = {
       arch = "linuxx86";
-      sha256 = "0mhmm8zbk42p2b9amy702365m687k5p0xnz010yqrki6mwyxlkx9";
+      sha256 = "sha256-cAae50xvBoXfg+tiJM4i8+eRnheyM0dseE5EDWDia/E=";
       runtime = "lx86cl64";
       kernel = "linuxx8664";
     };
@@ -26,13 +26,13 @@ let
     };
     armv7l-linux = {
       arch = "linuxarm";
-      sha256 = "1a4y07cmmn1r88b4hl4msb0bvr2fxd2vw9lf7h4j9f7a5rpq7124";
+      sha256 = "sha256-iyUMTDuHbyfEAxAAhjXANjh6HhpLkWG5+diXI6aFUUc=";
       runtime = "armcl";
       kernel = "linuxarm";
     };
     x86_64-darwin = {
       arch = "darwinx86";
-      sha256 = "1xclnik6pqhkmr15cbqa2n1ddzdf0rs452lyiln3c42nmkf9jjb6";
+      sha256 = "sha256-r+OhkU0b+QDgoZpZb0Xpc3V0yRq8GBKcNLt2IzeOSdE=";
       runtime = "dx86cl64";
       kernel = "darwinx8664";
     };
@@ -45,7 +45,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "ccl";
-  version = "1.12.2";
+  version = "1.13";
 
   src = fetchurl {
     url = "https://github.com/Clozure/ccl/releases/download/v${version}/ccl-${version}-${cfg.arch}.tar.gz";

From 36e552147f9d9f7a74d528d05b7e59598f02ce12 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 3 Jan 2026 12:58:46 +0000
Subject: [PATCH 019/100] terraform-providers.okta_okta: 6.5.2 -> 6.5.3

---
 .../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 065238882c06..70afd9ca4bf3 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1004,13 +1004,13 @@
     "vendorHash": "sha256-CZo/GLUwmq/TxRDQr2h49rqENB24Zt4M7k5t7epXHuE="
   },
   "okta_okta": {
-    "hash": "sha256-2PiDzxS+O9iIqLxIfFGwfBLYP4f79m82tIBI2GeBUDs=",
+    "hash": "sha256-844cF3pAIegwOBhCwLmEaKZCGjgPnJry1DduXNfL8mg=",
     "homepage": "https://registry.terraform.io/providers/okta/okta",
     "owner": "okta",
     "repo": "terraform-provider-okta",
-    "rev": "v6.5.2",
+    "rev": "v6.5.3",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-fPv5fezuiVNXCa8IedyaH1cnjMzEOiA7gl/r5K7cX3A="
+    "vendorHash": "sha256-XW0D9lsSkLyVPZQW+LmXrDoAeeYw337fAmU6GEZcMt0="
   },
   "oktadeveloper_oktaasa": {
     "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=",

From 4ed444ce9d4aa508266d7a8c58b9cdbd9ee14909 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 3 Jan 2026 14:47:13 +0000
Subject: [PATCH 020/100] cnspec: 12.15.0 -> 12.16.0

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

diff --git a/pkgs/by-name/cn/cnspec/package.nix b/pkgs/by-name/cn/cnspec/package.nix
index 7f56a1ad034d..35ecbba23f00 100644
--- a/pkgs/by-name/cn/cnspec/package.nix
+++ b/pkgs/by-name/cn/cnspec/package.nix
@@ -6,18 +6,18 @@
 
 buildGoModule rec {
   pname = "cnspec";
-  version = "12.15.0";
+  version = "12.16.0";
 
   src = fetchFromGitHub {
     owner = "mondoohq";
     repo = "cnspec";
     tag = "v${version}";
-    hash = "sha256-QPTmsJ7hwA6QGRHWrRELrAjSzZbNQVm1O1adxKU08Ak=";
+    hash = "sha256-N6Rd/NRNpimJrbzG5XzJ/LoSlk8x4W84hHcy95e1JK0=";
   };
 
   proxyVendor = true;
 
-  vendorHash = "sha256-rIrcnYN/6uyxLi4Wqr3v2Tsv6xPEF1ZfvLqkgDBrj2E=";
+  vendorHash = "sha256-+dkC4rhkB6XOFyaRhwd7u1kBq2DAts+izedYmtYDFB0=";
 
   subPackages = [ "apps/cnspec" ];
 

From c3c9d68a45bf49934623589533a3f6a2c35174a3 Mon Sep 17 00:00:00 2001
From: Kamil Monicz <kamil@monicz.dev>
Date: Sat, 3 Jan 2026 15:19:07 +0000
Subject: [PATCH 021/100] lamb: init at unstable-2025-12-22

---
 pkgs/by-name/la/lamb/package.nix | 75 ++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 pkgs/by-name/la/lamb/package.nix

diff --git a/pkgs/by-name/la/lamb/package.nix b/pkgs/by-name/la/lamb/package.nix
new file mode 100644
index 000000000000..2da378a2dd7c
--- /dev/null
+++ b/pkgs/by-name/la/lamb/package.nix
@@ -0,0 +1,75 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  gnugrep,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "lamb";
+  version = "unstable-2025-12-22";
+
+  src = fetchFromGitHub {
+    owner = "tsoding";
+    repo = "lamb";
+    rev = "50938686d4b8ae929121b62a67243baf72867cde";
+    hash = "sha256-ALqjh4DmvysdcGQQrCW87r5rvmCrEWPcViN4zg026nY=";
+  };
+
+  strictDeps = true;
+
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version=unstable" ]; };
+
+  buildPhase = ''
+    runHook preBuild
+    ${stdenv.cc.targetPrefix}cc -o lamb lamb.c
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 lamb -t "$out/bin"
+    install -Dm644 std.lamb -t "$out/share/lamb"
+
+    runHook postInstall
+  '';
+
+  doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
+
+  nativeCheckInputs = [
+    gnugrep
+  ];
+
+  checkPhase = ''
+    runHook preCheck
+
+    output="$(
+      {
+        printf '%s\n' \
+          'pair 69 (pair 420 1337)' \
+          'xs = pair 69 (pair 420 1337)' \
+          'first xs' \
+          'second xs' \
+          'first (second xs)' \
+          ':q'
+      } | ./lamb ./std.lamb 2>&1
+    )"
+
+    grep -Fq "RESULT: 69" <<<"$output"
+    grep -Fq "RESULT: 420" <<<"$output"
+
+    runHook postCheck
+  '';
+
+  meta = {
+    description = "Tiny pure functional programming language in C";
+    homepage = "https://github.com/tsoding/lamb";
+    license = lib.licenses.mit;
+    sourceProvenance = with lib.sourceTypes; [ fromSource ];
+    maintainers = with lib.maintainers; [ Zaczero ];
+    mainProgram = "lamb";
+    platforms = lib.platforms.unix;
+  };
+})

From 3ef158a6c15f2fd48987b2664128439d79fa92d4 Mon Sep 17 00:00:00 2001
From: 7c6f434c <7c6f434c@mail.ru>
Date: Sat, 3 Jan 2026 16:51:10 +0100
Subject: [PATCH 022/100] lincity: import Debian patch to fix gcc15 build

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

diff --git a/pkgs/by-name/li/lincity/package.nix b/pkgs/by-name/li/lincity/package.nix
index 5b49bb1feb20..7f32ad174340 100644
--- a/pkgs/by-name/li/lincity/package.nix
+++ b/pkgs/by-name/li/lincity/package.nix
@@ -59,6 +59,10 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://sources.debian.org/data/main/l/lincity/1.13.1-16/debian/patches/map-max-draw";
       hash = "sha256-9qLPrmEKMMrSVwqtEvoiyjPPo1eLO3u6bCJslubmBJU=";
     })
+    (fetchpatch {
+      url = "https://sources.debian.org/data/main/l/lincity/1.13.1-17/debian/patches/function-pointer-1097300";
+      hash = "sha256-6fwDIX88dCpAFE02Z4Ts5gsMf3wwxrToEwpy0DwZ6H4=";
+    })
   ];
 
   # Workaround build failure on -fno-common toolchains like upstream

From 638ba9670c618c6e8313fe1d49be0cba544afa48 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 3 Jan 2026 15:55:35 +0000
Subject: [PATCH 023/100] all-the-package-names: 2.0.2309 -> 2.0.2315

---
 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 29a13583c428..bb24fc97bcbf 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.2309";
+  version = "2.0.2315";
 
   src = fetchFromGitHub {
     owner = "nice-registry";
     repo = "all-the-package-names";
     tag = "v${version}";
-    hash = "sha256-DSriCaoMVYoZOIZKGZIximjzPVteAuIwOv2bswinqgc=";
+    hash = "sha256-kVTwrxvNBRVuovgnfjBktgBXgP9tYfl+ivYyS10bPdM=";
   };
 
-  npmDepsHash = "sha256-Qz7sbsbeaS2e2OsM6rtTPfzNzUXZOVxK/pi438qzy2o=";
+  npmDepsHash = "sha256-iizozowyq1mVJWLKIC8EPoRX4c1YdyVVWuhLtadNDYI=";
 
   passthru.updateScript = nix-update-script { };
 

From 7ee63c1d3ab26db30b69d169c90bdd270781c6e2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 3 Jan 2026 15:58:10 +0000
Subject: [PATCH 024/100] python3Packages.python-roborock: 4.1.1 -> 4.2.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 f03b4ac35538..f291cf2d38f3 100644
--- a/pkgs/development/python-modules/python-roborock/default.nix
+++ b/pkgs/development/python-modules/python-roborock/default.nix
@@ -23,14 +23,14 @@
 
 buildPythonPackage rec {
   pname = "python-roborock";
-  version = "4.1.1";
+  version = "4.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Python-roborock";
     repo = "python-roborock";
     tag = "v${version}";
-    hash = "sha256-Wf9nJDcNOLIuIskiDyGYo4TwekQprW4o99oJLkaV5X4=";
+    hash = "sha256-2XY07JJ4t8jOqthBi41hrC0tEIgWKF7OmMcxlPoX8bw=";
   };
 
   pythonRelaxDeps = [ "pycryptodome" ];

From 3c322d688b77a6bd6645b9a39a7113a1949f562e Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Sat, 3 Jan 2026 17:49:57 +0100
Subject: [PATCH 025/100] tinymist: 0.14.4 -> 0.14.6

Changelog:
https://github.com/Myriad-Dreamin/tinymist/releases/tag/v0.14.6
Diff:
https://github.com/Myriad-Dreamin/tinymist/compare/v0.14.4...v0.14.6
---
 .../vscode/extensions/myriad-dreamin.tinymist/default.nix   | 4 ++--
 pkgs/by-name/ti/tinymist/package.nix                        | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix
index d1d34b3b2b8c..96ee2cd04479 100644
--- a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix
@@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "tinymist";
     publisher = "myriad-dreamin";
-    version = "0.14.4";
-    hash = "sha256-Y8yIAIT0TrrM8ZQSZl4QnVG6uE0F+AwWFvmhLe0ZPto=";
+    version = "0.14.6";
+    hash = "sha256-gm12h/+9ROveHwltXLCxArO8DWOOC096EtaR93sWsR0=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ti/tinymist/package.nix b/pkgs/by-name/ti/tinymist/package.nix
index b8858ccd48f1..21db267878f9 100644
--- a/pkgs/by-name/ti/tinymist/package.nix
+++ b/pkgs/by-name/ti/tinymist/package.nix
@@ -15,16 +15,16 @@ rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tinymist";
   # Please update the corresponding vscode extension when updating
   # this derivation.
-  version = "0.14.4";
+  version = "0.14.6";
 
   src = fetchFromGitHub {
     owner = "Myriad-Dreamin";
     repo = "tinymist";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-TbiihruRF5N0d9VQ/9NB320q4Hf1YlfAfkMhhTOOBGo=";
+    hash = "sha256-bAfehxoI5oDAMgkj1BbQ2I8j2rvITXLHbIWN+gW7TPA=";
   };
 
-  cargoHash = "sha256-rg2PSQL3oHMvL/QMusF0hfxvrlv3ZxYh28FD1JZJDbE=";
+  cargoHash = "sha256-c3kJ/d/EPtccdzIw9KDZPJkMsXNSaVhF36/jbRkiAaU=";
 
   nativeBuildInputs = [
     installShellFiles

From ca9c8c888afad5ad718a518e012bafaf19cbbf76 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 3 Jan 2026 17:00:51 +0000
Subject: [PATCH 026/100] coc-clangd: 0-unstable-2025-11-18 ->
 0-unstable-2026-01-01

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

diff --git a/pkgs/by-name/co/coc-clangd/package.nix b/pkgs/by-name/co/coc-clangd/package.nix
index d5659b86eb6a..0f8ced31a3e0 100644
--- a/pkgs/by-name/co/coc-clangd/package.nix
+++ b/pkgs/by-name/co/coc-clangd/package.nix
@@ -7,16 +7,16 @@
 
 buildNpmPackage {
   pname = "coc-clangd";
-  version = "0-unstable-2025-11-18";
+  version = "0-unstable-2026-01-01";
 
   src = fetchFromGitHub {
     owner = "clangd";
     repo = "coc-clangd";
-    rev = "72a4edc5ec39c6d7c4fd5a49aee7d9f3f84b8b6e";
-    hash = "sha256-uNCN3+8KovQ/Grrv7k5YZz6tTCNUX+6EN1Gkm867LMc=";
+    rev = "d4f246f326f066637653eafdf60e12e6b159827d";
+    hash = "sha256-+ydeReWxXp93PtU0zv8OEuSpIebqi1avGNzopyKXeD0=";
   };
 
-  npmDepsHash = "sha256-cLW5pY3LaumtE2qyxMMP9WirCMdWq+gsSO+dZNhCc1g=";
+  npmDepsHash = "sha256-1331Qaz9BXOeg6NsHuIokXI6VAjiRoslbLT3hXcjgak=";
 
   passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
 

From 26e529527115cf4241d279523e9e48d8cd4e6630 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 3 Jan 2026 17:01:43 +0000
Subject: [PATCH 027/100] coc-pyright: 0-unstable-2025-12-01 ->
 0-unstable-2026-01-01

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

diff --git a/pkgs/by-name/co/coc-pyright/package.nix b/pkgs/by-name/co/coc-pyright/package.nix
index 50cb5ed6a569..23eb4be6fdc4 100644
--- a/pkgs/by-name/co/coc-pyright/package.nix
+++ b/pkgs/by-name/co/coc-pyright/package.nix
@@ -7,17 +7,17 @@
 
 buildNpmPackage {
   pname = "coc-pyright";
-  version = "0-unstable-2025-12-01";
+  version = "0-unstable-2026-01-01";
 
   src = fetchFromGitHub {
     owner = "fannheyward";
     repo = "coc-pyright";
     # No tagged releases, this commit corresponds to the latest release of the package.
-    rev = "263919ddd3dce33d15626ed6c6139702839295e0";
-    hash = "sha256-tcD4Irq3IRVNFh1rCfvVg1VSbiMtc1bswAKTRmIfo8Y=";
+    rev = "33184c03e543b29227df989cf893752bae5f3ea2";
+    hash = "sha256-fj6iSQHprf/lkDGI5aFsogMAPv6a3Ghp9uDqnTM3/MY=";
   };
 
-  npmDepsHash = "sha256-LW0twhPlWZLFYSzfzoi9Rg8+EsmkllfasR51YtrcdnQ=";
+  npmDepsHash = "sha256-0KKEPl0H0HxNCw7GTaxE+voQhS5J1TSpd4JjyWW62UI=";
 
   passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
 

From 03165019df8cdce284d0f7ab6c7eb22d5d5c6be6 Mon Sep 17 00:00:00 2001
From: Steve Purcell <steve@sanityinc.com>
Date: Sat, 3 Jan 2026 17:32:29 +0000
Subject: [PATCH 028/100] tree-sitter-grammars.tree-sitter-razor: note
 maintainer and license

See https://github.com/NixOS/nixpkgs/pull/472724#issuecomment-3700558139
---
 .../tools/parsing/tree-sitter/grammars/grammar-sources.nix  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix
index 04e179d1fafc..66805a1a99fb 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix
@@ -557,6 +557,12 @@
     version = "0-unstable-2025-02-17";
     url = "github:tris203/tree-sitter-razor/fe46ce5ea7d844e53d59bc96f2175d33691c61c5";
     hash = "sha256-E4fgy588g6IP258TS2DvoILc1Aikvpfbtq20VIhBE4U=";
+    meta = {
+      license = lib.licenses.mit;
+      maintainers = with lib.maintainers; [
+        tris203
+      ];
+    };
   };
 
   regex = {

From 28696997dcb17f2fb0e959e88f014ea08b61de52 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 3 Jan 2026 17:33:05 +0000
Subject: [PATCH 029/100] terraform-providers.gitlabhq_gitlab: 18.6.1 -> 18.7.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 065238882c06..dd0ebfd4d0d6 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -436,13 +436,13 @@
     "vendorHash": "sha256-FcxAh8EOvnT8r1GHu0Oj2C5Jgbr2WPwD7/vY4/qIvTA="
   },
   "gitlabhq_gitlab": {
-    "hash": "sha256-XVOvtRj+MIrBtZQ6GJHOeLUu5Xjp6ZdGbRveXfZKEQc=",
+    "hash": "sha256-9NYlkXiUbUtTbaa4K2Ft+khPx6NlSQs9ZnzUf3Ms0K8=",
     "homepage": "https://registry.terraform.io/providers/gitlabhq/gitlab",
     "owner": "gitlabhq",
     "repo": "terraform-provider-gitlab",
-    "rev": "v18.6.1",
+    "rev": "v18.7.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-/TJRnVktc1PwtlPgHuyAi/mUx16h7j5cCF9rhF8Goag="
+    "vendorHash": "sha256-TPyvNpTwTMcysG4kGeRuu+H5hR3/By69vyNuWodnKVg="
   },
   "go-gandi_gandi": {
     "hash": "sha256-fsCtmwyxkXfOtiZG27VEb010jglK35yr4EynnUWlFog=",

From bc97942e6cbb23dd5759e48a1b73068b1ac5238c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 3 Jan 2026 17:47:49 +0000
Subject: [PATCH 030/100] python3Packages.weaviate-client: 4.18.3 -> 4.19.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 e23459a93bf3..7280abd02aba 100644
--- a/pkgs/development/python-modules/weaviate-client/default.nix
+++ b/pkgs/development/python-modules/weaviate-client/default.nix
@@ -27,7 +27,7 @@
 
 buildPythonPackage rec {
   pname = "weaviate-client";
-  version = "4.18.3";
+  version = "4.19.2";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     owner = "weaviate";
     repo = "weaviate-python-client";
     tag = "v${version}";
-    hash = "sha256-2cgj7Ry6lcmrvjhXkAmUO1vjsjF2dZxb1MsbQH3uElM=";
+    hash = "sha256-LQLvMoj91+B4dU6z4oyxNy7eX+6C5cSL2IBCUVgZ05w=";
   };
 
   pythonRelaxDeps = [

From 382d5de18ee19e56eb8fa0b61716c4c4446ea63d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 3 Jan 2026 17:48:39 +0000
Subject: [PATCH 031/100] python3Packages.countryguess: 0.4.8 -> 0.4.9

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

diff --git a/pkgs/development/python-modules/countryguess/default.nix b/pkgs/development/python-modules/countryguess/default.nix
index dab183ec48e7..19d7f86c0256 100644
--- a/pkgs/development/python-modules/countryguess/default.nix
+++ b/pkgs/development/python-modules/countryguess/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "countryguess";
-  version = "0.4.8";
+  version = "0.4.9";
   pyproject = true;
 
   src = fetchFromGitea {
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "plotski";
     repo = "countryguess";
     tag = "v${version}";
-    hash = "sha256-XP84p9zX9dKhNaTPLmSQrYdYmPjym+m3EZL5A8AbgfM=";
+    hash = "sha256-RlOOao6aU3MylghDyOeg3poYQw+0UhljN79/ZBLjq24=";
   };
 
   build-system = [

From e0d472e9902f5db6e93b02def4abe31979bf7925 Mon Sep 17 00:00:00 2001
From: Maksym Balatsko <mbalatsko@gmail.com>
Date: Sat, 3 Jan 2026 18:26:08 +0100
Subject: [PATCH 032/100] python3Packages.aioboto3: remove mbalatsko from
 maintainers

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

diff --git a/pkgs/development/python-modules/aioboto3/default.nix b/pkgs/development/python-modules/aioboto3/default.nix
index 5bf77e926d61..6632580490ed 100644
--- a/pkgs/development/python-modules/aioboto3/default.nix
+++ b/pkgs/development/python-modules/aioboto3/default.nix
@@ -69,6 +69,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/terricain/aioboto3";
     changelog = "https://github.com/terricain/aioboto3/blob/${src.rev}/CHANGELOG.rst";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ mbalatsko ];
+    maintainers = [ ];
   };
 }

From 36d43f3924778ce7ef73f0191f8bb4026f24f08c Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sat, 3 Jan 2026 20:04:51 +0200
Subject: [PATCH 033/100] nixos/yggdrasil: put release notes in the right place

This will become part of the 26.05 release notes, not the already
released 25.11.
---
 doc/release-notes/rl-2511.section.md | 7 -------
 doc/release-notes/rl-2605.section.md | 7 +++++++
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index 8522948accd4..baa6daea1584 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -318,13 +318,6 @@ and [release notes for v18](https://goteleport.com/docs/changelog/#1800-070325).
 
 - `zig_0_12` has been removed.
 
-- The `services.yggdrasil` module has been refactored with the following breaking changes:
-  - The `services.yggdrasil.configFile` option has been removed. Configuration should now be specified directly via `services.yggdrasil.settings`.
-  - The `services.yggdrasil.persistentKeys` option has been removed. To maintain persistent keys and IPv6 addresses across reboots, use `services.yggdrasil.settings.PrivateKeyPath` to securely load your private key from a file via systemd credentials. The private key must be in PEM format (PKCS #8).
-  - Storing `PrivateKey` directly in `settings` is now explicitly forbidden to prevent keys from being stored world-readable in the Nix store.
-  - If you previously used `configFile`, migrate your configuration to the `settings` option and extract the private key to a separate file referenced by `PrivateKeyPath`.
-  - If you previously used `persistentKeys`, convert your keys to PEM format and store them in a secure location accessible only to root, then reference them via `PrivateKeyPath`.
-
 - `zigbee2mqtt` was updated to version 2.x, which contains breaking changes. See the [discussion](https://github.com/Koenkk/zigbee2mqtt/discussions/24198) for further information.
 
 ## Other Notable Changes {#sec-nixpkgs-release-25.11-notable-changes}
diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md
index fb6d78e1046c..fc34a120d84d 100644
--- a/doc/release-notes/rl-2605.section.md
+++ b/doc/release-notes/rl-2605.section.md
@@ -42,6 +42,13 @@
 - `jetbrains.plugins.addPlugins` no longer supports plugin names or ID strings.
   You can still use `addPlugins` with plugin derivations, such as plugins packaged outside of Nixpkgs.
 
+- The `services.yggdrasil` module has been refactored with the following breaking changes:
+  - The `services.yggdrasil.configFile` option has been removed. Configuration should now be specified directly via `services.yggdrasil.settings`.
+  - The `services.yggdrasil.persistentKeys` option has been removed. To maintain persistent keys and IPv6 addresses across reboots, use `services.yggdrasil.settings.PrivateKeyPath` to securely load your private key from a file via systemd credentials. The private key must be in PEM format (PKCS #8).
+  - Storing `PrivateKey` directly in `settings` is now explicitly forbidden to prevent keys from being stored world-readable in the Nix store.
+  - If you previously used `configFile`, migrate your configuration to the `settings` option and extract the private key to a separate file referenced by `PrivateKeyPath`.
+  - If you previously used `persistentKeys`, convert your keys to PEM format and store them in a secure location accessible only to root, then reference them via `PrivateKeyPath`.
+
 - `asio` (standalone version of `boost::asio`) has been updated from 1.24.0 to 1.36.0. Some breaking changes were introduced between these
   two versions, and the one affected most was the removal of `asio::io_service` in favor of `asio::io_context` in 1.33.0. `asio_1_32_0` is
   retained for packages that have not completed migration. `asio_1_10` has been removed as no packages depend on it anymore.

From 70dd1d4c940c983abcf2ecb85341320d2458a39e Mon Sep 17 00:00:00 2001
From: Maksym Balatsko <mbalatsko@gmail.com>
Date: Sat, 3 Jan 2026 18:26:37 +0100
Subject: [PATCH 034/100] python3Packages.aiohttp-basicauth: remove mbalatsko
 from maintainers

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

diff --git a/pkgs/development/python-modules/aiohttp-basicauth/default.nix b/pkgs/development/python-modules/aiohttp-basicauth/default.nix
index 6d0a6148a63f..7800c1bd52bf 100644
--- a/pkgs/development/python-modules/aiohttp-basicauth/default.nix
+++ b/pkgs/development/python-modules/aiohttp-basicauth/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     description = "HTTP basic authentication middleware for aiohttp 3.0";
     homepage = "https://github.com/romis2012/aiohttp-basicauth";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ mbalatsko ];
+    maintainers = [ ];
   };
 }

From 093b7c22762ae1cc64762d413219026b064f6029 Mon Sep 17 00:00:00 2001
From: Maksym Balatsko <mbalatsko@gmail.com>
Date: Sat, 3 Jan 2026 18:27:04 +0100
Subject: [PATCH 035/100] python3Packages.aioprometheus: remove mbalatsko from
 maintainers

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

diff --git a/pkgs/development/python-modules/aioprometheus/default.nix b/pkgs/development/python-modules/aioprometheus/default.nix
index 71e55587ce58..dfb2ccedf167 100644
--- a/pkgs/development/python-modules/aioprometheus/default.nix
+++ b/pkgs/development/python-modules/aioprometheus/default.nix
@@ -56,6 +56,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/claws/aioprometheus";
     changelog = "https://github.com/claws/aioprometheus/blob/${src.rev}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ mbalatsko ];
+    maintainers = [ ];
   };
 }

From a8eb9e3bee943f71641032f0a499af0fe85ba964 Mon Sep 17 00:00:00 2001
From: Maksym Balatsko <mbalatsko@gmail.com>
Date: Sat, 3 Jan 2026 18:27:17 +0100
Subject: [PATCH 036/100] python3Packages.beautiful-date: remove mbalatsko from
 maintainers

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

diff --git a/pkgs/development/python-modules/beautiful-date/default.nix b/pkgs/development/python-modules/beautiful-date/default.nix
index 3492c4045291..933e6850cef8 100644
--- a/pkgs/development/python-modules/beautiful-date/default.nix
+++ b/pkgs/development/python-modules/beautiful-date/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     description = "Simple and beautiful way to create date and datetime objects";
     homepage = "https://github.com/kuzmoyev/beautiful-date";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ mbalatsko ];
+    maintainers = [ ];
   };
 }

From 31b770f0c380bdc4f99d4aa4ad2a9d0f49d43b09 Mon Sep 17 00:00:00 2001
From: Maksym Balatsko <mbalatsko@gmail.com>
Date: Sat, 3 Jan 2026 18:28:10 +0100
Subject: [PATCH 037/100] python3Packages.boto3-stubs: remove mbalatsko from
 maintainers

---
 pkgs/development/python-modules/boto3-stubs/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix
index 8ac137b6acef..abdbe77a0cf8 100644
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@@ -1096,7 +1096,6 @@ buildPythonPackage rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       fab
-      mbalatsko
     ];
   };
 }

From 9a1d2304a5cc69af1c98ac0e22a1fd3140910f57 Mon Sep 17 00:00:00 2001
From: Maksym Balatsko <mbalatsko@gmail.com>
Date: Sat, 3 Jan 2026 18:28:26 +0100
Subject: [PATCH 038/100] python3Packages.checksumdir: remove mbalatsko from
 maintainers

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

diff --git a/pkgs/development/python-modules/checksumdir/default.nix b/pkgs/development/python-modules/checksumdir/default.nix
index 291f8b93893c..e5b1373a7d4b 100644
--- a/pkgs/development/python-modules/checksumdir/default.nix
+++ b/pkgs/development/python-modules/checksumdir/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
     description = "Simple package to compute a single deterministic hash of the file contents of a directory";
     homepage = "https://github.com/to-mc/checksumdir";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ mbalatsko ];
+    maintainers = [ ];
   };
 }

From b3ae36f23fc8531d155e74cf4c51cd071d2c1a01 Mon Sep 17 00:00:00 2001
From: Maksym Balatsko <mbalatsko@gmail.com>
Date: Sat, 3 Jan 2026 18:28:36 +0100
Subject: [PATCH 039/100] python3Packages.dataprep-ml: remove mbalatsko from
 maintainers

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

diff --git a/pkgs/development/python-modules/dataprep-ml/default.nix b/pkgs/development/python-modules/dataprep-ml/default.nix
index 4ae64b3eba77..747cfe0db4d9 100644
--- a/pkgs/development/python-modules/dataprep-ml/default.nix
+++ b/pkgs/development/python-modules/dataprep-ml/default.nix
@@ -81,6 +81,6 @@ buildPythonPackage rec {
     description = "Data utilities for Machine Learning pipelines";
     homepage = "https://github.com/mindsdb/dataprep_ml";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ mbalatsko ];
+    maintainers = [ ];
   };
 }

From 7c0f3a955306e4249ae3a477dbbff4b861e14039 Mon Sep 17 00:00:00 2001
From: Maksym Balatsko <mbalatsko@gmail.com>
Date: Sat, 3 Jan 2026 18:28:46 +0100
Subject: [PATCH 040/100] python3Packages.dtw-python: remove mbalatsko from
 maintainers

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

diff --git a/pkgs/development/python-modules/dtw-python/default.nix b/pkgs/development/python-modules/dtw-python/default.nix
index 2066ade03f2a..33e59b64d771 100644
--- a/pkgs/development/python-modules/dtw-python/default.nix
+++ b/pkgs/development/python-modules/dtw-python/default.nix
@@ -51,7 +51,7 @@ buildPythonPackage rec {
     homepage = "https://github.com/DynamicTimeWarping/dtw-python";
     changelog = "https://github.com/DynamicTimeWarping/dtw-python/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ mbalatsko ];
+    maintainers = [ ];
     mainProgram = "dtw";
   };
 }

From a49b37773f6d6337fc4fd1e1261e82b5d01826d1 Mon Sep 17 00:00:00 2001
From: Maksym Balatsko <mbalatsko@gmail.com>
Date: Sat, 3 Jan 2026 18:28:54 +0100
Subject: [PATCH 041/100] python3Packages.esig: remove mbalatsko from
 maintainers

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

diff --git a/pkgs/development/python-modules/esig/default.nix b/pkgs/development/python-modules/esig/default.nix
index b3282de08078..db45eed834c1 100644
--- a/pkgs/development/python-modules/esig/default.nix
+++ b/pkgs/development/python-modules/esig/default.nix
@@ -50,6 +50,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/datasig-ac-uk/esig";
     changelog = "https://github.com/datasig-ac-uk/esig/blob/release/CHANGELOG";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ mbalatsko ];
+    maintainers = [ ];
   };
 }

From 8a6e6d363202d3d42c81c2e5c916e29c70e2965e Mon Sep 17 00:00:00 2001
From: Maksym Balatsko <mbalatsko@gmail.com>
Date: Sat, 3 Jan 2026 18:29:02 +0100
Subject: [PATCH 042/100] python3Packages.gcsa: remove mbalatsko from
 maintainers

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

diff --git a/pkgs/development/python-modules/gcsa/default.nix b/pkgs/development/python-modules/gcsa/default.nix
index cf1b127dce3a..0e8884e5c085 100644
--- a/pkgs/development/python-modules/gcsa/default.nix
+++ b/pkgs/development/python-modules/gcsa/default.nix
@@ -45,6 +45,6 @@ buildPythonPackage rec {
     description = "Pythonic wrapper for the Google Calendar API";
     homepage = "https://github.com/kuzmoyev/google-calendar-simple-api";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ mbalatsko ];
+    maintainers = [ ];
   };
 }

From 656f3ff9d59d35bd56f063f3bad1a362df8e5bc3 Mon Sep 17 00:00:00 2001
From: Maksym Balatsko <mbalatsko@gmail.com>
Date: Sat, 3 Jan 2026 18:29:15 +0100
Subject: [PATCH 043/100] python3Packages.greynoise: remove mbalatsko from
 maintainers

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

diff --git a/pkgs/development/python-modules/greynoise/default.nix b/pkgs/development/python-modules/greynoise/default.nix
index 3627efc57890..1dcc4ea9ca87 100644
--- a/pkgs/development/python-modules/greynoise/default.nix
+++ b/pkgs/development/python-modules/greynoise/default.nix
@@ -77,6 +77,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/GreyNoise-Intelligence/pygreynoise";
     changelog = "https://github.com/GreyNoise-Intelligence/pygreynoise/blob/${src.tag}/CHANGELOG.rst";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ mbalatsko ];
+    maintainers = [ ];
   };
 }

From b5b048fa3421ccd7e3bed0a3ce7dd957b367ce74 Mon Sep 17 00:00:00 2001
From: Maksym Balatsko <mbalatsko@gmail.com>
Date: Sat, 3 Jan 2026 18:29:27 +0100
Subject: [PATCH 044/100] python3Packages.h5io: remove mbalatsko from
 maintainers

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

diff --git a/pkgs/development/python-modules/h5io/default.nix b/pkgs/development/python-modules/h5io/default.nix
index 0d5f24dd1382..39f6c827158c 100644
--- a/pkgs/development/python-modules/h5io/default.nix
+++ b/pkgs/development/python-modules/h5io/default.nix
@@ -55,6 +55,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/h5io/h5io";
     changelog = "https://github.com/h5io/h5io/releases/tag/h5io-${version}";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ mbalatsko ];
+    maintainers = [ ];
   };
 }

From c6dc3446db81d8cd16aaced1ef24756836373950 Mon Sep 17 00:00:00 2001
From: Maksym Balatsko <mbalatsko@gmail.com>
Date: Sat, 3 Jan 2026 18:29:41 +0100
Subject: [PATCH 045/100] python3Packages.hyperscan: remove mbalatsko from
 maintainers

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

diff --git a/pkgs/development/python-modules/hyperscan/default.nix b/pkgs/development/python-modules/hyperscan/default.nix
index b11474f7b28c..f4634220306f 100644
--- a/pkgs/development/python-modules/hyperscan/default.nix
+++ b/pkgs/development/python-modules/hyperscan/default.nix
@@ -62,6 +62,6 @@ buildPythonPackage rec {
       "x86_64-darwin"
     ];
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ mbalatsko ];
+    maintainers = [ ];
   };
 }

From 30117c242b96dcc6413d4748a385d3e4fe5a16b0 Mon Sep 17 00:00:00 2001
From: Maksym Balatsko <mbalatsko@gmail.com>
Date: Sat, 3 Jan 2026 18:29:54 +0100
Subject: [PATCH 046/100] python3Packages.iisignature: remove mbalatsko from
 maintainers

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

diff --git a/pkgs/development/python-modules/iisignature/default.nix b/pkgs/development/python-modules/iisignature/default.nix
index 7d11d4cbd226..607836d73978 100644
--- a/pkgs/development/python-modules/iisignature/default.nix
+++ b/pkgs/development/python-modules/iisignature/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "Iterated integral signature calculations";
     homepage = "https://pypi.org/project/iisignature";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ mbalatsko ];
+    maintainers = [ ];
   };
 }

From cc700bf386ef20b61f016000455d4c15f4c41650 Mon Sep 17 00:00:00 2001
From: Maksym Balatsko <mbalatsko@gmail.com>
Date: Sat, 3 Jan 2026 18:30:02 +0100
Subject: [PATCH 047/100] python3Packages.kaggle: remove mbalatsko from
 maintainers

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

diff --git a/pkgs/development/python-modules/kaggle/default.nix b/pkgs/development/python-modules/kaggle/default.nix
index c4542ed87743..1420a581833a 100644
--- a/pkgs/development/python-modules/kaggle/default.nix
+++ b/pkgs/development/python-modules/kaggle/default.nix
@@ -62,6 +62,6 @@ buildPythonPackage rec {
     mainProgram = "kaggle";
     homepage = "https://github.com/Kaggle/kaggle-api";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ mbalatsko ];
+    maintainers = [ ];
   };
 }

From 9f7203719069348ea3e065309767639bfb243617 Mon Sep 17 00:00:00 2001
From: Maksym Balatsko <mbalatsko@gmail.com>
Date: Sat, 3 Jan 2026 18:30:11 +0100
Subject: [PATCH 048/100] python3Packages.kotsu: remove mbalatsko from
 maintainers

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

diff --git a/pkgs/development/python-modules/kotsu/default.nix b/pkgs/development/python-modules/kotsu/default.nix
index 9d6e083a2cdf..15e0624556ba 100644
--- a/pkgs/development/python-modules/kotsu/default.nix
+++ b/pkgs/development/python-modules/kotsu/default.nix
@@ -43,6 +43,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/datavaluepeople/kotsu";
     changelog = "https://github.com/datavaluepeople/kotsu/blob/${src.rev}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ mbalatsko ];
+    maintainers = [ ];
   };
 }

From a5754179b96ffd07dd0933dbe67d093158be4b9d Mon Sep 17 00:00:00 2001
From: Maksym Balatsko <mbalatsko@gmail.com>
Date: Sat, 3 Jan 2026 18:30:19 +0100
Subject: [PATCH 049/100] python3Packages.langid: remove mbalatsko from
 maintainers

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

diff --git a/pkgs/development/python-modules/langid/default.nix b/pkgs/development/python-modules/langid/default.nix
index 0430c1f55ae7..efb1ea013617 100644
--- a/pkgs/development/python-modules/langid/default.nix
+++ b/pkgs/development/python-modules/langid/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     mainProgram = "langid";
     homepage = "https://pypi.org/project/langid/";
     license = lib.licenses.bsd2;
-    maintainers = with lib.maintainers; [ mbalatsko ];
+    maintainers = [ ];
   };
 }

From 0c026f6f23622127845136c3d12a21d3b4838385 Mon Sep 17 00:00:00 2001
From: Maksym Balatsko <mbalatsko@gmail.com>
Date: Sat, 3 Jan 2026 18:30:31 +0100
Subject: [PATCH 050/100] python3Packages.mindsdb-evaluator: remove mbalatsko
 from maintainers

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

diff --git a/pkgs/development/python-modules/mindsdb-evaluator/default.nix b/pkgs/development/python-modules/mindsdb-evaluator/default.nix
index e9c11be20c46..a90cf30825e5 100644
--- a/pkgs/development/python-modules/mindsdb-evaluator/default.nix
+++ b/pkgs/development/python-modules/mindsdb-evaluator/default.nix
@@ -50,6 +50,6 @@ buildPythonPackage rec {
     description = "Model evaluation for Machine Learning pipelines";
     homepage = "https://github.com/mindsdb/mindsdb_evaluator";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ mbalatsko ];
+    maintainers = [ ];
   };
 }

From 73fe565babc365903b76ff1f8d7771a4f9664dc9 Mon Sep 17 00:00:00 2001
From: Maksym Balatsko <mbalatsko@gmail.com>
Date: Sat, 3 Jan 2026 18:30:39 +0100
Subject: [PATCH 051/100] python3Packages.mne: remove mbalatsko from
 maintainers

---
 pkgs/development/python-modules/mne/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/python-modules/mne/default.nix b/pkgs/development/python-modules/mne/default.nix
index 8dbe204f59ca..3e90d29ff904 100644
--- a/pkgs/development/python-modules/mne/default.nix
+++ b/pkgs/development/python-modules/mne/default.nix
@@ -113,7 +113,6 @@ buildPythonPackage rec {
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [
       bcdarwin
-      mbalatsko
     ];
   };
 }

From 3ca01d2b74ea6cbb92acf8a43a4a4c28c9b29356 Mon Sep 17 00:00:00 2001
From: Maksym Balatsko <mbalatsko@gmail.com>
Date: Sat, 3 Jan 2026 18:30:48 +0100
Subject: [PATCH 052/100] python3Packages.mrsqm: remove mbalatsko from
 maintainers

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

diff --git a/pkgs/development/python-modules/mrsqm/default.nix b/pkgs/development/python-modules/mrsqm/default.nix
index e6828479a5dd..4d22e66478f5 100644
--- a/pkgs/development/python-modules/mrsqm/default.nix
+++ b/pkgs/development/python-modules/mrsqm/default.nix
@@ -76,6 +76,6 @@ buildPythonPackage rec {
     homepage = "https://pypi.org/project/mrsqm";
     changelog = "https://github.com/mlgig/mrsqm/releases/tag/v.${src.tag}";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ mbalatsko ];
+    maintainers = [ ];
   };
 }

From 76e3b3ce6ad17c5be9fc95a6ac61a6cb24070131 Mon Sep 17 00:00:00 2001
From: Maksym Balatsko <mbalatsko@gmail.com>
Date: Sat, 3 Jan 2026 18:31:11 +0100
Subject: [PATCH 053/100] python3Packages.mypy-boto3: remove mbalatsko from
 maintainers

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 0510d26cf9bc..466311f76e20 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -39,7 +39,6 @@ let
         license = with lib.licenses; [ mit ];
         maintainers = with lib.maintainers; [
           fab
-          mbalatsko
         ];
       };
     };

From d3537523aba3f289809369a6449e7aa0289c70cd Mon Sep 17 00:00:00 2001
From: Maksym Balatsko <mbalatsko@gmail.com>
Date: Sat, 3 Jan 2026 18:31:30 +0100
Subject: [PATCH 054/100] python3Packages.pmdarima: remove mbalatsko from
 maintainers

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

diff --git a/pkgs/development/python-modules/pmdarima/default.nix b/pkgs/development/python-modules/pmdarima/default.nix
index cadd521996d7..a81237d371a3 100644
--- a/pkgs/development/python-modules/pmdarima/default.nix
+++ b/pkgs/development/python-modules/pmdarima/default.nix
@@ -79,6 +79,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/alkaline-ml/pmdarima";
     changelog = "https://github.com/alkaline-ml/pmdarima/releases/tag/v${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ mbalatsko ];
+    maintainers = [ ];
   };
 }

From 539b9631cd27575eb9b5c707172b3fa438b94e60 Mon Sep 17 00:00:00 2001
From: Maksym Balatsko <mbalatsko@gmail.com>
Date: Sat, 3 Jan 2026 18:31:47 +0100
Subject: [PATCH 055/100] python3Packages.prometheus-async: remove mbalatsko
 from maintainers

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

diff --git a/pkgs/development/python-modules/prometheus-async/default.nix b/pkgs/development/python-modules/prometheus-async/default.nix
index c7668870e601..8e75cc25c487 100644
--- a/pkgs/development/python-modules/prometheus-async/default.nix
+++ b/pkgs/development/python-modules/prometheus-async/default.nix
@@ -54,6 +54,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/hynek/prometheus-async";
     changelog = "https://github.com/hynek/prometheus-async/blob/${src.rev}/CHANGELOG.md";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ mbalatsko ];
+    maintainers = [ ];
   };
 }

From fd34a0b4bdbe9d49e855db80649d3b223ab8ac66 Mon Sep 17 00:00:00 2001
From: Maksym Balatsko <mbalatsko@gmail.com>
Date: Sat, 3 Jan 2026 18:31:59 +0100
Subject: [PATCH 056/100] python3Packages.pycatch22: remove mbalatsko from
 maintainers

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

diff --git a/pkgs/development/python-modules/pycatch22/default.nix b/pkgs/development/python-modules/pycatch22/default.nix
index 70b91224b54e..a9c8842f9e9c 100644
--- a/pkgs/development/python-modules/pycatch22/default.nix
+++ b/pkgs/development/python-modules/pycatch22/default.nix
@@ -38,6 +38,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/DynamicsAndNeuralSystems/pycatch22";
     changelog = "https://github.com/DynamicsAndNeuralSystems/pycatch22/releases/tag/v${version}";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ mbalatsko ];
+    maintainers = [ ];
   };
 }

From 63c0fb8044ac26ddd6267cd910f1649221b431f8 Mon Sep 17 00:00:00 2001
From: Maksym Balatsko <mbalatsko@gmail.com>
Date: Sat, 3 Jan 2026 18:32:09 +0100
Subject: [PATCH 057/100] python3Packages.pydateinfer: remove mbalatsko from
 maintainers

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

diff --git a/pkgs/development/python-modules/pydateinfer/default.nix b/pkgs/development/python-modules/pydateinfer/default.nix
index 565d1f1cbe21..0f4693829a7a 100644
--- a/pkgs/development/python-modules/pydateinfer/default.nix
+++ b/pkgs/development/python-modules/pydateinfer/default.nix
@@ -34,6 +34,6 @@ buildPythonPackage rec {
     description = "Infers date format from examples";
     homepage = "https://pypi.org/project/pydateinfer/";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ mbalatsko ];
+    maintainers = [ ];
   };
 }

From 519704d1051960f45d54bd178662cc7f55a47b3b Mon Sep 17 00:00:00 2001
From: Maksym Balatsko <mbalatsko@gmail.com>
Date: Sat, 3 Jan 2026 18:32:17 +0100
Subject: [PATCH 058/100] python3Packages.pykalman: remove mbalatsko from
 maintainers

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

diff --git a/pkgs/development/python-modules/pykalman/default.nix b/pkgs/development/python-modules/pykalman/default.nix
index 5d829a2aee26..1da089ce3d8f 100644
--- a/pkgs/development/python-modules/pykalman/default.nix
+++ b/pkgs/development/python-modules/pykalman/default.nix
@@ -38,6 +38,6 @@ buildPythonPackage rec {
     description = "Implementation of the Kalman Filter, Kalman Smoother, and EM algorithm in Python";
     homepage = "https://github.com/pykalman/pykalman";
     license = lib.licenses.bsd2;
-    maintainers = with lib.maintainers; [ mbalatsko ];
+    maintainers = [ ];
   };
 }

From b94c05aef6d89ade25d574dfeb3a2dbc2bf3ce7f Mon Sep 17 00:00:00 2001
From: Maksym Balatsko <mbalatsko@gmail.com>
Date: Sat, 3 Jan 2026 18:32:33 +0100
Subject: [PATCH 059/100] python3Packages.pymatreader: remove mbalatsko from
 maintainers

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

diff --git a/pkgs/development/python-modules/pymatreader/default.nix b/pkgs/development/python-modules/pymatreader/default.nix
index 4a62d6944670..637c98bea145 100644
--- a/pkgs/development/python-modules/pymatreader/default.nix
+++ b/pkgs/development/python-modules/pymatreader/default.nix
@@ -46,6 +46,6 @@ buildPythonPackage rec {
     homepage = "https://gitlab.com/obob/pymatreader/";
     changelog = "https://gitlab.com/obob/pymatreader/-/blob/${src.rev}/CHANGELOG.md";
     license = lib.licenses.bsd2;
-    maintainers = with lib.maintainers; [ mbalatsko ];
+    maintainers = [ ];
   };
 }

From 7c10168f1de83a534af54e1de9f2e292df716d86 Mon Sep 17 00:00:00 2001
From: Maksym Balatsko <mbalatsko@gmail.com>
Date: Sat, 3 Jan 2026 18:32:44 +0100
Subject: [PATCH 060/100] python3Packages.pytest-harvest: remove mbalatsko from
 maintainers

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

diff --git a/pkgs/development/python-modules/pytest-harvest/default.nix b/pkgs/development/python-modules/pytest-harvest/default.nix
index 7f34250f9969..6b1e340d100e 100644
--- a/pkgs/development/python-modules/pytest-harvest/default.nix
+++ b/pkgs/development/python-modules/pytest-harvest/default.nix
@@ -66,6 +66,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/smarie/python-pytest-harvest";
     changelog = "https://github.com/smarie/python-pytest-harvest/releases/tag/${version}";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ mbalatsko ];
+    maintainers = [ ];
   };
 }

From bbfeb9ca168b742aa3fede21a3179ce2f65363d2 Mon Sep 17 00:00:00 2001
From: Maksym Balatsko <mbalatsko@gmail.com>
Date: Sat, 3 Jan 2026 18:32:56 +0100
Subject: [PATCH 061/100] python3Packages.pytest-reverse: remove mbalatsko from
 maintainers

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

diff --git a/pkgs/development/python-modules/pytest-reverse/default.nix b/pkgs/development/python-modules/pytest-reverse/default.nix
index 343b85afaa60..668a3a6c21c9 100644
--- a/pkgs/development/python-modules/pytest-reverse/default.nix
+++ b/pkgs/development/python-modules/pytest-reverse/default.nix
@@ -32,6 +32,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/adamchainz/pytest-reverse";
     changelog = "https://github.com/adamchainz/pytest-reverse/blob/${src.tag}/CHANGELOG.rst";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ mbalatsko ];
+    maintainers = [ ];
   };
 }

From c23af91e6e5ebb77b248c365c16ce1901c98fba1 Mon Sep 17 00:00:00 2001
From: Maksym Balatsko <mbalatsko@gmail.com>
Date: Sat, 3 Jan 2026 18:33:06 +0100
Subject: [PATCH 062/100] python3Packages.python-tds: remove mbalatsko from
 maintainers

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

diff --git a/pkgs/development/python-modules/python-tds/default.nix b/pkgs/development/python-modules/python-tds/default.nix
index 3865d9332d81..1577e1b5c259 100644
--- a/pkgs/development/python-modules/python-tds/default.nix
+++ b/pkgs/development/python-modules/python-tds/default.nix
@@ -66,6 +66,6 @@ buildPythonPackage rec {
     description = "Python DBAPI driver for MSSQL using pure Python TDS (Tabular Data Stream) protocol implementation";
     homepage = "https://python-tds.readthedocs.io/";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ mbalatsko ];
+    maintainers = [ ];
   };
 }

From 34fdc1324b7309c1bebbf6998eff0134e6948a95 Mon Sep 17 00:00:00 2001
From: Maksym Balatsko <mbalatsko@gmail.com>
Date: Sat, 3 Jan 2026 18:33:22 +0100
Subject: [PATCH 063/100] python3Packages.quantile-python: remove mbalatsko
 from maintainers

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

diff --git a/pkgs/development/python-modules/quantile-python/default.nix b/pkgs/development/python-modules/quantile-python/default.nix
index 38cc9d2e3a39..90ba34f92d13 100644
--- a/pkgs/development/python-modules/quantile-python/default.nix
+++ b/pkgs/development/python-modules/quantile-python/default.nix
@@ -23,6 +23,6 @@ buildPythonPackage rec {
     description = "Python Implementation of Graham Cormode and S. Muthukrishnan's Effective Computation of Biased Quantiles over Data Streams in ICDE'05";
     homepage = "https://github.com/matttproud/python_quantile_estimation";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ mbalatsko ];
+    maintainers = [ ];
   };
 }

From b2d02f50d0885d9d6927eb272873b6f30b9a7a8d Mon Sep 17 00:00:00 2001
From: Maksym Balatsko <mbalatsko@gmail.com>
Date: Sat, 3 Jan 2026 18:33:34 +0100
Subject: [PATCH 064/100] python3Packages.requests-ratelimiter: remove
 mbalatsko from maintainers

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

diff --git a/pkgs/development/python-modules/requests-ratelimiter/default.nix b/pkgs/development/python-modules/requests-ratelimiter/default.nix
index 057bfd8ef46d..9ae3a830ff89 100644
--- a/pkgs/development/python-modules/requests-ratelimiter/default.nix
+++ b/pkgs/development/python-modules/requests-ratelimiter/default.nix
@@ -47,6 +47,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/JWCook/requests-ratelimiter";
     changelog = "https://github.com/JWCook/requests-ratelimiter/blob/${src.rev}/HISTORY.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ mbalatsko ];
+    maintainers = [ ];
   };
 }

From 3ba37470fb559219d8c381b74f003019793f9fdd Mon Sep 17 00:00:00 2001
From: Maksym Balatsko <mbalatsko@gmail.com>
Date: Sat, 3 Jan 2026 18:33:47 +0100
Subject: [PATCH 065/100] python3Packages.scikit-posthocs: remove mbalatsko
 from maintainers

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

diff --git a/pkgs/development/python-modules/scikit-posthocs/default.nix b/pkgs/development/python-modules/scikit-posthocs/default.nix
index 3b8def6e84e1..532ca1cae503 100644
--- a/pkgs/development/python-modules/scikit-posthocs/default.nix
+++ b/pkgs/development/python-modules/scikit-posthocs/default.nix
@@ -48,6 +48,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/maximtrp/scikit-posthocs";
     changelog = "https://github.com/maximtrp/scikit-posthocs/releases/tag/${src.tag}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ mbalatsko ];
+    maintainers = [ ];
   };
 }

From f6a27d7fcfc9cee07e15730e70bde3fdee8d86db Mon Sep 17 00:00:00 2001
From: Maksym Balatsko <mbalatsko@gmail.com>
Date: Sat, 3 Jan 2026 18:33:54 +0100
Subject: [PATCH 066/100] python3Packages.seasonal: remove mbalatsko from
 maintainers

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

diff --git a/pkgs/development/python-modules/seasonal/default.nix b/pkgs/development/python-modules/seasonal/default.nix
index 368182ffbdd9..fb69686159cd 100644
--- a/pkgs/development/python-modules/seasonal/default.nix
+++ b/pkgs/development/python-modules/seasonal/default.nix
@@ -58,6 +58,6 @@ buildPythonPackage rec {
     description = "Robustly estimate trend and periodicity in a timeseries";
     homepage = "https://github.com/welch/seasonal";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ mbalatsko ];
+    maintainers = [ ];
   };
 }

From 51b8e37c3d07e93a45592ddcc5a8ec24a6beb076 Mon Sep 17 00:00:00 2001
From: Maksym Balatsko <mbalatsko@gmail.com>
Date: Sat, 3 Jan 2026 18:34:02 +0100
Subject: [PATCH 067/100] python3Packages.stamina: remove mbalatsko from
 maintainers

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

diff --git a/pkgs/development/python-modules/stamina/default.nix b/pkgs/development/python-modules/stamina/default.nix
index a28149fbe795..09a976bf667f 100644
--- a/pkgs/development/python-modules/stamina/default.nix
+++ b/pkgs/development/python-modules/stamina/default.nix
@@ -48,6 +48,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/hynek/stamina";
     changelog = "https://github.com/hynek/stamina/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ mbalatsko ];
+    maintainers = [ ];
   };
 }

From 2f65345e819b9a39f8c1f074e69a16a49161a091 Mon Sep 17 00:00:00 2001
From: Maksym Balatsko <mbalatsko@gmail.com>
Date: Sat, 3 Jan 2026 18:34:11 +0100
Subject: [PATCH 068/100] python3Packages.tbats: remove mbalatsko from
 maintainers

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

diff --git a/pkgs/development/python-modules/tbats/default.nix b/pkgs/development/python-modules/tbats/default.nix
index bf1daa3ca665..b1f71c1a0a66 100644
--- a/pkgs/development/python-modules/tbats/default.nix
+++ b/pkgs/development/python-modules/tbats/default.nix
@@ -52,6 +52,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/intive-DataScience/tbats";
     changelog = "https://github.com/intive-DataScience/tbats/releases/tag/${src.rev}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ mbalatsko ];
+    maintainers = [ ];
   };
 }

From b85b53b2be6f925dcede93ab6c58eaff261f43e2 Mon Sep 17 00:00:00 2001
From: Maksym Balatsko <mbalatsko@gmail.com>
Date: Sat, 3 Jan 2026 18:34:21 +0100
Subject: [PATCH 069/100] python3Packages.treelib: remove mbalatsko from
 maintainers

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

diff --git a/pkgs/development/python-modules/treelib/default.nix b/pkgs/development/python-modules/treelib/default.nix
index 6b58921268c6..253fff14b305 100644
--- a/pkgs/development/python-modules/treelib/default.nix
+++ b/pkgs/development/python-modules/treelib/default.nix
@@ -32,6 +32,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/caesar0301/treelib";
     changelog = "https://github.com/caesar0301/treelib/releases/tag/${src.tag}";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ mbalatsko ];
+    maintainers = [ ];
   };
 }

From 44671e302eec33f4102e91be4cf0bb16e0dc376e Mon Sep 17 00:00:00 2001
From: Maksym Balatsko <mbalatsko@gmail.com>
Date: Sat, 3 Jan 2026 18:34:33 +0100
Subject: [PATCH 070/100] python3Packages.tsfresh: remove mbalatsko from
 maintainers

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

diff --git a/pkgs/development/python-modules/tsfresh/default.nix b/pkgs/development/python-modules/tsfresh/default.nix
index d8f30b6fda61..40594e2dedaf 100644
--- a/pkgs/development/python-modules/tsfresh/default.nix
+++ b/pkgs/development/python-modules/tsfresh/default.nix
@@ -108,6 +108,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/blue-yonder/tsfresh";
     changelog = "https://github.com/blue-yonder/tsfresh/blob/${src.tag}/CHANGES.rst";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ mbalatsko ];
+    maintainers = [ ];
   };
 }

From 74256ad876a66f8d641f3b57dc22f7d442dec068 Mon Sep 17 00:00:00 2001
From: Maksym Balatsko <mbalatsko@gmail.com>
Date: Sat, 3 Jan 2026 18:34:43 +0100
Subject: [PATCH 071/100] python3Packages.type-infer: remove mbalatsko from
 maintainers

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

diff --git a/pkgs/development/python-modules/type-infer/default.nix b/pkgs/development/python-modules/type-infer/default.nix
index 198ac71cb683..a085c462b164 100644
--- a/pkgs/development/python-modules/type-infer/default.nix
+++ b/pkgs/development/python-modules/type-infer/default.nix
@@ -91,6 +91,6 @@ buildPythonPackage {
     description = "Automated type inference for Machine Learning pipelines";
     homepage = "https://github.com/mindsdb/type_infer";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ mbalatsko ];
+    maintainers = [ ];
   };
 }

From 85e7d8d0f616169676573dd09a1c2db0fcdcb81f Mon Sep 17 00:00:00 2001
From: Maksym Balatsko <mbalatsko@gmail.com>
Date: Sat, 3 Jan 2026 18:34:58 +0100
Subject: [PATCH 072/100] python3Packages.types-aiobotocore: remove mbalatsko
 from maintainers

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

diff --git a/pkgs/development/python-modules/types-aiobotocore/default.nix b/pkgs/development/python-modules/types-aiobotocore/default.nix
index ecaad13ae1ba..b1faaa7fba86 100644
--- a/pkgs/development/python-modules/types-aiobotocore/default.nix
+++ b/pkgs/development/python-modules/types-aiobotocore/default.nix
@@ -1111,6 +1111,6 @@ buildPythonPackage rec {
     description = "Type annotations for aiobotocore generated with mypy-boto3-builder";
     homepage = "https://pypi.org/project/types-aiobotocore/";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ mbalatsko ];
+    maintainers = [ ];
   };
 }

From 7931edc1181eee616277aa89a259e557754dd6a5 Mon Sep 17 00:00:00 2001
From: Maksym Balatsko <mbalatsko@gmail.com>
Date: Sat, 3 Jan 2026 18:35:34 +0100
Subject: [PATCH 073/100] python3Packages.types-aiobotocore-packages: remove
 mbalatsko from maintainers

---
 .../python-modules/types-aiobotocore-packages/default.nix       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/types-aiobotocore-packages/default.nix b/pkgs/development/python-modules/types-aiobotocore-packages/default.nix
index acc967434c20..935897b9737c 100644
--- a/pkgs/development/python-modules/types-aiobotocore-packages/default.nix
+++ b/pkgs/development/python-modules/types-aiobotocore-packages/default.nix
@@ -55,7 +55,7 @@ let
         description = "Type annotations for aiobotocore ${serviceName}";
         homepage = "https://github.com/youtype/mypy_boto3_builder";
         license = lib.licenses.mit;
-        maintainers = with lib.maintainers; [ mbalatsko ];
+        maintainers = [ ];
       };
     };
 in

From 4b2d83c34e834928c83098bf191ca1dbcc22865f Mon Sep 17 00:00:00 2001
From: Maksym Balatsko <mbalatsko@gmail.com>
Date: Sat, 3 Jan 2026 18:35:43 +0100
Subject: [PATCH 074/100] python3Packages.walrus: remove mbalatsko from
 maintainers

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

diff --git a/pkgs/development/python-modules/walrus/default.nix b/pkgs/development/python-modules/walrus/default.nix
index 44e945538952..feab6ef503b7 100644
--- a/pkgs/development/python-modules/walrus/default.nix
+++ b/pkgs/development/python-modules/walrus/default.nix
@@ -41,6 +41,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/coleifer/walrus";
     changelog = "https://github.com/coleifer/walrus/blob/${version}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ mbalatsko ];
+    maintainers = [ ];
   };
 }

From 4a817cb40a1f2c8d65195a8dc9ff989e3a2867b6 Mon Sep 17 00:00:00 2001
From: Maksym Balatsko <mbalatsko@gmail.com>
Date: Sat, 3 Jan 2026 18:35:50 +0100
Subject: [PATCH 075/100] python3Packages.whois-api: remove mbalatsko from
 maintainers

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

diff --git a/pkgs/development/python-modules/whois-api/default.nix b/pkgs/development/python-modules/whois-api/default.nix
index 6f8d1c906ffa..3cf944eea9ff 100644
--- a/pkgs/development/python-modules/whois-api/default.nix
+++ b/pkgs/development/python-modules/whois-api/default.nix
@@ -32,6 +32,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/whois-api-llc/whois-api-py";
     changelog = "https://github.com/whois-api-llc/whois-api-py/blob/${src.rev}/CHANGELOG.rst";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ mbalatsko ];
+    maintainers = [ ];
   };
 }

From 3398b44ad548a2a5f099fc25fa10c17efa80825e Mon Sep 17 00:00:00 2001
From: Maksym Balatsko <mbalatsko@gmail.com>
Date: Sat, 3 Jan 2026 18:36:03 +0100
Subject: [PATCH 076/100] python3Packages.wikipedia-api: remove mbalatsko from
 maintainers

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

diff --git a/pkgs/development/python-modules/wikipedia-api/default.nix b/pkgs/development/python-modules/wikipedia-api/default.nix
index aaab51bd7871..67183f19e39d 100644
--- a/pkgs/development/python-modules/wikipedia-api/default.nix
+++ b/pkgs/development/python-modules/wikipedia-api/default.nix
@@ -32,6 +32,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/martin-majlis/Wikipedia-API";
     changelog = "https://github.com/martin-majlis/Wikipedia-API/blob/${src.tag}/CHANGES.rst";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ mbalatsko ];
+    maintainers = [ ];
   };
 }

From 112b5764c5cd1e3bb59068c1a3967942970ae66d Mon Sep 17 00:00:00 2001
From: Maksym Balatsko <mbalatsko@gmail.com>
Date: Sat, 3 Jan 2026 18:36:25 +0100
Subject: [PATCH 077/100] seaborn-data: remove mbalatsko from maintainers

---
 pkgs/tools/misc/seaborn-data/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/seaborn-data/default.nix b/pkgs/tools/misc/seaborn-data/default.nix
index f105756072f1..d08303bf6f23 100644
--- a/pkgs/tools/misc/seaborn-data/default.nix
+++ b/pkgs/tools/misc/seaborn-data/default.nix
@@ -13,7 +13,7 @@ let
       description = "Data repository for seaborn examples";
       homepage = "https://github.com/mwaskom/seaborn-data";
       platforms = lib.platforms.all;
-      maintainers = with lib.maintainers; [ mbalatsko ];
+      maintainers = [ ];
     };
   };
   makeSeabornDataPackage =

From c7f1c838c456b8fd2416dd0317088b81108956df Mon Sep 17 00:00:00 2001
From: Maksym Balatsko <mbalatsko@gmail.com>
Date: Sat, 3 Jan 2026 18:36:59 +0100
Subject: [PATCH 078/100] maintainers: remove mbalatsko

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 6d0c3f8174b3..27dcb246dfc5 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -16648,12 +16648,6 @@
     githubId = 613740;
     name = "Martin Baillie";
   };
-  mbalatsko = {
-    email = "mbalatsko@gmail.com";
-    github = "mbalatsko";
-    githubId = 15967073;
-    name = "Maksym Balatsko";
-  };
   mbbx6spp = {
     email = "me@susanpotter.net";
     github = "mbbx6spp";

From ce6f4a3d2c2e84553e4f1abad52f254c222b5d0b Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Sat, 3 Jan 2026 19:32:11 +0100
Subject: [PATCH 079/100] complgen: 0.5.0 -> 0.6.0

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

diff --git a/pkgs/by-name/co/complgen/package.nix b/pkgs/by-name/co/complgen/package.nix
index 66a371ead111..06d560c0402b 100644
--- a/pkgs/by-name/co/complgen/package.nix
+++ b/pkgs/by-name/co/complgen/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "complgen";
-  version = "0.5.0";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "adaszko";
     repo = "complgen";
     rev = "v${version}";
-    hash = "sha256-GgGFlrAJN9w+bsoXmVJaYUyx/ViH9m4E4EeJlmWRo6o=";
+    hash = "sha256-iwbU3DOzyPm3ZoyCRsgBZcSBSg48SsAMS/W4o5e3Gfs=";
   };
 
-  cargoHash = "sha256-JexvR/djdRGq3BsOWfEhFCbTe3OaP/jqQgiO+RkK1Tg=";
+  cargoHash = "sha256-BGnTZxDv971s0h87RcOowoOpNdpwCx7FLcQNipPCTvc=";
 
   meta = {
     description = "Generate {bash,fish,zsh} completions from a single EBNF-like grammar";

From 815df6baf68fd49545fa03e5b146d8f645747b2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 2 Jan 2026 03:58:47 -0800
Subject: [PATCH 080/100] python3Packages.aiohomematic: 2025.11.7 -> 2026.1.5

Diff: https://github.com/SukramJ/aiohomematic/compare/2025.11.7...2026.1.5

Changelog: https://github.com/SukramJ/aiohomematic/blob/2026.1.5/changelog.md
---
 pkgs/development/python-modules/aiohomematic/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aiohomematic/default.nix b/pkgs/development/python-modules/aiohomematic/default.nix
index a66a6169b327..384c71f3485d 100644
--- a/pkgs/development/python-modules/aiohomematic/default.nix
+++ b/pkgs/development/python-modules/aiohomematic/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "aiohomematic";
-  version = "2025.11.7";
+  version = "2026.1.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "SukramJ";
     repo = "aiohomematic";
     tag = version;
-    hash = "sha256-WKpcySWdw3yJeFgFR9JTv/MEaSGA/u2sENQH/ZXtds4=";
+    hash = "sha256-WOAbfy3cufE/5iDpDR5J0eNFFYyzwCLsgFqIFfLvYZM=";
   };
 
   build-system = [ setuptools ];

From 9a5a56b04d844d3a50289cf99e8b0d7c5f739c85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 2 Jan 2026 03:58:54 -0800
Subject: [PATCH 081/100] home-assistant-custom-components.homematicip_local:
 1.90.2 -> 2.0.2

Diff: https://github.com/SukramJ/custom_homematic/compare/1.90.2...2.0.2

Changelog: https://github.com/SukramJ/custom_homematic/blob/2.0.2/changelog.md
---
 .../custom-components/homematicip_local/package.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix
index 76568f9a7d73..45b3718be15b 100644
--- a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix
@@ -13,13 +13,13 @@
 buildHomeAssistantComponent rec {
   owner = "SukramJ";
   domain = "homematicip_local";
-  version = "1.90.2";
+  version = "2.0.2";
 
   src = fetchFromGitHub {
     owner = "SukramJ";
     repo = "custom_homematic";
     tag = version;
-    hash = "sha256-ARBCwwvGFODMBNf0Ds4DL65V8LKm9nfiKaPUn0c6kYE=";
+    hash = "sha256-r/VKs5npPNoOZmWQmpoyEgCjRBZz8KEpNeLFVo5PECo=";
   };
 
   postPatch = ''

From e90b8cecacc92aecccbe4b7e5cc82971904356f8 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Sat, 3 Jan 2026 19:32:56 +0100
Subject: [PATCH 082/100] complgen: use finalAttrs pattern

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

diff --git a/pkgs/by-name/co/complgen/package.nix b/pkgs/by-name/co/complgen/package.nix
index 06d560c0402b..ecb169010984 100644
--- a/pkgs/by-name/co/complgen/package.nix
+++ b/pkgs/by-name/co/complgen/package.nix
@@ -4,14 +4,14 @@
   fetchFromGitHub,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "complgen";
   version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "adaszko";
     repo = "complgen";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-iwbU3DOzyPm3ZoyCRsgBZcSBSg48SsAMS/W4o5e3Gfs=";
   };
 
@@ -21,8 +21,8 @@ rustPlatform.buildRustPackage rec {
     description = "Generate {bash,fish,zsh} completions from a single EBNF-like grammar";
     mainProgram = "complgen";
     homepage = "https://github.com/adaszko/complgen";
-    changelog = "https://github.com/adaszko/complgen/blob/${src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/adaszko/complgen/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = [ ];
   };
-}
+})

From 797e91362da968cbe970d8d1c57c84476d1904e9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 3 Jan 2026 18:33:04 +0000
Subject: [PATCH 083/100] fingerprintx: 1.1.16 -> 1.1.19

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

diff --git a/pkgs/by-name/fi/fingerprintx/package.nix b/pkgs/by-name/fi/fingerprintx/package.nix
index 48b09174e36d..de1e8c8c6f52 100644
--- a/pkgs/by-name/fi/fingerprintx/package.nix
+++ b/pkgs/by-name/fi/fingerprintx/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "fingerprintx";
-  version = "1.1.16";
+  version = "1.1.19";
 
   src = fetchFromGitHub {
     owner = "praetorian-inc";
     repo = "fingerprintx";
     tag = "v${version}";
-    hash = "sha256-U6QHSvZKgFwRkbWXpHMJZQyXG68DYyl5zXA+Y7eQp8Y=";
+    hash = "sha256-aK3XYSbFd1FfgbORUQn9ogOD4HZC5Ig/fz7nHYcW09s=";
   };
 
-  vendorHash = "sha256-1KSNvK2ylqWjfhxMY+NQFoDahPgqGb12nA4oGqqoFIA=";
+  vendorHash = "sha256-kAAg0zrVfFcbk1HXwUrUI380Sf//vAhGa6HdJlPgn90=";
 
   ldflags = [
     "-s"

From 101dabfd8abef68173391ccde727ec4a0d24287e Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Sat, 3 Jan 2026 19:33:40 +0100
Subject: [PATCH 084/100] complgen: reorder meta attributes

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

diff --git a/pkgs/by-name/co/complgen/package.nix b/pkgs/by-name/co/complgen/package.nix
index ecb169010984..265eadbacb10 100644
--- a/pkgs/by-name/co/complgen/package.nix
+++ b/pkgs/by-name/co/complgen/package.nix
@@ -18,11 +18,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
   cargoHash = "sha256-BGnTZxDv971s0h87RcOowoOpNdpwCx7FLcQNipPCTvc=";
 
   meta = {
-    description = "Generate {bash,fish,zsh} completions from a single EBNF-like grammar";
-    mainProgram = "complgen";
-    homepage = "https://github.com/adaszko/complgen";
     changelog = "https://github.com/adaszko/complgen/blob/v${finalAttrs.version}/CHANGELOG.md";
+    description = "Generate {bash,fish,zsh} completions from a single EBNF-like grammar";
+    homepage = "https://github.com/adaszko/complgen";
     license = lib.licenses.asl20;
+    mainProgram = "complgen";
     maintainers = [ ];
   };
 })

From 60525056252d2f2e9385d8ad82fd336627ddc6c7 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Sat, 3 Jan 2026 19:33:58 +0100
Subject: [PATCH 085/100] complgen: reorder inputs

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

diff --git a/pkgs/by-name/co/complgen/package.nix b/pkgs/by-name/co/complgen/package.nix
index 265eadbacb10..d323dc5fbe57 100644
--- a/pkgs/by-name/co/complgen/package.nix
+++ b/pkgs/by-name/co/complgen/package.nix
@@ -1,7 +1,7 @@
 {
+  fetchFromGitHub,
   lib,
   rustPlatform,
-  fetchFromGitHub,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {

From 858aff6097860d8fae781bfa998de34cf1825ef3 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Sat, 3 Jan 2026 19:34:12 +0100
Subject: [PATCH 086/100] complgen: use tag instead or rev

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

diff --git a/pkgs/by-name/co/complgen/package.nix b/pkgs/by-name/co/complgen/package.nix
index d323dc5fbe57..3b1dd05b749f 100644
--- a/pkgs/by-name/co/complgen/package.nix
+++ b/pkgs/by-name/co/complgen/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   src = fetchFromGitHub {
     owner = "adaszko";
     repo = "complgen";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-iwbU3DOzyPm3ZoyCRsgBZcSBSg48SsAMS/W4o5e3Gfs=";
   };
 

From e8b5e558cbad31459fa2008fbddce442080b8852 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Sat, 3 Jan 2026 19:34:33 +0100
Subject: [PATCH 087/100] complgen: add hythera as maintainer

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

diff --git a/pkgs/by-name/co/complgen/package.nix b/pkgs/by-name/co/complgen/package.nix
index 3b1dd05b749f..650bfc458f9d 100644
--- a/pkgs/by-name/co/complgen/package.nix
+++ b/pkgs/by-name/co/complgen/package.nix
@@ -23,6 +23,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/adaszko/complgen";
     license = lib.licenses.asl20;
     mainProgram = "complgen";
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ hythera ];
   };
 })

From 683a9b61f4bdd50e1f56e61a780f0edb7d360724 Mon Sep 17 00:00:00 2001
From: BatteredBunny <ayes2022@protonmail.com>
Date: Sat, 3 Jan 2026 20:55:29 +0200
Subject: [PATCH 088/100] electron-mail: 5.3.3 -> 5.3.5

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

diff --git a/pkgs/by-name/el/electron-mail/package.nix b/pkgs/by-name/el/electron-mail/package.nix
index ea53de4cbf49..73fe4bc3d456 100644
--- a/pkgs/by-name/el/electron-mail/package.nix
+++ b/pkgs/by-name/el/electron-mail/package.nix
@@ -7,11 +7,11 @@
 
 let
   pname = "electron-mail";
-  version = "5.3.3";
+  version = "5.3.5";
 
   src = fetchurl {
     url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-linux-x86_64.AppImage";
-    hash = "sha256-i1oJ/DNGspE7ELuN7MI0e8/69SZwirqahBa7Jf5kP7s=";
+    hash = "sha256-xlDk/MwDs1DKzIx+8NyrS+yQw4u3gY5iTXvc2NWLn8s=";
   };
 
   appimageContents = appimageTools.extract { inherit pname version src; };

From 0266fe89483498c03e433e4bf59e54eeb5a4dcc7 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Mon, 22 Dec 2025 14:56:16 -0400
Subject: [PATCH 089/100] zlib-ng: fix cygwin build

---
 pkgs/by-name/zl/zlib-ng/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/zl/zlib-ng/package.nix b/pkgs/by-name/zl/zlib-ng/package.nix
index 154bc13acbfb..479c6cad4b98 100644
--- a/pkgs/by-name/zl/zlib-ng/package.nix
+++ b/pkgs/by-name/zl/zlib-ng/package.nix
@@ -45,7 +45,10 @@ stdenv.mkDerivation rec {
     "-DBUILD_SHARED_LIBS=ON"
     "-DINSTALL_UTILS=ON"
   ]
-  ++ lib.optionals withZlibCompat [ "-DZLIB_COMPAT=ON" ];
+  ++ lib.optionals withZlibCompat [ "-DZLIB_COMPAT=ON" ]
+  ++ lib.optional (
+    stdenv.hostPlatform.isWindows || stdenv.hostPlatform.isCygwin
+  ) "-DCMAKE_RC_COMPILER=${stdenv.cc.targetPrefix}windres";
 
   meta = {
     description = "Zlib data compression library for the next generation systems";

From 1bbcc160cd7e46a79009f39fe898e9a609449c8e Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sat, 3 Jan 2026 18:25:05 +0100
Subject: [PATCH 090/100] dwarf-fortress: fix build

- part of: https://github.com/NixOS/nixpkgs/issues/445447

It also seems that the previous CMakeLists patche was committed
upstream.
Lastly, adds a missing `<cstdint>` header
---
 pkgs/games/dwarf-fortress/unfuck.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix
index 4d47e4102575..174470b7368c 100644
--- a/pkgs/games/dwarf-fortress/unfuck.nix
+++ b/pkgs/games/dwarf-fortress/unfuck.nix
@@ -66,11 +66,18 @@ stdenv.mkDerivation {
       url = "https://github.com/svenstaro/dwarf_fortress_unfuck/commit/6dcfe5ae869fddd51940c6c37a95f7bc639f4389.patch";
       hash = "sha256-b9eI3iR7dmFqCrktPyn6QJ9U2A/7LvfYRS+vE3BOaqk=";
     })
+    (fetchpatch {
+      name = "use-the-glew-cmake-target.patch";
+      url = "https://github.com/svenstaro/dwarf_fortress_unfuck/commit/abd2961836ace8cf6277ceff997b02704c6edd7a.patch";
+      hash = "sha256-2VS/Mvhl6oLoMcH4x3hX9RO0VrHha8hhkdKwN0ZfUTs=";
+    })
   ];
 
   postPatch = ''
-    # https://github.com/svenstaro/dwarf_fortress_unfuck/pull/27
-    substituteInPlace CMakeLists.txt --replace \''${GLEW_LIBRARIES} GLEW::glew
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+
+    sed -i "1i #include <cstdint>" g_src/files.h
   '';
 
   cmakeFlags = [

From dc7ff9191df5ce072394f04264f88be1270105c4 Mon Sep 17 00:00:00 2001
From: BatteredBunny <ayes2022@protonmail.com>
Date: Sat, 3 Jan 2026 21:23:11 +0200
Subject: [PATCH 091/100] electron-mail: add darwin support

---
 pkgs/by-name/el/electron-mail/package.nix | 97 ++++++++++++++++++-----
 1 file changed, 75 insertions(+), 22 deletions(-)

diff --git a/pkgs/by-name/el/electron-mail/package.nix b/pkgs/by-name/el/electron-mail/package.nix
index 73fe4bc3d456..a430fb7c5a98 100644
--- a/pkgs/by-name/el/electron-mail/package.nix
+++ b/pkgs/by-name/el/electron-mail/package.nix
@@ -3,35 +3,35 @@
   lib,
   fetchurl,
   nix-update-script,
+  stdenvNoCC,
+  makeWrapper,
+  undmg,
 }:
 
 let
   pname = "electron-mail";
   version = "5.3.5";
 
-  src = fetchurl {
-    url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-linux-x86_64.AppImage";
-    hash = "sha256-xlDk/MwDs1DKzIx+8NyrS+yQw4u3gY5iTXvc2NWLn8s=";
+  sources = {
+    x86_64-linux = fetchurl {
+      url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-linux-x86_64.AppImage";
+      hash = "sha256-xlDk/MwDs1DKzIx+8NyrS+yQw4u3gY5iTXvc2NWLn8s=";
+    };
+    aarch64-darwin = fetchurl {
+      url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-mac-arm64.dmg";
+      hash = "sha256-5g/6ndODuK1OkeI2+DwYTZoDdgM+/qMYMgrFhHRPnAI=";
+    };
+    x86_64-darwin = fetchurl {
+      url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-mac-x64.dmg";
+      hash = "sha256-qjqND/H5ng2gG+llZ1aM2ju8ITHPfMVZTzDdqN0lhnU=";
+    };
   };
 
-  appimageContents = appimageTools.extract { inherit pname version src; };
-in
-appimageTools.wrapType2 {
-  inherit pname version src;
+  src = sources.${stdenvNoCC.hostPlatform.system};
 
-  extraInstallCommands = ''
-    install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications
-    substituteInPlace $out/share/applications/${pname}.desktop \
-      --replace-fail 'Exec=AppRun' 'Exec=${pname}'
-    cp -r ${appimageContents}/usr/share/icons $out/share
-  '';
-
-  extraPkgs = pkgs: [
-    pkgs.libsecret
-    pkgs.libappindicator-gtk3
-  ];
-
-  passthru.updateScript = nix-update-script { };
+  appimageContents = appimageTools.extract {
+    inherit src pname version;
+  };
 
   meta = {
     description = "Unofficial Election-based ProtonMail desktop client";
@@ -39,7 +39,60 @@ appimageTools.wrapType2 {
     homepage = "https://github.com/vladimiry/ElectronMail";
     license = lib.licenses.gpl3;
     maintainers = [ lib.maintainers.princemachiavelli ];
-    platforms = [ "x86_64-linux" ];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-darwin"
+      "x86_64-darwin"
+    ];
     changelog = "https://github.com/vladimiry/ElectronMail/releases/tag/v${version}";
   };
-}
+
+  linux = appimageTools.wrapType2 {
+    inherit
+      src
+      pname
+      version
+      meta
+      ;
+
+    extraInstallCommands = ''
+      install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications
+      substituteInPlace $out/share/applications/${pname}.desktop \
+        --replace-fail 'Exec=AppRun' 'Exec=${pname}'
+      cp -r ${appimageContents}/usr/share/icons $out/share
+    '';
+
+    extraPkgs = pkgs: [
+      pkgs.libsecret
+      pkgs.libappindicator-gtk3
+    ];
+
+    passthru.updateScript = nix-update-script { };
+  };
+
+  darwin = stdenvNoCC.mkDerivation {
+    inherit
+      src
+      pname
+      version
+      meta
+      ;
+
+    sourceRoot = ".";
+    nativeBuildInputs = [
+      undmg
+      makeWrapper
+    ];
+
+    installPhase = ''
+      runHook preInstall
+
+      mkdir -p $out/Applications
+      cp -r *.app $out/Applications/
+      makeWrapper "$out/Applications/electron-mail.app/Contents/MacOS/electron-mail" $out/bin/${pname}
+
+      runHook postInstall
+    '';
+  };
+in
+if stdenvNoCC.hostPlatform.isDarwin then darwin else linux

From 448e3df0369c8177f1e61da497ed99dec517677a Mon Sep 17 00:00:00 2001
From: BatteredBunny <ayes2022@protonmail.com>
Date: Sat, 3 Jan 2026 21:26:38 +0200
Subject: [PATCH 092/100] electron-mail: add BatteredBunny as maintainer

---
 pkgs/by-name/el/electron-mail/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/el/electron-mail/package.nix b/pkgs/by-name/el/electron-mail/package.nix
index a430fb7c5a98..16c8bb7f2d30 100644
--- a/pkgs/by-name/el/electron-mail/package.nix
+++ b/pkgs/by-name/el/electron-mail/package.nix
@@ -38,7 +38,10 @@ let
     mainProgram = "electron-mail";
     homepage = "https://github.com/vladimiry/ElectronMail";
     license = lib.licenses.gpl3;
-    maintainers = [ lib.maintainers.princemachiavelli ];
+    maintainers = with lib.maintainers; [
+      princemachiavelli
+      BatteredBunny
+    ];
     platforms = [
       "x86_64-linux"
       "aarch64-darwin"

From e7de830e80bfe6695cded0c15d8ea3a5cbd8ea8c Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Sat, 3 Jan 2026 21:17:17 +0100
Subject: [PATCH 093/100] lazygit: 0.57.0 -> 0.58.0

Changelog: https://github.com/jesseduffield/lazygit/releases/tag/v0.58.0
Diff: https://github.com/jesseduffield/lazygit/compare/v0.57.0...v0.58.0
---
 pkgs/by-name/la/lazygit/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/la/lazygit/package.nix b/pkgs/by-name/la/lazygit/package.nix
index 1e24d3dc7c0d..93c1d90e00f9 100644
--- a/pkgs/by-name/la/lazygit/package.nix
+++ b/pkgs/by-name/la/lazygit/package.nix
@@ -8,13 +8,13 @@
 }:
 buildGoModule rec {
   pname = "lazygit";
-  version = "0.57.0";
+  version = "0.58.0";
 
   src = fetchFromGitHub {
     owner = "jesseduffield";
     repo = "lazygit";
     tag = "v${version}";
-    hash = "sha256-DC0wVkFI7Te3QSE8Y0WU/ysanfukTkGa3N43hmKHXW8=";
+    hash = "sha256-+xWryg9iLip0VF6GFCDXPKayooNPurBgBfZestpSv4M=";
   };
 
   vendorHash = null;

From f60921b62e2d2bd3448f09e9b65e4a7aa62b8f71 Mon Sep 17 00:00:00 2001
From: Changseo Jang <beleap@beleap.dev>
Date: Sun, 4 Jan 2026 05:05:33 +0900
Subject: [PATCH 094/100] terminal-notifier: set mainProgram

---
 pkgs/by-name/te/terminal-notifier/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/te/terminal-notifier/package.nix b/pkgs/by-name/te/terminal-notifier/package.nix
index 1f4e97ec2715..9cca1d289092 100644
--- a/pkgs/by-name/te/terminal-notifier/package.nix
+++ b/pkgs/by-name/te/terminal-notifier/package.nix
@@ -35,5 +35,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/julienXX/terminal-notifier";
     license = lib.licenses.mit;
     platforms = lib.platforms.darwin;
+    mainProgram = "terminal-notifier";
   };
 }

From e50fad7105da44f8e0ff8bf527b50b70e94ab500 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 3 Jan 2026 20:24:19 +0000
Subject: [PATCH 095/100] basedpyright: 1.36.1 -> 1.36.2

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

diff --git a/pkgs/by-name/ba/basedpyright/package.nix b/pkgs/by-name/ba/basedpyright/package.nix
index 4c0ec9af0b88..61c77331a8ec 100644
--- a/pkgs/by-name/ba/basedpyright/package.nix
+++ b/pkgs/by-name/ba/basedpyright/package.nix
@@ -18,13 +18,13 @@
 
 buildNpmPackage rec {
   pname = "basedpyright";
-  version = "1.36.1";
+  version = "1.36.2";
 
   src = fetchFromGitHub {
     owner = "detachhead";
     repo = "basedpyright";
     tag = "v${version}";
-    hash = "sha256-c0yvnLOwOR4nMYbfyXe/QRUt3qaNRzwuS8UbyviJj9E=";
+    hash = "sha256-fi1TGvlH6h9MHymCn0INc1lIqTyMnHEhxXJuAiYmkpo=";
   };
 
   npmDepsHash = "sha256-VHQOmRWirZYnoxk/JzGwFFV5QEIyHGg/isDvf/f7uro=";

From b3408fbed93789a6fd3476f8e4b0ae16bb224715 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 3 Jan 2026 21:41:56 +0100
Subject: [PATCH 096/100] python313Packages.http-message-signatures: remove
 disabled

---
 .../python-modules/http-message-signatures/default.nix         | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/python-modules/http-message-signatures/default.nix b/pkgs/development/python-modules/http-message-signatures/default.nix
index b36233551bb6..71f7ba88ef6c 100644
--- a/pkgs/development/python-modules/http-message-signatures/default.nix
+++ b/pkgs/development/python-modules/http-message-signatures/default.nix
@@ -4,7 +4,6 @@
   cryptography,
   fetchFromGitHub,
   pytestCheckHook,
-  pythonOlder,
   hatchling,
   hatch-vcs,
   requests,
@@ -15,8 +14,6 @@ buildPythonPackage rec {
   version = "1.0.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "pyauth";
     repo = "http-message-signatures";

From d271094e8863d07448ea6e610fd10157d3ac5062 Mon Sep 17 00:00:00 2001
From: rowan amber-jones <roarch@proton.me>
Date: Sat, 9 Aug 2025 21:31:40 +0100
Subject: [PATCH 097/100] maintainers: add mushrowan

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 6d0c3f8174b3..10ef37934596 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -18067,6 +18067,12 @@
     githubId = 96225281;
     name = "Mustafa Çalışkan";
   };
+  mushrowan = {
+    email = "roarch@proton.me";
+    name = "Rowan";
+    github = "mushrowan";
+    githubId = 69822445;
+  };
   musjj = {
     name = "musjj";
     github = "musjj";

From 0d0cae402f25f5eaa460e905f7d6473b7f72a44c Mon Sep 17 00:00:00 2001
From: rowan amber-jones <roarch@proton.me>
Date: Sat, 3 Jan 2026 20:22:19 +0000
Subject: [PATCH 098/100] nixos/git: add mushrowan to maintainers

---
 nixos/modules/programs/git.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/programs/git.nix b/nixos/modules/programs/git.nix
index e247ff1a7a33..90857863f69e 100644
--- a/nixos/modules/programs/git.nix
+++ b/nixos/modules/programs/git.nix
@@ -115,5 +115,5 @@ in
     })
   ];
 
-  meta.maintainers = [ ];
+  meta.maintainers = [ lib.maintainers.mushrowan ];
 }

From 96b7f9953c877ef92d956b9a878e6d3136dc7ff2 Mon Sep 17 00:00:00 2001
From: SkohTV <contact@skoh.dev>
Date: Sat, 29 Nov 2025 17:56:36 -0500
Subject: [PATCH 099/100] iqtree: 2.3.6 -> 3.0.1

---
 pkgs/by-name/iq/iqtree/package.nix | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/iq/iqtree/package.nix b/pkgs/by-name/iq/iqtree/package.nix
index 1ab38a4cd85c..9caab953b28b 100644
--- a/pkgs/by-name/iq/iqtree/package.nix
+++ b/pkgs/by-name/iq/iqtree/package.nix
@@ -9,15 +9,15 @@
   llvmPackages,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "iqtree";
-  version = "2.3.6";
+  version = "3.0.1";
 
   src = fetchFromGitHub {
     owner = "iqtree";
-    repo = "iqtree2";
-    tag = "v${version}";
-    hash = "sha256-8d5zqZIevv3bnq7z7Iyo/x8i445y1RAFtRMeK8s/ieQ=";
+    repo = "iqtree3";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-6Zy/u7YSCoqkLwq6xOoFMFDInGYREea1gS+PzSP4F8Q=";
     fetchSubmodules = true;
   };
 
@@ -32,15 +32,16 @@ stdenv.mkDerivation rec {
     llvmPackages.openmp
   ];
 
+  cmakeFlags = [
+    (lib.cmakeBool "USE_CMAPLE" false) # tries to download googletest
+  ];
+
   meta = {
-    homepage = "http://www.iqtree.org/";
+    homepage = "https://iqtree.github.io/";
     description = "Efficient and versatile phylogenomic software by maximum likelihood";
-    mainProgram = "iqtree2";
+    mainProgram = "iqtree3";
     license = lib.licenses.lgpl2;
     maintainers = with lib.maintainers; [ bzizou ];
-    platforms = [
-      "x86_64-linux"
-      "x86_64-darwin"
-    ];
+    platforms = lib.platforms.linux;
   };
-}
+})

From 050b8ae0cc930913aef83288b847d3cdae3dd1a3 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Mon, 10 Nov 2025 18:55:51 +0000
Subject: [PATCH 100/100] liquidwar: migrate to by-name

---
 .../default.nix => by-name/li/liquidwar/package.nix}        | 4 ++--
 .../liquidwar/5.nix => by-name/li/liquidwar5/package.nix}   | 0
 pkgs/top-level/all-packages.nix                             | 6 ------
 3 files changed, 2 insertions(+), 8 deletions(-)
 rename pkgs/{games/liquidwar/default.nix => by-name/li/liquidwar/package.nix} (98%)
 rename pkgs/{games/liquidwar/5.nix => by-name/li/liquidwar5/package.nix} (100%)

diff --git a/pkgs/games/liquidwar/default.nix b/pkgs/by-name/li/liquidwar/package.nix
similarity index 98%
rename from pkgs/games/liquidwar/default.nix
rename to pkgs/by-name/li/liquidwar/package.nix
index 0ac6905c9f34..05f7349bf995 100644
--- a/pkgs/games/liquidwar/default.nix
+++ b/pkgs/by-name/li/liquidwar/package.nix
@@ -11,7 +11,7 @@
   expat,
   gettext,
   perl,
-  guile,
+  guile_2_0,
   SDL,
   SDL_image,
   SDL_mixer,
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     xorgproto
     libX11
     gmp
-    guile
+    guile_2_0
     libjpeg
     libpng
     expat
diff --git a/pkgs/games/liquidwar/5.nix b/pkgs/by-name/li/liquidwar5/package.nix
similarity index 100%
rename from pkgs/games/liquidwar/5.nix
rename to pkgs/by-name/li/liquidwar5/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e641a167e423..813a81211a8e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12682,12 +12682,6 @@ with pkgs;
     pythonSupport = true;
   };
 
-  liquidwar = callPackage ../games/liquidwar {
-    guile = guile_2_0;
-  };
-
-  liquidwar5 = callPackage ../games/liquidwar/5.nix { };
-
   mindustry-wayland = callPackage ../by-name/mi/mindustry/package.nix {
     enableWayland = true;
   };