From 192501af3a8b758fca4ebcbb4b4a5ff38dd9597e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 Jan 2026 06:01:49 +0000
Subject: [PATCH 01/77] megasync: 5.16.0.2 -> 6.1.1.0

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

diff --git a/pkgs/by-name/me/megasync/package.nix b/pkgs/by-name/me/megasync/package.nix
index cf951fb801b5..a6d93bc7a996 100644
--- a/pkgs/by-name/me/megasync/package.nix
+++ b/pkgs/by-name/me/megasync/package.nix
@@ -34,13 +34,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "megasync";
-  version = "5.16.0.2";
+  version = "6.1.1.0";
 
   src = fetchFromGitHub rec {
     owner = "meganz";
     repo = "MEGAsync";
     tag = "v${finalAttrs.version}_Linux";
-    hash = "sha256-Bkye2Is3GbdnYYaS//AkNfrt8ppWP9zE58obcmUm0wE=";
+    hash = "sha256-lY8YfBWRYo+Q0ZvsZI2Mo0pgjD7wQvpyybPU+9bWahw=";
     fetchSubmodules = false; # DesignTokensImporter cannot be fetched, see #1010 in github:meganz/megasync
     leaveDotGit = true;
     postFetch = ''

From 596e4935a7c2b1504c2a3d3d75f4b3169b9becab Mon Sep 17 00:00:00 2001
From: cedev-1 <121963179+cedev-1@users.noreply.github.com>
Date: Wed, 8 Oct 2025 19:01:11 +0200
Subject: [PATCH 02/77] maintainers: add cedev-1

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index f3c6fe29eb87..ea5c7973fe69 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4505,6 +4505,12 @@
     github = "cdombroski";
     githubId = 244909;
   };
+  cedev-1 = {
+    name = "Cedev";
+    email = "cedev@ce-dev.eu";
+    github = "cedev-1";
+    githubId = 121963179;
+  };
   ceedubs = {
     email = "ceedubs@gmail.com";
     github = "ceedubs";

From ab731f6125c0dfbc82682c480fae5382af893672 Mon Sep 17 00:00:00 2001
From: cedev-1 <121963179+cedev-1@users.noreply.github.com>
Date: Wed, 8 Oct 2025 21:10:04 +0200
Subject: [PATCH 03/77] sshm: init at 1.10.0

---
 pkgs/by-name/ss/sshm/package.nix | 36 ++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 pkgs/by-name/ss/sshm/package.nix

diff --git a/pkgs/by-name/ss/sshm/package.nix b/pkgs/by-name/ss/sshm/package.nix
new file mode 100644
index 000000000000..c0a4ee336dae
--- /dev/null
+++ b/pkgs/by-name/ss/sshm/package.nix
@@ -0,0 +1,36 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+
+buildGoModule rec {
+  pname = "sshm";
+  version = "1.10.0";
+
+  src = fetchFromGitHub {
+    owner = "Gu1llaum-3";
+    repo = "sshm";
+    tag = "v${version}";
+    hash = "sha256-tDaRRZXj0XJ8XpCxs2b6Bm3qvfcE8t9CfR3mxuOrPDM=";
+  };
+
+  vendorHash = "sha256-aU/+bxcETs/Jq5FVAdiioyuc1AufvWeiqFQ7uo1cK1k=";
+
+  subPackages = [ "." ];
+  ldflags = [
+    "-s"
+    "-w"
+    "-X=github.com/Gu1llaum-3/sshm/cmd.AppVersion=${version}"
+  ];
+
+  meta = {
+    description = "Terminal UI to manage and connect to SSH hosts";
+    mainProgram = "sshm";
+    homepage = "https://github.com/Gu1llaum-3/sshm";
+    changelog = "https://github.com/Gu1llaum-3/sshm/releases/tag/${version}";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ cedev-1 ];
+  };
+}

From f5b6b1323e86b9ec9dce72e29cc16bd4d0d58d34 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Feb 2026 03:50:14 +0000
Subject: [PATCH 04/77] python3Packages.gehomesdk: 2025.11.5 -> 2026.2.0

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

diff --git a/pkgs/development/python-modules/gehomesdk/default.nix b/pkgs/development/python-modules/gehomesdk/default.nix
index 492f239d5ab7..9c8b7a47913a 100644
--- a/pkgs/development/python-modules/gehomesdk/default.nix
+++ b/pkgs/development/python-modules/gehomesdk/default.nix
@@ -15,12 +15,12 @@
 
 buildPythonPackage rec {
   pname = "gehomesdk";
-  version = "2025.11.5";
+  version = "2026.2.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-HS33yTE+3n0DKRD4+cr8zAE+xcW1ca7q8inQ7qwKJMA=";
+    hash = "sha256-+BWGkUDKd+9QGbdXuLjmJxLm1xUv0dpIRlPlDkUJ25w=";
   };
 
   build-system = [ setuptools ];

From f6cd0e205968826a03db6a819022e06c78f37c22 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Sun, 22 Feb 2026 16:36:05 -0600
Subject: [PATCH 05/77] _010editor: add updatescript

Co-authored-by: Fedi Jamoussi <Fedi.Jamoussi@protonmail.ch>
---
 pkgs/by-name/_0/_010editor/package.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkgs/by-name/_0/_010editor/package.nix b/pkgs/by-name/_0/_010editor/package.nix
index 3884de5b4c22..d80ff2082fce 100644
--- a/pkgs/by-name/_0/_010editor/package.nix
+++ b/pkgs/by-name/_0/_010editor/package.nix
@@ -10,6 +10,7 @@
   qt6,
   undmg,
   xkeyboard-config,
+  writeScript,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -105,6 +106,21 @@ stdenv.mkDerivation (finalAttrs: {
     };
   };
 
+  passthru = {
+    updateScript = writeScript "update-010editor" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p curl pcre2 common-updater-scripts
+
+      set -eu -o pipefail
+
+      # Expect the text in format of "Version: major.minor.patchlevel
+      newVersion="$(curl -s https://sweetscape.com/download/010editor/ | pcre2grep -o1 'Version: ([0-9]+\.[0-9]+\.[0-9]+)' | sort -u)"
+      for platform in ${toString finalAttrs.meta.platforms}; do
+        update-source-version _010editor "$newVersion" --source-key=passthru.srcs.$platform --ignore-same-version
+      done
+    '';
+  };
+
   meta = {
     description = "Text and hex editor";
     homepage = "https://www.sweetscape.com/010editor/";

From cceb80f319fc6427e55fbad961222305c7b6418e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 24 Feb 2026 09:01:34 +0100
Subject: [PATCH 06/77] python314Packages.gehomesdk: migrate to finalAttrs

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

diff --git a/pkgs/development/python-modules/gehomesdk/default.nix b/pkgs/development/python-modules/gehomesdk/default.nix
index 9c8b7a47913a..df4dfb912947 100644
--- a/pkgs/development/python-modules/gehomesdk/default.nix
+++ b/pkgs/development/python-modules/gehomesdk/default.nix
@@ -13,13 +13,13 @@
   websockets,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "gehomesdk";
   version = "2026.2.0";
   pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-+BWGkUDKd+9QGbdXuLjmJxLm1xUv0dpIRlPlDkUJ25w=";
   };
 
@@ -44,9 +44,9 @@ buildPythonPackage rec {
   meta = {
     description = "Python SDK for GE smart appliances";
     homepage = "https://github.com/simbaja/gehome";
-    changelog = "https://github.com/simbaja/gehome/releases/tag/v${version}";
+    changelog = "https://github.com/simbaja/gehome/releases/tag/${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "gehome-appliance-data";
   };
-}
+})

From 58be915c55630836d3a15053982178268c0b6d1d Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 5 Mar 2026 10:02:15 -0600
Subject: [PATCH 07/77] neothesia: modernize derivation

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

diff --git a/pkgs/by-name/ne/neothesia/package.nix b/pkgs/by-name/ne/neothesia/package.nix
index 31e79e2fbc1a..3d4656723b89 100644
--- a/pkgs/by-name/ne/neothesia/package.nix
+++ b/pkgs/by-name/ne/neothesia/package.nix
@@ -14,20 +14,16 @@
   libxcursor,
   libx11,
 }:
-let
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "neothesia";
   version = "0.3.1";
 
   src = fetchFromGitHub {
     owner = "PolyMeilex";
     repo = "Neothesia";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-qYwBSye6RYClSlWmHwuy/rxq9w5932tR33Z+o2S1l8k=";
   };
-in
-rustPlatform.buildRustPackage {
-  pname = "neothesia";
-
-  inherit src version;
 
   buildInputs = [
     ffmpeg_7
@@ -74,4 +70,4 @@ rustPlatform.buildRustPackage {
       lib.maintainers.naxdy
     ];
   };
-}
+})

From 1994a16a4bc1e7f9f83368d2ed004f39778c1710 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 18 Feb 2026 10:48:28 +0100
Subject: [PATCH 08/77] python314Packages.sqlmodel: 0.0.32 -> 0.0.34

Diff: https://github.com/tiangolo/sqlmodel/compare/0.0.32...0.0.34

Changelog: https://github.com/fastapi/sqlmodel/releases/tag/0.0.34
---
 pkgs/development/python-modules/sqlmodel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sqlmodel/default.nix b/pkgs/development/python-modules/sqlmodel/default.nix
index 69c5cbde7885..c44436d195a5 100644
--- a/pkgs/development/python-modules/sqlmodel/default.nix
+++ b/pkgs/development/python-modules/sqlmodel/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "sqlmodel";
-  version = "0.0.32";
+  version = "0.0.34";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tiangolo";
     repo = "sqlmodel";
     tag = finalAttrs.version;
-    hash = "sha256-+92QPpWFHs2qUUR5au6MKO/wHIk+4lXYX/gFfxKzafo=";
+    hash = "sha256-qcRWtp4f2ce4oHUN1IHL3v+aumTMc5aEaWn23Kt2rZM=";
   };
 
   build-system = [ pdm-backend ];

From d37707e7ab4f18c3ae75d13977158c50fddc907a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 6 Mar 2026 18:59:09 +0100
Subject: [PATCH 09/77] python3Packages.sqlmodel: 0.0.34 -> 0.0.37

Diff: https://github.com/tiangolo/sqlmodel/compare/0.0.34...0.0.37

Changelog: https://github.com/fastapi/sqlmodel/releases/tag/0.0.37
---
 pkgs/development/python-modules/sqlmodel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sqlmodel/default.nix b/pkgs/development/python-modules/sqlmodel/default.nix
index c44436d195a5..e71fe153fa52 100644
--- a/pkgs/development/python-modules/sqlmodel/default.nix
+++ b/pkgs/development/python-modules/sqlmodel/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "sqlmodel";
-  version = "0.0.34";
+  version = "0.0.37";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tiangolo";
     repo = "sqlmodel";
     tag = finalAttrs.version;
-    hash = "sha256-qcRWtp4f2ce4oHUN1IHL3v+aumTMc5aEaWn23Kt2rZM=";
+    hash = "sha256-Ir0bWLdWF1h9Hr83QAbn5GiA9dh06Zrinltv54IKaM0=";
   };
 
   build-system = [ pdm-backend ];

From 5c1d477dcdeb29e97cad8e0742bfc2dbe40c5298 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 6 Mar 2026 19:07:04 +0100
Subject: [PATCH 10/77] python3Packages.camel-converter: 5.0.0 -> 5.1.0

Diff: https://github.com/sanders41/camel-converter/compare/v5.0.0...v5.1.0

Changelog: https://github.com/sanders41/camel-converter/releases/tag/v5.1.0
---
 pkgs/development/python-modules/camel-converter/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/camel-converter/default.nix b/pkgs/development/python-modules/camel-converter/default.nix
index 418c62096842..1ed4877fc233 100644
--- a/pkgs/development/python-modules/camel-converter/default.nix
+++ b/pkgs/development/python-modules/camel-converter/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "camel-converter";
-  version = "5.0.0";
+  version = "5.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sanders41";
     repo = "camel-converter";
     tag = "v${version}";
-    hash = "sha256-ADjgs72+tzMUdg2OS2bs1sMb0kMgVqBlUfYo+RRtsvg=";
+    hash = "sha256-7CqwpmRGHK7mkYoIS+3NwMtEqtdtnLB463OO2Dp0Ut0=";
   };
 
   build-system = [ hatchling ];

From 87004266dff8f6f9ccd8f682a9e02b7cf0f64f00 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 6 Mar 2026 20:14:10 +0100
Subject: [PATCH 11/77] python3Packages.camel-converter: migrate to finalAttrs

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

diff --git a/pkgs/development/python-modules/camel-converter/default.nix b/pkgs/development/python-modules/camel-converter/default.nix
index 1ed4877fc233..677c6d649f81 100644
--- a/pkgs/development/python-modules/camel-converter/default.nix
+++ b/pkgs/development/python-modules/camel-converter/default.nix
@@ -8,7 +8,7 @@
   pytest-cov-stub,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "camel-converter";
   version = "5.1.0";
   pyproject = true;
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sanders41";
     repo = "camel-converter";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-7CqwpmRGHK7mkYoIS+3NwMtEqtdtnLB463OO2Dp0Ut0=";
   };
 
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     pytestCheckHook
     pytest-cov-stub
   ]
-  ++ optional-dependencies.pydantic;
+  ++ lib.flatten (builtins.attrValues finalAttrs.passthru.optional-dependencies);
 
   pythonImportsCheck = [ "camel_converter" ];
 
@@ -42,8 +42,8 @@ buildPythonPackage rec {
   meta = {
     description = "Module to convert strings from snake case to camel case or camel case to snake case";
     homepage = "https://github.com/sanders41/camel-converter";
-    changelog = "https://github.com/sanders41/camel-converter/releases/tag/${src.tag}";
+    changelog = "https://github.com/sanders41/camel-converter/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

From f55d84973ccaf949d364e5244a186480bf48a626 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Fri, 6 Mar 2026 21:59:04 +0100
Subject: [PATCH 12/77] doge: 3.9.0 -> 3.9.2

3.9.2 is functionally the same as 3.9.0
but it prevents r-ryantm from trying to update to 3.9.1
see https://github.com/NixOS/nixpkgs/pull/493917#issuecomment-3962269649
closes https://github.com/NixOS/nixpkgs/pull/496965
---
 pkgs/by-name/do/doge/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/do/doge/package.nix b/pkgs/by-name/do/doge/package.nix
index 83b5ee893048..b7317256e30a 100644
--- a/pkgs/by-name/do/doge/package.nix
+++ b/pkgs/by-name/do/doge/package.nix
@@ -5,14 +5,14 @@
 }:
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "doge";
-  version = "3.9.0";
+  version = "3.9.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Olivia5k";
     repo = "doge";
-    tag = finalAttrs.version;
-    hash = "sha256-aJ1SFehjKiSc7osf5BOB1xjDnrkVXp37PQ5bNpbv1Mk=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-I/wvwl+I6qclFSGlIIXexyw6ADs9+/MdI4PAb07QwGA=";
   };
 
   build-system = [ python3Packages.hatchling ];

From 429c3474d7000af85e5df7673521537008afb152 Mon Sep 17 00:00:00 2001
From: Majitelll <jonnyxeko@gmail.com>
Date: Wed, 18 Mar 2026 15:12:14 +0100
Subject: [PATCH 13/77] _010editor: 16.0.3 -> 16.0.4

---
 pkgs/by-name/_0/_010editor/package.nix | 54 ++++++++++++--------------
 1 file changed, 25 insertions(+), 29 deletions(-)

diff --git a/pkgs/by-name/_0/_010editor/package.nix b/pkgs/by-name/_0/_010editor/package.nix
index 342a8ad3e905..ec4b21efa289 100644
--- a/pkgs/by-name/_0/_010editor/package.nix
+++ b/pkgs/by-name/_0/_010editor/package.nix
@@ -4,6 +4,7 @@
   fetchzip,
   fetchurl,
   autoPatchelfHook,
+  copyDesktopItems,
   makeWrapper,
   makeDesktopItem,
   cups,
@@ -14,7 +15,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "010editor";
-  version = "16.0.3";
+  version = "16.0.4";
 
   src = finalAttrs.passthru.srcs.${stdenv.hostPlatform.system};
 
@@ -27,6 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs =
     lib.optionals stdenv.hostPlatform.isLinux [
       autoPatchelfHook
+      copyDesktopItems
       makeWrapper
       qt6.wrapQtAppsHook
     ]
@@ -54,54 +56,48 @@ stdenv.mkDerivation (finalAttrs: {
           --unset QT_PLUGIN_PATH \
           --set XKB_CONFIG_ROOT ${xkeyboard-config}/share/X11/xkb
 
-        # Install icon + desktop entry
+        # Install icon
         install -D $out/opt/010_icon_128x128.png $out/share/icons/hicolor/128x128/apps/010.png
-        install -D $desktopItem/share/applications/* -t $out/share/applications/
       '';
     in
     ''
       runHook preInstall
-      ${
-        if stdenv.hostPlatform.isDarwin then
-          darwinInstall
-        else if stdenv.hostPlatform.isLinux then
-          linuxInstall
-        else
-          "echo 'Unsupported Platform' && exit 1"
-      }
+      ${if stdenv.hostPlatform.isDarwin then darwinInstall else linuxInstall}
       runHook postInstall
     '';
 
-  desktopItem = makeDesktopItem {
-    name = "010editor";
-    exec = "010editor %f";
-    icon = "010";
-    desktopName = "010 Editor";
-    genericName = "Text and hex editor";
-    categories = [ "Development" ];
-    mimeTypes = [
-      "text/html"
-      "text/plain"
-      "text/x-c++hdr"
-      "text/x-c++src"
-      "text/xml"
-    ];
-  };
+  desktopItems = [
+    (makeDesktopItem {
+      name = "010editor";
+      exec = "010editor %f";
+      icon = "010";
+      desktopName = "010 Editor";
+      genericName = "Text and hex editor";
+      categories = [ "Development" ];
+      mimeTypes = [
+        "text/html"
+        "text/plain"
+        "text/x-c++hdr"
+        "text/x-c++src"
+        "text/xml"
+      ];
+    })
+  ];
 
   passthru.srcs = {
     x86_64-linux = fetchzip {
       url = "https://download.sweetscape.com/010EditorLinux64Installer${finalAttrs.version}.tar.gz";
-      hash = "sha256-4p7EZ/wcOgcLKTAGgTlJVvabeIttI0UFl+DF7V7ma50=";
+      hash = "sha256-M1D2Bmi45sYiB0Ci+0X0AxyIeR+On60xt4jP1Jsy5tA=";
     };
 
     x86_64-darwin = fetchurl {
       url = "https://download.sweetscape.com/010EditorMac64Installer${finalAttrs.version}.dmg";
-      hash = "sha256-v1QdX+osklCXtg0HoT3+HnEL+AbVhynJ0XA+jA7bX3M=";
+      hash = "sha256-vsI0VgcJGleJTQ5C1JaiCkELfWfwgFhyCx+6j5mldIk=";
     };
 
     aarch64-darwin = fetchurl {
       url = "https://download.sweetscape.com/010EditorMacARM64Installer${finalAttrs.version}.dmg";
-      hash = "sha256-CmatQUVGJHpi23b5C3betL6YkP3+gOA9p+xfUbsKxi0=";
+      hash = "sha256-+yU5JdPNS2BfiZLsBLyyC+ieVNqbIWba3teBlTIDWtk=";
     };
   };
 

From 54d20e195c724390316c45f9297770110de79f60 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Mar 2026 00:18:53 +0000
Subject: [PATCH 14/77] pixi: 0.63.2 -> 0.66.0

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

diff --git a/pkgs/by-name/pi/pixi/package.nix b/pkgs/by-name/pi/pixi/package.nix
index fe6c9206ebbf..cd00f4579f3a 100644
--- a/pkgs/by-name/pi/pixi/package.nix
+++ b/pkgs/by-name/pi/pixi/package.nix
@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "pixi";
-  version = "0.63.2";
+  version = "0.66.0";
 
   src = fetchFromGitHub {
     owner = "prefix-dev";
     repo = "pixi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-XI7NyZhqPAgQlagCsW0GulQaHxRfgI0X/wOM19phnSA=";
+    hash = "sha256-1towGuRa9CHtq6IdOekHhrbQ0m8XiN9ATg3seY6nUtM=";
   };
 
-  cargoHash = "sha256-Tx3XHz7/t27WB2N2QqlLzpfilRD2+dwNvC54NF0kwz8=";
+  cargoHash = "sha256-UpFjJfIDe/n/BVFljTEVAzxQ3E0/tOicfNcitiDlCOo=";
 
   nativeBuildInputs = [
     pkg-config

From 4e08b0cf550724120bf9bd50ef6c912430cf0c8b Mon Sep 17 00:00:00 2001
From: Adriel Velazquez <AdrielVelazquez@gmail.com>
Date: Mon, 23 Mar 2026 23:33:16 -0400
Subject: [PATCH 15/77] oculante: Generated Nix Path Changed

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

diff --git a/pkgs/by-name/oc/oculante/package.nix b/pkgs/by-name/oc/oculante/package.nix
index fd5eb689ce2b..c2a73185c511 100644
--- a/pkgs/by-name/oc/oculante/package.nix
+++ b/pkgs/by-name/oc/oculante/package.nix
@@ -76,7 +76,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   patchFlags = [
     "-p1"
-    "--directory=../${finalAttrs.pname}-${finalAttrs.version}-vendor"
+    "--directory=../${finalAttrs.pname}-${finalAttrs.version}-vendor/source-registry-0"
   ];
 
   postInstall = ''

From dab8bcc7f6a08d5db002212d08315ead2c6ef56c Mon Sep 17 00:00:00 2001
From: Joachim Ernst <joachim.ernst@helsinki-systems.de>
Date: Wed, 25 Mar 2026 09:56:03 +0100
Subject: [PATCH 16/77] netbox_4_4: 4.4.9 -> 4.4.10

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

diff --git a/pkgs/by-name/ne/netbox_4_4/package.nix b/pkgs/by-name/ne/netbox_4_4/package.nix
index 80abaa7093f8..66301f779d14 100644
--- a/pkgs/by-name/ne/netbox_4_4/package.nix
+++ b/pkgs/by-name/ne/netbox_4_4/package.nix
@@ -16,14 +16,14 @@ let
 in
 py.pkgs.buildPythonApplication rec {
   pname = "netbox";
-  version = "4.4.9";
+  version = "4.4.10";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "netbox-community";
     repo = "netbox";
     tag = "v${version}";
-    hash = "sha256-NA84Rcs27S68pyVdo+bif8P2sNmGkfuMPrCBn1YXubc=";
+    hash = "sha256-a0OwVZgeoyEH+xoXfUs0nV6N6IaOCULJpgJBRJdYs10=";
   };
 
   patches = [

From 1b52227cd3277e209f919956745b1821473c5d4d Mon Sep 17 00:00:00 2001
From: Artem Leshchev <matshch@avride.ai>
Date: Wed, 25 Mar 2026 10:14:52 -0500
Subject: [PATCH 17/77] maintainers: remove arnoldfarkas

---
 maintainers/maintainer-list.nix                             | 6 ------
 .../python-modules/atlassian-python-api/default.nix         | 2 +-
 .../djangorestframework-simplejwt/default.nix               | 2 +-
 pkgs/development/python-modules/flower/default.nix          | 2 +-
 pkgs/development/python-modules/nbconflux/default.nix       | 2 +-
 pkgs/development/python-modules/sanic-auth/default.nix      | 2 +-
 pkgs/development/python-modules/sqlitedict/default.nix      | 2 +-
 pkgs/development/python-modules/untangle/default.nix        | 2 +-
 pkgs/development/python-modules/vertica-python/default.nix  | 2 +-
 pkgs/development/python-modules/zstandard/default.nix       | 2 +-
 10 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index c79cba377258..aabd1ee0e7ab 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2247,12 +2247,6 @@
     githubId = 1291396;
     name = "Arnar Ingason";
   };
-  arnoldfarkas = {
-    email = "arnold.farkas@gmail.com";
-    github = "arnoldfarkas";
-    githubId = 59696216;
-    name = "Arnold Farkas";
-  };
   arnoutkroeze = {
     email = "nixpkgs@arnoutkroeze.nl";
     github = "ArnoutKroeze";
diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/pkgs/development/python-modules/atlassian-python-api/default.nix
index 7373fccf734d..8941296b2eb8 100644
--- a/pkgs/development/python-modules/atlassian-python-api/default.nix
+++ b/pkgs/development/python-modules/atlassian-python-api/default.nix
@@ -49,6 +49,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/atlassian-api/atlassian-python-api";
     changelog = "https://github.com/atlassian-api/atlassian-python-api/releases/tag/${src.tag}";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ arnoldfarkas ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix b/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix
index 53c12a6a14fa..2a1406a0a355 100644
--- a/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix
+++ b/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix
@@ -44,6 +44,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/davesque/django-rest-framework-simplejwt";
     changelog = "https://github.com/jazzband/djangorestframework-simplejwt/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ arnoldfarkas ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/flower/default.nix b/pkgs/development/python-modules/flower/default.nix
index f41a0833be25..5f5559df45ea 100644
--- a/pkgs/development/python-modules/flower/default.nix
+++ b/pkgs/development/python-modules/flower/default.nix
@@ -44,6 +44,6 @@ buildPythonPackage rec {
     description = "Real-time monitor and web admin for Celery distributed task queue";
     homepage = "https://github.com/mher/flower";
     license = lib.licenses.bsdOriginal;
-    maintainers = with lib.maintainers; [ arnoldfarkas ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/nbconflux/default.nix b/pkgs/development/python-modules/nbconflux/default.nix
index 3c1809fc25e3..aa74f2e509f5 100644
--- a/pkgs/development/python-modules/nbconflux/default.nix
+++ b/pkgs/development/python-modules/nbconflux/default.nix
@@ -64,6 +64,6 @@ buildPythonPackage rec {
     mainProgram = "nbconflux";
     homepage = "https://github.com/Valassis-Digital-Media/nbconflux";
     license = lib.licenses.bsd3;
-    maintainers = [ lib.maintainers.arnoldfarkas ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/sanic-auth/default.nix b/pkgs/development/python-modules/sanic-auth/default.nix
index 6ad9c2e20c93..9cd01b8544f8 100644
--- a/pkgs/development/python-modules/sanic-auth/default.nix
+++ b/pkgs/development/python-modules/sanic-auth/default.nix
@@ -45,6 +45,6 @@ buildPythonPackage rec {
     description = "Simple Authentication for Sanic";
     homepage = "https://github.com/pyx/sanic-auth/";
     license = lib.licenses.bsdOriginal;
-    maintainers = with lib.maintainers; [ arnoldfarkas ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/sqlitedict/default.nix b/pkgs/development/python-modules/sqlitedict/default.nix
index 2d31f72766a8..dce9e96ddc32 100644
--- a/pkgs/development/python-modules/sqlitedict/default.nix
+++ b/pkgs/development/python-modules/sqlitedict/default.nix
@@ -41,6 +41,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/RaRe-Technologies/sqlitedict";
     changelog = "https://github.com/piskvorky/sqlitedict/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ arnoldfarkas ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/untangle/default.nix b/pkgs/development/python-modules/untangle/default.nix
index e28e8c57110a..0266500dc8ea 100644
--- a/pkgs/development/python-modules/untangle/default.nix
+++ b/pkgs/development/python-modules/untangle/default.nix
@@ -32,6 +32,6 @@ buildPythonPackage rec {
     description = "Convert XML documents into Python objects";
     homepage = "https://github.com/stchris/untangle";
     license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.arnoldfarkas ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/vertica-python/default.nix b/pkgs/development/python-modules/vertica-python/default.nix
index 74f562bb8afa..665ee640079f 100644
--- a/pkgs/development/python-modules/vertica-python/default.nix
+++ b/pkgs/development/python-modules/vertica-python/default.nix
@@ -45,6 +45,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/vertica/vertica-python";
     changelog = "https://github.com/vertica/vertica-python/releases/tag/${version}";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ arnoldfarkas ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/zstandard/default.nix b/pkgs/development/python-modules/zstandard/default.nix
index 854c2c8fe910..c3053e6c0117 100644
--- a/pkgs/development/python-modules/zstandard/default.nix
+++ b/pkgs/development/python-modules/zstandard/default.nix
@@ -50,6 +50,6 @@ buildPythonPackage rec {
     description = "Zstandard bindings for Python";
     homepage = "https://github.com/indygreg/python-zstandard";
     license = lib.licenses.bsdOriginal;
-    maintainers = with lib.maintainers; [ arnoldfarkas ];
+    maintainers = [ ];
   };
 }

From 5e2fa65c2daae219332f7296d2db48339b91842b Mon Sep 17 00:00:00 2001
From: benaryorg <binary@benary.org>
Date: Tue, 24 Mar 2026 06:14:27 +0000
Subject: [PATCH 18/77] nixos/kubo: IFD-less merging of defaults

No more IFD for the defaults.
Specifically the merging with the config values is now done at runtime.
The output of the command for generating the defaults is also specifically stripped of the generated credentials, making it reproducible.

This introduces caveats in terms of overwriting as it is now dependent on jq's merge behaviour.

A cleaner solution would probably move from specifying a single JSON-esque datastructure to specifying an attrset with keys and values being those of `ipfs config set` respectively.
This would allow setting individual keys to objects, removing entries, and more fine grained control in general.
However that would introduce severe backwards incompatibilities, so this commit is merely a "minimum viable fix" so to say.

Signed-off-by: benaryorg <binary@benary.org>
---
 .../services/network-filesystems/kubo.nix     | 39 +++++++++++--------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/nixos/modules/services/network-filesystems/kubo.nix b/nixos/modules/services/network-filesystems/kubo.nix
index a94d3a366b83..3c75423f3ffa 100644
--- a/nixos/modules/services/network-filesystems/kubo.nix
+++ b/nixos/modules/services/network-filesystems/kubo.nix
@@ -10,29 +10,22 @@ let
 
   settingsFormat = pkgs.formats.json { };
 
-  rawDefaultConfig = lib.importJSON (
+  defaultConfig =
     pkgs.runCommand "kubo-default-config"
       {
-        nativeBuildInputs = [ cfg.package ];
+        nativeBuildInputs = [
+          cfg.package
+          pkgs.jq
+        ];
       }
       ''
         export IPFS_PATH="$TMPDIR"
         ipfs init --empty-repo --profile=${profile}
-        ipfs --offline config show > "$out"
-      ''
-  );
+        # Remove the variable key to make the result deterministic.
+        ipfs --offline config show | jq 'del(.Identity)' > $out
+      '';
 
-  # Remove the PeerID (an attribute of "Identity") of the temporary Kubo repo.
-  # The "Pinning" section contains the "RemoteServices" section, which would prevent
-  # the daemon from starting as that setting can't be changed via ipfs config replace.
-  defaultConfig = removeAttrs rawDefaultConfig [
-    "Identity"
-    "Pinning"
-  ];
-
-  customizedConfig = lib.recursiveUpdate defaultConfig cfg.settings;
-
-  configFile = settingsFormat.generate "kubo-config.json" customizedConfig;
+  configFile = settingsFormat.generate "kubo-config.json" cfg.settings;
 
   # Create a fake repo containing only the file "api".
   # $IPFS_PATH will point to this directory instead of the real one.
@@ -392,8 +385,20 @@ in
       ''
       + ''
         fi
+
+        # We need the Identity and Pinning configuration from the current settings.
         ipfs --offline config show |
-          ${pkgs.jq}/bin/jq -s '.[0].Pinning as $Pinning | .[0].Identity as $Identity | .[1] + {$Identity,$Pinning}' - '${configFile}' |
+          ${lib.getExe pkgs.jq} '{ Identity, Pinning, }' |
+
+          # Now we deep-merge all configuration sources (later data wins):
+          # 1. the default configuration
+          # 2. the user-provided configuration
+          # 3. the dynamic keys from the existing configuration
+          ${lib.getExe pkgs.jq} -s 'reduce .[] as $config ({}; . * $config)' \
+            ${defaultConfig} \
+            ${configFile} \
+            - \
+          |
 
           # This command automatically injects the private key and other secrets from
           # the old config file back into the new config file.

From 9cd19c6bc5bcf4d85a36c42acd1147bdbe272bdc Mon Sep 17 00:00:00 2001
From: benaryorg <binary@benary.org>
Date: Tue, 24 Mar 2026 06:19:14 +0000
Subject: [PATCH 19/77] nixos/tests/kubo: readable curl output

The progress output really messes with the nix log.

Signed-off-by: benaryorg <binary@benary.org>
---
 nixos/tests/kubo/kubo.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/kubo/kubo.nix b/nixos/tests/kubo/kubo.nix
index c43bfee4333e..41627e6c4c50 100644
--- a/nixos/tests/kubo/kubo.nix
+++ b/nixos/tests/kubo/kubo.nix
@@ -56,7 +56,7 @@
 
     with subtest("Socket activation for the Gateway"):
         machine.succeed(
-            f"curl 'http://127.0.0.1:8080/ipfs/{ipfs_hash.strip()}' | grep fnord2"
+            f"curl -s 'http://127.0.0.1:8080/ipfs/{ipfs_hash.strip()}' | grep fnord2"
         )
 
     with subtest("Setting dataDir works properly with the hardened systemd unit"):

From 37114635cabd9da574472359063dc664ae2e4683 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 21:50:24 +0000
Subject: [PATCH 20/77] vscode-extensions.detachhead.basedpyright: 1.38.1 ->
 1.38.4

---
 .../vscode/extensions/detachhead.basedpyright/default.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix b/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix
index 16d6ee92ca09..2e16b6cb2eb2 100644
--- a/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix
@@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "basedpyright";
     publisher = "detachhead";
-    version = "1.38.1";
-    hash = "sha256-KomVzNgm4CD3AMuJ7myZlU6R4bp97pNlnooYdEepQNo=";
+    version = "1.38.4";
+    hash = "sha256-05Pu65luhtoYQscIXfO7lXdJCbadRerSY2xFjTji/W4=";
   };
   meta = {
     changelog = "https://github.com/detachhead/basedpyright/releases";

From 68c8a4d0b7a7b31f41e44538b931ed4fd2003e8d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Apr 2026 11:17:17 +0000
Subject: [PATCH 21/77] dolt: 1.81.2 -> 1.84.1

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

diff --git a/pkgs/by-name/do/dolt/package.nix b/pkgs/by-name/do/dolt/package.nix
index ddb1ba53a4d2..889bc07ed584 100644
--- a/pkgs/by-name/do/dolt/package.nix
+++ b/pkgs/by-name/do/dolt/package.nix
@@ -7,18 +7,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "dolt";
-  version = "1.81.2";
+  version = "1.84.1";
 
   src = fetchFromGitHub {
     owner = "dolthub";
     repo = "dolt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-dL6WJvApRGC8ADFowms81YbJpLbbTyNQfI/RIotgTdc=";
+    hash = "sha256-gV5KqBo3Sk+oUER/VOgQVwnCucc4IZF/QmqZRTddI04=";
   };
 
   modRoot = "./go";
   subPackages = [ "cmd/dolt" ];
-  vendorHash = "sha256-wufwBlRiRiNVZgkBFRqZIB6vNeWBBaCDdV2tcynhatk=";
+  vendorHash = "sha256-SRwxzkBNNVnGVDDhi3YR4ZXY1q2O78S2I+kp79Wh+50=";
   proxyVendor = true;
   doCheck = false;
 

From 4d430efa040288c759c280e65d8e5481838bf697 Mon Sep 17 00:00:00 2001
From: David Isaksson <davidisaksson93@gmail.com>
Date: Wed, 1 Apr 2026 17:41:52 +0200
Subject: [PATCH 22/77] globulation2: set pname and version

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

diff --git a/pkgs/by-name/gl/globulation2/package.nix b/pkgs/by-name/gl/globulation2/package.nix
index b1a210712b32..7f65fdc79a5b 100644
--- a/pkgs/by-name/gl/globulation2/package.nix
+++ b/pkgs/by-name/gl/globulation2/package.nix
@@ -19,7 +19,6 @@
   fetchpatch,
 }:
 let
-  version = "0.9.4";
   patchlevel = "4";
   tutorial4patch = fetchurl {
     url = "http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=34;filename=tutorial-part4.map.bspatch;att=1;bug=595448";
@@ -28,10 +27,11 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  name = "glob2-${version}.${patchlevel}";
+  pname = "glob2";
+  version = "0.9.4.${patchlevel}";
 
   src = fetchurl {
-    url = "mirror://savannah/glob2/${version}/${name}.tar.gz";
+    url = "mirror://savannah/glob2/${version}/${pname}-${version}.tar.gz";
     sha256 = "1f0l2cqp2g3llhr9jl6jj15k0wb5q8n29vqj99xy4p5hqs78jk8g";
   };
 

From 5dd2f1fbc4135844c34774a1093ca31bfa625e3c Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 1 Apr 2026 20:31:08 +0700
Subject: [PATCH 23/77] slackdump: 4.0.2 -> 4.1.2

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

diff --git a/pkgs/by-name/sl/slackdump/package.nix b/pkgs/by-name/sl/slackdump/package.nix
index 73883a523cde..fc841e2aea68 100644
--- a/pkgs/by-name/sl/slackdump/package.nix
+++ b/pkgs/by-name/sl/slackdump/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "slackdump";
-  version = "4.0.2";
+  version = "4.1.2";
 
   src = fetchFromGitHub {
     owner = "rusq";
     repo = "slackdump";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-82mMlb0sJXAnuTR8a+hchigVnc9cVzXutp1nD0qHIWk=";
+    hash = "sha256-Kt9FGQiGaWDOpJMeg/UFDcNO16skQ8qblYwl26Fr5Bk=";
   };
 
   nativeCheckInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.IOKitTools;
@@ -26,13 +26,16 @@ buildGoModule (finalAttrs: {
         "TestSession_saveUserCache"
         "TestSession_GetUsers"
         "Test_exportV3" # This was skipped on upstream's CI. It is seemed that some file are missed
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isDarwin [
+        "TestWithRetry" # flaky timing-sensitive test on darwin
       ];
     in
     [
       "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$"
     ];
 
-  vendorHash = "sha256-N5NzmnpKJ8cIvaY9h6kW9dT/L7a057H+nE0gBozwsuc=";
+  vendorHash = "sha256-3pZCGE8MLNIdU4zVDwkHJwPr7xHHDhnUlzidej6c4E0=";
 
   __darwinAllowLocalNetworking = true;
 

From 59c924f660d6830d2a6916d0c73bfc93ca71a12a Mon Sep 17 00:00:00 2001
From: Marcel <me@m4rc3l.de>
Date: Thu, 2 Apr 2026 18:22:02 +0200
Subject: [PATCH 24/77] ddev: fix docker plugins patch

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

diff --git a/pkgs/by-name/dd/ddev/package.nix b/pkgs/by-name/dd/ddev/package.nix
index 4fa3e20b55da..865b4fb33021 100644
--- a/pkgs/by-name/dd/ddev/package.nix
+++ b/pkgs/by-name/dd/ddev/package.nix
@@ -30,7 +30,7 @@ buildGoModule (finalAttrs: {
   };
 
   postPatch = ''
-    (cd vendor/github.com/docker/cli && patch ${./cli-system-plugin-dir-from-env.patch})
+    (cd vendor/github.com/docker/cli && patch -p1 < ${./cli-system-plugin-dir-from-env.patch})
   '';
 
   nativeBuildInputs = [

From 5c4c4ab1e84bbfdd9e9bdf987c4e371a666e5be9 Mon Sep 17 00:00:00 2001
From: GraysonTinker <graysontinker@gmail.com>
Date: Fri, 3 Apr 2026 08:32:13 -0700
Subject: [PATCH 25/77] python3Packages.llamaindex-py-client: drop

---
 .../llama-index-core/default.nix              |  2 -
 .../llamaindex-py-client/default.nix          | 39 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 -
 4 files changed, 1 insertion(+), 43 deletions(-)
 delete mode 100644 pkgs/development/python-modules/llamaindex-py-client/default.nix

diff --git a/pkgs/development/python-modules/llama-index-core/default.nix b/pkgs/development/python-modules/llama-index-core/default.nix
index 706003773906..141c9b2fe5a9 100644
--- a/pkgs/development/python-modules/llama-index-core/default.nix
+++ b/pkgs/development/python-modules/llama-index-core/default.nix
@@ -13,7 +13,6 @@
   hatchling,
   jsonpath-ng,
   llama-index-workflows,
-  llamaindex-py-client,
   nest-asyncio,
   networkx,
   nltk-data,
@@ -83,7 +82,6 @@ buildPythonPackage (finalAttrs: {
     fsspec
     jsonpath-ng
     llama-index-workflows
-    llamaindex-py-client
     nest-asyncio
     networkx
     nltk
diff --git a/pkgs/development/python-modules/llamaindex-py-client/default.nix b/pkgs/development/python-modules/llamaindex-py-client/default.nix
deleted file mode 100644
index 6b8772b42e0b..000000000000
--- a/pkgs/development/python-modules/llamaindex-py-client/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-  httpx,
-  poetry-core,
-  pydantic,
-}:
-
-buildPythonPackage rec {
-  pname = "llamaindex-py-client";
-  version = "0.1.19";
-  pyproject = true;
-
-  src = fetchPypi {
-    pname = "llamaindex_py_client";
-    inherit version;
-    hash = "sha256-c/dHkruMCSuubcYmYnoJrBOgmfqNEPj8yD4XorMyzKc=";
-  };
-
-  build-system = [ poetry-core ];
-
-  dependencies = [
-    httpx
-    pydantic
-  ];
-
-  # Module has no tests
-  doCheck = false;
-
-  pythonImportsCheck = [ "llama_index_client" ];
-
-  meta = {
-    description = "Client for LlamaIndex";
-    homepage = "https://pypi.org/project/llamaindex-py-client/";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ fab ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 45ecd7aa94db..cf0709073d4f 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -304,6 +304,7 @@ mapAliases {
   llama-index-multi-modal-llms-openai = throw "'llama-index-multi-modal-llms-openai' has been removed as it was deprecated in favor of 'llama-index-llms-openai'"; # added 2026-03-25
   llama-index-readers-llama-parse = throw "'llama-index-readers-llama-parse' has been removed as it was deprecated upstream in favor of 'llama-cloud'"; # added 2026-03-25
   llama-parse = throw "'llama-parse' has been removed as it was deprecated upstream in favor of 'llama-cloud'"; # added 2026-03-25
+  llamaindex-py-client = throw "'llamaindex-pyclient' has been removed as it was removed from upstream"; # Added 2026-04-03
   lmcloud = throw "'lmcloud' has been renamed to/replaced by 'pylamarzocco'"; # Converted to throw 2025-10-29
   logilab_common = throw "'logilab_common' has been renamed to/replaced by 'logilab-common'"; # Converted to throw 2025-10-29
   loo-py = throw "'loo-py' has been renamed to/replaced by 'loopy'"; # Converted to throw 2025-10-29
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3b2b7243af76..b5e21336dff3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9121,8 +9121,6 @@ self: super: with self; {
 
   llama-stack-client = callPackage ../development/python-modules/llama-stack-client { };
 
-  llamaindex-py-client = callPackage ../development/python-modules/llamaindex-py-client { };
-
   llfuse = callPackage ../development/python-modules/llfuse { inherit (pkgs) fuse; };
 
   llguidance = callPackage ../development/python-modules/llguidance { };

From 9e547ae01bad97ebdda2cb7c729994467ad08a1d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Apr 2026 16:15:23 +0000
Subject: [PATCH 26/77] dart-sass: 1.98.0 -> 1.99.0

---
 pkgs/by-name/da/dart-sass/package.nix       |  4 ++--
 pkgs/by-name/da/dart-sass/pubspec.lock.json | 24 ++++++++++-----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/da/dart-sass/package.nix b/pkgs/by-name/da/dart-sass/package.nix
index 8fb516f338e3..b8b051f3acfb 100644
--- a/pkgs/by-name/da/dart-sass/package.nix
+++ b/pkgs/by-name/da/dart-sass/package.nix
@@ -23,13 +23,13 @@ let
 in
 buildDartApplication rec {
   pname = "dart-sass";
-  version = "1.98.0";
+  version = "1.99.0";
 
   src = fetchFromGitHub {
     owner = "sass";
     repo = "dart-sass";
     tag = version;
-    hash = "sha256-3RmJ41azPeKyLGXtobD6drTaucJGbTWZXPmbYOJlDFQ=";
+    hash = "sha256-WbXjMnbBKzgX8PjFhthLj4iQCccPcwln59UoiRrf5z4=";
   };
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;
diff --git a/pkgs/by-name/da/dart-sass/pubspec.lock.json b/pkgs/by-name/da/dart-sass/pubspec.lock.json
index 815c7d8320a7..3d8fc9a42a88 100644
--- a/pkgs/by-name/da/dart-sass/pubspec.lock.json
+++ b/pkgs/by-name/da/dart-sass/pubspec.lock.json
@@ -44,11 +44,11 @@
       "dependency": "direct main",
       "description": {
         "name": "async",
-        "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb",
+        "sha256": "e2eb0491ba5ddb6177742d2da23904574082139b07c1e33b8503b9f46f3e1a37",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.13.0"
+      "version": "2.13.1"
     },
     "boolean_selector": {
       "dependency": "transitive",
@@ -354,11 +354,11 @@
       "dependency": "transitive",
       "description": {
         "name": "markdown",
-        "sha256": "935e23e1ff3bc02d390bad4d4be001208ee92cc217cb5b5a6c19bc14aaa318c1",
+        "sha256": "ee85086ad7698b42522c6ad42fe195f1b9898e4d974a1af4576c1a3a176cada9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.3.0"
+      "version": "7.3.1"
     },
     "matcher": {
       "dependency": "transitive",
@@ -374,11 +374,11 @@
       "dependency": "direct main",
       "description": {
         "name": "meta",
-        "sha256": "9f29b9bcc8ee287b1a31e0d01be0eae99a930dbffdaecf04b3f3d82a969f296f",
+        "sha256": "df0c643f44ad098eb37988027a8e2b2b5a031fd3977f06bbfd3a76637e8df739",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.18.1"
+      "version": "1.18.2"
     },
     "mime": {
       "dependency": "transitive",
@@ -674,31 +674,31 @@
       "dependency": "direct dev",
       "description": {
         "name": "test",
-        "sha256": "280d6d890011ca966ad08df7e8a4ddfab0fb3aa49f96ed6de56e3521347a9ae7",
+        "sha256": "8d9ceddbab833f180fbefed08afa76d7c03513dfdba87ffcec2718b02bbcbf20",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.30.0"
+      "version": "1.31.0"
     },
     "test_api": {
       "dependency": "transitive",
       "description": {
         "name": "test_api",
-        "sha256": "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a",
+        "sha256": "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.10"
+      "version": "0.7.11"
     },
     "test_core": {
       "dependency": "transitive",
       "description": {
         "name": "test_core",
-        "sha256": "0381bd1585d1a924763c308100f2138205252fb90c9d4eeaf28489ee65ccde51",
+        "sha256": "1991d4cfe85d5043241acac92962c3977c8d2f2add1ee73130c7b286417d1d34",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.6.16"
+      "version": "0.6.17"
     },
     "test_descriptor": {
       "dependency": "direct dev",

From 0e3d02cada85a90cf6e8db625ff440c9f101202d Mon Sep 17 00:00:00 2001
From: Malik <abdelmalik.najhi@stud.hs-kempten.de>
Date: Mon, 23 Mar 2026 17:42:42 +0100
Subject: [PATCH 27/77] seconlay: init at 0-unstable-2026-03-30

---
 pkgs/by-name/se/seconlay/package.nix | 62 ++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 pkgs/by-name/se/seconlay/package.nix

diff --git a/pkgs/by-name/se/seconlay/package.nix b/pkgs/by-name/se/seconlay/package.nix
new file mode 100644
index 000000000000..472b30ca6970
--- /dev/null
+++ b/pkgs/by-name/se/seconlay/package.nix
@@ -0,0 +1,62 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitLab,
+  pkg-config,
+  protobuf,
+  openssl,
+  zlib,
+  nix-update-script,
+  cloud-utils,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "seconlay";
+  version = "0-unstable-2026-03-30";
+
+  src = fetchFromGitLab {
+    group = "alasca.cloud";
+    owner = "scl";
+    repo = "scl-management";
+    rev = "ba2bff59916fc3597ebec20c6d0405b888a79c44";
+    hash = "sha256-tJxWdEK+BpVlBeR5z/MsQGgeOp9yt3o1wtSzjA+gHt4=";
+  };
+
+  cargoHash = "sha256-uVccOT0DCHet52Oer3mGzFd/zs9rp4IZCvl5o/JMJgQ=";
+
+  nativeBuildInputs = [
+    pkg-config
+    protobuf
+  ];
+
+  buildInputs = [
+    openssl
+    zlib
+  ];
+
+  nativeCheckInputs = [ cloud-utils ];
+  doCheck = true;
+
+  passthru.updateScript = nix-update-script {
+    extraArgs = [ "--version=branch" ];
+  };
+
+  meta = {
+    description = "Minimal IaaS system with strong tenant separation and small TCB";
+    longDescription = ''
+      Seconlay (commonly abbreviated as SCL) is a minimal IaaS system built in Rust with strong tenant separation and small TCB.
+      It is intended for providing an easy-to-use API to manage a VM-based separation layer underlying to user-facing infrastructure such as tenant-specific Kubernetes clusters.
+    '';
+    homepage = "https://alasca.cloud/projects/seconlay/";
+    license = lib.licenses.eupl12;
+    maintainers = with lib.maintainers; [
+      malik
+      messemar
+    ];
+    mainProgram = "sclctl";
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+    ];
+  };
+})

From 085b64b020739b5baa5c040af3ef56dfac5e2a90 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Apr 2026 19:45:48 +0000
Subject: [PATCH 28/77] python3Packages.dirigera: 1.2.6 -> 1.2.7

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

diff --git a/pkgs/development/python-modules/dirigera/default.nix b/pkgs/development/python-modules/dirigera/default.nix
index 8ba2ac807ae2..8eba00c3f3c5 100644
--- a/pkgs/development/python-modules/dirigera/default.nix
+++ b/pkgs/development/python-modules/dirigera/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "dirigera";
-  version = "1.2.6";
+  version = "1.2.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Leggin";
     repo = "dirigera";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5pfzmaIkIEtxDtkhG1lOLSTjWahEDgQKLJKbAG5rBjE=";
+    hash = "sha256-R8K32jTYIh6GW3WyGRUJWxwi7Elw0D0iX8flr422L5M=";
   };
 
   build-system = [ setuptools ];

From 701296d25b20d8832d7691c34c7c1374848a727b Mon Sep 17 00:00:00 2001
From: Alex Ionescu <github@ionescu.sh>
Date: Fri, 3 Apr 2026 22:13:57 +0200
Subject: [PATCH 29/77] dropbox: drop support for i686

---
 .../networking/dropbox/default.nix            | 23 +++----------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index ae424918dad6..2ad66b9cf842 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -1,5 +1,4 @@
 {
-  stdenv,
   lib,
   buildFHSEnv,
   writeScript,
@@ -9,21 +8,8 @@
 # Dropbox client to bootstrap installation.
 # The client is self-updating, so the actual version may be newer.
 let
-  version =
-    {
-      x86_64-linux = "217.4.4417";
-      i686-linux = "206.3.6386";
-    }
-    .${stdenv.hostPlatform.system} or "";
-
-  arch =
-    {
-      x86_64-linux = "x86_64";
-      i686-linux = "x86";
-    }
-    .${stdenv.hostPlatform.system};
-
-  installer = "https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.${arch}-${version}.tar.gz";
+  version = "217.4.4417";
+  installer = "https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${version}.tar.gz";
 
   desktopItem = makeDesktopItem {
     name = "dropbox";
@@ -129,10 +115,7 @@ buildFHSEnv {
     homepage = "https://www.dropbox.com/";
     license = lib.licenses.unfree;
     maintainers = with lib.maintainers; [ ttuegel ];
-    platforms = [
-      "i686-linux"
-      "x86_64-linux"
-    ];
+    platforms = [ "x86_64-linux" ];
     mainProgram = "dropbox";
   };
 }

From 8311b2bc0e64eb6f239765ee9a433b491cad44ac Mon Sep 17 00:00:00 2001
From: Alex Ionescu <github@ionescu.sh>
Date: Mon, 23 Mar 2026 23:46:23 +0100
Subject: [PATCH 30/77] dropbox: 217.4.4417 -> 246.4.3513

---
 pkgs/applications/networking/dropbox/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index 2ad66b9cf842..521a530f3f00 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -8,7 +8,7 @@
 # Dropbox client to bootstrap installation.
 # The client is self-updating, so the actual version may be newer.
 let
-  version = "217.4.4417";
+  version = "246.4.3513";
   installer = "https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${version}.tar.gz";
 
   desktopItem = makeDesktopItem {

From b1b9bb99464c179a8ab7fadad4056b0c6cfa963d Mon Sep 17 00:00:00 2001
From: deng232 <deng232@purdue.edu>
Date: Fri, 3 Apr 2026 15:22:48 -0400
Subject: [PATCH 31/77] libreoffice: add unixodbc to LD_LIBRARY_PATH

---
 pkgs/applications/office/libreoffice/wrapper.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/office/libreoffice/wrapper.nix b/pkgs/applications/office/libreoffice/wrapper.nix
index c4735aaad101..165482e3bf16 100644
--- a/pkgs/applications/office/libreoffice/wrapper.nix
+++ b/pkgs/applications/office/libreoffice/wrapper.nix
@@ -19,6 +19,7 @@
   extraMakeWrapperArgs ? [ ],
   dbusVerify ? stdenv.hostPlatform.isLinux,
   dbus,
+  unixodbc,
 }:
 
 let
@@ -28,6 +29,10 @@ let
 
   makeWrapperArgs = builtins.concatStringsSep " " (
     [
+      "--prefix"
+      "LD_LIBRARY_PATH"
+      ":"
+      "${lib.getLib unixodbc}/lib"
       "--set"
       "GDK_PIXBUF_MODULE_FILE"
       "${librsvg}/${gdk-pixbuf.moduleDir}.cache"

From 06727b0f28ef7f5fc8a4fbdd81ced7f1e26b900d Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 3 Apr 2026 15:48:04 -0500
Subject: [PATCH 32/77] luaPackages: update on 2026-04-03

---
 .../lua-modules/generated-packages.nix        | 52 +++++++++----------
 pkgs/development/lua-modules/overrides.nix    | 10 ----
 2 files changed, 26 insertions(+), 36 deletions(-)

diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index a6f688b0a66b..1b6848105bc3 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -1008,15 +1008,15 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "fzf-lua";
-      version = "0.0.2556-1";
+      version = "0.0.2558-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/fzf-lua-0.0.2556-1.rockspec";
-          sha256 = "0vr0cx0x1j0pniw5s16fpy5ypzpxb4hz143rgyksiyyrdz366kcc";
+          url = "mirror://luarocks/fzf-lua-0.0.2558-1.rockspec";
+          sha256 = "0s4vnm2wbwqf3z733n5h4g5y0p66ml2vgapnhailkq7f7c5gkbs0";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/ibhagwan/fzf-lua/archive/c9e7b7bfbd01f949164988ee1684035468e1995c.zip";
-        sha256 = "0bnfw6svi916zpy34i803a9rgjhs566imn0mrgdgmar4kf0qvw5b";
+        url = "https://github.com/ibhagwan/fzf-lua/archive/3f194300c92e3ec2de8f9307d6a7ce988b7b6d0c.zip";
+        sha256 = "0g0kn4ycc719h7fn91398mbxav36clf59ms7igghry59nva64hkr";
       };
 
       disabled = luaOlder "5.1";
@@ -1136,15 +1136,15 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "haskell-tools.nvim";
-      version = "7.0.3-1";
+      version = "8.1.0-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/haskell-tools.nvim-7.0.3-1.rockspec";
-          sha256 = "0zmarh3ypsfnh22zm3mqr4padjkzmlz622jnm2s5n5xkvfqjc4q8";
+          url = "mirror://luarocks/haskell-tools.nvim-8.1.0-1.rockspec";
+          sha256 = "1khw7f1zllgx3l4ijmqv86cy3y6g12xrwy95q20a62mkzcck8rk4";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/v7.0.3.zip";
-        sha256 = "0hdd2qnhy0vki0qcj7xzs29xla0a1ccwmym163py45lhwlgnjxvw";
+        url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/v8.1.0.zip";
+        sha256 = "1x15z28ga130f59dvfb7mrmfz27rp2kd0l2n923s0qqmgqld26yb";
       };
 
       disabled = luaOlder "5.1";
@@ -3221,13 +3221,13 @@ final: prev: {
       knownRockspec =
         (fetchurl {
           url = "mirror://luarocks/lualine.nvim-scm-1.rockspec";
-          sha256 = "01cqa4nvpq0z4230szwbcwqb0kd8cz2dycrd764r0z5c6vivgfzs";
+          sha256 = "06cm86prf92fiqc30r0lsas70fzp7fli2p758gy5sd133ncqxliz";
         }).outPath;
       src = fetchFromGitHub {
         owner = "nvim-lualine";
         repo = "lualine.nvim";
-        rev = "47f91c416daef12db467145e16bed5bbfe00add8";
-        hash = "sha256-OpLZH+sL5cj2rcP5/T+jDOnuxd1QWLHCt2RzloffZOA=";
+        rev = "74114f0df664f14d7c228945693ba68a3b70a794";
+        hash = "sha256-dgiB5nzjGfkv85qSx3oJPKv/9e7QCHa6aPRSuMLDByU=";
       };
 
       disabled = luaOlder "5.1";
@@ -4628,15 +4628,15 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "neotest";
-      version = "5.14.3-1";
+      version = "5.15.0-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/neotest-5.14.3-1.rockspec";
-          sha256 = "12hx48pvnxk0i5mwl6w2wzla109n75rbz5rn2cq2dhzxszx3h4rz";
+          url = "mirror://luarocks/neotest-5.15.0-1.rockspec";
+          sha256 = "0kp8ybvnrlaisrra9lrwmqk9ll6qs2vddck2449b9k2prjhmfm3q";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/nvim-neotest/neotest/archive/72bc8f1ec62a590fb47368c81f89610e0f353e28.zip";
-        sha256 = "1hlwlp7kyz1navkz4k3fbxgkmqgabr160l8ic6mgnp7f4q0xfhj9";
+        url = "https://github.com/nvim-neotest/neotest/archive/fd0b7986dd0ae04e38ec7dc0c78a432e3820839c.zip";
+        sha256 = "0lkck8pb5d65v2xhbg0hbxinzii9yzg4g10dbanq0j7wbpbwximm";
       };
 
       disabled = luaOlder "5.1";
@@ -5400,21 +5400,21 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "rustaceanvim";
-      version = "8.0.4-2";
+      version = "9.0.0-2";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/rustaceanvim-8.0.4-2.rockspec";
-          sha256 = "12c711xrr0chsmx86w0zf4z3fg10nn53cv1dqdhq64a6vi5gjd4g";
+          url = "mirror://luarocks/rustaceanvim-9.0.0-2.rockspec";
+          sha256 = "0amjbw96n9ijh1f1zd4m0nkpr6ngysb6bysfb6jzr2p48r2jkfws";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/mrcjkb/rustaceanvim/archive/refs/tags/v8.0.4.zip";
-        sha256 = "0nhbl28bxgbkd2jlhb5v9na29972djgmhd9kczma66mf0bwfwi7d";
+        url = "https://github.com/mrcjkb/rustaceanvim/archive/refs/tags/v9.0.0.zip";
+        sha256 = "1g5lsy7wz7hd3jnx28vmy1nflvrzz7ibswzv9jglpm132m05x6q2";
       };
 
       disabled = lua.luaversion != "5.1";
 
       meta = {
-        homepage = "https://github.com/mrcjkb/rustaceanvim/archive/refs/tags/v8.0.4.zip";
+        homepage = "https://github.com/mrcjkb/rustaceanvim/archive/refs/tags/v9.0.0.zip";
         maintainers = with lib.maintainers; [ mrcjkb ];
         license.fullName = "GPL-2.0-only";
         description = "🦀 Supercharge your Rust experience in Neovim! A heavily modified fork of rust-tools.nvim";
@@ -5779,8 +5779,8 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "nvim-telescope";
         repo = "telescope.nvim";
-        rev = "e6cdb4dc528c5dc4ca8da86e83ef4e3c84b0729c";
-        hash = "sha256-eTDW8KdrFAt68ih5Dxn9WgIBW8PjZ+9yBX2HpIPyVJs=";
+        rev = "cfb85dcf7f822b79224e9e6aef9e8c794211b20b";
+        hash = "sha256-QNBlbeVc7wl8j+K38xfC6ZT4XpGJzylQtateQiZxjBY=";
       };
 
       disabled = lua.luaversion != "5.1";
diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix
index c78df573b52c..af4acdffa2e0 100644
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@@ -854,16 +854,6 @@ in
   };
 
   neotest = prev.neotest.overrideAttrs (old: {
-    patches = [
-      (fetchpatch {
-        # fix compatibility with neovim 0.12: iter_matches breaking change
-        # https://github.com/nvim-neotest/neotest/pull/594
-        name = "fix-neovim-0-12-compat";
-        url = "https://github.com/LiamCoop/neotest/commit/2ffca3aefb070e31f1ac00e9fbfd1a83f995c326.patch";
-        hash = "sha256-3+ooC3ZB8pl90FG+kTZxIzmPxrdJTx/XNYE2tPDWO+w=";
-      })
-    ];
-
     doCheck = stdenv.hostPlatform.isLinux;
     nativeCheckInputs = old.nativeCheckInputs ++ [
       final.nlua

From c5eeb0bf4ebaab77cdd167204386b7e3c4dda7a0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Apr 2026 23:21:03 +0000
Subject: [PATCH 33/77] python3Packages.gardena-bluetooth: 2.1.0 -> 2.4.0

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

diff --git a/pkgs/development/python-modules/gardena-bluetooth/default.nix b/pkgs/development/python-modules/gardena-bluetooth/default.nix
index 42a624460871..2427855e880b 100644
--- a/pkgs/development/python-modules/gardena-bluetooth/default.nix
+++ b/pkgs/development/python-modules/gardena-bluetooth/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "gardena-bluetooth";
-  version = "2.1.0";
+  version = "2.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "elupus";
     repo = "gardena-bluetooth";
     tag = finalAttrs.version;
-    hash = "sha256-H02Uq/n2iWAtrO/Reg+yWkFxVkLJWUhq3frc50EF4fo=";
+    hash = "sha256-1G7d8sILpgDm9rwNIV20C14xmzCKrozGPctXn2hBBIQ=";
   };
 
   build-system = [ setuptools ];

From 63a09133896330bf8674ab154921e91f6cbfcfac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Apr 2026 00:34:42 +0000
Subject: [PATCH 34/77] python3Packages.biothings-client: 0.4.1 -> 0.5.0

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

diff --git a/pkgs/development/python-modules/biothings-client/default.nix b/pkgs/development/python-modules/biothings-client/default.nix
index 884a9e458d73..2f0bf7566db9 100644
--- a/pkgs/development/python-modules/biothings-client/default.nix
+++ b/pkgs/development/python-modules/biothings-client/default.nix
@@ -9,14 +9,14 @@
 }:
 buildPythonPackage rec {
   pname = "biothings-client";
-  version = "0.4.1";
+  version = "0.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "biothings";
     repo = "biothings_client.py";
     tag = "v${version}";
-    hash = "sha256-uItIVoWbclF5Xkt7BxI/Q9sfKtrOJxYeJJmTd2NeGfo=";
+    hash = "sha256-SG664xpajbLLTRfqanqYJhKdZqAOXPTDNBcfCAdlZ5M=";
   };
 
   build-system = [ setuptools ];

From 9c4ef24ce34b0bf91d1035709b6bc259edb29477 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Apr 2026 00:52:22 +0000
Subject: [PATCH 35/77] websurfx: 1.24.62 -> 1.25.5

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

diff --git a/pkgs/by-name/we/websurfx/package.nix b/pkgs/by-name/we/websurfx/package.nix
index 2754be647148..9deb0e603165 100644
--- a/pkgs/by-name/we/websurfx/package.nix
+++ b/pkgs/by-name/we/websurfx/package.nix
@@ -6,7 +6,7 @@
   pkg-config,
 }:
 let
-  version = "1.24.62";
+  version = "1.25.5";
 in
 rustPlatform.buildRustPackage {
   pname = "websurfx";
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage {
     owner = "neon-mmd";
     repo = "websurfx";
     tag = "v${version}";
-    hash = "sha256-5IjjKXFFfvjtlQuxbVk3QK4t1nlx95Y5HgYv2yVpMEA=";
+    hash = "sha256-CtS3HYRLq+Li7IPOOG+0lP8nyLwF+z0pjBtvTzQh2fE=";
   };
 
   nativeBuildInputs = [
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage {
     openssl
   ];
 
-  cargoHash = "sha256-U4+oAdiXy86Gk0sitxIKDmUo4Mx/zdHWNv09FyqDuTU=";
+  cargoHash = "sha256-cFKuXhnUhPDBgy/LQUqSQgX2VBQLzzC6VBoeUU8J0H0=";
 
   postPatch = ''
     substituteInPlace src/handler.rs \

From 53f2e36f8fcbe252b8b1b91c8fe1778cf6c95ec1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Apr 2026 02:04:07 +0000
Subject: [PATCH 36/77] python3Packages.lightwave2: 0.8.23 -> 0.9.0

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

diff --git a/pkgs/development/python-modules/lightwave2/default.nix b/pkgs/development/python-modules/lightwave2/default.nix
index 33304c21908c..38423fd7f0d7 100644
--- a/pkgs/development/python-modules/lightwave2/default.nix
+++ b/pkgs/development/python-modules/lightwave2/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "lightwave2";
-  version = "0.8.23";
+  version = "0.9.0";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-umhFqeX16c6o006MU9/9h4EnqcX7v8C5q3XjxYgi+xk=";
+    hash = "sha256-7NFzfUDIDa36VfOsqcaAx8AbWHftfwTyYr0hu6VyAtI=";
   };
 
   propagatedBuildInputs = [ aiohttp ];

From 532f40e27a1aa0dae56545fec3144e4f47c58c17 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Apr 2026 03:54:51 +0000
Subject: [PATCH 37/77] troubadix: 26.3.0 -> 26.4.0

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

diff --git a/pkgs/by-name/tr/troubadix/package.nix b/pkgs/by-name/tr/troubadix/package.nix
index 1e4743fb91a4..3d1e762ea1c0 100644
--- a/pkgs/by-name/tr/troubadix/package.nix
+++ b/pkgs/by-name/tr/troubadix/package.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "troubadix";
-  version = "26.3.0";
+  version = "26.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "greenbone";
     repo = "troubadix";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-E4pgTZErn9Mdrz66Wz7sf7zEDIN6WbVvHlToj8ozIr0=";
+    hash = "sha256-+S/BU6Iaq1gDI3Ncxcm4pxeIvE6vP6AK8IC8w8+FkS0=";
   };
 
   pythonRelaxDeps = [

From d939c993d031f60ddb20dfae632dc4e8dc405326 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Apr 2026 04:15:54 +0000
Subject: [PATCH 38/77] avalonia: 11.3.12 -> 11.3.13

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

diff --git a/pkgs/by-name/av/avalonia/package.nix b/pkgs/by-name/av/avalonia/package.nix
index df352c0eab12..91460fe1cc90 100644
--- a/pkgs/by-name/av/avalonia/package.nix
+++ b/pkgs/by-name/av/avalonia/package.nix
@@ -46,14 +46,14 @@ stdenvNoCC.mkDerivation (
     }
     rec {
       pname = "Avalonia";
-      version = "11.3.12";
+      version = "11.3.13";
 
       src = fetchFromGitHub {
         owner = "AvaloniaUI";
         repo = "Avalonia";
         tag = version;
         fetchSubmodules = true;
-        hash = "sha256-pRIR4Hr/6YjOXmznBclTmQ+Ql7+wJAMANTXOJ/VDpYI=";
+        hash = "sha256-jBpzPm9zKSrhuaOwhfSRaWwrESgGI0iHPhrU3JczHwY=";
       };
 
       patches = [

From 46133d3cc86938d0a755d9261e2332b7b9d13112 Mon Sep 17 00:00:00 2001
From: Karl Hallsby <karl@hallsby.com>
Date: Fri, 3 Apr 2026 23:45:04 -0500
Subject: [PATCH 39/77] maintainers: Update KarlJoad/ravenjoad information

---
 maintainers/maintainer-list.nix                      | 12 ++++++------
 pkgs/development/libraries/librsb/default.nix        |  2 +-
 pkgs/development/octave-modules/arduino/default.nix  |  2 +-
 pkgs/development/octave-modules/audio/default.nix    |  2 +-
 pkgs/development/octave-modules/bim/default.nix      |  2 +-
 pkgs/development/octave-modules/bsltl/default.nix    |  2 +-
 pkgs/development/octave-modules/cgi/default.nix      |  2 +-
 .../octave-modules/communications/default.nix        |  2 +-
 pkgs/development/octave-modules/control/default.nix  |  2 +-
 .../octave-modules/data-smoothing/default.nix        |  2 +-
 pkgs/development/octave-modules/database/default.nix |  2 +-
 .../development/octave-modules/dataframe/default.nix |  2 +-
 .../development/octave-modules/datatypes/default.nix |  2 +-
 pkgs/development/octave-modules/dicom/default.nix    |  2 +-
 pkgs/development/octave-modules/divand/default.nix   |  2 +-
 pkgs/development/octave-modules/doctest/default.nix  |  2 +-
 .../octave-modules/econometrics/default.nix          |  2 +-
 .../development/octave-modules/financial/default.nix |  2 +-
 pkgs/development/octave-modules/fits/default.nix     |  2 +-
 pkgs/development/octave-modules/fpl/default.nix      |  2 +-
 .../octave-modules/fuzzy-logic-toolkit/default.nix   |  2 +-
 pkgs/development/octave-modules/ga/default.nix       |  2 +-
 pkgs/development/octave-modules/general/default.nix  |  2 +-
 .../octave-modules/generate_html/default.nix         |  2 +-
 pkgs/development/octave-modules/geometry/default.nix |  2 +-
 pkgs/development/octave-modules/gsl/default.nix      |  2 +-
 .../octave-modules/image-acquisition/default.nix     |  2 +-
 pkgs/development/octave-modules/image/default.nix    |  2 +-
 .../octave-modules/instrument-control/default.nix    |  2 +-
 pkgs/development/octave-modules/interval/default.nix |  2 +-
 pkgs/development/octave-modules/io/default.nix       |  2 +-
 .../octave-modules/linear-algebra/default.nix        |  2 +-
 pkgs/development/octave-modules/lssa/default.nix     |  2 +-
 pkgs/development/octave-modules/ltfat/default.nix    |  2 +-
 pkgs/development/octave-modules/mapping/default.nix  |  2 +-
 pkgs/development/octave-modules/matgeom/default.nix  |  2 +-
 .../octave-modules/miscellaneous/default.nix         |  2 +-
 pkgs/development/octave-modules/msh/default.nix      |  2 +-
 pkgs/development/octave-modules/mvn/default.nix      |  2 +-
 pkgs/development/octave-modules/nan/default.nix      |  2 +-
 pkgs/development/octave-modules/ncarray/default.nix  |  2 +-
 pkgs/development/octave-modules/netcdf/default.nix   |  2 +-
 pkgs/development/octave-modules/nurbs/default.nix    |  2 +-
 pkgs/development/octave-modules/ocl/default.nix      |  2 +-
 pkgs/development/octave-modules/octclip/default.nix  |  2 +-
 pkgs/development/octave-modules/octproj/default.nix  |  2 +-
 pkgs/development/octave-modules/optics/default.nix   |  2 +-
 pkgs/development/octave-modules/optim/default.nix    |  2 +-
 .../octave-modules/optiminterp/default.nix           |  2 +-
 .../octave-modules/quaternion/default.nix            |  2 +-
 pkgs/development/octave-modules/queueing/default.nix |  2 +-
 pkgs/development/octave-modules/signal/default.nix   |  2 +-
 pkgs/development/octave-modules/sockets/default.nix  |  2 +-
 pkgs/development/octave-modules/splines/default.nix  |  2 +-
 .../octave-modules/statistics/default.nix            |  2 +-
 pkgs/development/octave-modules/stk/default.nix      |  2 +-
 pkgs/development/octave-modules/strings/default.nix  |  2 +-
 pkgs/development/octave-modules/struct/default.nix   |  2 +-
 pkgs/development/octave-modules/symbolic/default.nix |  2 +-
 pkgs/development/octave-modules/tsa/default.nix      |  2 +-
 pkgs/development/octave-modules/video/default.nix    |  2 +-
 pkgs/development/octave-modules/windows/default.nix  |  2 +-
 pkgs/development/octave-modules/zeromq/default.nix   |  2 +-
 pkgs/top-level/octave-packages.nix                   |  2 +-
 64 files changed, 69 insertions(+), 69 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 25a9eb1f0272..3d8b218e554b 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -13718,12 +13718,6 @@
     githubId = 32744028;
     keys = [ { fingerprint = "7577 13A4 9609 0C2F 51C4  018C B5C8 89A2 F195 28F6"; } ];
   };
-  KarlJoad = {
-    email = "karl@hallsby.com";
-    github = "KarlJoad";
-    githubId = 34152449;
-    name = "Karl Hallsby";
-  };
   karpfediem = {
     name = "Karpfen";
     github = "karpfediem";
@@ -22540,6 +22534,12 @@
     githubId = 25647735;
     name = "Victor Freire";
   };
+  ravenjoad = {
+    email = "raven@hallsby.com";
+    github = "ravenjoad";
+    githubId = 34152449;
+    name = "Raven Hallsby";
+  };
   ravenz46 = {
     email = "goldraven0406@gmail.com";
     github = "RAVENz46";
diff --git a/pkgs/development/libraries/librsb/default.nix b/pkgs/development/libraries/librsb/default.nix
index 83caf9d4ac24..f30cf3449447 100644
--- a/pkgs/development/libraries/librsb/default.nix
+++ b/pkgs/development/libraries/librsb/default.nix
@@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
       want to make use of librsb.
     '';
     license = with lib.licenses; [ lgpl3Plus ];
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     platforms = lib.platforms.all;
     # linking errors such as 'undefined reference to `gzungetc'
     broken = true;
diff --git a/pkgs/development/octave-modules/arduino/default.nix b/pkgs/development/octave-modules/arduino/default.nix
index 52f18c273522..6c10becb439f 100644
--- a/pkgs/development/octave-modules/arduino/default.nix
+++ b/pkgs/development/octave-modules/arduino/default.nix
@@ -37,7 +37,7 @@ buildOctavePackage rec {
     name = "Octave Arduino Toolkit";
     homepage = "https://gnu-octave.github.io/packages/arduino/";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Basic Octave implementation of the matlab arduino extension, allowing communication to a programmed arduino board to control its hardware";
   };
 }
diff --git a/pkgs/development/octave-modules/audio/default.nix b/pkgs/development/octave-modules/audio/default.nix
index c4bbb27d037f..e3377b1c8f53 100644
--- a/pkgs/development/octave-modules/audio/default.nix
+++ b/pkgs/development/octave-modules/audio/default.nix
@@ -52,7 +52,7 @@ buildOctavePackage rec {
   meta = {
     homepage = "https://gnu-octave.github.io/packages/audio/";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Audio and MIDI Toolbox for GNU Octave";
     platforms = lib.platforms.linux; # Because of run-time dependency on jack2 and alsa-lib
   };
diff --git a/pkgs/development/octave-modules/bim/default.nix b/pkgs/development/octave-modules/bim/default.nix
index 4232176fba29..4793e4652842 100644
--- a/pkgs/development/octave-modules/bim/default.nix
+++ b/pkgs/development/octave-modules/bim/default.nix
@@ -25,7 +25,7 @@ buildOctavePackage rec {
   meta = {
     homepage = "https://gnu-octave.github.io/packages/bim/";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Package for solving Diffusion Advection Reaction (DAR) Partial Differential Equations";
   };
 }
diff --git a/pkgs/development/octave-modules/bsltl/default.nix b/pkgs/development/octave-modules/bsltl/default.nix
index 35182df7c5bf..35439f687e96 100644
--- a/pkgs/development/octave-modules/bsltl/default.nix
+++ b/pkgs/development/octave-modules/bsltl/default.nix
@@ -16,7 +16,7 @@ buildOctavePackage rec {
   meta = {
     homepage = "https://gnu-octave.github.io/packages/bsltl/";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Free collection of OCTAVE/MATLAB routines for working with the biospeckle laser technique";
   };
 }
diff --git a/pkgs/development/octave-modules/cgi/default.nix b/pkgs/development/octave-modules/cgi/default.nix
index eb3edf3cb83a..6d5ec298af46 100644
--- a/pkgs/development/octave-modules/cgi/default.nix
+++ b/pkgs/development/octave-modules/cgi/default.nix
@@ -16,7 +16,7 @@ buildOctavePackage rec {
   meta = {
     homepage = "https://gnu-octave.github.io/packages/cgi/";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Common Gateway Interface for Octave";
   };
 }
diff --git a/pkgs/development/octave-modules/communications/default.nix b/pkgs/development/octave-modules/communications/default.nix
index f75d43ea2f93..0083b2b12296 100644
--- a/pkgs/development/octave-modules/communications/default.nix
+++ b/pkgs/development/octave-modules/communications/default.nix
@@ -26,7 +26,7 @@ buildOctavePackage rec {
   meta = {
     homepage = "https://gnu-octave.github.io/packages/communications/";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Digital Communications, Error Correcting Codes (Channel Code), Source Code functions, Modulation and Galois Fields";
   };
 }
diff --git a/pkgs/development/octave-modules/control/default.nix b/pkgs/development/octave-modules/control/default.nix
index fd1b98ea42b9..4ba5c2f90799 100644
--- a/pkgs/development/octave-modules/control/default.nix
+++ b/pkgs/development/octave-modules/control/default.nix
@@ -44,7 +44,7 @@ buildOctavePackage rec {
   meta = {
     homepage = "https://gnu-octave.github.io/packages/control/";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Computer-Aided Control System Design (CACSD) Tools for GNU Octave, based on the proven SLICOT Library";
   };
 }
diff --git a/pkgs/development/octave-modules/data-smoothing/default.nix b/pkgs/development/octave-modules/data-smoothing/default.nix
index 9607ed43669a..238dac46b15f 100644
--- a/pkgs/development/octave-modules/data-smoothing/default.nix
+++ b/pkgs/development/octave-modules/data-smoothing/default.nix
@@ -21,7 +21,7 @@ buildOctavePackage rec {
   meta = {
     homepage = "https://gnu-octave.github.io/packages/data-smoothing/";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Algorithms for smoothing noisy data";
     # Hasn't been updated since 2012, and fails to build with octave >= 10.1.0
     broken = true;
diff --git a/pkgs/development/octave-modules/database/default.nix b/pkgs/development/octave-modules/database/default.nix
index e65d4bd881c8..e71d277532a7 100644
--- a/pkgs/development/octave-modules/database/default.nix
+++ b/pkgs/development/octave-modules/database/default.nix
@@ -34,7 +34,7 @@ buildOctavePackage rec {
   meta = {
     homepage = "https://gnu-octave.github.io/packages/database/";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Interface to SQL databases, currently only postgresql using libpq";
   };
 }
diff --git a/pkgs/development/octave-modules/dataframe/default.nix b/pkgs/development/octave-modules/dataframe/default.nix
index e08dbc25b433..27481125335e 100644
--- a/pkgs/development/octave-modules/dataframe/default.nix
+++ b/pkgs/development/octave-modules/dataframe/default.nix
@@ -16,7 +16,7 @@ buildOctavePackage rec {
   meta = {
     homepage = "https://gnu-octave.github.io/packages/dataframe/";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Data manipulation toolbox similar to R data.frame";
   };
 }
diff --git a/pkgs/development/octave-modules/datatypes/default.nix b/pkgs/development/octave-modules/datatypes/default.nix
index 44c4242e3a90..e07d860ed1a0 100644
--- a/pkgs/development/octave-modules/datatypes/default.nix
+++ b/pkgs/development/octave-modules/datatypes/default.nix
@@ -21,7 +21,7 @@ buildOctavePackage rec {
   meta = {
     homepage = "https://gnu-octave.github.io/packages/datatypes/";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Extra data types for GNU Octave";
   };
 }
diff --git a/pkgs/development/octave-modules/dicom/default.nix b/pkgs/development/octave-modules/dicom/default.nix
index f40e2fe36abb..c10995e0c0ea 100644
--- a/pkgs/development/octave-modules/dicom/default.nix
+++ b/pkgs/development/octave-modules/dicom/default.nix
@@ -33,7 +33,7 @@ buildOctavePackage rec {
   meta = {
     homepage = "https://gnu-octave.github.io/packages/dicom/";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Digital communications in medicine (DICOM) file io";
   };
 }
diff --git a/pkgs/development/octave-modules/divand/default.nix b/pkgs/development/octave-modules/divand/default.nix
index 321c44ef1f77..7c7f18fdc7ba 100644
--- a/pkgs/development/octave-modules/divand/default.nix
+++ b/pkgs/development/octave-modules/divand/default.nix
@@ -16,7 +16,7 @@ buildOctavePackage rec {
   meta = {
     homepage = "https://gnu-octave.github.io/packages/divand/";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Performs an n-dimensional variational analysis (interpolation) of arbitrarily located observations";
   };
 }
diff --git a/pkgs/development/octave-modules/doctest/default.nix b/pkgs/development/octave-modules/doctest/default.nix
index c32f1426d9d8..aa7a53ac26d3 100644
--- a/pkgs/development/octave-modules/doctest/default.nix
+++ b/pkgs/development/octave-modules/doctest/default.nix
@@ -16,7 +16,7 @@ buildOctavePackage rec {
   meta = {
     homepage = "https://gnu-octave.github.io/packages/doctest/";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Find and run example code within documentation";
     longDescription = ''
       Find and run example code within documentation. Formatted blocks
diff --git a/pkgs/development/octave-modules/econometrics/default.nix b/pkgs/development/octave-modules/econometrics/default.nix
index eec1d952b12d..012e9758d4bb 100644
--- a/pkgs/development/octave-modules/econometrics/default.nix
+++ b/pkgs/development/octave-modules/econometrics/default.nix
@@ -21,7 +21,7 @@ buildOctavePackage rec {
   meta = {
     homepage = "https://gnu-octave.github.io/packages/econometrics/";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Econometrics functions including MLE and GMM based techniques";
     # Hasn't been updated since 2012, and fails to build with octave >= 10.1.0
     broken = true;
diff --git a/pkgs/development/octave-modules/financial/default.nix b/pkgs/development/octave-modules/financial/default.nix
index bded9c443f48..565574ca1d06 100644
--- a/pkgs/development/octave-modules/financial/default.nix
+++ b/pkgs/development/octave-modules/financial/default.nix
@@ -21,7 +21,7 @@ buildOctavePackage rec {
   meta = {
     homepage = "https://gnu-octave.github.io/packages/financial/";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Monte Carlo simulation, options pricing routines, financial manipulation, plotting functions and additional date manipulation tools";
   };
 }
diff --git a/pkgs/development/octave-modules/fits/default.nix b/pkgs/development/octave-modules/fits/default.nix
index bc5b9d3874ba..190a80d740f2 100644
--- a/pkgs/development/octave-modules/fits/default.nix
+++ b/pkgs/development/octave-modules/fits/default.nix
@@ -36,7 +36,7 @@ buildOctavePackage rec {
   meta = {
     homepage = "https://gnu-octave.github.io/packages/fits/";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Functions for reading, and writing FITS (Flexible Image Transport System) files using cfitsio";
     # Hasn't been updated since 2015, and fails to build with octave >= 10.1.0
     broken = true;
diff --git a/pkgs/development/octave-modules/fpl/default.nix b/pkgs/development/octave-modules/fpl/default.nix
index 3083082a13a7..b52803cbb2eb 100644
--- a/pkgs/development/octave-modules/fpl/default.nix
+++ b/pkgs/development/octave-modules/fpl/default.nix
@@ -16,7 +16,7 @@ buildOctavePackage rec {
   meta = {
     homepage = "https://gnu-octave.github.io/packages/fpl/";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Collection of routines to export data produced by Finite Elements or Finite Volume Simulations in formats used by some visualization programs";
   };
 }
diff --git a/pkgs/development/octave-modules/fuzzy-logic-toolkit/default.nix b/pkgs/development/octave-modules/fuzzy-logic-toolkit/default.nix
index 86dd634b17ce..1541c1140bad 100644
--- a/pkgs/development/octave-modules/fuzzy-logic-toolkit/default.nix
+++ b/pkgs/development/octave-modules/fuzzy-logic-toolkit/default.nix
@@ -18,7 +18,7 @@ buildOctavePackage rec {
   meta = {
     homepage = "https://github.com/lmarkowsky/fuzzy-logic-toolkit";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Mostly MATLAB-compatible fuzzy logic toolkit for Octave";
   };
 }
diff --git a/pkgs/development/octave-modules/ga/default.nix b/pkgs/development/octave-modules/ga/default.nix
index 5375fba5c77f..3d50393a4ebc 100644
--- a/pkgs/development/octave-modules/ga/default.nix
+++ b/pkgs/development/octave-modules/ga/default.nix
@@ -16,7 +16,7 @@ buildOctavePackage rec {
   meta = {
     homepage = "https://gnu-octave.github.io/packages/ga/";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Genetic optimization code";
   };
 }
diff --git a/pkgs/development/octave-modules/general/default.nix b/pkgs/development/octave-modules/general/default.nix
index cfb9bafd7afc..8ce80b719369 100644
--- a/pkgs/development/octave-modules/general/default.nix
+++ b/pkgs/development/octave-modules/general/default.nix
@@ -26,7 +26,7 @@ buildOctavePackage rec {
   meta = {
     homepage = "https://gnu-octave.github.io/packages/general/";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "General tools for Octave";
   };
 }
diff --git a/pkgs/development/octave-modules/generate_html/default.nix b/pkgs/development/octave-modules/generate_html/default.nix
index d113092b5aaa..391de931f5a8 100644
--- a/pkgs/development/octave-modules/generate_html/default.nix
+++ b/pkgs/development/octave-modules/generate_html/default.nix
@@ -16,7 +16,7 @@ buildOctavePackage rec {
   meta = {
     homepage = "https://gnu-octave.github.io/packages/generate_html/";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Provides functions for generating HTML pages that contain the help texts for a set of functions";
     longDescription = ''
       This package provides functions for generating HTML pages that contain
diff --git a/pkgs/development/octave-modules/geometry/default.nix b/pkgs/development/octave-modules/geometry/default.nix
index 8e48c4500da6..52bd17427422 100644
--- a/pkgs/development/octave-modules/geometry/default.nix
+++ b/pkgs/development/octave-modules/geometry/default.nix
@@ -29,7 +29,7 @@ buildOctavePackage rec {
       gpl3Plus
       boost
     ];
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Library for extending MatGeom functionality";
   };
 }
diff --git a/pkgs/development/octave-modules/gsl/default.nix b/pkgs/development/octave-modules/gsl/default.nix
index c7bbf114606f..92693cd7df5c 100644
--- a/pkgs/development/octave-modules/gsl/default.nix
+++ b/pkgs/development/octave-modules/gsl/default.nix
@@ -22,7 +22,7 @@ buildOctavePackage rec {
   meta = {
     homepage = "https://gnu-octave.github.io/packages/gsl/";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Octave bindings to the GNU Scientific Library";
     # gsl_sf.cc:1782:11: error: no member named 'is_real_type' in 'octave_value'
     #  1782 |     if (! ISREAL(args(i)))
diff --git a/pkgs/development/octave-modules/image-acquisition/default.nix b/pkgs/development/octave-modules/image-acquisition/default.nix
index 251068c7087a..183812b174c4 100644
--- a/pkgs/development/octave-modules/image-acquisition/default.nix
+++ b/pkgs/development/octave-modules/image-acquisition/default.nix
@@ -36,7 +36,7 @@ buildOctavePackage rec {
   meta = {
     homepage = "https://gnu-octave.github.io/packages/image-acquisition/";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Functions to capture images from connected devices";
     longDescription = ''
       The Octave-forge Image Aquisition package provides functions to
diff --git a/pkgs/development/octave-modules/image/default.nix b/pkgs/development/octave-modules/image/default.nix
index 32ef4eb4a9bd..3a5df2b848cd 100644
--- a/pkgs/development/octave-modules/image/default.nix
+++ b/pkgs/development/octave-modules/image/default.nix
@@ -30,7 +30,7 @@ buildOctavePackage rec {
   meta = {
     homepage = "https://gnu-octave.github.io/packages/image/";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Functions for processing images";
     longDescription = ''
       The Octave-forge Image package provides functions for processing
diff --git a/pkgs/development/octave-modules/instrument-control/default.nix b/pkgs/development/octave-modules/instrument-control/default.nix
index c45c3d961dd7..907c8e6b771a 100644
--- a/pkgs/development/octave-modules/instrument-control/default.nix
+++ b/pkgs/development/octave-modules/instrument-control/default.nix
@@ -26,7 +26,7 @@ buildOctavePackage rec {
   meta = {
     homepage = "https://gnu-octave.github.io/packages/instrument-control/";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Low level I/O functions for serial, i2c, spi, parallel, tcp, gpib, vxi11, udp and usbtmc interfaces";
   };
 }
diff --git a/pkgs/development/octave-modules/interval/default.nix b/pkgs/development/octave-modules/interval/default.nix
index 635dfbd57ebe..869faa64b980 100644
--- a/pkgs/development/octave-modules/interval/default.nix
+++ b/pkgs/development/octave-modules/interval/default.nix
@@ -21,7 +21,7 @@ buildOctavePackage rec {
   meta = {
     homepage = "https://gnu-octave.github.io/packages/interval/";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Interval arithmetic to evaluate functions over subsets of their domain";
     longDescription = ''
       The interval package for real-valued interval arithmetic allows one to
diff --git a/pkgs/development/octave-modules/io/default.nix b/pkgs/development/octave-modules/io/default.nix
index 4edcf9336928..a4db56e12a42 100644
--- a/pkgs/development/octave-modules/io/default.nix
+++ b/pkgs/development/octave-modules/io/default.nix
@@ -30,7 +30,7 @@ buildOctavePackage rec {
       gpl3Plus
       bsd2
     ];
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Input/Output in external formats";
   };
 }
diff --git a/pkgs/development/octave-modules/linear-algebra/default.nix b/pkgs/development/octave-modules/linear-algebra/default.nix
index 3e349e3ec8d1..89416c34c394 100644
--- a/pkgs/development/octave-modules/linear-algebra/default.nix
+++ b/pkgs/development/octave-modules/linear-algebra/default.nix
@@ -20,7 +20,7 @@ buildOctavePackage rec {
       lgpl3Plus
     ];
     # They claim to have a FreeBSD license, but none of their code seems to have it.
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Additional linear algebra code, including matrix functions";
   };
 }
diff --git a/pkgs/development/octave-modules/lssa/default.nix b/pkgs/development/octave-modules/lssa/default.nix
index 5fa4bf53125a..a9e8a2ec6e42 100644
--- a/pkgs/development/octave-modules/lssa/default.nix
+++ b/pkgs/development/octave-modules/lssa/default.nix
@@ -16,7 +16,7 @@ buildOctavePackage rec {
   meta = {
     homepage = "https://gnu-octave.github.io/packages/lssa/";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Tools to compute spectral decompositions of irregularly-spaced time series";
     longDescription = ''
       A package implementing tools to compute spectral decompositions of
diff --git a/pkgs/development/octave-modules/ltfat/default.nix b/pkgs/development/octave-modules/ltfat/default.nix
index 198cb4ee43f2..55184905aefe 100644
--- a/pkgs/development/octave-modules/ltfat/default.nix
+++ b/pkgs/development/octave-modules/ltfat/default.nix
@@ -36,7 +36,7 @@ buildOctavePackage rec {
     name = "The Large Time-Frequency Analysis Toolbox";
     homepage = "https://gnu-octave.github.io/packages/ltfat/";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Toolbox for working with time-frequency analysis, wavelets and signal processing";
     longDescription = ''
       The Large Time/Frequency Analysis Toolbox (LTFAT) is a Matlab/Octave
diff --git a/pkgs/development/octave-modules/mapping/default.nix b/pkgs/development/octave-modules/mapping/default.nix
index 490841816bc2..5f130b9995b7 100644
--- a/pkgs/development/octave-modules/mapping/default.nix
+++ b/pkgs/development/octave-modules/mapping/default.nix
@@ -28,7 +28,7 @@ buildOctavePackage rec {
   meta = {
     homepage = "https://gnu-octave.github.io/packages/mapping/";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Simple mapping and GIS .shp .dxf and raster file functions";
   };
 }
diff --git a/pkgs/development/octave-modules/matgeom/default.nix b/pkgs/development/octave-modules/matgeom/default.nix
index 26761cd7c1fd..fcfc978250ac 100644
--- a/pkgs/development/octave-modules/matgeom/default.nix
+++ b/pkgs/development/octave-modules/matgeom/default.nix
@@ -19,7 +19,7 @@ buildOctavePackage rec {
       bsd2
       gpl3Plus
     ];
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Geometry toolbox for 2D/3D geometric computing";
   };
 }
diff --git a/pkgs/development/octave-modules/miscellaneous/default.nix b/pkgs/development/octave-modules/miscellaneous/default.nix
index d1fd05e738eb..da71663faaac 100644
--- a/pkgs/development/octave-modules/miscellaneous/default.nix
+++ b/pkgs/development/octave-modules/miscellaneous/default.nix
@@ -37,7 +37,7 @@ buildOctavePackage rec {
   meta = {
     homepage = "https://gnu-octave.github.io/packages/miscellaneous/";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Miscellaneous tools that don't fit somewhere else";
   };
 }
diff --git a/pkgs/development/octave-modules/msh/default.nix b/pkgs/development/octave-modules/msh/default.nix
index 4145a706941b..88efc656a5fc 100644
--- a/pkgs/development/octave-modules/msh/default.nix
+++ b/pkgs/development/octave-modules/msh/default.nix
@@ -48,7 +48,7 @@ buildOctavePackage rec {
   meta = {
     homepage = "https://gnu-octave.github.io/packages/msh/";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Create and manage triangular and tetrahedral meshes for Finite Element or Finite Volume PDE solvers";
     longDescription = ''
       Create and manage triangular and tetrahedral meshes for Finite Element or
diff --git a/pkgs/development/octave-modules/mvn/default.nix b/pkgs/development/octave-modules/mvn/default.nix
index e8dc61b1965c..520beb42d77e 100644
--- a/pkgs/development/octave-modules/mvn/default.nix
+++ b/pkgs/development/octave-modules/mvn/default.nix
@@ -16,7 +16,7 @@ buildOctavePackage rec {
   meta = {
     homepage = "https://gnu-octave.github.io/packages/mvn/";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Multivariate normal distribution clustering and utility functions";
   };
 }
diff --git a/pkgs/development/octave-modules/nan/default.nix b/pkgs/development/octave-modules/nan/default.nix
index f89535316507..a1d7cb2257b8 100644
--- a/pkgs/development/octave-modules/nan/default.nix
+++ b/pkgs/development/octave-modules/nan/default.nix
@@ -21,7 +21,7 @@ buildOctavePackage rec {
   meta = {
     homepage = "https://gnu-octave.github.io/packages/nan/";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Statistics and machine learning toolbox for data with and w/o missing values";
   };
 }
diff --git a/pkgs/development/octave-modules/ncarray/default.nix b/pkgs/development/octave-modules/ncarray/default.nix
index be85625f83c0..6cb892bf0bc5 100644
--- a/pkgs/development/octave-modules/ncarray/default.nix
+++ b/pkgs/development/octave-modules/ncarray/default.nix
@@ -26,7 +26,7 @@ buildOctavePackage rec {
   meta = {
     homepage = "https://gnu-octave.github.io/packages/ncarray/";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Access a single or a collection of NetCDF files as a multi-dimensional array";
   };
 }
diff --git a/pkgs/development/octave-modules/netcdf/default.nix b/pkgs/development/octave-modules/netcdf/default.nix
index 4e41446c3a67..5a93cf59a72d 100644
--- a/pkgs/development/octave-modules/netcdf/default.nix
+++ b/pkgs/development/octave-modules/netcdf/default.nix
@@ -24,7 +24,7 @@ buildOctavePackage rec {
   meta = {
     homepage = "https://gnu-octave.github.io/packages/netcdf/";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "NetCDF interface for Octave";
   };
 }
diff --git a/pkgs/development/octave-modules/nurbs/default.nix b/pkgs/development/octave-modules/nurbs/default.nix
index 15fb06db5d9d..fe4eab4058ad 100644
--- a/pkgs/development/octave-modules/nurbs/default.nix
+++ b/pkgs/development/octave-modules/nurbs/default.nix
@@ -16,7 +16,7 @@ buildOctavePackage rec {
   meta = {
     homepage = "https://gnu-octave.github.io/packages/nurbs/";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Collection of routines for the creation, and manipulation of Non-Uniform Rational B-Splines (NURBS), based on the NURBS toolbox by Mark Spink";
   };
 }
diff --git a/pkgs/development/octave-modules/ocl/default.nix b/pkgs/development/octave-modules/ocl/default.nix
index f57a141b5054..ae616ed23879 100644
--- a/pkgs/development/octave-modules/ocl/default.nix
+++ b/pkgs/development/octave-modules/ocl/default.nix
@@ -16,7 +16,7 @@ buildOctavePackage rec {
   meta = {
     homepage = "https://gnu-octave.github.io/packages/ocl/";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Use OpenCL for parallelization";
     longDescription = ''
       Package using OpenCL for parallelization, mostly suitable to
diff --git a/pkgs/development/octave-modules/octclip/default.nix b/pkgs/development/octave-modules/octclip/default.nix
index faf519fbf7a2..1b7f2b00e3ac 100644
--- a/pkgs/development/octave-modules/octclip/default.nix
+++ b/pkgs/development/octave-modules/octclip/default.nix
@@ -26,7 +26,7 @@ buildOctavePackage rec {
     name = "GNU Octave Clipping Polygons Tool";
     homepage = "https://gnu-octave.github.io/packages/octclip/";
     license = with lib.licenses; [ gpl3Plus ]; # modified BSD?
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Perform boolean operations with polygons using the Greiner-Hormann algorithm";
   };
 }
diff --git a/pkgs/development/octave-modules/octproj/default.nix b/pkgs/development/octave-modules/octproj/default.nix
index 48812b0ac6c0..d08115321128 100644
--- a/pkgs/development/octave-modules/octproj/default.nix
+++ b/pkgs/development/octave-modules/octproj/default.nix
@@ -37,7 +37,7 @@ buildOctavePackage rec {
   meta = {
     homepage = "https://gnu-octave.github.io/packages/octproj/";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "GNU Octave bindings to PROJ library for cartographic projections and CRS transformations";
   };
 }
diff --git a/pkgs/development/octave-modules/optics/default.nix b/pkgs/development/octave-modules/optics/default.nix
index c10b9aa28530..eb503213358a 100644
--- a/pkgs/development/octave-modules/optics/default.nix
+++ b/pkgs/development/octave-modules/optics/default.nix
@@ -16,7 +16,7 @@ buildOctavePackage rec {
   meta = {
     homepage = "https://gnu-octave.github.io/packages/optics/";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Functions covering various aspects of optics";
   };
 }
diff --git a/pkgs/development/octave-modules/optim/default.nix b/pkgs/development/octave-modules/optim/default.nix
index e0aaef524a9f..e0f9c98db2d9 100644
--- a/pkgs/development/octave-modules/optim/default.nix
+++ b/pkgs/development/octave-modules/optim/default.nix
@@ -34,7 +34,7 @@ buildOctavePackage rec {
       publicDomain
     ];
     # Modified BSD code seems removed
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Non-linear optimization toolkit";
     # Hasn't been updated since 2022, and fails to build with octave >= 10.1.0
     broken = true;
diff --git a/pkgs/development/octave-modules/optiminterp/default.nix b/pkgs/development/octave-modules/optiminterp/default.nix
index 2b6717eea897..67a4ee93544a 100644
--- a/pkgs/development/octave-modules/optiminterp/default.nix
+++ b/pkgs/development/octave-modules/optiminterp/default.nix
@@ -21,7 +21,7 @@ buildOctavePackage rec {
   meta = {
     homepage = "https://gnu-octave.github.io/packages/optiminterp/";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Optimal interpolation toolbox for octave";
     longDescription = ''
       An optimal interpolation toolbox for octave. This package provides
diff --git a/pkgs/development/octave-modules/quaternion/default.nix b/pkgs/development/octave-modules/quaternion/default.nix
index 0fe0f7a33464..a947839d8e91 100644
--- a/pkgs/development/octave-modules/quaternion/default.nix
+++ b/pkgs/development/octave-modules/quaternion/default.nix
@@ -16,7 +16,7 @@ buildOctavePackage rec {
   meta = {
     homepage = "https://gnu-octave.github.io/packages/quaternion/";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Quaternion package for GNU Octave, includes a quaternion class with overloaded operators";
   };
 }
diff --git a/pkgs/development/octave-modules/queueing/default.nix b/pkgs/development/octave-modules/queueing/default.nix
index 9256479c8708..a14e2c3beeb2 100644
--- a/pkgs/development/octave-modules/queueing/default.nix
+++ b/pkgs/development/octave-modules/queueing/default.nix
@@ -16,7 +16,7 @@ buildOctavePackage rec {
   meta = {
     homepage = "https://gnu-octave.github.io/packages/queueing/";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Provides functions for queueing networks and Markov chains analysis";
     longDescription = ''
       The queueing package provides functions for queueing networks and Markov
diff --git a/pkgs/development/octave-modules/signal/default.nix b/pkgs/development/octave-modules/signal/default.nix
index fef5c120310a..296278341448 100644
--- a/pkgs/development/octave-modules/signal/default.nix
+++ b/pkgs/development/octave-modules/signal/default.nix
@@ -24,7 +24,7 @@ buildOctavePackage rec {
   meta = {
     homepage = "https://gnu-octave.github.io/packages/signal/";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Signal processing tools, including filtering, windowing and display functions";
   };
 }
diff --git a/pkgs/development/octave-modules/sockets/default.nix b/pkgs/development/octave-modules/sockets/default.nix
index 905c3fe8c8cf..e9032bfebaa8 100644
--- a/pkgs/development/octave-modules/sockets/default.nix
+++ b/pkgs/development/octave-modules/sockets/default.nix
@@ -26,7 +26,7 @@ buildOctavePackage rec {
   meta = {
     homepage = "https://gnu-octave.github.io/packages/sockets/";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Socket functions for networking from within octave";
   };
 }
diff --git a/pkgs/development/octave-modules/splines/default.nix b/pkgs/development/octave-modules/splines/default.nix
index 699d784b73f1..be6abc12e83c 100644
--- a/pkgs/development/octave-modules/splines/default.nix
+++ b/pkgs/development/octave-modules/splines/default.nix
@@ -19,7 +19,7 @@ buildOctavePackage rec {
       gpl3Plus
       publicDomain
     ];
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Additional spline functions";
   };
 }
diff --git a/pkgs/development/octave-modules/statistics/default.nix b/pkgs/development/octave-modules/statistics/default.nix
index cc9225a3474d..bc7742fece29 100644
--- a/pkgs/development/octave-modules/statistics/default.nix
+++ b/pkgs/development/octave-modules/statistics/default.nix
@@ -28,7 +28,7 @@ buildOctavePackage rec {
       gpl3Plus
       publicDomain
     ];
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Statistics package for GNU Octave";
   };
 }
diff --git a/pkgs/development/octave-modules/stk/default.nix b/pkgs/development/octave-modules/stk/default.nix
index fbcf44718992..25f1653db318 100644
--- a/pkgs/development/octave-modules/stk/default.nix
+++ b/pkgs/development/octave-modules/stk/default.nix
@@ -16,7 +16,7 @@ buildOctavePackage rec {
   meta = {
     homepage = "https://gnu-octave.github.io/packages/stk/";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "STK is a (not so) Small Toolbox for Kriging";
     longDescription = ''
       The STK is a (not so) Small Toolbox for Kriging. Its primary focus is on
diff --git a/pkgs/development/octave-modules/strings/default.nix b/pkgs/development/octave-modules/strings/default.nix
index ebd50b521116..29230c4aec81 100644
--- a/pkgs/development/octave-modules/strings/default.nix
+++ b/pkgs/development/octave-modules/strings/default.nix
@@ -38,7 +38,7 @@ buildOctavePackage rec {
     homepage = "https://gnu-octave.github.io/packages/strings/";
     license = lib.licenses.gpl3Plus;
     # Claims to have a freebsd license, but I found none.
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Additional functions for manipulation and analysis of strings";
     # Some pcre symbols claimed to be missing
     broken = stdenv.hostPlatform.isDarwin;
diff --git a/pkgs/development/octave-modules/struct/default.nix b/pkgs/development/octave-modules/struct/default.nix
index eadfea5a6ed7..6b59fa7e291d 100644
--- a/pkgs/development/octave-modules/struct/default.nix
+++ b/pkgs/development/octave-modules/struct/default.nix
@@ -16,7 +16,7 @@ buildOctavePackage rec {
   meta = {
     homepage = "https://gnu-octave.github.io/packages/struct/";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Additional structure manipulation functions";
   };
 }
diff --git a/pkgs/development/octave-modules/symbolic/default.nix b/pkgs/development/octave-modules/symbolic/default.nix
index a0cb08f121c6..541f7ed7d71e 100644
--- a/pkgs/development/octave-modules/symbolic/default.nix
+++ b/pkgs/development/octave-modules/symbolic/default.nix
@@ -29,7 +29,7 @@ buildOctavePackage rec {
   meta = {
     homepage = "https://gnu-octave.github.io/packages/symbolic/";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Adds symbolic calculation features to GNU Octave";
   };
 }
diff --git a/pkgs/development/octave-modules/tsa/default.nix b/pkgs/development/octave-modules/tsa/default.nix
index 167073dc8f99..6e260d017dfa 100644
--- a/pkgs/development/octave-modules/tsa/default.nix
+++ b/pkgs/development/octave-modules/tsa/default.nix
@@ -21,7 +21,7 @@ buildOctavePackage rec {
   meta = {
     homepage = "https://gnu-octave.github.io/packages/tsa/";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Stochastic concepts and maximum entropy methods for time series analysis";
   };
 }
diff --git a/pkgs/development/octave-modules/video/default.nix b/pkgs/development/octave-modules/video/default.nix
index 590aeea1d705..17905bea3be4 100644
--- a/pkgs/development/octave-modules/video/default.nix
+++ b/pkgs/development/octave-modules/video/default.nix
@@ -46,7 +46,7 @@ buildOctavePackage rec {
       gpl3Plus
       bsd3
     ];
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Wrapper for OpenCV's CvCapture_FFMPEG and CvVideoWriter_FFMPEG";
   };
 }
diff --git a/pkgs/development/octave-modules/windows/default.nix b/pkgs/development/octave-modules/windows/default.nix
index b28373831a63..e62f57b03d95 100644
--- a/pkgs/development/octave-modules/windows/default.nix
+++ b/pkgs/development/octave-modules/windows/default.nix
@@ -41,7 +41,7 @@ buildOctavePackage rec {
   meta = {
     homepage = "https://gnu-octave.github.io/packages/windows/";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Provides COM interface and additional functionality on Windows";
     platforms = lib.platforms.windows;
   };
diff --git a/pkgs/development/octave-modules/zeromq/default.nix b/pkgs/development/octave-modules/zeromq/default.nix
index 98fab4f9e898..0b2a62bed93c 100644
--- a/pkgs/development/octave-modules/zeromq/default.nix
+++ b/pkgs/development/octave-modules/zeromq/default.nix
@@ -46,7 +46,7 @@ buildOctavePackage rec {
   meta = {
     homepage = "https://gnu-octave.github.io/packages/zeromq/";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ ravenjoad ];
     description = "ZeroMQ bindings for GNU Octave";
   };
 }
diff --git a/pkgs/top-level/octave-packages.nix b/pkgs/top-level/octave-packages.nix
index acb164f047d0..08dc904487d3 100644
--- a/pkgs/top-level/octave-packages.nix
+++ b/pkgs/top-level/octave-packages.nix
@@ -156,7 +156,7 @@ makeScope newScope (
     miscellaneous = callPackage ../development/octave-modules/miscellaneous { };
 
     msh = callPackage ../development/octave-modules/msh {
-      # PLACEHOLDER until KarlJoad gets dolfin packaged.
+      # PLACEHOLDER until ravenjoad gets dolfin packaged.
       dolfin = null;
     };
 

From 681438af504e7c41db00056041f164e7f115108b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Apr 2026 06:09:30 +0000
Subject: [PATCH 40/77] mage: 1.17.0 -> 1.17.1

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

diff --git a/pkgs/by-name/ma/mage/package.nix b/pkgs/by-name/ma/mage/package.nix
index dc5cdd05904d..193fb03ffea6 100644
--- a/pkgs/by-name/ma/mage/package.nix
+++ b/pkgs/by-name/ma/mage/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "mage";
-  version = "1.17.0";
+  version = "1.17.1";
 
   src = fetchFromGitHub {
     owner = "magefile";
     repo = "mage";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-F+eKV4FIf2rAcaNzoLS4AtTwuTrBAqntdjuAhrhVnCQ=";
+    sha256 = "sha256-PoZqVUT+sKr9UY8OaWjYxaqTSYItOkOdi1FnmGJ1K78=";
   };
 
   vendorHash = null;

From aac9b607559d0a8a84141a11df46cc50a6bc0746 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Apr 2026 06:20:59 +0000
Subject: [PATCH 41/77] SDL: 1.2.74 -> 1.2.76

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

diff --git a/pkgs/by-name/sd/SDL_compat/package.nix b/pkgs/by-name/sd/SDL_compat/package.nix
index 08ac93585ab0..5252282ea6b5 100644
--- a/pkgs/by-name/sd/SDL_compat/package.nix
+++ b/pkgs/by-name/sd/SDL_compat/package.nix
@@ -27,13 +27,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "SDL_compat";
-  version = "1.2.74";
+  version = "1.2.76";
 
   src = fetchFromGitHub {
     owner = "libsdl-org";
     repo = "sdl12-compat";
     rev = "release-" + finalAttrs.version;
-    hash = "sha256-nKEUCI6qPM2x8qPzPyZX9gDSjoWszsADSEQG65hSuA8=";
+    hash = "sha256-hSHtYFn4gr8Y9cNyLBT6frDgidNCRENPtTrtGfgH3po=";
   };
 
   nativeBuildInputs = [

From 4715137417914e2e0f3cd8955c368826eb3b801a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Apr 2026 07:19:21 +0000
Subject: [PATCH 42/77] gtk-layer-shell: 0.10.0 -> 0.10.1

---
 pkgs/by-name/gt/gtk-layer-shell/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gt/gtk-layer-shell/package.nix b/pkgs/by-name/gt/gtk-layer-shell/package.nix
index 34d8dcb00754..94a801f73aca 100644
--- a/pkgs/by-name/gt/gtk-layer-shell/package.nix
+++ b/pkgs/by-name/gt/gtk-layer-shell/package.nix
@@ -17,7 +17,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gtk-layer-shell";
-  version = "0.10.0";
+  version = "0.10.1";
 
   outputs = [
     "out"
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "wmww";
     repo = "gtk-layer-shell";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Rl0cSIOsHDXlvjGesVoF98S3ehvTIzKOyetEyBCXDgk=";
+    hash = "sha256-Qhbk5g3cYaE6qH/V4t0OMU/PsW233G53v8Ft0ceYfCI=";
   };
 
   strictDeps = true;

From b7ee01a531f4040c0d9e7f2d29eb17a2de37a792 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 4 Apr 2026 10:01:18 +0200
Subject: [PATCH 43/77] python3Packages.claude-agent-sdk: 0.1.52 -> 0.1.56

Diff: https://github.com/anthropics/claude-agent-sdk-python/compare/v0.1.52...v0.1.56

Changelog: https://github.com/anthropics/claude-agent-sdk-python/blob/v0.1.56/CHANGELOG.md
---
 pkgs/development/python-modules/claude-agent-sdk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/claude-agent-sdk/default.nix b/pkgs/development/python-modules/claude-agent-sdk/default.nix
index ffdf01616e48..1e7387e84dfe 100644
--- a/pkgs/development/python-modules/claude-agent-sdk/default.nix
+++ b/pkgs/development/python-modules/claude-agent-sdk/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "claude-agent-sdk";
-  version = "0.1.52";
+  version = "0.1.56";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "anthropics";
     repo = "claude-agent-sdk-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4sj9jqf06RSec9xUhJ1gDbfuYaxFODvM5pz9uVpsLTo=";
+    hash = "sha256-lpgRTDaGJGFnhs60we+YqBurvMi/dmC5Y80RfJP8NS0=";
   };
 
   build-system = [ hatchling ];

From 5908630190e3f8504f47658aace3a602df430614 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Apr 2026 09:32:15 +0000
Subject: [PATCH 44/77] brewtarget: 4.2.1 -> 5.0.4

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

diff --git a/pkgs/by-name/br/brewtarget/package.nix b/pkgs/by-name/br/brewtarget/package.nix
index 24966784b077..09cf2074825d 100644
--- a/pkgs/by-name/br/brewtarget/package.nix
+++ b/pkgs/by-name/br/brewtarget/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "brewtarget";
-  version = "4.2.1";
+  version = "5.0.4";
 
   src = fetchFromGitHub {
     owner = "Brewtarget";
     repo = "brewtarget";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/BEVnAtuwDnJXra9EAMD3LhA/93nFJ5ObCSgSy3CJnk=";
+    hash = "sha256-lwrs2ZRHEbBXKzszlCE+WyclM7m4iX639tT0aFanFR0=";
     fetchSubmodules = true;
   };
 

From a78017f53bf0e575f4de197443221b13439c8ea7 Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Sat, 4 Apr 2026 12:43:47 +0200
Subject: [PATCH 45/77] wiredtiger: fix eval

Environment variables must be strings, booleans or integers.
---
 pkgs/by-name/wi/wiredtiger/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/wi/wiredtiger/package.nix b/pkgs/by-name/wi/wiredtiger/package.nix
index af3623f00816..def3c54cbb56 100644
--- a/pkgs/by-name/wi/wiredtiger/package.nix
+++ b/pkgs/by-name/wi/wiredtiger/package.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib")
   ];
 
-  env.NIX_CFLAGS_COMPILE = [ "-Wno-array-bounds" ];
+  env.NIX_CFLAGS_COMPILE = "-Wno-array-bounds";
 
   passthru.updateScript = nix-update-script { };
 

From 1741ab86f62e121265f2b84bdca0a67439bb7236 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Apr 2026 10:45:05 +0000
Subject: [PATCH 46/77] air-formatter: 0.8.2 -> 0.9.0

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

diff --git a/pkgs/by-name/ai/air-formatter/package.nix b/pkgs/by-name/ai/air-formatter/package.nix
index 9394712f43e6..14ea7346f1d0 100644
--- a/pkgs/by-name/ai/air-formatter/package.nix
+++ b/pkgs/by-name/ai/air-formatter/package.nix
@@ -7,16 +7,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "air-formatter";
-  version = "0.8.2";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "posit-dev";
     repo = "air";
     tag = finalAttrs.version;
-    hash = "sha256-wxHq1/8gd0T9Q8mAtkCGbFb3EiyeMBqg1anafuTfchM=";
+    hash = "sha256-9itu/coUlYNdH2go1AmMff1pMozv6nGeOEZKTwBqA8M=";
   };
 
-  cargoHash = "sha256-7wq5Qal2/6yZ3TFH/Nw4jKbGS1MqGbNMGB6v7qdLPOQ=";
+  cargoHash = "sha256-R7rUXx+I1bmdP6fvbXyKulaWQZQxBcngJihCg0SVFY0=";
 
   useNextest = true;
 

From 8215a59a89cea0805d642acbdae38e867fa6b1d9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Apr 2026 10:48:13 +0000
Subject: [PATCH 47/77] libretro.pcsx-rearmed: 0-unstable-2026-03-21 ->
 0-unstable-2026-04-02

---
 pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix b/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix
index 5e5081b0090f..6cb3bc5ee28a 100644
--- a/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix
+++ b/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "pcsx-rearmed";
-  version = "0-unstable-2026-03-21";
+  version = "0-unstable-2026-04-02";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "pcsx_rearmed";
-    rev = "80bc0e4784e8e8ce98c02f6802484577f28be3cc";
-    hash = "sha256-GIqbWH48snEbiiZKVk2z7H8QXZZwvkAHJxGBHwAJJts=";
+    rev = "c1e885c71f24204a919e3bc40735497ccf541f0d";
+    hash = "sha256-mJY9kngb/YsClAJFhsc6tHl857k2/MOHP/oWaltg+so=";
   };
 
   dontConfigure = true;

From 2b206b69b83b0ca3d1129912e0c8dbd2299647bc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Apr 2026 11:09:55 +0000
Subject: [PATCH 48/77] python3Packages.gitlike-commands: 0.3.0 -> 0.3.1

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

diff --git a/pkgs/development/python-modules/gitlike-commands/default.nix b/pkgs/development/python-modules/gitlike-commands/default.nix
index e1fb2f8d298d..cdb77ac46541 100644
--- a/pkgs/development/python-modules/gitlike-commands/default.nix
+++ b/pkgs/development/python-modules/gitlike-commands/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "gitlike-commands";
-  version = "0.3.0";
+  version = "0.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "unixorn";
     repo = "gitlike-commands";
     tag = "v${version}";
-    hash = "sha256-Z0l8nCKov1iMJvI3YTHvg0ey+oPju3rgaKtmk6OX44g=";
+    hash = "sha256-7z6JJgTbELWor8GodtWRg51/oeakLcb9rAdT6K0/JQs=";
   };
 
   nativeBuildInputs = [ poetry-core ];

From 5adec710c9560066d9c64b10665ba8252b215ed0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Apr 2026 11:40:09 +0000
Subject: [PATCH 49/77] biome: 2.4.9 -> 2.4.10

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

diff --git a/pkgs/by-name/bi/biome/package.nix b/pkgs/by-name/bi/biome/package.nix
index 19f4a9df36eb..321dd7818967 100644
--- a/pkgs/by-name/bi/biome/package.nix
+++ b/pkgs/by-name/bi/biome/package.nix
@@ -11,16 +11,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "biome";
-  version = "2.4.9";
+  version = "2.4.10";
 
   src = fetchFromGitHub {
     owner = "biomejs";
     repo = "biome";
     rev = "@biomejs/biome@${finalAttrs.version}";
-    hash = "sha256-Fv+jqgwI4UZNwsy5oC+ekXmnJpIqIXWY+ttRbIu+lQg=";
+    hash = "sha256-DIXPYPqJEjQMiSqP+ww58FX2G6ePFOW6xW0chtumbgs=";
   };
 
-  cargoHash = "sha256-vU7yFXNx3r0aCDdMVra1omo+HgK5OwCohgbjyP3Q5VI=";
+  cargoHash = "sha256-gXfu4P15zeqC+8PrGytp2/IUcqtD0vh1E/UYYM70+RI=";
 
   nativeBuildInputs = [ pkg-config ];
 

From bc14efb91b62907880a6d09733e491de79add216 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 4 Apr 2026 14:17:02 +0200
Subject: [PATCH 50/77] python3Packages.iamdata: 0.1.202604031 -> 0.1.202604041

Diff: https://github.com/cloud-copilot/iam-data-python/compare/v0.1.202604031...v0.1.202604041

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

diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix
index e39e11a3375a..369bf8ca9f65 100644
--- a/pkgs/development/python-modules/iamdata/default.nix
+++ b/pkgs/development/python-modules/iamdata/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "iamdata";
-  version = "0.1.202604031";
+  version = "0.1.202604041";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cloud-copilot";
     repo = "iam-data-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-shYdMojdoqfMgJbYYEEGLGb+G8ueKaDfZy/h7tccBRc=";
+    hash = "sha256-nFV0iZr01YkjAFXjkYmgFHuUNhGsX2pHjSiRrlyt6uI=";
   };
 
   __darwinAllowLocalNetworking = true;

From 878a3872407b441968f629b4565ad2e6b767f434 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sat, 4 Apr 2026 13:16:54 +0200
Subject: [PATCH 51/77] lib.systems.equals: optimize removeFunctions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Replace filterAttrs + lib.isFunction with removeAttrs + builtins.filter
+ builtins.isFunction. System attrs are never __functor-style attrsets,
so lib.isFunction's wrapper is unnecessary overhead. The double negation
(!pred ∘ !isFunction) also cancels out.

NIX_SHOW_STATS delta on hello.drvPath:

  nrFunctionCalls:  229,883 -> 154,411   (-32.8%)
  envs.number:      250,215 -> 174,743   (-30.2%)
  envs.bytes:         4.6M -> 3.4M       (-26.4%)
  nrAvoided:        291,314 -> 216,054   (-25.8%)
  gc.totalBytes:     49.7M -> 48.5M      (-2.4%)

Repro:

  NIX_SHOW_STATS=1 nix-instantiate --eval \
    -E '(import ./. {}).hello.drvPath' 2>stats.json >/dev/null
  jq . stats.json
---
 lib/systems/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index 5de640da8697..bc1efee548bb 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -43,7 +43,9 @@ let
   */
   equals =
     let
-      removeFunctions = a: filterAttrs (_: v: !isFunction v) a;
+      # perf: avoid lib.isFunction because system attrs are never __functor-style attrsets.
+      removeFunctions =
+        a: removeAttrs a (builtins.filter (n: builtins.isFunction a.${n}) (builtins.attrNames a));
     in
     a: b: removeFunctions a == removeFunctions b;
 

From 078d318015e741c35113686a241e7bb4bbd825ea Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 4 Apr 2026 14:20:14 +0200
Subject: [PATCH 52/77] python3Packages.gitlike-commands: modernize

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

diff --git a/pkgs/development/python-modules/gitlike-commands/default.nix b/pkgs/development/python-modules/gitlike-commands/default.nix
index cdb77ac46541..6452f756120f 100644
--- a/pkgs/development/python-modules/gitlike-commands/default.nix
+++ b/pkgs/development/python-modules/gitlike-commands/default.nix
@@ -5,7 +5,7 @@
   poetry-core,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "gitlike-commands";
   version = "0.3.1";
   pyproject = true;
@@ -13,11 +13,11 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "unixorn";
     repo = "gitlike-commands";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-7z6JJgTbELWor8GodtWRg51/oeakLcb9rAdT6K0/JQs=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ poetry-core ];
 
   # Module has no real tests
   doCheck = false;
@@ -27,8 +27,8 @@ buildPythonPackage rec {
   meta = {
     description = "Easy python module for creating git-style subcommand handling";
     homepage = "https://github.com/unixorn/gitlike-commands";
-    changelog = "https://github.com/unixorn/gitlike-commands/releases/tag/v${version}";
+    changelog = "https://github.com/unixorn/gitlike-commands/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

From 63db781937e352ba949d61b5830d4dfa825666cb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 4 Apr 2026 14:22:13 +0200
Subject: [PATCH 53/77] python3Packages.lightwave2: modernize

---
 .../python-modules/lightwave2/default.nix           | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/lightwave2/default.nix b/pkgs/development/python-modules/lightwave2/default.nix
index 38423fd7f0d7..a213718d45d7 100644
--- a/pkgs/development/python-modules/lightwave2/default.nix
+++ b/pkgs/development/python-modules/lightwave2/default.nix
@@ -3,19 +3,22 @@
   aiohttp,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "lightwave2";
   version = "0.9.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-7NFzfUDIDa36VfOsqcaAx8AbWHftfwTyYr0hu6VyAtI=";
   };
 
-  propagatedBuildInputs = [ aiohttp ];
+  build-system = [ setuptools ];
+
+  dependencies = [ aiohttp ];
 
   # Module has no tests
   doCheck = false;
@@ -28,4 +31,4 @@ buildPythonPackage rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

From 5e319301e101c48842a94cdd271cee7ced4f7778 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 4 Apr 2026 14:31:57 +0200
Subject: [PATCH 54/77] python3Packages.biothings-client: migrate to finalAttrs

---
 .../python-modules/biothings-client/default.nix       | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/biothings-client/default.nix b/pkgs/development/python-modules/biothings-client/default.nix
index 2f0bf7566db9..c0a2f837de19 100644
--- a/pkgs/development/python-modules/biothings-client/default.nix
+++ b/pkgs/development/python-modules/biothings-client/default.nix
@@ -7,7 +7,8 @@
   pytestCheckHook,
   pytest-asyncio,
 }:
-buildPythonPackage rec {
+
+buildPythonPackage (finalAttrs: {
   pname = "biothings-client";
   version = "0.5.0";
   pyproject = true;
@@ -15,12 +16,14 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "biothings";
     repo = "biothings_client.py";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-SG664xpajbLLTRfqanqYJhKdZqAOXPTDNBcfCAdlZ5M=";
   };
 
   build-system = [ setuptools ];
+
   dependencies = [ httpx ];
+
   pythonImportsCheck = [ "biothings_client" ];
 
   nativeCheckInputs = [
@@ -41,10 +44,10 @@ buildPythonPackage rec {
   ];
 
   meta = {
-    changelog = "https://github.com/biothings/biothings_client.py/blob/${src.tag}/CHANGES.txt";
+    changelog = "https://github.com/biothings/biothings_client.py/blob/${finalAttrs.src.tag}/CHANGES.txt";
     description = "Wrapper to access Biothings.api-based backend services";
     homepage = "https://github.com/biothings/biothings_client.py";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ rayhem ];
   };
-}
+})

From dab66585b7211a401ed46618da3cbd38562c12f9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 4 Apr 2026 14:33:53 +0200
Subject: [PATCH 55/77] frigate: provide keras dependency

Frigate imports tensorflow.keras which is an indirection for keras, but
our tensorflow version does not depend on keras.

Closes: #506591
---
 pkgs/by-name/fr/frigate/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/fr/frigate/package.nix b/pkgs/by-name/fr/frigate/package.nix
index 8db02d035474..8cb605a69061 100644
--- a/pkgs/by-name/fr/frigate/package.nix
+++ b/pkgs/by-name/fr/frigate/package.nix
@@ -165,6 +165,7 @@ python3Packages.buildPythonApplication rec {
     importlib-metadata
     importlib-resources
     joserfc
+    keras # via tensorflow.keras
     librosa
     markupsafe
     memray

From 2976649b9a1233534e3a8825506948fe8a2ceb2f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 4 Apr 2026 14:46:42 +0200
Subject: [PATCH 56/77] python3Packages.mypy-boto3-imagebuilder: 1.42.45 ->
 1.42.83

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 64e3be3047f5..72d325d4f8d7 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -610,8 +610,8 @@ in
       "sha256-rb8qotqFW+ZcesRS0TUl+NMsrOS7CTQosZ633jSE38k=";
 
   mypy-boto3-imagebuilder =
-    buildMypyBoto3Package "imagebuilder" "1.42.45"
-      "sha256-q8toJ7n/MSEt+w/n21rBEXHV7JAMJEno32RBmznPcKY=";
+    buildMypyBoto3Package "imagebuilder" "1.42.83"
+      "sha256-SKqhvfHPmhOOYLnr7LkTClB2lB/3iQHqcefbsVsvk60=";
 
   mypy-boto3-importexport =
     buildMypyBoto3Package "importexport" "1.42.3"

From 8b9c2da254d6823abebb647dba0764f5d8848b8f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 4 Apr 2026 14:46:56 +0200
Subject: [PATCH 57/77] python3Packages.mypy-boto3-lightsail: 1.42.74 ->
 1.42.83

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 72d325d4f8d7..943b3c2843c3 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -798,8 +798,8 @@ in
       "sha256-Ru2IODClBpjyDb8JNzBJi9LPY12mg46dpSBz182qkuI=";
 
   mypy-boto3-lightsail =
-    buildMypyBoto3Package "lightsail" "1.42.74"
-      "sha256-DdvGA4L+J/aHyJpq2nqK6uov0A4j212h6lMk3gtVu+s=";
+    buildMypyBoto3Package "lightsail" "1.42.83"
+      "sha256-FymSFD0/M7ncv1p6hiFxGrWQL70X65mrUF9JBHlbv9M=";
 
   mypy-boto3-location =
     buildMypyBoto3Package "location" "1.42.3"

From 55faebf1742fd395c8126fb3a53398599742eca4 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 4 Apr 2026 14:46:58 +0200
Subject: [PATCH 58/77] python3Packages.mypy-boto3-logs: 1.42.82 -> 1.42.83

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 943b3c2843c3..c2f577572e9a 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -806,8 +806,8 @@ in
       "sha256-VGQzgnrUynTDjfYpEk+FR+PrljbULl0UpbeqbaPKqSc=";
 
   mypy-boto3-logs =
-    buildMypyBoto3Package "logs" "1.42.82"
-      "sha256-xZxyCo7+tTU69IfNy2p6ECx+fXI9CsnAx8V9neRB818=";
+    buildMypyBoto3Package "logs" "1.42.83"
+      "sha256-dtYr9gkww6brHLUoQd7ew0yc59XqyZjczJL94ivt2bk=";
 
   mypy-boto3-lookoutequipment =
     buildMypyBoto3Package "lookoutequipment" "1.42.3"

From ca9c904ce1fcc8905289a5260267f0c5ea4fb5e7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 4 Apr 2026 14:47:03 +0200
Subject: [PATCH 59/77] python3Packages.mypy-boto3-medialive: 1.42.68 ->
 1.42.83

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index c2f577572e9a..62b8b7451396 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -862,8 +862,8 @@ in
       "sha256-+Dgo1XpVUPmmUntpzFlPDeym6xUxRiXZki1j5ieS3CU=";
 
   mypy-boto3-medialive =
-    buildMypyBoto3Package "medialive" "1.42.68"
-      "sha256-J9NnMG0prpzU+1dNQcH396UcZ0tCoNCbRXqVI42Qfz0=";
+    buildMypyBoto3Package "medialive" "1.42.83"
+      "sha256-FmfFTQiciHHNheumvBOAXoBYVNfMp8owUndvr7n1JHs=";
 
   mypy-boto3-mediapackage =
     buildMypyBoto3Package "mediapackage" "1.42.3"

From b00ee9a5d1f4f58d6eae43981d4558f4e636d2c0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 4 Apr 2026 14:47:12 +0200
Subject: [PATCH 60/77] python3Packages.mypy-boto3-organizations: 1.42.80 ->
 1.42.83

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 62b8b7451396..f191ab8b4abf 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -982,8 +982,8 @@ in
       "sha256-JEuEjo0htTuDCZx2nNJK2Zq59oSUqkMf4BrNamerfVk=";
 
   mypy-boto3-organizations =
-    buildMypyBoto3Package "organizations" "1.42.80"
-      "sha256-9buhdZaiVVK4dCg0tfFce1w8XVIpXnynAAkBwLgCDCU=";
+    buildMypyBoto3Package "organizations" "1.42.83"
+      "sha256-sQqxy9tcynLqyBfXS4+FOgAcIQsttj8hiRf+GFK+tHE=";
 
   mypy-boto3-osis =
     buildMypyBoto3Package "osis" "1.42.3"

From 3c1fc3523ff74ab45d2d733280f9436784a05292 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 4 Apr 2026 14:47:14 +0200
Subject: [PATCH 61/77] python3Packages.mypy-boto3-payment-cryptography:
 1.42.12 -> 1.42.83

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index f191ab8b4abf..57862d1b0637 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -998,8 +998,8 @@ in
       "sha256-ynBHsnTvNz9G8sM9d88RI31ZMl0UzBgIz3ONEsJ+aHA=";
 
   mypy-boto3-payment-cryptography =
-    buildMypyBoto3Package "payment-cryptography" "1.42.12"
-      "sha256-MpksWgEGbXdbgF2r6CKcEZif7zzFNqmLrsbvETJAAXc=";
+    buildMypyBoto3Package "payment-cryptography" "1.42.83"
+      "sha256-TpWy7EJGmqSb3u2+/5TPaAMjTOCtcuyEVJh48ADuxm8=";
 
   mypy-boto3-payment-cryptography-data =
     buildMypyBoto3Package "payment-cryptography-data" "1.42.12"

From 5cfce990dfbae9bd2a185702016a99e72b3ad2ac Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 4 Apr 2026 14:47:53 +0200
Subject: [PATCH 62/77] python314Packages.boto3-stubs: 1.42.82 -> 1.42.83

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

diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix
index 81433f0db473..08b1c38ba506 100644
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@@ -358,13 +358,13 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "boto3-stubs";
-  version = "1.42.82";
+  version = "1.42.83";
   pyproject = true;
 
   src = fetchPypi {
     pname = "boto3_stubs";
     inherit (finalAttrs) version;
-    hash = "sha256-m5hsmOXjHtdhNpeg2dSryLEP7pbWitneosJw3hMFi6k=";
+    hash = "sha256-HsvYj0rjV2S56jV5yh6FG2fqCnOkQstAbeJ3/BR42us=";
   };
 
   build-system = [ setuptools ];

From a88f576b95978246d64798bd74094bd46fa90cd4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Apr 2026 13:12:36 +0000
Subject: [PATCH 63/77] libretro.stella: 0-unstable-2026-03-25 ->
 0-unstable-2026-04-04

---
 pkgs/applications/emulators/libretro/cores/stella.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/stella.nix b/pkgs/applications/emulators/libretro/cores/stella.nix
index c8b913447af7..3f929f869075 100644
--- a/pkgs/applications/emulators/libretro/cores/stella.nix
+++ b/pkgs/applications/emulators/libretro/cores/stella.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "stella";
-  version = "0-unstable-2026-03-25";
+  version = "0-unstable-2026-04-04";
 
   src = fetchFromGitHub {
     owner = "stella-emu";
     repo = "stella";
-    rev = "65631824500f8764ee3da726f5f24cb06d243b60";
-    hash = "sha256-Qrr19OF6YGfvOAIBS0Irhfl4VYVFfA20ZNGIJoKboNE=";
+    rev = "1a09c51e639d44bd821a598a095c5d3f6776590e";
+    hash = "sha256-qEEE7QMTDwVFMB/6dmTq8VsOQ9qwYky8SBGD0KppqTs=";
   };
 
   makefile = "Makefile";

From 0e9e7de81eedaab584de143f4d200c4829f0b9a2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 29 Jan 2026 22:50:23 +0100
Subject: [PATCH 64/77] python314Packages.mozart-api: migrate to finalAttrs

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

diff --git a/pkgs/development/python-modules/mozart-api/default.nix b/pkgs/development/python-modules/mozart-api/default.nix
index 0e5cdee4e574..105d1a22ac13 100644
--- a/pkgs/development/python-modules/mozart-api/default.nix
+++ b/pkgs/development/python-modules/mozart-api/default.nix
@@ -16,14 +16,14 @@
   zeroconf,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "mozart-api";
   version = "5.3.1.108.2";
   pyproject = true;
 
   src = fetchPypi {
     pname = "mozart_api";
-    inherit version;
+    inherit (finalAttrs) version;
     hash = "sha256-ilUSGgc4m6iMBUuSI7qt7c4DAE8cOPTzLGeQ4JQAB8U=";
   };
 
@@ -50,8 +50,8 @@ buildPythonPackage rec {
   meta = {
     description = "REST API for the Bang & Olufsen Mozart platform";
     homepage = "https://github.com/bang-olufsen/mozart-open-api";
-    changelog = "https://github.com/bang-olufsen/mozart-open-api/releases/tag/${version}";
+    changelog = "https://github.com/bang-olufsen/mozart-open-api/releases/tag/${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = [ ];
   };
-}
+})

From 1266aa38aa83f9a7f266c205e2ea6db904525866 Mon Sep 17 00:00:00 2001
From: Stephane <stephane@github.no-sp.am>
Date: Sat, 4 Apr 2026 15:13:32 +0200
Subject: [PATCH 65/77] ollama: 0.20.0 -> 0.20.2

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

diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix
index e2b7c03d1d0e..9aa37a88d9dc 100644
--- a/pkgs/by-name/ol/ollama/package.nix
+++ b/pkgs/by-name/ol/ollama/package.nix
@@ -94,7 +94,7 @@ let
 
   cudaToolkit = buildEnv {
     # ollama hardcodes the major version in the Makefile to support different variants.
-    # - https://github.com/ollama/ollama/blob/v0.19.0/CMakePresets.json#L21-L47
+    # - https://github.com/ollama/ollama/blob/v0.20.2/CMakePresets.json#L21-L47
     name = "cuda-merged-${cudaMajorVersion}";
     paths = map lib.getLib cudaLibs ++ [
       (lib.getOutput "static" cudaPackages.cuda_cudart)
@@ -140,13 +140,13 @@ let
 in
 goBuild (finalAttrs: {
   pname = "ollama";
-  version = "0.20.0";
+  version = "0.20.2";
 
   src = fetchFromGitHub {
     owner = "ollama";
     repo = "ollama";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-QQKPXdXlsT+uMGGIyqkVZqk6OTa7VHrwDVmgDdgdKOY=";
+    hash = "sha256-Ic3eLOohLR7MQGkLvDJBNOCiBBKxh6l8X9MgK0b4w+Y=";
   };
 
   vendorHash = "sha256-Lc1Ktdqtv2VhJQssk8K1UOimeEjVNvDWePE9WkamCos=";
@@ -232,7 +232,7 @@ goBuild (finalAttrs: {
     '';
 
   # ollama looks for acceleration libs in ../lib/ollama/ (now also for CPU-only with arch specific optimizations)
-  # https://github.com/ollama/ollama/blob/v0.19.0/docs/development.md#library-detection
+  # https://github.com/ollama/ollama/blob/v0.20.2/docs/development.md#library-detection
   postInstall = ''
     mkdir -p $out/lib
     cp -r build/lib/ollama $out/lib/

From d0e55e676e4f5010bc903e089277d65906f153cf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Apr 2026 13:48:45 +0000
Subject: [PATCH 66/77] python3Packages.llama-index-workflows: 2.16.1 -> 2.17.1

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

diff --git a/pkgs/development/python-modules/llama-index-workflows/default.nix b/pkgs/development/python-modules/llama-index-workflows/default.nix
index b5abca8952dd..4d206c01dfcb 100644
--- a/pkgs/development/python-modules/llama-index-workflows/default.nix
+++ b/pkgs/development/python-modules/llama-index-workflows/default.nix
@@ -10,13 +10,13 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "llama-index-workflows";
-  version = "2.16.1";
+  version = "2.17.1";
   pyproject = true;
 
   src = fetchPypi {
     pname = "llama_index_workflows";
     inherit (finalAttrs) version;
-    hash = "sha256-L2viI69AcITu8GS8vsj2CuTdAR2aBGMYh86YYlj6xYo=";
+    hash = "sha256-xi+r5QnPAAPd/lsrJ/SLNEPHyahOnNyQTG+e1fjL4l0=";
   };
 
   postPatch = ''

From 58aaf4cf07b288b8fb64bdb8e41e04a4d600bb50 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 5 Mar 2026 10:06:21 -0600
Subject: [PATCH 67/77] neothesia: 0.3.1 -> 0.4.0, fix edge case test

---
 pkgs/by-name/ne/neothesia/package.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ne/neothesia/package.nix b/pkgs/by-name/ne/neothesia/package.nix
index 3d4656723b89..9aa6d9eb1dde 100644
--- a/pkgs/by-name/ne/neothesia/package.nix
+++ b/pkgs/by-name/ne/neothesia/package.nix
@@ -13,18 +13,26 @@
   libxi,
   libxcursor,
   libx11,
+  fetchpatch,
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "neothesia";
-  version = "0.3.1";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "PolyMeilex";
     repo = "Neothesia";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-qYwBSye6RYClSlWmHwuy/rxq9w5932tR33Z+o2S1l8k=";
+    hash = "sha256-5DuyWuDJ08S12C3OWhC9mLhQvPCfWMdJCRUOWtKq/+k=";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/PolyMeilex/Neothesia/commit/c450689134e5e767293ae9a4878a0396e585259b.patch";
+      hash = "sha256-A7GuaEHIfSFrvS1SCBWGCuh3rvb2gaaw8dQ970f6u2Y=";
+    })
+  ];
+
   buildInputs = [
     ffmpeg_7
     alsa-lib
@@ -36,7 +44,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     rustPlatform.bindgenHook
   ];
 
-  cargoHash = "sha256-mXeNAVYqPsBWiUZFV/atx/xjLgFNarm2HwI7k/NaAbc=";
+  cargoHash = "sha256-gX9DlgPgrM8KukX3auxbBKpJq7QG4+kRhHSUk3eQjAQ=";
 
   cargoBuildFlags = [
     "-p neothesia -p neothesia-cli"

From 799404675215d5be2df5b29a42a17a8628c21efb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 4 Apr 2026 15:47:30 +0200
Subject: [PATCH 68/77] sshm: migrate to finalAttrs

---
 pkgs/by-name/ss/sshm/package.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ss/sshm/package.nix b/pkgs/by-name/ss/sshm/package.nix
index c0a4ee336dae..a2c9da5b053d 100644
--- a/pkgs/by-name/ss/sshm/package.nix
+++ b/pkgs/by-name/ss/sshm/package.nix
@@ -4,33 +4,34 @@
   fetchFromGitHub,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "sshm";
   version = "1.10.0";
 
   src = fetchFromGitHub {
     owner = "Gu1llaum-3";
     repo = "sshm";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-tDaRRZXj0XJ8XpCxs2b6Bm3qvfcE8t9CfR3mxuOrPDM=";
   };
 
   vendorHash = "sha256-aU/+bxcETs/Jq5FVAdiioyuc1AufvWeiqFQ7uo1cK1k=";
 
   subPackages = [ "." ];
+
   ldflags = [
     "-s"
     "-w"
-    "-X=github.com/Gu1llaum-3/sshm/cmd.AppVersion=${version}"
+    "-X=github.com/Gu1llaum-3/sshm/cmd.AppVersion=${finalAttrs.version}"
   ];
 
   meta = {
     description = "Terminal UI to manage and connect to SSH hosts";
-    mainProgram = "sshm";
     homepage = "https://github.com/Gu1llaum-3/sshm";
-    changelog = "https://github.com/Gu1llaum-3/sshm/releases/tag/${version}";
+    changelog = "https://github.com/Gu1llaum-3/sshm/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ cedev-1 ];
+    mainProgram = "sshm";
   };
-}
+})

From af162f612dc5004ef548d7e0542de6fdf592d865 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 4 Apr 2026 16:13:14 +0200
Subject: [PATCH 69/77] sshm: 1.10.0 -> 1.11.0

Diff: https://github.com/Gu1llaum-3/sshm/compare/v1.10.0...v1.11.0

Changelog: https://github.com/Gu1llaum-3/sshm/releases/tag/v1.11.0
---
 pkgs/by-name/ss/sshm/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ss/sshm/package.nix b/pkgs/by-name/ss/sshm/package.nix
index a2c9da5b053d..d62414c86a2c 100644
--- a/pkgs/by-name/ss/sshm/package.nix
+++ b/pkgs/by-name/ss/sshm/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "sshm";
-  version = "1.10.0";
+  version = "1.11.0";
 
   src = fetchFromGitHub {
     owner = "Gu1llaum-3";
     repo = "sshm";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tDaRRZXj0XJ8XpCxs2b6Bm3qvfcE8t9CfR3mxuOrPDM=";
+    hash = "sha256-eqObVdyfGAD+kiIvRZZOHPVtFzYnGztVn2odsE+voLI=";
   };
 
   vendorHash = "sha256-aU/+bxcETs/Jq5FVAdiioyuc1AufvWeiqFQ7uo1cK1k=";

From 5b03d61af052330c9ab30cdde2c7f8d24386f2e4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Apr 2026 14:46:58 +0000
Subject: [PATCH 70/77] avdl: 0.1.7+1.12.1 -> 0.1.8+1.12.1

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

diff --git a/pkgs/by-name/av/avdl/package.nix b/pkgs/by-name/av/avdl/package.nix
index b0462db08ba7..a9a20ec96ab6 100644
--- a/pkgs/by-name/av/avdl/package.nix
+++ b/pkgs/by-name/av/avdl/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "avdl";
-  version = "0.1.7+1.12.1";
+  version = "0.1.8+1.12.1";
 
   src = fetchFromGitHub {
     owner = "jonhoo";
     repo = "avdl";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-hqZt+3Bewr4+0Uh4u0pXErcLzlmL1AY4Gq41WNnQNN8=";
+    hash = "sha256-NQ0IUC51tKfcREQRQLjdxj8+TKw/I2yRMlNIcG158aM=";
     fetchSubmodules = true;
   };
 
-  cargoHash = "sha256-B0TAJHTrpDT6C57FAc9wqgyA3kkI77P2RzrInQluR2M=";
+  cargoHash = "sha256-8GoS31OxpvtWfT+DcHIa6a6+YlrhmO/YkV7YSd2vrd4=";
 
   meta = {
     description = "Rust port of avro-tools' IDL tooling";

From 6f59c45cec7bc6ee3026d45a0ebb2a0da74f1112 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Apr 2026 14:55:31 +0000
Subject: [PATCH 71/77] libretro.np2kai: 0-unstable-2026-03-26 ->
 0-unstable-2026-04-01

---
 pkgs/applications/emulators/libretro/cores/np2kai.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/np2kai.nix b/pkgs/applications/emulators/libretro/cores/np2kai.nix
index 111845899807..adbadf5e6914 100644
--- a/pkgs/applications/emulators/libretro/cores/np2kai.nix
+++ b/pkgs/applications/emulators/libretro/cores/np2kai.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore rec {
   core = "np2kai";
-  version = "0-unstable-2026-03-26";
+  version = "0-unstable-2026-04-01";
 
   src = fetchFromGitHub {
     owner = "AZO234";
     repo = "NP2kai";
-    rev = "bcde7400f921abfadf6cb3b6e02458d48ee7be09";
-    hash = "sha256-5Oh1SfZsW1MkAy+X155799aG8TjHX/v+cbuD+bvosOA=";
+    rev = "cbadd7572e0b13de0c0c011a86758ca4dc4a74ae";
+    hash = "sha256-4p5SpXgGzfj2lc+0yAgwrRLDkYWrIkZi+XREQpNhdKA=";
     fetchSubmodules = true;
   };
 

From 68e77efe98d409641a4e25266914d225cd879798 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Sat, 4 Apr 2026 08:21:09 -0700
Subject: [PATCH 72/77] devenv: fix build with lowdown 3.0

The devenv nix fork (2.32-based) uses LOWDOWN_TERM_NORELLINK which was
removed in lowdown 3.0. Apply the upstream compatibility patch via
applyPatches to avoid the +N version suffix that appendPatches adds,
which breaks devenv's nix-bindings-store build script.
---
 pkgs/by-name/de/devenv/package.nix | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/de/devenv/package.nix b/pkgs/by-name/de/devenv/package.nix
index 170f35405d86..7611f1780f6d 100644
--- a/pkgs/by-name/de/devenv/package.nix
+++ b/pkgs/by-name/de/devenv/package.nix
@@ -2,6 +2,8 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
+  applyPatches,
   gitMinimal,
   makeBinaryWrapper,
   installShellFiles,
@@ -27,18 +29,30 @@ let
   devenvNixVersion = "2.32";
   devenvNixRev = "e127c1c94cefe02d8ca4cca79ef66be4c527510e";
 
-  nix_components =
-    (nixVersions.nixComponents_git.overrideSource (fetchFromGitHub {
+  devenvNixSrc = applyPatches {
+    name = "devenv-nix-${devenvNixVersion}-source";
+    src = fetchFromGitHub {
       owner = "cachix";
       repo = "nix";
       rev = devenvNixRev;
       hash = "sha256-MRNVInSmvhKIg3y0UdogQJXe+omvKijGszFtYpd5r9k=";
-    })).overrideScope
-      (
-        finalScope: prevScope: {
-          version = devenvNixVersion;
-        }
-      );
+    };
+    patches = [
+      # Lowdown 3.0 compatibility; devenv's nix fork (2.32-based) predates
+      # the upstream fix.
+      (fetchpatch {
+        name = "nix-lowdown-3.0-support.patch";
+        url = "https://github.com/NixOS/nix/commit/472c35c561bd9e8db1465e0677f1efe2cb88c568.patch";
+        hash = "sha256-ZCQgI/euBN8t9rgdCsGRgrcEWG3T5MUc+bQc4tIcHuI=";
+      })
+    ];
+  };
+
+  nix_components = (nixVersions.nixComponents_git.overrideSource devenvNixSrc).overrideScope (
+    finalScope: prevScope: {
+      version = devenvNixVersion;
+    }
+  );
 in
 rustPlatform.buildRustPackage {
   pname = "devenv";

From b1e838275f93e4312a54d48a3f976ffd863e2dcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?=
 =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= <toastal@posteo.net>
Date: Wed, 1 Apr 2026 17:38:35 +0700
Subject: [PATCH 73/77] =?UTF-8?q?nixtamal:=201.3.0=20=E2=86=92=201.4.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/by-name/ni/nixtamal/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ni/nixtamal/package.nix b/pkgs/by-name/ni/nixtamal/package.nix
index 30548ba467d0..41d3965c7319 100644
--- a/pkgs/by-name/ni/nixtamal/package.nix
+++ b/pkgs/by-name/ni/nixtamal/package.nix
@@ -18,7 +18,7 @@
 
 ocamlPackages.buildDunePackage (finalAttrs: {
   pname = "nixtamal";
-  version = "1.3.0";
+  version = "1.4.0";
   release_year = 2026;
 
   minimalOCamlVersion = "5.3";
@@ -27,7 +27,7 @@ ocamlPackages.buildDunePackage (finalAttrs: {
     url = "https://darcs.toastal.in.th/nixtamal/stable/";
     mirrors = [ "https://smeder.ee/~toastal/nixtamal.darcs" ];
     rev = finalAttrs.version;
-    hash = "sha256-fB7Rl3AGCMAwLfSegV2au9IvTZ7yNRjyS4YBBHU1pBQ=";
+    hash = "sha256-mHjz18wsJfF4Oww34uZ5CdNZirtz4bgcuj8YDUgZKyE=";
   };
 
   nativeBuildInputs = [
@@ -63,6 +63,7 @@ ocamlPackages.buildDunePackage (finalAttrs: {
     saturn
     stdint
     uri
+    xdg
   ];
 
   checkInputs = with ocamlPackages; [

From b6a57a032256730c6c7ef00e87df23105fe4262f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?=
 =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= <toastal@posteo.net>
Date: Sun, 5 Apr 2026 00:07:59 +0700
Subject: [PATCH 74/77] =?UTF-8?q?nixtamal:=201.4.0=20=E2=86=92=201.4.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/by-name/ni/nixtamal/package.nix b/pkgs/by-name/ni/nixtamal/package.nix
index 41d3965c7319..5db44d30f003 100644
--- a/pkgs/by-name/ni/nixtamal/package.nix
+++ b/pkgs/by-name/ni/nixtamal/package.nix
@@ -18,7 +18,7 @@
 
 ocamlPackages.buildDunePackage (finalAttrs: {
   pname = "nixtamal";
-  version = "1.4.0";
+  version = "1.4.1";
   release_year = 2026;
 
   minimalOCamlVersion = "5.3";
@@ -27,7 +27,7 @@ ocamlPackages.buildDunePackage (finalAttrs: {
     url = "https://darcs.toastal.in.th/nixtamal/stable/";
     mirrors = [ "https://smeder.ee/~toastal/nixtamal.darcs" ];
     rev = finalAttrs.version;
-    hash = "sha256-mHjz18wsJfF4Oww34uZ5CdNZirtz4bgcuj8YDUgZKyE=";
+    hash = "sha256-0iXSACRjdBkEV+9wfcKJhpzY3oArd66g/Dc30HcCbng=";
   };
 
   nativeBuildInputs = [

From a403d75b6f39360893af0e9b79697ba94806c558 Mon Sep 17 00:00:00 2001
From: Chloe A <chloe@sapphic.moe>
Date: Sat, 4 Apr 2026 22:10:48 +0500
Subject: [PATCH 75/77] maintainers: add SapphoSys

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 25a9eb1f0272..f7ab2dee4817 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -24059,6 +24059,12 @@
     email = "hey@sandydoo.me";
     matrix = "@sandydoo:matrix.org";
   };
+  SapphoSys = {
+    name = "Chloe";
+    github = "SapphoSys";
+    githubId = 22654782;
+    email = "contact@sapphic.moe";
+  };
   sarahec = {
     email = "seclark@nextquestion.net";
     github = "sarahec";

From 0caaf21e4eeb9223194c134abedeb65160860a21 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Apr 2026 17:25:07 +0000
Subject: [PATCH 76/77] oxlint: 1.57.0 -> 1.58.0

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

diff --git a/pkgs/by-name/ox/oxlint/package.nix b/pkgs/by-name/ox/oxlint/package.nix
index ae901d69ff7d..7e58138b2ce5 100644
--- a/pkgs/by-name/ox/oxlint/package.nix
+++ b/pkgs/by-name/ox/oxlint/package.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "oxlint";
-  version = "1.57.0";
+  version = "1.58.0";
 
   src = fetchFromGitHub {
     owner = "oxc-project";
     repo = "oxc";
     tag = "oxlint_v${finalAttrs.version}";
-    hash = "sha256-IMGrnOZlNmVDBlyWnXflm3G7A4w3uBWc9thOjTELmVs=";
+    hash = "sha256-FqKqLO31ej9NgBdcCjzVkgjlfMHV6RZMcHbdBVVwhHs=";
   };
 
-  cargoHash = "sha256-ptLprKpkyAx+5/13MsH6lpnF9gznhsWQbcdoCOiPSXQ=";
+  cargoHash = "sha256-OpMGS5+pTPZvfY2EMxQMTWrCHhnxUQb9kQC/pLvrZSY=";
 
   nativeBuildInputs = [
     cmake

From ba51b9e73a3b58e6a5fb1a19acac0d10a92f8f57 Mon Sep 17 00:00:00 2001
From: Chloe A <chloe@sapphic.moe>
Date: Sat, 4 Apr 2026 22:10:48 +0500
Subject: [PATCH 77/77] chiri: init at 0.8.0

---
 pkgs/by-name/ch/chiri/package.nix | 107 ++++++++++++++++++++++++++++++
 1 file changed, 107 insertions(+)
 create mode 100644 pkgs/by-name/ch/chiri/package.nix

diff --git a/pkgs/by-name/ch/chiri/package.nix b/pkgs/by-name/ch/chiri/package.nix
new file mode 100644
index 000000000000..335ab3719767
--- /dev/null
+++ b/pkgs/by-name/ch/chiri/package.nix
@@ -0,0 +1,107 @@
+{
+  lib,
+  stdenv,
+  rustPlatform,
+  fetchFromGitHub,
+
+  # build tools
+  cargo-tauri,
+  nodejs_22,
+  pnpmConfigHook,
+  pnpm_10,
+  fetchPnpmDeps,
+  pkg-config,
+  makeBinaryWrapper,
+  wrapGAppsHook4,
+
+  # Linux dependencies
+  glib-networking,
+  libayatana-appindicator,
+  openssl,
+  webkitgtk_4_1,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "chiri";
+  version = "0.8.0";
+
+  src = fetchFromGitHub {
+    owner = "SapphoSys";
+    repo = "chiri";
+    tag = "app-v${finalAttrs.version}";
+    hash = "sha256-VrENUwkItT+8C7JowoEfqjIX4RhThTm+4hntdm9ifVk=";
+  };
+
+  cargoHash = "sha256-2CDwuZiE4b5cBUPZs8l4pf9/FyvtSpRwNwQZ5gp85zc=";
+
+  pnpmDeps = fetchPnpmDeps {
+    inherit (finalAttrs) pname version src;
+    pnpm = pnpm_10;
+    hash = "sha256-z2AMfMYNEK4pmjlE5YXn1DRCGyIcOO0EWCFlhXSxwrU=";
+    fetcherVersion = 3;
+  };
+
+  nativeBuildInputs = [
+    cargo-tauri.hook
+    nodejs_22
+    pnpmConfigHook
+    pnpm_10
+    pkg-config
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    wrapGAppsHook4
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    makeBinaryWrapper
+  ];
+
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    glib-networking
+    libayatana-appindicator
+    webkitgtk_4_1
+  ];
+
+  cargoRoot = "src-tauri";
+  buildAndTestSubdir = "src-tauri";
+
+  postPatch =
+    lib.optionalString stdenv.hostPlatform.isLinux ''
+      for libappindicatorRs in $cargoDepsCopy/*/libappindicator-sys-*/src/lib.rs; do
+        if [[ -f "$libappindicatorRs" ]]; then
+          substituteInPlace "$libappindicatorRs" \
+            --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
+        fi
+      done
+    ''
+    + ''
+      substituteInPlace src-tauri/tauri.conf.json \
+        --replace-fail '"createUpdaterArtifacts": true' '"createUpdaterArtifacts": false'
+    '';
+
+  # This is needed since the signing keys are private, and are only used in CI during releases anyways. Regular users won't need this.
+  preBuild = ''
+    unset TAURI_SIGNING_PRIVATE_KEY
+    unset TAURI_SIGNING_PUBLIC_KEY
+    pnpm build
+  '';
+
+  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mkdir -p $out/bin
+    makeWrapper "$out/Applications/Chiri.app/Contents/MacOS/chiri" "$out/bin/chiri"
+  '';
+
+  doCheck = false;
+
+  meta = {
+    description = "Cross-platform CalDAV task management app";
+    homepage = "https://github.com/SapphoSys/chiri";
+    changelog = "https://github.com/SapphoSys/chiri/releases/tag/app-v${finalAttrs.version}";
+    license = lib.licenses.zlib;
+    maintainers = with lib.maintainers; [ SapphoSys ];
+    mainProgram = "chiri";
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+  };
+})