From 852ce9cee188078cd40c5aa222c9be241f0dbfac Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Fri, 27 Feb 2026 10:34:24 -0600
Subject: [PATCH 01/52] opl3bankeditor: migrate to by-name, hardcode values

---
 ...or-Look-for-system-installed-Rt-libs.patch |  0
 pkgs/by-name/op/opl3bankeditor/package.nix    | 69 +++++++++++++++++++
 pkgs/tools/audio/opl3bankeditor/default.nix   |  9 ---
 pkgs/top-level/all-packages.nix               |  1 -
 4 files changed, 69 insertions(+), 10 deletions(-)
 rename pkgs/{tools/audio => by-name/op}/opl3bankeditor/0001-opl3bankeditor-Look-for-system-installed-Rt-libs.patch (100%)
 create mode 100644 pkgs/by-name/op/opl3bankeditor/package.nix
 delete mode 100644 pkgs/tools/audio/opl3bankeditor/default.nix

diff --git a/pkgs/tools/audio/opl3bankeditor/0001-opl3bankeditor-Look-for-system-installed-Rt-libs.patch b/pkgs/by-name/op/opl3bankeditor/0001-opl3bankeditor-Look-for-system-installed-Rt-libs.patch
similarity index 100%
rename from pkgs/tools/audio/opl3bankeditor/0001-opl3bankeditor-Look-for-system-installed-Rt-libs.patch
rename to pkgs/by-name/op/opl3bankeditor/0001-opl3bankeditor-Look-for-system-installed-Rt-libs.patch
diff --git a/pkgs/by-name/op/opl3bankeditor/package.nix b/pkgs/by-name/op/opl3bankeditor/package.nix
new file mode 100644
index 000000000000..11d4b7005ee8
--- /dev/null
+++ b/pkgs/by-name/op/opl3bankeditor/package.nix
@@ -0,0 +1,69 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  dos2unix,
+  cmake,
+  pkg-config,
+  libsForQt5,
+  rtaudio,
+  rtmidi,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "opl3bankeditor";
+  version = "1.5.1";
+
+  src = fetchFromGitHub {
+    owner = "Wohlstand";
+    repo = "opl3bankeditor";
+    rev = "v${version}";
+    sha256 = "08krbxlxgmc7i2r2k6d6wgi0m6k8hh3j60xf21kz4kp023w613sa";
+  };
+
+  prePatch = ''
+    dos2unix CMakeLists.txt
+  '';
+
+  patches = [
+    ./0001-opl3bankeditor-Look-for-system-installed-Rt-libs.patch
+  ];
+
+  nativeBuildInputs = [
+    dos2unix
+    cmake
+    pkg-config
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    libsForQt5.qtbase
+    libsForQt5.qwt6_1
+    rtaudio
+    rtmidi
+  ];
+
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.2)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
+  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mkdir $out/{bin,Applications}
+    mv "OPL3 Bank Editor.app" $out/Applications/
+
+    install_name_tool -change {,${libsForQt5.qwt6_1}/lib/}libqwt.6.dylib "$out/Applications/OPL3 Bank Editor.app/Contents/MacOS/OPL3 Bank Editor"
+
+    ln -s "$out/Applications/OPL3 Bank Editor.app/Contents/MacOS/OPL3 Bank Editor" $out/bin/opl3_bank_editor
+  '';
+
+  meta = {
+    mainProgram = "opl3_bank_editor";
+    description = "Small cross-platform editor of the OPL3 FM banks of different formats";
+    homepage = src.meta.homepage;
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ OPNA2608 ];
+  };
+}
diff --git a/pkgs/tools/audio/opl3bankeditor/default.nix b/pkgs/tools/audio/opl3bankeditor/default.nix
deleted file mode 100644
index f905e01db3d7..000000000000
--- a/pkgs/tools/audio/opl3bankeditor/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-import ./common.nix {
-  pname = "opl3bankeditor";
-  chip = "OPL3";
-  version = "1.5.1";
-  sha256 = "08krbxlxgmc7i2r2k6d6wgi0m6k8hh3j60xf21kz4kp023w613sa";
-  extraPatches = [
-    ./0001-opl3bankeditor-Look-for-system-installed-Rt-libs.patch
-  ];
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b7fc449cbfe4..77f687aee159 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3180,7 +3180,6 @@ with pkgs;
 
   optifine = optifinePackages.optifine-latest;
 
-  opl3bankeditor = libsForQt5.callPackage ../tools/audio/opl3bankeditor { };
   opn2bankeditor = libsForQt5.callPackage ../tools/audio/opl3bankeditor/opn2bankeditor.nix { };
 
   p4c = callPackage ../development/compilers/p4c {

From d97f4dd2abe5ac658c820a8f154756ebe12d0bfd Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Fri, 27 Feb 2026 10:36:32 -0600
Subject: [PATCH 02/52] opl3bankeditor: modernize derivation, switch to
 finalAttrs

---
 pkgs/by-name/op/opl3bankeditor/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/op/opl3bankeditor/package.nix b/pkgs/by-name/op/opl3bankeditor/package.nix
index 11d4b7005ee8..52f3f6372e9d 100644
--- a/pkgs/by-name/op/opl3bankeditor/package.nix
+++ b/pkgs/by-name/op/opl3bankeditor/package.nix
@@ -10,15 +10,15 @@
   rtmidi,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "opl3bankeditor";
   version = "1.5.1";
 
   src = fetchFromGitHub {
     owner = "Wohlstand";
     repo = "opl3bankeditor";
-    rev = "v${version}";
-    sha256 = "08krbxlxgmc7i2r2k6d6wgi0m6k8hh3j60xf21kz4kp023w613sa";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-So9g+BDgTvJnEK4DIweEaJoK4uOmmSmyiIfV12lfeSI=";
   };
 
   prePatch = ''
@@ -61,9 +61,9 @@ stdenv.mkDerivation rec {
   meta = {
     mainProgram = "opl3_bank_editor";
     description = "Small cross-platform editor of the OPL3 FM banks of different formats";
-    homepage = src.meta.homepage;
+    homepage = "https://github.com/Wohlstand/opl3bankeditor";
     license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.all;
     maintainers = with lib.maintainers; [ OPNA2608 ];
   };
-}
+})

From 6f5cef5ce039aa6db2b65cb46e140720243ac1c5 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Fri, 27 Feb 2026 10:45:38 -0600
Subject: [PATCH 03/52] opn2bankeditor: migrate to by-name, hardcode values

---
 ...or-Look-for-system-installed-Rt-libs.patch |  0
 pkgs/by-name/op/opn2bankeditor/package.nix    | 69 +++++++++++++++++++
 .../audio/opl3bankeditor/opn2bankeditor.nix   |  9 ---
 pkgs/top-level/all-packages.nix               |  2 -
 4 files changed, 69 insertions(+), 11 deletions(-)
 rename pkgs/{tools/audio/opl3bankeditor => by-name/op/opn2bankeditor}/0001-opn2bankeditor-Look-for-system-installed-Rt-libs.patch (100%)
 create mode 100644 pkgs/by-name/op/opn2bankeditor/package.nix
 delete mode 100644 pkgs/tools/audio/opl3bankeditor/opn2bankeditor.nix

diff --git a/pkgs/tools/audio/opl3bankeditor/0001-opn2bankeditor-Look-for-system-installed-Rt-libs.patch b/pkgs/by-name/op/opn2bankeditor/0001-opn2bankeditor-Look-for-system-installed-Rt-libs.patch
similarity index 100%
rename from pkgs/tools/audio/opl3bankeditor/0001-opn2bankeditor-Look-for-system-installed-Rt-libs.patch
rename to pkgs/by-name/op/opn2bankeditor/0001-opn2bankeditor-Look-for-system-installed-Rt-libs.patch
diff --git a/pkgs/by-name/op/opn2bankeditor/package.nix b/pkgs/by-name/op/opn2bankeditor/package.nix
new file mode 100644
index 000000000000..8793b569a0b2
--- /dev/null
+++ b/pkgs/by-name/op/opn2bankeditor/package.nix
@@ -0,0 +1,69 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  dos2unix,
+  cmake,
+  pkg-config,
+  libsForQt5,
+  rtaudio,
+  rtmidi,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "opn2bankeditor";
+  version = "1.3";
+
+  src = fetchFromGitHub {
+    owner = "Wohlstand";
+    repo = "opn2bankeditor";
+    rev = "v${version}";
+    sha256 = "0niam6a6y57msbl0xj23g6l7gisv4a670q0k1zqfm34804532a32";
+  };
+
+  prePatch = ''
+    dos2unix CMakeLists.txt
+  '';
+
+  patches = [
+    ./0001-opn2bankeditor-Look-for-system-installed-Rt-libs.patch
+  ];
+
+  nativeBuildInputs = [
+    dos2unix
+    cmake
+    pkg-config
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    libsForQt5.qtbase
+    libsForQt5.qwt6_1
+    rtaudio
+    rtmidi
+  ];
+
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.2)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
+  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mkdir $out/{bin,Applications}
+    mv "OPN2 Bank Editor.app" $out/Applications/
+
+    install_name_tool -change {,${libsForQt5.qwt6_1}/lib/}libqwt.6.dylib "$out/Applications/OPN2 Bank Editor.app/Contents/MacOS/OPN2 Bank Editor"
+
+    ln -s "$out/Applications/OPN2 Bank Editor.app/Contents/MacOS/OPN2 Bank Editor" $out/bin/opn2_bank_editor
+  '';
+
+  meta = {
+    mainProgram = "opn2_bank_editor";
+    description = "Small cross-platform editor of the OPN2 FM banks of different formats";
+    homepage = src.meta.homepage;
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ OPNA2608 ];
+  };
+}
diff --git a/pkgs/tools/audio/opl3bankeditor/opn2bankeditor.nix b/pkgs/tools/audio/opl3bankeditor/opn2bankeditor.nix
deleted file mode 100644
index 9286d29d2d0e..000000000000
--- a/pkgs/tools/audio/opl3bankeditor/opn2bankeditor.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-import ./common.nix {
-  pname = "opn2bankeditor";
-  chip = "OPN2";
-  version = "1.3";
-  sha256 = "0niam6a6y57msbl0xj23g6l7gisv4a670q0k1zqfm34804532a32";
-  extraPatches = [
-    ./0001-opn2bankeditor-Look-for-system-installed-Rt-libs.patch
-  ];
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 77f687aee159..bd57debe5514 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3180,8 +3180,6 @@ with pkgs;
 
   optifine = optifinePackages.optifine-latest;
 
-  opn2bankeditor = libsForQt5.callPackage ../tools/audio/opl3bankeditor/opn2bankeditor.nix { };
-
   p4c = callPackage ../development/compilers/p4c {
     protobuf = protobuf_21;
   };

From 3b1d00b3fe769a9ba2f772c454a824c7fbfcc6c4 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Fri, 27 Feb 2026 10:47:35 -0600
Subject: [PATCH 04/52] opn2bankeditor: modernize derivation

---
 pkgs/by-name/op/opn2bankeditor/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/op/opn2bankeditor/package.nix b/pkgs/by-name/op/opn2bankeditor/package.nix
index 8793b569a0b2..7b2e6e84e82b 100644
--- a/pkgs/by-name/op/opn2bankeditor/package.nix
+++ b/pkgs/by-name/op/opn2bankeditor/package.nix
@@ -10,15 +10,15 @@
   rtmidi,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "opn2bankeditor";
   version = "1.3";
 
   src = fetchFromGitHub {
     owner = "Wohlstand";
     repo = "opn2bankeditor";
-    rev = "v${version}";
-    sha256 = "0niam6a6y57msbl0xj23g6l7gisv4a670q0k1zqfm34804532a32";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-YigxCgGIjOrwDxNgcIwiW8d3qHlDyA7o0vUUb5SpKlo=";
   };
 
   prePatch = ''
@@ -61,9 +61,9 @@ stdenv.mkDerivation rec {
   meta = {
     mainProgram = "opn2_bank_editor";
     description = "Small cross-platform editor of the OPN2 FM banks of different formats";
-    homepage = src.meta.homepage;
+    homepage = "https://github.com/Wohlstand/opn2bankeditor";
     license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.all;
     maintainers = with lib.maintainers; [ OPNA2608 ];
   };
-}
+})

From ce5dcbf15cc119eb2b6e123370b5076cbc8f910a Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Fri, 27 Feb 2026 10:48:41 -0600
Subject: [PATCH 05/52] opl3bankeditor: remove common file

---
 pkgs/tools/audio/opl3bankeditor/common.nix | 80 ----------------------
 1 file changed, 80 deletions(-)
 delete mode 100644 pkgs/tools/audio/opl3bankeditor/common.nix

diff --git a/pkgs/tools/audio/opl3bankeditor/common.nix b/pkgs/tools/audio/opl3bankeditor/common.nix
deleted file mode 100644
index c6f8ea4351ff..000000000000
--- a/pkgs/tools/audio/opl3bankeditor/common.nix
+++ /dev/null
@@ -1,80 +0,0 @@
-{
-  pname,
-  chip,
-  version,
-  sha256,
-  extraPatches ? [ ],
-}:
-
-{
-  mkDerivation,
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  dos2unix,
-  cmake,
-  pkg-config,
-  qttools,
-  qtbase,
-  qwt6_1,
-  rtaudio,
-  rtmidi,
-}:
-
-let
-  binname = "${chip} Bank Editor";
-  mainProgram = "${lib.strings.toLower chip}_bank_editor";
-in
-mkDerivation rec {
-  inherit pname version;
-
-  src = fetchFromGitHub {
-    owner = "Wohlstand";
-    repo = pname;
-    rev = "v${version}";
-    inherit sha256;
-  };
-
-  prePatch = ''
-    dos2unix CMakeLists.txt
-  '';
-
-  patches = extraPatches;
-
-  nativeBuildInputs = [
-    dos2unix
-    cmake
-    pkg-config
-    qttools
-  ];
-
-  buildInputs = [
-    qtbase
-    qwt6_1
-    rtaudio
-    rtmidi
-  ];
-
-  postPatch = ''
-    substituteInPlace CMakeLists.txt \
-      --replace-fail "cmake_minimum_required(VERSION 3.2)" "cmake_minimum_required(VERSION 3.10)"
-  '';
-
-  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    mkdir $out/{bin,Applications}
-    mv "${binname}.app" $out/Applications/
-
-    install_name_tool -change {,${qwt6_1}/lib/}libqwt.6.dylib "$out/Applications/${binname}.app/Contents/MacOS/${binname}"
-
-    ln -s "$out/Applications/${binname}.app/Contents/MacOS/${binname}" $out/bin/${mainProgram}
-  '';
-
-  meta = {
-    inherit mainProgram;
-    description = "Small cross-platform editor of the ${chip} FM banks of different formats";
-    homepage = src.meta.homepage;
-    license = lib.licenses.gpl3Plus;
-    platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [ OPNA2608 ];
-  };
-}

From 5448db58821d63356daf1aa123551526b4da58b7 Mon Sep 17 00:00:00 2001
From: azban <me@azban.net>
Date: Fri, 20 Mar 2026 00:48:53 -0600
Subject: [PATCH 06/52] gallery-dl: 1.31.9 -> 1.31.10

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

diff --git a/pkgs/by-name/ga/gallery-dl/package.nix b/pkgs/by-name/ga/gallery-dl/package.nix
index e6dea50776bd..e14efc3c0ab6 100644
--- a/pkgs/by-name/ga/gallery-dl/package.nix
+++ b/pkgs/by-name/ga/gallery-dl/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  fetchFromGitHub,
+  fetchFromCodeberg,
   nix-update-script,
   yt-dlp,
   python3Packages,
@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "gallery-dl";
-  version = "1.31.9";
+  version = "1.31.10";
   pyproject = true;
 
-  src = fetchFromGitHub {
+  src = fetchFromCodeberg {
     owner = "mikf";
     repo = "gallery-dl";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Dq4SSj78CEZ4hq3jCgzcJK/+KPgn7h52HMfFNDQXQPY=";
+    hash = "sha256-npt9jbBBHgjURmayhNgkSTQZYLC1aysDR83dLOm2Z/s=";
   };
 
   build-system = [ python3Packages.setuptools ];

From 526b0e090c346597db1e0e12ffe0ced15600e647 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Apr 2026 05:46:45 +0000
Subject: [PATCH 07/52] clickable: 8.7.0 -> 8.8.0

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

diff --git a/pkgs/by-name/cl/clickable/package.nix b/pkgs/by-name/cl/clickable/package.nix
index 60d913e7d6b4..f88311957c10 100644
--- a/pkgs/by-name/cl/clickable/package.nix
+++ b/pkgs/by-name/cl/clickable/package.nix
@@ -11,14 +11,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "clickable";
-  version = "8.7.0";
+  version = "8.8.0";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "clickable";
     repo = "clickable";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-W6NPZ5uP7wGjgyA+Nv2vpmshKWny2CCSrn/Gaoi7Pr4=";
+    hash = "sha256-EEICNL5ydrtep+Lbo9ryKW3+vcJwQxPeXY/C4bZaAnI=";
   };
 
   __structuredAttrs = true;

From 94690a55f2129d996dcc4c8c4579ffd95248d1cb Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sat, 4 Apr 2026 16:49:22 +0200
Subject: [PATCH 08/52] maintainers: drop Gonzih

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 maintainers/maintainer-list.nix                          | 6 ------
 pkgs/applications/audio/mopidy/mopify.nix                | 2 +-
 pkgs/applications/networking/cluster/linkerd/generic.nix | 3 +--
 pkgs/by-name/ai/air/package.nix                          | 2 +-
 pkgs/by-name/do/doge/package.nix                         | 1 -
 pkgs/by-name/k9/k9s/package.nix                          | 1 -
 6 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 25a9eb1f0272..d040614a0891 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -9886,12 +9886,6 @@
     githubId = 2041764;
     name = "Andreas Wendleder";
   };
-  Gonzih = {
-    email = "gonzih@gmail.com";
-    github = "Gonzih";
-    githubId = 266275;
-    name = "Max Gonzih";
-  };
   goodrone = {
     email = "goodrone@gmail.com";
     github = "goodrone";
diff --git a/pkgs/applications/audio/mopidy/mopify.nix b/pkgs/applications/audio/mopidy/mopify.nix
index d737df6ff7b3..b0dc0b3ebcee 100644
--- a/pkgs/applications/audio/mopidy/mopify.nix
+++ b/pkgs/applications/audio/mopidy/mopify.nix
@@ -34,6 +34,6 @@ pythonPackages.buildPythonApplication (finalAttrs: {
     homepage = "https://github.com/dirkgroenen/mopidy-mopify";
     description = "Mopidy webclient based on the Spotify webbased interface";
     license = lib.licenses.gpl3;
-    maintainers = [ lib.maintainers.Gonzih ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/applications/networking/cluster/linkerd/generic.nix b/pkgs/applications/networking/cluster/linkerd/generic.nix
index d4cca900ba69..7df69dabc1e2 100644
--- a/pkgs/applications/networking/cluster/linkerd/generic.nix
+++ b/pkgs/applications/networking/cluster/linkerd/generic.nix
@@ -68,8 +68,7 @@ buildGoModule rec {
     downloadPage = "https://github.com/linkerd/linkerd2/";
     homepage = "https://linkerd.io/";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [
-      Gonzih
+    maintainers = [
     ];
   };
 }
diff --git a/pkgs/by-name/ai/air/package.nix b/pkgs/by-name/ai/air/package.nix
index 833457a14d98..d1c2d434aaa7 100644
--- a/pkgs/by-name/ai/air/package.nix
+++ b/pkgs/by-name/ai/air/package.nix
@@ -30,6 +30,6 @@ buildGoModule (finalAttrs: {
     mainProgram = "air";
     homepage = "https://github.com/air-verse/air";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ Gonzih ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/do/doge/package.nix b/pkgs/by-name/do/doge/package.nix
index 83b5ee893048..8c49e1d7e883 100644
--- a/pkgs/by-name/do/doge/package.nix
+++ b/pkgs/by-name/do/doge/package.nix
@@ -32,7 +32,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
     license = lib.licenses.mit;
     mainProgram = "doge";
     maintainers = with lib.maintainers; [
-      Gonzih
       quantenzitrone
     ];
   };
diff --git a/pkgs/by-name/k9/k9s/package.nix b/pkgs/by-name/k9/k9s/package.nix
index 37759f5c43b2..9ea0554890ac 100644
--- a/pkgs/by-name/k9/k9s/package.nix
+++ b/pkgs/by-name/k9/k9s/package.nix
@@ -73,7 +73,6 @@ buildGoModule (finalAttrs: {
     license = lib.licenses.asl20;
     mainProgram = "k9s";
     maintainers = with lib.maintainers; [
-      Gonzih
       markus1189
       qjoly
       devusb

From 5cac8ff7291159095b2e97d9acc0048ed2f7310f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 6 Apr 2026 22:53:32 +0000
Subject: [PATCH 09/52] famistudio: 4.4.4 -> 4.5.0

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

diff --git a/pkgs/by-name/fa/famistudio/package.nix b/pkgs/by-name/fa/famistudio/package.nix
index 437fe12b4ff7..077a641a7d48 100644
--- a/pkgs/by-name/fa/famistudio/package.nix
+++ b/pkgs/by-name/fa/famistudio/package.nix
@@ -30,13 +30,13 @@ let
 in
 buildDotnetModule (finalAttrs: {
   pname = "famistudio";
-  version = "4.4.4";
+  version = "4.5.0";
 
   src = fetchFromGitHub {
     owner = "BleuBleu";
     repo = "FamiStudio";
     tag = finalAttrs.version;
-    hash = "sha256-hYJ82EXR1kP8hzUj+CCXnGuohVzyA1O9TBpWjRccj9Y=";
+    hash = "sha256-Yvbb8f3bFnSiC6AcYuczwPZhU7FZpqpB9YEd52brXtw=";
   };
 
   postPatch =

From ade3bfce37077a7b7aa6f004ac4e8d14d257780b Mon Sep 17 00:00:00 2001
From: Jan Kratochvil <jan.kratochvil.94@gmail.com>
Date: Tue, 7 Apr 2026 22:48:50 +0200
Subject: [PATCH 10/52] prusa-slicer: add x-scheme-handler/prusaslicer to
 desktop file

---
 pkgs/by-name/pr/prusa-slicer/package.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/by-name/pr/prusa-slicer/package.nix b/pkgs/by-name/pr/prusa-slicer/package.nix
index d79c2a7b63e3..d9661ec1d9c4 100644
--- a/pkgs/by-name/pr/prusa-slicer/package.nix
+++ b/pkgs/by-name/pr/prusa-slicer/package.nix
@@ -95,6 +95,18 @@ clangStdenv.mkDerivation (finalAttrs: {
       substituteInPlace src/platform/unix/PrusaGcodeviewer.desktop \
         --replace-fail 'MimeType=text/x.gcode;' 'MimeType=application/x-bgcode;text/x.gcode;'
     ''
+    # Make PrusaSlicer handle the url "prusaslicer://"
+    + ''
+      substituteInPlace src/platform/unix/PrusaSlicer.desktop \
+        --replace-fail \
+        'Exec=prusa-slicer %F' \
+        'Exec=prusa-slicer %U'
+
+      substituteInPlace src/platform/unix/PrusaSlicer.desktop \
+        --replace-fail \
+        'MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;application/x-amf;' \
+        'MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;application/x-amf;x-scheme-handler/prusaslicer;'
+    ''
   );
 
   nativeBuildInputs = [

From 56117629ad573a1f3afd8308740150a6de51aab1 Mon Sep 17 00:00:00 2001
From: Xiangyan Sun <wishstudio@gmail.com>
Date: Tue, 7 Apr 2026 16:29:18 -0700
Subject: [PATCH 11/52] jabcode-{reader,writer}: fix build

---
 pkgs/development/libraries/jabcode/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/jabcode/default.nix b/pkgs/development/libraries/jabcode/default.nix
index b4480bd911f4..5f5188982d76 100644
--- a/pkgs/development/libraries/jabcode/default.nix
+++ b/pkgs/development/libraries/jabcode/default.nix
@@ -32,6 +32,13 @@ stdenv.mkDerivation {
   ]
   ++ lib.optionals (subproject != "library") [ jabcode ];
 
+  postPatch = ''
+    substituteInPlace src/jabcode/Makefile src/jabcodeReader/Makefile src/jabcodeWriter/Makefile \
+      --replace-fail "CC 	= \$(PREFIX)gcc" ""
+    # remove bundled library binaries to force using system libraries
+    rm -rf src/jabcode/lib
+  '';
+
   preConfigure = "cd src/${subdir}";
 
   installPhase =
@@ -53,6 +60,5 @@ stdenv.mkDerivation {
     license = lib.licenses.lgpl21;
     maintainers = [ lib.maintainers.xaverdh ];
     platforms = lib.platforms.unix;
-    broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/jabcode.x86_64-darwin
   };
 }

From 013aa2812eb8d587d297495720e2c38f3346d43b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 8 Apr 2026 12:29:41 +0000
Subject: [PATCH 12/52] odiff: 4.3.2 -> 4.3.3

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

diff --git a/pkgs/by-name/od/odiff/package.nix b/pkgs/by-name/od/odiff/package.nix
index ddb2ca5aac25..725f65df6b24 100644
--- a/pkgs/by-name/od/odiff/package.nix
+++ b/pkgs/by-name/od/odiff/package.nix
@@ -14,13 +14,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "odiff";
-  version = "4.3.2";
+  version = "4.3.3";
 
   src = fetchFromGitHub {
     owner = "dmtrKovalenko";
     repo = "odiff";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gCF+CInczBJfDyZgxEQor5C/OSxKciCu9gbZanaE/nA=";
+    hash = "sha256-5x03mpqBllfEVBGMspcC/ljC6PrSXQgU2j+eKfHu6PM=";
   };
 
   postConfigure = ''

From 486067894a146062ef6e406d4e95130812255cde Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Apr 2026 05:17:17 +0000
Subject: [PATCH 13/52] gmobile: 0.6.0 -> 0.7.0

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

diff --git a/pkgs/by-name/gm/gmobile/package.nix b/pkgs/by-name/gm/gmobile/package.nix
index c312466132d1..208392283b73 100644
--- a/pkgs/by-name/gm/gmobile/package.nix
+++ b/pkgs/by-name/gm/gmobile/package.nix
@@ -17,7 +17,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gmobile";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "Phosh";
     repo = "gmobile";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+IRKGkqDgSRAWbK30R2eGA3mI393ARdzYNKBA75AyyY=";
+    hash = "sha256-zAF/9FQwpb6xiKRqfhWI/3lBwiDOEDu+TNkIJpEdbYY=";
   };
 
   nativeBuildInputs = [

From 886d933be714227ce68f5f26762598dd436d1477 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 00:59:34 +0000
Subject: [PATCH 14/52] opencommit: 3.2.14 -> 3.2.18

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

diff --git a/pkgs/by-name/op/opencommit/package.nix b/pkgs/by-name/op/opencommit/package.nix
index 9fd758d97495..f5560c912ace 100644
--- a/pkgs/by-name/op/opencommit/package.nix
+++ b/pkgs/by-name/op/opencommit/package.nix
@@ -8,13 +8,13 @@
 
 buildNpmPackage rec {
   pname = "opencommit";
-  version = "3.2.14";
+  version = "3.2.18";
 
   src = fetchFromGitHub {
     owner = "di-sukharev";
     repo = "opencommit";
     rev = "v${version}";
-    hash = "sha256-FA4ER8UDxDy/KcGgUu4xqjQnV17ouKt/QWUcrwjtb/s=";
+    hash = "sha256-AhybkTAUojFPuw8RETGHoxDCWXcgb1zclfvh2h7bokM=";
     postFetch = ''
       cd $out
       # Fix lockfile issues with bundled dependencies
@@ -22,7 +22,7 @@ buildNpmPackage rec {
     '';
   };
 
-  npmDepsHash = "sha256-gxjJoodnKE08bhOnA5r6A0UQg8ElB693Vm2BVrA2Z0k=";
+  npmDepsHash = "sha256-Kk0sPgxkWvbjGT8I3RDeniGN+8sQkwNYAXCTt009LbY=";
 
   passthru.updateScript = nix-update-script { };
 

From a70a5f890cccc2177bacf23cb0875ca4248a447e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 01:37:26 +0000
Subject: [PATCH 15/52] burpsuite: 2026.3.1 -> 2026.3.2

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

diff --git a/pkgs/by-name/bu/burpsuite/package.nix b/pkgs/by-name/bu/burpsuite/package.nix
index e0037221f0d2..d924788489dd 100644
--- a/pkgs/by-name/bu/burpsuite/package.nix
+++ b/pkgs/by-name/bu/burpsuite/package.nix
@@ -9,20 +9,20 @@
 }:
 
 let
-  version = "2026.3.1";
+  version = "2026.3.2";
 
   product =
     if proEdition then
       {
         productName = "pro";
         productDesktop = "Burp Suite Professional Edition";
-        hash = "sha256-jRVRvqFRsRO+vbEoV35bX4vi9XEYl737L0umt61ACtk=";
+        hash = "sha256-oZGSP19ejP9amfXV89kNDQwxLekZCs7oGKaX/DDHSZM=";
       }
     else
       {
         productName = "community";
         productDesktop = "Burp Suite Community Edition";
-        hash = "sha256-wjXzFXE+cIHw8tXuitsN4emH5varOTWQxiohwFGKZvc=";
+        hash = "sha256-PuV5XmgdBBkfPS0pc3xENtTUPMpemyHDDOTLVux24Xs=";
       };
 
   src = fetchurl {

From ee97c52f4e38fbd4c7135028e74db30f63fb8565 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 02:07:38 +0000
Subject: [PATCH 16/52] maestro: 2.3.0 -> 2.4.0

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

diff --git a/pkgs/by-name/ma/maestro/package.nix b/pkgs/by-name/ma/maestro/package.nix
index 4725612806e5..d6a0630a9671 100644
--- a/pkgs/by-name/ma/maestro/package.nix
+++ b/pkgs/by-name/ma/maestro/package.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "maestro";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchurl {
     url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${finalAttrs.version}/maestro.zip";
-    hash = "sha256-qvUkxrzUVgE4VbEzdGT5ZNmmXi+4iGGv/qm0wBRkTlA=";
+    hash = "sha256-rqIs5nq2cYmX7JkMWGUu3gwr6PEKxHmQOco9zjOQ1jQ=";
   };
 
   dontUnpack = true;

From faa02b0a6aa7935544da9f00f4bbafba67946107 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 14:44:46 +0000
Subject: [PATCH 17/52] xlights: 2026.04 -> 2026.05

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

diff --git a/pkgs/by-name/xl/xlights/package.nix b/pkgs/by-name/xl/xlights/package.nix
index 5f85a5c10c3c..7f1003f6fc2a 100644
--- a/pkgs/by-name/xl/xlights/package.nix
+++ b/pkgs/by-name/xl/xlights/package.nix
@@ -6,11 +6,11 @@
 
 appimageTools.wrapType2 rec {
   pname = "xlights";
-  version = "2026.04";
+  version = "2026.05";
 
   src = fetchurl {
     url = "https://github.com/smeighan/xLights/releases/download/${version}/xLights-${version}-x86_64.AppImage";
-    hash = "sha256-eNt1dm2TDnw+JtRP73RppKeCspxKLgS3mnYKRNQ3Srs=";
+    hash = "sha256-W1Il2dIDFUtkwPsPptdD2s/5eluGAeH7tw/ZmArN8dY=";
   };
 
   meta = {

From a90d314ae62e93355c7ce691564e7c62c81ead81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20M=C3=A9meint?= <git@nicomem.com>
Date: Fri, 10 Apr 2026 20:37:25 +0200
Subject: [PATCH 18/52] authelia: 4.39.12 -> 4.39.18

---
 pkgs/by-name/au/authelia/sources.nix | 8 ++++----
 pkgs/by-name/au/authelia/web.nix     | 6 +++++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/au/authelia/sources.nix b/pkgs/by-name/au/authelia/sources.nix
index 18b0c37e5e37..095d522635ad 100644
--- a/pkgs/by-name/au/authelia/sources.nix
+++ b/pkgs/by-name/au/authelia/sources.nix
@@ -1,14 +1,14 @@
 { fetchFromGitHub }:
 rec {
   pname = "authelia";
-  version = "4.39.12";
+  version = "4.39.18";
 
   src = fetchFromGitHub {
     owner = "authelia";
     repo = "authelia";
     rev = "v${version}";
-    hash = "sha256-u7TIhOGXfvWdAXvpL5qa43jaoa7PNAVL2MtGEuWBDPc=";
+    hash = "sha256-IROdncF3TC1X9000jw0RGtrcFrzqRpG7g2QuLGQ/Q4k=";
   };
-  vendorHash = "sha256-7RoPv4OvOhiv+TmYOJuW95h/uh2LuTrpUSAZiTvbh7g=";
-  pnpmDepsHash = "sha256-Ck2nqFwDv3OxN0ONA3A+h4Rli1te+EYqKivcqrAInKw=";
+  vendorHash = "sha256-ZDsLRMip2B8PPZu8VxW+91FVvwC2rXzohhAZFifT26g=";
+  pnpmDepsHash = "sha256-ki/jXNT9dIno1UIcDgBcsLdiKcaiw/dwnff3t9xv07o=";
 }
diff --git a/pkgs/by-name/au/authelia/web.nix b/pkgs/by-name/au/authelia/web.nix
index 9682c05adf78..dd4f8851f0c8 100644
--- a/pkgs/by-name/au/authelia/web.nix
+++ b/pkgs/by-name/au/authelia/web.nix
@@ -40,8 +40,12 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   postPatch = ''
+    NL=$'\n'
+    LINE_BEFORE_HOST='allowedHosts: ["login.example.com", ...allowedHosts],'
+
     substituteInPlace ./vite.config.ts \
-      --replace 'outDir: "../internal/server/public_html"' 'outDir: "dist"'
+      --replace-fail 'outDir: "../internal/server/public_html"' 'outDir: "dist"' \
+      --replace-fail "$LINE_BEFORE_HOST" "$LINE_BEFORE_HOST$NL"'            host: "127.0.0.1",'
   '';
 
   postBuild = ''

From ae5617725313df28ad14e1d21651edb02cba2548 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 18:40:57 +0000
Subject: [PATCH 19/52] dbeaver-bin: 26.0.1 -> 26.0.2

---
 pkgs/by-name/db/dbeaver-bin/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix
index 29b038d3bdf8..07f66df0366f 100644
--- a/pkgs/by-name/db/dbeaver-bin/package.nix
+++ b/pkgs/by-name/db/dbeaver-bin/package.nix
@@ -19,7 +19,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "dbeaver-bin";
-  version = "26.0.1";
+  version = "26.0.2";
 
   src =
     let
@@ -32,10 +32,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
         aarch64-darwin = "macos-aarch64.dmg";
       };
       hash = selectSystem {
-        x86_64-linux = "sha256-tmT62M2NvvSsBWKbRT0iTVdQVuBuPsDuDBtVtr7FKPU=";
-        aarch64-linux = "sha256-WL7pO0l5TZEl2Ur8Qiqw/5ZAKR4iaoN8yxpG7wtPmds=";
-        x86_64-darwin = "sha256-vg3zi39kWfPqxhKtUv2WixJMqejgDLIuVQ26Jyrtl9c=";
-        aarch64-darwin = "sha256-jNwcIKmOCI75h0Ul/oARm2S1UzUUw2GflHdwA7d+3nU=";
+        x86_64-linux = "sha256-qAjGYm164/teNcNxZwMNtBNKUOAd/7EjJMk1DtQKGFA=";
+        aarch64-linux = "sha256-tMCMRMNA1sQprDouHtRKPAE1CHWRII2/p05UqVaPcpE=";
+        x86_64-darwin = "sha256-2hSrJhlvFr/5AK9VCXU/hZke9oHgde50ng0pEAXV63Y=";
+        aarch64-darwin = "sha256-YADZ7ttETfs+3HC045eHntLj1x8GREw027GGDSGIeDw=";
       };
     in
     fetchurl {

From 3e5adab0bbd4f3f6bbbc74ae753a042e1eeb04ca Mon Sep 17 00:00:00 2001
From: ccicnce113424 <ccicnce113424@gmail.com>
Date: Sat, 11 Apr 2026 02:17:15 +0800
Subject: [PATCH 20/52] motrix-next: 3.6.3 -> 3.6.8, move gapp wrapping to
 postFixup

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

diff --git a/pkgs/by-name/mo/motrix-next/package.nix b/pkgs/by-name/mo/motrix-next/package.nix
index 61682bab45ad..a8df486edd5f 100644
--- a/pkgs/by-name/mo/motrix-next/package.nix
+++ b/pkgs/by-name/mo/motrix-next/package.nix
@@ -25,16 +25,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "motrix-next";
-  version = "3.6.3";
+  version = "3.6.8";
 
   src = fetchFromGitHub {
     owner = "AnInsomniacy";
     repo = "motrix-next";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-u4t/QIRFDuvGPA4+p4OuS6tDnU6+ZmEJSfOYIh//NaQ=";
+    hash = "sha256-nn1YivQ7UCRpWnWa2w0F06n6bQrMJ1d8Gb84hY6K5WE=";
   };
 
-  cargoHash = "sha256-WcYXb5UF4mhahYQ5Jomsph+UHWqa+3cjRQdJyydw7oY=";
+  cargoHash = "sha256-mrzyIvHlfs3epOm3ZKPetmJOCKpZdHlfosOP7iLlu1k=";
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs)
@@ -84,7 +84,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     src-tauri/tauri.conf.json | sponge src-tauri/tauri.conf.json
   '';
 
-  preFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
+  postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
     gappsWrapperArgs+=(
       --prefix LD_LIBRARY_PATH : ${
         lib.makeLibraryPath [

From abbfb75941291845995c8efff6ef1b6402792cd6 Mon Sep 17 00:00:00 2001
From: ccicnce113424 <ccicnce113424@gmail.com>
Date: Fri, 10 Apr 2026 19:26:23 +0800
Subject: [PATCH 21/52] libtsm: enable `strictDeps` and `__structuredAttrs`

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

diff --git a/pkgs/by-name/li/libtsm/package.nix b/pkgs/by-name/li/libtsm/package.nix
index 12850696935b..f83c1082fba5 100644
--- a/pkgs/by-name/li/libtsm/package.nix
+++ b/pkgs/by-name/li/libtsm/package.nix
@@ -21,13 +21,18 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-AKwS088lP3dByKh3dQRW76+L6ouD8EmVms2qWIC5IiE=";
   };
 
-  buildInputs = [ libxkbcommon ];
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  buildInputs = [
+    libxkbcommon
+    check
+  ];
 
   nativeBuildInputs = [
     meson
     ninja
     pkg-config
-    check
   ];
 
   passthru.updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; };

From 24970ea02cba5e6f4ffd3fb8f2fddb7307919761 Mon Sep 17 00:00:00 2001
From: ccicnce113424 <ccicnce113424@gmail.com>
Date: Fri, 10 Apr 2026 19:26:36 +0800
Subject: [PATCH 22/52] kmscon: enable `__structuredAttrs`

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

diff --git a/pkgs/by-name/km/kmscon/package.nix b/pkgs/by-name/km/kmscon/package.nix
index cedf3862c60e..329c49f59af3 100644
--- a/pkgs/by-name/km/kmscon/package.nix
+++ b/pkgs/by-name/km/kmscon/package.nix
@@ -39,6 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   strictDeps = true;
+  __structuredAttrs = true;
 
   depsBuildBuild = [
     buildPackages.stdenv.cc

From db0a3f91d84ff068e1bc65c9ae551122049bc191 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Fri, 10 Apr 2026 18:32:18 -0400
Subject: [PATCH 23/52] podman-desktop: pin nodejs version for fetchPnpmDeps

---
 pkgs/by-name/po/podman-desktop/package.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/po/podman-desktop/package.nix b/pkgs/by-name/po/podman-desktop/package.nix
index 92b1651bbded..ed644116e3ec 100644
--- a/pkgs/by-name/po/podman-desktop/package.nix
+++ b/pkgs/by-name/po/podman-desktop/package.nix
@@ -5,7 +5,7 @@
   makeBinaryWrapper,
   copyDesktopItems,
   electron_41,
-  nodejs,
+  nodejs_24,
   pnpm_10_29_2,
   fetchPnpmDeps,
   pnpmConfigHook,
@@ -21,6 +21,8 @@
 }:
 
 let
+  nodejs = nodejs_24;
+  pnpm = pnpm_10_29_2.override { inherit nodejs; };
   electron = electron_41;
   appName = "Podman Desktop";
 in
@@ -64,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
-    pnpm = pnpm_10_29_2;
+    inherit pnpm;
     fetcherVersion = 2;
     hash = "sha256-tCp5qLZVo93H8VIToU3mkmwNsVXOAd1IEsL6RlazPXo=";
   };
@@ -83,8 +85,8 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     makeBinaryWrapper
     nodejs
+    pnpm
     pnpmConfigHook
-    pnpm_10_29_2
   ]
   ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
     copyDesktopItems

From edbc81012a3c746302b741f9c7f10fc467361e44 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Fri, 10 Apr 2026 18:32:41 -0400
Subject: [PATCH 24/52] podman-desktop: extract nodejs version from
 package.json

---
 pkgs/by-name/po/podman-desktop/package.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/po/podman-desktop/package.nix b/pkgs/by-name/po/podman-desktop/package.nix
index ed644116e3ec..d09b6b3a294a 100644
--- a/pkgs/by-name/po/podman-desktop/package.nix
+++ b/pkgs/by-name/po/podman-desktop/package.nix
@@ -45,8 +45,15 @@ stdenv.mkDerivation (finalAttrs: {
       };
       text = ''
         new_src="$(nix-build --attr "pkgs.$PNAME.src" --no-out-link)"
-        new_electron_major="$(jq '.devDependencies.electron' "$new_src/package.json" | grep --perl-regexp --only-matching '\d+' | head -n 1)"
-        new_pnpm_major="$(jq '.packageManager' "$new_src/package.json" | grep --perl-regexp --only-matching '\d+' | head -n 1)"
+        get_major_version() {
+          jq -r "$1" "$new_src/package.json" | grep --perl-regexp --only-matching '[0-9]+' | head -n 1
+        }
+
+        new_node_major="$(get_major_version '.engines.node')"
+        new_electron_major="$(get_major_version '.devDependencies.electron')"
+        new_pnpm_major="$(get_major_version '.packageManager')"
+
+        sed -i -E "s/nodejs_[0-9]+/nodejs_$new_node_major/g" "$PKG_FILE"
         sed -i -E "s/electron_[0-9]+/electron_$new_electron_major/g" "$PKG_FILE"
         sed -i -E "s/pnpm_[0-9]+/pnpm_$new_pnpm_major/g" "$PKG_FILE"
       '';

From 2167d634c647f3d58870bc443ee6832953e33f60 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 23:17:50 +0000
Subject: [PATCH 25/52] sdl_gamecontrollerdb: 0-unstable-2026-04-02 ->
 0-unstable-2026-04-10

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

diff --git a/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix b/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix
index c470a7e98808..653555123294 100644
--- a/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix
+++ b/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "sdl_gamecontrollerdb";
-  version = "0-unstable-2026-04-02";
+  version = "0-unstable-2026-04-10";
 
   src = fetchFromGitHub {
     owner = "mdqinc";
     repo = "SDL_GameControllerDB";
-    rev = "202d0070d75e51cdf2fc6e9c4d4662d87226d5c6";
-    hash = "sha256-79DvPUHzUw3XAnMQu3pNxZq0+CG9J1u5MiOTyG7pXkk=";
+    rev = "bd4ef5de42d50480c5be6bd54de164140a62f384";
+    hash = "sha256-mJB51qS3U0nyjhi+CzOJmRExG7jP3IlhYvABHilcaOA=";
   };
 
   dontBuild = true;

From 7114e76717383169a44bf5ac97bc8237902bfd86 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Sat, 11 Apr 2026 01:45:41 +0200
Subject: [PATCH 26/52] hieroglyphic: 2.2.0 -> 2.3.0

diff: https://github.com/FineFindus/Hieroglyphic/compare/v2.2.0...v2.3.0
---
 pkgs/by-name/hi/hieroglyphic/package.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/hi/hieroglyphic/package.nix b/pkgs/by-name/hi/hieroglyphic/package.nix
index cb7fa2660ce4..140c79ff14a2 100644
--- a/pkgs/by-name/hi/hieroglyphic/package.nix
+++ b/pkgs/by-name/hi/hieroglyphic/package.nix
@@ -21,18 +21,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hieroglyphic";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "FineFindus";
     repo = "Hieroglyphic";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-mqoYdHpVnivDTblvoaACyCE7Y25cfLj1m0Q5D33zEfk=";
+    hash = "sha256-uCzxv3jyBIFXYoEk2q26rB0Me3MAt1NiINulA1FjQtA=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-kArrsHW+cFZQQgIEL+7Os8ixKtuIZAByEr6D4XDmfRE=";
+    hash = "sha256-vqTySi22Gi4WrkNolAIFFbpSmIzjgbIcmW0gkStK6H4=";
   };
 
   nativeBuildInputs = [
@@ -51,12 +51,14 @@ stdenv.mkDerivation (finalAttrs: {
     glib
     gtk4
     libadwaita
+    onnxruntime
     openssl
   ];
 
   env = {
     ORT_STRATEGY = "system";
     ORT_LIB_LOCATION = "${lib.getLib onnxruntime}/lib";
+    ORT_PREFER_DYNAMIC_LINK = "1";
   };
 
   passthru = {

From 6c4da7fdb57c7ee434bec173bf15a40aae69c7e9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Apr 2026 00:31:34 +0000
Subject: [PATCH 27/52] dwproton-bin: dwproton-10.0-22 -> dwproton-10.0-23

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

diff --git a/pkgs/by-name/dw/dwproton-bin/package.nix b/pkgs/by-name/dw/dwproton-bin/package.nix
index d1095082c312..699bbf2117d9 100644
--- a/pkgs/by-name/dw/dwproton-bin/package.nix
+++ b/pkgs/by-name/dw/dwproton-bin/package.nix
@@ -11,11 +11,11 @@ proton-ge-bin.overrideAttrs (
     inherit steamDisplayName;
 
     pname = "dwproton-bin";
-    version = "dwproton-10.0-22";
+    version = "dwproton-10.0-23";
 
     src = fetchzip {
       url = "https://dawn.wine/dawn-winery/dwproton/releases/download/${finalAttrs.version}/${finalAttrs.version}-x86_64.tar.xz";
-      hash = "sha256-U/lLAF/WUxHInBgAt7YuDUM/eGGSv7mkjAACr15iW/0=";
+      hash = "sha256-XqXXxsTekvTUNsykpWu4vbZ4Mi+2tMR57zngaOt+3gQ=";
     };
 
     passthru.updateScript = writeScript "update-dwproton" ''

From 312e4af562f3cfc23e64883f40ab9490355b50fc Mon Sep 17 00:00:00 2001
From: Xiangyan Sun <wishstudio@gmail.com>
Date: Fri, 10 Apr 2026 18:16:38 -0700
Subject: [PATCH 28/52] dopewars: fix build with gcc15

---
 pkgs/by-name/do/dopewars/0002-fix_gcc15.patch | 26 +++++++++++++++++++
 pkgs/by-name/do/dopewars/package.nix          |  8 ++++--
 2 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/by-name/do/dopewars/0002-fix_gcc15.patch

diff --git a/pkgs/by-name/do/dopewars/0002-fix_gcc15.patch b/pkgs/by-name/do/dopewars/0002-fix_gcc15.patch
new file mode 100644
index 000000000000..594cc5aa5081
--- /dev/null
+++ b/pkgs/by-name/do/dopewars/0002-fix_gcc15.patch
@@ -0,0 +1,26 @@
+diff --git a/src/gtkport/itemfactory.c b/src/gtkport/itemfactory.c
+index b7a8c3f..980682c 100644
+--- a/src/gtkport/itemfactory.c
++++ b/src/gtkport/itemfactory.c
+@@ -217,7 +217,7 @@ void dp_gtk_item_factory_create_item(DPGtkItemFactory *ifactory,
+   new_child->widget = menu_item;
+   if (entry->callback) {
+     g_signal_connect(G_OBJECT(menu_item), "activate",
+-                     entry->callback, callback_data);
++                     G_CALLBACK(entry->callback), callback_data);
+   }
+ 
+   if (parent) {
+diff --git a/src/gtkport/itemfactory.h b/src/gtkport/itemfactory.h
+index a1d5b1d..2702595 100644
+--- a/src/gtkport/itemfactory.h
++++ b/src/gtkport/itemfactory.h
+@@ -59,7 +59,7 @@ GtkItemFactory *dp_gtk_item_factory_new(const gchar *path,
+ 
+ typedef gchar *(*DPGtkTranslateFunc) (const gchar *path, gpointer func_data);
+ 
+-typedef void (*DPGtkItemFactoryCallback) ();
++typedef void (*DPGtkItemFactoryCallback) (GtkWidget *widget, gpointer data);
+ 
+ typedef struct _DPGtkItemFactoryEntry DPGtkItemFactoryEntry;
+ typedef struct _DPGtkItemFactory DPGtkItemFactory;
diff --git a/pkgs/by-name/do/dopewars/package.nix b/pkgs/by-name/do/dopewars/package.nix
index ab3f7603b86c..7b9dea613aed 100644
--- a/pkgs/by-name/do/dopewars/package.nix
+++ b/pkgs/by-name/do/dopewars/package.nix
@@ -34,8 +34,12 @@ stdenv.mkDerivation (finalAttrs: {
     ncurses
   ];
 
-  # remove the denied setting of setuid bit permission
-  patches = [ ./0001-remove_setuid.patch ];
+  patches = [
+    # remove the denied setting of setuid bit permission
+    ./0001-remove_setuid.patch
+    # fix compilation errors with gcc15
+    ./0002-fix_gcc15.patch
+  ];
 
   # run dopewars with -f so that it finds its scoreboard file in ~/.local/share
   postInstall = ''

From 356ee9197f29211f99dd9f7bc52fb56477002d1a Mon Sep 17 00:00:00 2001
From: A Frederick Christensen <fauxmight@users.noreply.github.com>
Date: Fri, 10 Apr 2026 20:54:21 -0500
Subject: [PATCH 29/52] webull-desktop: fix unfindable .desktop file

---
 pkgs/by-name/we/webull-desktop/package.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/we/webull-desktop/package.nix b/pkgs/by-name/we/webull-desktop/package.nix
index fcacb5bb94c1..39f8206199a2 100644
--- a/pkgs/by-name/we/webull-desktop/package.nix
+++ b/pkgs/by-name/we/webull-desktop/package.nix
@@ -60,7 +60,13 @@ stdenv.mkDerivation (finalAttrs: {
     mkdir $out/bin
     ln -s $out/usr/local/WebullDesktop/WebullDesktop $out/bin/webull-desktop
     substituteInPlace $out/usr/share/applications/WebullDesktop.desktop \
-      --replace-fail Categories=Utiltity Categories=Finance
+      --replace-fail Categories=Utiltity Categories=Finance \
+      --replace-fail "Exec=/usr/local/WebullDesktop/WebullDesktop" "Exec=webull-desktop" \
+      --replace-fail "Icon=WebullDesktop.png" "Icon=WebullDesktop" \
+      --replace-fail "Version=8.2.0" "Version=${finalAttrs.version}"
+
+    ln -s $out/usr/share $out/share
+
 
     addAutoPatchelfSearchPath $out/usr/local/WebullDesktop
     addAutoPatchelfSearchPath $out/usr/local/WebullDesktop/platforms

From cafe89fe26a09559c30e4317e1618ec05625dd96 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Apr 2026 05:05:45 +0000
Subject: [PATCH 30/52] jellyfin-tui: 1.4.1 -> 1.4.2

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

diff --git a/pkgs/by-name/je/jellyfin-tui/package.nix b/pkgs/by-name/je/jellyfin-tui/package.nix
index 87a5dbcddc77..22d7df003201 100644
--- a/pkgs/by-name/je/jellyfin-tui/package.nix
+++ b/pkgs/by-name/je/jellyfin-tui/package.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "jellyfin-tui";
-  version = "1.4.1";
+  version = "1.4.2";
 
   src = fetchFromGitHub {
     owner = "dhonus";
     repo = "jellyfin-tui";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-dJbCMIKxDEht2Fgor2VsTyDvmhFxi5K22nTRMM1KOu0=";
+    hash = "sha256-GumYBQkdTNR+sfEY0l5xHjtFM9Z9sn/2H+yVzC0MEe4=";
   };
 
-  cargoHash = "sha256-b47arb13oXnulUZB58Cj0v0Qu+IygYlInbBQeeLXYP0=";
+  cargoHash = "sha256-1FUmCACPm9TaURMLXrNODnVtx8FQ6FeAkwF2ucgezhk=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [

From 755334ed6159a73490e3625acde66421bb3df9cc Mon Sep 17 00:00:00 2001
From: Mio <mio@mio19.uk>
Date: Sat, 11 Apr 2026 15:32:40 +1000
Subject: [PATCH 31/52] gradle: workaround for multiple console arguments error

---
 pkgs/development/tools/build-managers/gradle/setup-hook.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/build-managers/gradle/setup-hook.sh b/pkgs/development/tools/build-managers/gradle/setup-hook.sh
index 6c9c927f0c45..537b1c3f69aa 100644
--- a/pkgs/development/tools/build-managers/gradle/setup-hook.sh
+++ b/pkgs/development/tools/build-managers/gradle/setup-hook.sh
@@ -4,7 +4,7 @@ gradleConfigureHook() {
     fi
     export GRADLE_USER_HOME
     export TERM=dumb
-    gradleFlagsArray+=(--no-daemon --console plain --init-script "${gradleInitScript:-@init_script@}")
+    gradleFlagsArray+=(--no-daemon -Dorg.gradle.console=plain --init-script "${gradleInitScript:-@init_script@}")
     if [ -n "${MITM_CACHE_CA-}" ]; then
         if [ -z "${MITM_CACHE_KEYSTORE-}" ]; then
             MITM_CACHE_KEYSTORE="$MITM_CACHE_CERT_DIR/keystore"

From 44a66581f5fb35cb31c5a211ebc860dc4cf04249 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Apr 2026 06:48:27 +0000
Subject: [PATCH 32/52] all-the-package-names: 2.0.2405 -> 2.0.2413

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

diff --git a/pkgs/by-name/al/all-the-package-names/package.nix b/pkgs/by-name/al/all-the-package-names/package.nix
index 1c67cc9c5742..bd39063249df 100644
--- a/pkgs/by-name/al/all-the-package-names/package.nix
+++ b/pkgs/by-name/al/all-the-package-names/package.nix
@@ -7,16 +7,16 @@
 
 buildNpmPackage rec {
   pname = "all-the-package-names";
-  version = "2.0.2405";
+  version = "2.0.2413";
 
   src = fetchFromGitHub {
     owner = "nice-registry";
     repo = "all-the-package-names";
     tag = "v${version}";
-    hash = "sha256-dimap7vybYHNGSAWn6K8uMUMymrV8Ek5Vc27bbJo22w=";
+    hash = "sha256-loI9wKz0EcePvM2kXqmxNx9rfC/VaMCmJtm0dTjWoOk=";
   };
 
-  npmDepsHash = "sha256-13u+UoTckxKAmthuaxOCaGSW4BaAgWaz6/4dBcO+3VI=";
+  npmDepsHash = "sha256-6XLDdamRG+IVq/zdyKKlIsnfUVD8pKES7K7hm+yTQ78=";
 
   passthru.updateScript = nix-update-script { };
 

From 92105b74aff0e3a2767c846a54779aa97f815b88 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sat, 11 Apr 2026 01:23:08 -0600
Subject: [PATCH 33/52] limine: 11.2.1 -> 11.3.1

https://github.com/Limine-Bootloader/Limine/releases/tag/v11.3.1
Diff: https://github.com/Limine-Bootloader/Limine/compare/v11.2.1...v11.3.1

Repo has moved back to GitHub.
---
 pkgs/by-name/li/limine/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix
index 9453974c0f48..9b0236119a3b 100644
--- a/pkgs/by-name/li/limine/package.nix
+++ b/pkgs/by-name/li/limine/package.nix
@@ -47,14 +47,14 @@ in
 # as bootloader for various platforms and corresponding binary and helper files.
 stdenv.mkDerivation (finalAttrs: {
   pname = "limine";
-  version = "11.2.1";
+  version = "11.3.1";
 
   # We don't use the Git source but the release tarball, as the source has a
   # `./bootstrap` script performing network access to download resources.
   # Packaging that in Nix is very cumbersome.
   src = fetchurl {
-    url = "https://codeberg.org/Limine/Limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz";
-    hash = "sha256-HQq4hrjuITQY9ia1z4pKid81+WfX9CGUUSQUfvBPPgE=";
+    url = "https://github.com/Limine-Bootloader/Limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz";
+    hash = "sha256-7vst33RyAn6q0tJNLvmrEigVFM+exUaj46dZ3y2GVOc=";
   };
 
   enableParallelBuilding = true;
@@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     homepage = "https://limine-bootloader.org/";
-    changelog = "https://codeberg.org/Limine/Limine/raw/tag/v${finalAttrs.version}/ChangeLog";
+    changelog = "https://github.com/Limine-Bootloader/Limine/raw/refs/tags/v${finalAttrs.version}/ChangeLog";
     description = "Limine Bootloader";
     mainProgram = "limine";
     # The platforms on that the Limine binary and helper tools can run, not

From 1998d59849f83d79c85690bd1b8d90d2b51e6b56 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Apr 2026 08:40:28 +0000
Subject: [PATCH 34/52] webdav: 5.11.4 -> 5.11.5

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

diff --git a/pkgs/by-name/we/webdav/package.nix b/pkgs/by-name/we/webdav/package.nix
index 4fe02d4500b4..cda2eadfd9db 100644
--- a/pkgs/by-name/we/webdav/package.nix
+++ b/pkgs/by-name/we/webdav/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "webdav";
-  version = "5.11.4";
+  version = "5.11.5";
 
   src = fetchFromGitHub {
     owner = "hacdias";
     repo = "webdav";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-EEphTKjfCVgSyyGeZ9BjrNmpK4LMm9mFKJ7zqaYQu7E=";
+    hash = "sha256-Al1rl6Ez36I3qE++1ZOvTgey9lfHp0SVzK6KJQSPBYc=";
   };
 
-  vendorHash = "sha256-1rSIJIcJxw1YKy2bI+2RY71bSdfDBp3w7U3SQtJgCgI=";
+  vendorHash = "sha256-JctG+gkZtjlSX616Rv3rC7RU9YBNWp9LsD5Ut8qn1tY=";
 
   __darwinAllowLocalNetworking = true;
 

From 1346f9578d3a8b87e561c9034fcdaf540a69a7c7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Apr 2026 08:53:20 +0000
Subject: [PATCH 35/52] python3Packages.weaviate-client: 4.20.4 -> 4.20.5

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

diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix
index 7718af4e9d60..d5a886d223cb 100644
--- a/pkgs/development/python-modules/weaviate-client/default.nix
+++ b/pkgs/development/python-modules/weaviate-client/default.nix
@@ -27,7 +27,7 @@
 
 buildPythonPackage rec {
   pname = "weaviate-client";
-  version = "4.20.4";
+  version = "4.20.5";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     owner = "weaviate";
     repo = "weaviate-python-client";
     tag = "v${version}";
-    hash = "sha256-GzkMBNvXz8wqpYdsifeHqZFnYjRf4hNRmQQhHUB12VI=";
+    hash = "sha256-3CJLD/bew9qx2aDrIwcaMlgwCe8E4bj3ZDh5t0v8Pf8=";
   };
 
   pythonRelaxDeps = [

From bf17e84d656b177e91502702c315fb2ec4e4e839 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Apr 2026 09:33:04 +0000
Subject: [PATCH 36/52] libgedit-gfls: 0.4.0 -> 0.4.1

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

diff --git a/pkgs/by-name/li/libgedit-gfls/package.nix b/pkgs/by-name/li/libgedit-gfls/package.nix
index f5962dc28250..caf368fc0579 100644
--- a/pkgs/by-name/li/libgedit-gfls/package.nix
+++ b/pkgs/by-name/li/libgedit-gfls/package.nix
@@ -16,7 +16,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libgedit-gfls";
-  version = "0.4.0";
+  version = "0.4.1";
 
   outputs = [
     "out"
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
     repo = "libgedit-gfls";
     tag = finalAttrs.version;
     forceFetchGit = true; # To avoid occasional 501 failures.
-    hash = "sha256-VzQ58XD5Yfy+gv77yTVoYHhooz2pfAV0huJI023s8ew=";
+    hash = "sha256-61jq7tcAAzYuhKM4OlH/GniGTfiWg/Pcznb03+vaLvw=";
   };
 
   nativeBuildInputs = [

From c2ded5ea3a1059164fa8585f9918a88869ff62b7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Apr 2026 11:13:42 +0000
Subject: [PATCH 37/52] python3Packages.niquests: 3.18.4 -> 3.18.5

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

diff --git a/pkgs/development/python-modules/niquests/default.nix b/pkgs/development/python-modules/niquests/default.nix
index 31ebdac40a6d..bec4c7a7dc7a 100644
--- a/pkgs/development/python-modules/niquests/default.nix
+++ b/pkgs/development/python-modules/niquests/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "niquests";
-  version = "3.18.4";
+  version = "3.18.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jawah";
     repo = "niquests";
     tag = "v${version}";
-    hash = "sha256-AcF0HpC7vPusEGp7i4ofY2FTJrFxLwXv33MnR6sdvJg=";
+    hash = "sha256-1fljGr5b3OYtcaGg/Qq2W78FWORB1lXRtqaBlxTGTDI=";
   };
 
   build-system = [ hatchling ];

From 45c1e56b1fb693b541a8c72d2b955778844fffc1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Apr 2026 12:18:04 +0000
Subject: [PATCH 38/52] usque: 1.4.2 -> 2.0.1

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

diff --git a/pkgs/by-name/us/usque/package.nix b/pkgs/by-name/us/usque/package.nix
index d1a5ed3bbc43..913f14282e88 100644
--- a/pkgs/by-name/us/usque/package.nix
+++ b/pkgs/by-name/us/usque/package.nix
@@ -10,15 +10,15 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "usque";
-  version = "1.4.2";
+  version = "2.0.1";
   src = fetchFromGitHub {
     owner = "Diniboy1123";
     repo = "usque";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-U2C0To9WaQZaAuWbx3+h4hhDI8n3H55cXOnS9l2l2rY=";
+    hash = "sha256-veAUc2LeH2NoOs3AHj8GUr7zBPidHtr+JlUQjgo/WQQ=";
   };
 
-  vendorHash = "sha256-SS0Lqdfdp3hO2hUW0oRXH9jQWW/68a/tKYU7PMgeQYs=";
+  vendorHash = "sha256-pilBazQcrfCcgBCo9U9jGo/ZcuXLBR3kT8l+mad+umg=";
 
   ldflags = [
     "-s"

From b4d17f0cfa3f1154d85b8b1a179b31245af81500 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Sat, 11 Apr 2026 14:23:57 +0200
Subject: [PATCH 39/52] haskell.compiler.native-bignum: don't evaluate compiler
 exprs

This makes isNativeBignumGhc purely textual again after #460845.
Could improve performance in the right conditions, but most importantly
solves eval issues with aliases allowed (due to the throw-ing ghc
attributes) without resorting to tryEval.
---
 pkgs/top-level/haskell-packages.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index a8146c05d831..6deb331822d1 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -224,8 +224,7 @@ in
       native-bignum =
         let
           isNativeBignumGhc =
-            name:
-            !(builtins.elem name nativeBignumExcludes) && !(compiler.${name} ? isMhs && compiler.${name}.isMhs);
+            name: pkgs.lib.hasPrefix "ghc" name && !(builtins.elem name nativeBignumExcludes);
           nativeBignumGhcNames = pkgs.lib.filter isNativeBignumGhc (pkgs.lib.attrNames compiler);
         in
         pkgs.lib.recurseIntoAttrs (

From 0ff3c4a82e92ba61d553704b8ed54ce7fa1a6d46 Mon Sep 17 00:00:00 2001
From: loner <2788892716@qq.com>
Date: Wed, 8 Apr 2026 18:21:31 +0800
Subject: [PATCH 40/52] qwen-code: 0.14.0 -> 0.14.3

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

diff --git a/pkgs/by-name/qw/qwen-code/package.nix b/pkgs/by-name/qw/qwen-code/package.nix
index 8cd2c90e3c69..ec0b55b1af68 100644
--- a/pkgs/by-name/qw/qwen-code/package.nix
+++ b/pkgs/by-name/qw/qwen-code/package.nix
@@ -14,17 +14,17 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "qwen-code";
-  version = "0.14.0";
+  version = "0.14.3";
 
   src = fetchFromGitHub {
     owner = "QwenLM";
     repo = "qwen-code";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-XeJeBNfIFo2XowIRGgxixAtfz1saeKxt93/EK7EF5tA=";
+    hash = "sha256-RtZlwZev8zv3yMn+cCQpGvyPq/gyA39N4Iq0qFBTERY=";
   };
 
   npmDepsFetcherVersion = 3;
-  npmDepsHash = "sha256-UeEldKIcCS7km1nuyfLlSawDVBQDn+k97wxe9ZgaHtM=";
+  npmDepsHash = "sha256-mrc46cZJ2hI1VL/PMYsCCkgEGYMHrkhLZs0EfsXRRIw=";
 
   # npm 11 incompatible with fetchNpmDeps
   # https://github.com/NixOS/nixpkgs/issues/474535

From 488bb0f65235e4394d234fe6761dc267400b8e7e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Apr 2026 12:29:34 +0000
Subject: [PATCH 41/52] python3Packages.telnetlib3: 4.0.1 -> 4.0.2

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

diff --git a/pkgs/development/python-modules/telnetlib3/default.nix b/pkgs/development/python-modules/telnetlib3/default.nix
index 2f110d75bba3..5bb3dabd95cd 100644
--- a/pkgs/development/python-modules/telnetlib3/default.nix
+++ b/pkgs/development/python-modules/telnetlib3/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "telnetlib3";
-  version = "4.0.1";
+  version = "4.0.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jquast";
     repo = "telnetlib3";
     tag = finalAttrs.version;
-    hash = "sha256-dKvdg+1l7qRyc7COR0U6SKbrp5uJRtc4wsDPQEAkXZ8=";
+    hash = "sha256-MLNnmTuxrMV83FsM4Avlb31eH9s8/aFAoEbCsNyTmLY=";
   };
 
   build-system = [ hatchling ];

From 3c44c722b4b568056ffd6aa781d2d1e831d24c87 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 20:37:44 +0000
Subject: [PATCH 42/52] python3Packages.losant-rest: 2.1.3 -> 2.1.4

---
 pkgs/development/python-modules/losant-rest/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/losant-rest/default.nix b/pkgs/development/python-modules/losant-rest/default.nix
index e841c1b83c90..80520dd4c6bc 100644
--- a/pkgs/development/python-modules/losant-rest/default.nix
+++ b/pkgs/development/python-modules/losant-rest/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "losant-rest";
-  version = "2.1.3";
+  version = "2.1.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Losant";
     repo = "losant-rest-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-aIp1Rh91J78v6HoA8FPtI6xrr7Ld4sf1VRk/EP1Y5vg=";
+    hash = "sha256-51HzUrKBUwgXDSCV+iAtEBLLMl0yV5KVHYHTy+u5TAI=";
   };
 
   build-system = [ setuptools ];
@@ -36,7 +36,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Python module for consuming the Losant IoT Platform API";
     homepage = "https://github.com/Losant/losant-rest-python";
-    changelog = "https://github.com/Losant/losant-rest-python/releases/tag/v${finalAttrs.src.tag}";
+    changelog = "https://github.com/Losant/losant-rest-python/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };

From 3ce568b26a90e8360f93535b2f1cff6be2f888e0 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Sat, 11 Apr 2026 14:35:50 +0200
Subject: [PATCH 43/52] identity: 25.10.1 -> 26.03

changelog: https://gitlab.gnome.org/YaLTeR/identity/-/releases/v26.03

diff: https://gitlab.gnome.org/YaLTeR/identity/-/compare/v25.10.1...v26.03
---
 pkgs/by-name/id/identity/package.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/id/identity/package.nix b/pkgs/by-name/id/identity/package.nix
index 761d26f02dec..3e636485fb7c 100644
--- a/pkgs/by-name/id/identity/package.nix
+++ b/pkgs/by-name/id/identity/package.nix
@@ -27,21 +27,27 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "identity";
-  version = "25.10.1";
+  version = "26.03";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "YaLTeR";
     repo = "identity";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ThccOze4BkqAprk1Yt+Ughts0DFbBwLDYd4iE8ZMwxo=";
+    hash = "sha256-CVSUk0xhfsMM47L0BVQj69Jw2MhsElBI3mxETCWBqcU=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-Do+20wh9F8xE+fA9Sg+8uyRojOF7Ih4taL/pZszU6xc=";
+    hash = "sha256-AuIAfk6BipUHkIfRiLJf0tjadVxsEIKKvpZgKA11oJE=";
   };
 
+  # The crate can't find our provided gstreamer-gl-egl-1.0.pc in the PKG_CONFIG_PATH otherwise.
+  postPatch = ''
+    substituteInPlace $cargoDepsCopy/*/gstreamer-gl-egl-sys-*/Cargo.toml \
+      --replace-fail 'gstreamer-gl-egl-1.0' 'gstreamer-gl-1.0'
+  '';
+
   strictDeps = true;
 
   nativeBuildInputs = [

From 381c05cdbde705ed996678555ef478783b96a102 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Apr 2026 13:04:07 +0000
Subject: [PATCH 44/52] rgx: 0.10.1 -> 0.10.2

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

diff --git a/pkgs/by-name/rg/rgx/package.nix b/pkgs/by-name/rg/rgx/package.nix
index d8802bd82d9b..d5c0a4692d81 100644
--- a/pkgs/by-name/rg/rgx/package.nix
+++ b/pkgs/by-name/rg/rgx/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rgx";
-  version = "0.10.1";
+  version = "0.10.2";
 
   src = fetchFromGitHub {
     owner = "brevity1swos";
     repo = "rgx";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-H566bgnf4bNPXS7rPtOFTlqmkwoXKbB1fBmFDZQUjac=";
+    hash = "sha256-lZA8Tfyneg8cnBeCf0abgPr9232a1OGBfOJEBnU2l+s=";
   };
 
-  cargoHash = "sha256-hTR4eZKUOxvib5lAV/l76GZQPQ6s+Hgl3DT2kaGlaGg=";
+  cargoHash = "sha256-DOIQaqoUkR1KpQURC89PRds0wJkroSYufbKz62rjSB4=";
 
   buildInputs = [ pcre2 ];
 

From b2e08cbff239ae8dbd82ffb58dd2529b525b9335 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Apr 2026 13:50:09 +0000
Subject: [PATCH 45/52] python3Packages.pynintendoparental: 2.3.3 -> 2.3.4

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

diff --git a/pkgs/development/python-modules/pynintendoparental/default.nix b/pkgs/development/python-modules/pynintendoparental/default.nix
index a8c1978a498b..3f9f4db7bfab 100644
--- a/pkgs/development/python-modules/pynintendoparental/default.nix
+++ b/pkgs/development/python-modules/pynintendoparental/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pynintendoparental";
-  version = "2.3.3";
+  version = "2.3.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pantherale0";
     repo = "pynintendoparental";
     tag = finalAttrs.version;
-    hash = "sha256-2qcupx+x578E+n+YsmB81XrVE5M0QFZPP82H5KxEkss=";
+    hash = "sha256-Lwr3iwRFForLvlFV9Z7l9diduNDu9dtrQSCaVMPcKJs=";
   };
 
   postPatch = ''

From fa67e022a560afd6b8e9fef5737902996556f4bc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Apr 2026 13:56:24 +0000
Subject: [PATCH 46/52] python3Packages.actron-neo-api: 0.4.1 -> 0.5.1

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

diff --git a/pkgs/development/python-modules/actron-neo-api/default.nix b/pkgs/development/python-modules/actron-neo-api/default.nix
index 18b433a167ec..2fced01e209c 100644
--- a/pkgs/development/python-modules/actron-neo-api/default.nix
+++ b/pkgs/development/python-modules/actron-neo-api/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "actron-neo-api";
-  version = "0.4.1";
+  version = "0.5.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kclif9";
     repo = "actronneoapi";
     tag = "v${version}";
-    hash = "sha256-pqBMtrLqGP61nmUE5H34nH969fON2KgyCrEmd3/2X8w=";
+    hash = "sha256-TEKRQQbmcDjHuZOte4fqZqLkw4Eo8FUgoyui3Mg8CqA=";
   };
 
   build-system = [

From 8a0fe3e3afd2ba7da9f67c20990f7f9196990963 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Apr 2026 14:29:15 +0000
Subject: [PATCH 47/52] complgen: 0.8.3 -> 0.9.0

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

diff --git a/pkgs/by-name/co/complgen/package.nix b/pkgs/by-name/co/complgen/package.nix
index 366997c15a51..5cf497794077 100644
--- a/pkgs/by-name/co/complgen/package.nix
+++ b/pkgs/by-name/co/complgen/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "complgen";
-  version = "0.8.3";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "adaszko";
     repo = "complgen";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-z4jR2evvC0p306UeULroCLwaa7sjYUh7ENWp17FolAw=";
+    hash = "sha256-izIPX493EBqDgS58asiwFHF8XMNjVaFpXkOyiBb2688=";
   };
 
-  cargoHash = "sha256-VhfIUP9NjsgoJ0qNUFwWdaZpWAWzSlmVgPI8kNeFVgM=";
+  cargoHash = "sha256-S1nt28qpgTy3mQN8wh/Nai6H/mq5eR09s7jRgGaFLkA=";
 
   meta = {
     changelog = "https://github.com/adaszko/complgen/blob/v${finalAttrs.version}/CHANGELOG.md";

From 7ce2f6105f78710630cfef8929c273b9cfc0daef Mon Sep 17 00:00:00 2001
From: Lazaro O'Farrill <lazaroofarrill@gmail.com>
Date: Sat, 11 Apr 2026 16:34:37 +0200
Subject: [PATCH 48/52] gotools: 0.34.0 -> 0.44.0

Signed-off-by: Lazaro O'Farrill <lazaroofarrill@gmail.com>
---
 pkgs/by-name/go/gotools/package.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/go/gotools/package.nix b/pkgs/by-name/go/gotools/package.nix
index 74392d52e6eb..cce11d7f736d 100644
--- a/pkgs/by-name/go/gotools/package.nix
+++ b/pkgs/by-name/go/gotools/package.nix
@@ -8,20 +8,20 @@
 
 buildGoModule (finalAttrs: {
   pname = "gotools";
-  version = "0.34.0";
+  version = "0.44.0";
 
   # using GitHub instead of https://go.googlesource.com/tools because Gitiles UI is too basic to browse
   src = fetchFromGitHub {
     owner = "golang";
     repo = "tools";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-C+P2JoD4NzSAkAQuA20bVrfLZrMHXekvXn8KPOM5Nj4=";
+    hash = "sha256-F9DyZAZdrKCrCIB6FZP0KrOwPNRLk0ZQoNMHGMHd0UY=";
   };
 
   allowGoReference = true;
   doCheck = false;
 
-  vendorHash = "sha256-UZNYHx5y+kRp3AJq6s4Wy+k789GDG7FBTSzCTorVjgg=";
+  vendorHash = "sha256-HpWkPsRJ0vCqJi9LoZcVbzeoPQ2B9ftZwuS1r47W7Sc=";
 
   nativeBuildInputs = [ makeWrapper ];
 
@@ -29,8 +29,6 @@ buildGoModule (finalAttrs: {
     # The gopls folder contains a Go submodule which causes a build failure
     # and lives in its own package named gopls.
     rm -r gopls
-    # cmd/auth folder is similar and is scheduled to be removed https://github.com/golang/go/issues/70872
-    rm -r cmd/auth
   '';
 
   # Set GOTOOLDIR for derivations adding this to buildInputs

From 0cebcf63f406f46b42b42f5e7e5eedf29cac24ad Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sat, 11 Apr 2026 23:26:32 +0800
Subject: [PATCH 49/52] code-cursor: update hash for {aarch64,x86_64}-linux

---
 pkgs/by-name/co/code-cursor/sources.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/code-cursor/sources.json b/pkgs/by-name/co/code-cursor/sources.json
index 6acce0b40e06..af3c3981e4a6 100644
--- a/pkgs/by-name/co/code-cursor/sources.json
+++ b/pkgs/by-name/co/code-cursor/sources.json
@@ -4,11 +4,11 @@
   "sources": {
     "x86_64-linux": {
       "url": "https://downloads.cursor.com/production/475871d112608994deb2e3065dfb7c6b0baa0c54/linux/x64/Cursor-3.0.16-x86_64.AppImage",
-      "hash": "sha256-/kBlLvaF3/7WSEI6ika6opgUVDQVo7vLVLsgG8htEpk="
+      "hash": "sha256-dN8tFSppIpO/P0Thst5uaNzlmfWZDh0Y81Lx1BuSYt0="
     },
     "aarch64-linux": {
       "url": "https://downloads.cursor.com/production/475871d112608994deb2e3065dfb7c6b0baa0c54/linux/arm64/Cursor-3.0.16-aarch64.AppImage",
-      "hash": "sha256-tG75z9SPVaH6cgN75XW1ZKRyj689Yd97cbQZSvQtPrA="
+      "hash": "sha256-AJwCzST0fj8fjSVeK15uE50XWGIOLOwn4gRRB733eLg="
     },
     "x86_64-darwin": {
       "url": "https://downloads.cursor.com/production/475871d112608994deb2e3065dfb7c6b0baa0c54/darwin/x64/Cursor-darwin-x64.dmg",

From d9337fdd460bc48e9ed26f56e372f443a10f34c9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Apr 2026 15:28:12 +0000
Subject: [PATCH 50/52] everest: 6194 -> 6249

---
 pkgs/by-name/ev/everest-bin/package.nix | 6 +++---
 pkgs/by-name/ev/everest/package.nix     | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ev/everest-bin/package.nix b/pkgs/by-name/ev/everest-bin/package.nix
index b6ae60777831..c4f1b231d1f9 100644
--- a/pkgs/by-name/ev/everest-bin/package.nix
+++ b/pkgs/by-name/ev/everest-bin/package.nix
@@ -8,15 +8,15 @@
 
 let
   pname = "everest";
-  version = "6194";
+  version = "6249";
   phome = "$out/lib/Celeste";
 in
 stdenvNoCC.mkDerivation {
   inherit pname version;
   src = fetchzip {
-    url = "https://github.com/EverestAPI/Everest/releases/download/stable-1.6194.0/main.zip";
+    url = "https://github.com/EverestAPI/Everest/releases/download/stable-1.6249.0/main.zip";
     extension = "zip";
-    hash = "sha256-Ja/b/5kKekBZZbqp0o2I8dvtiQ/rRa2kS6Q+08yBX7I=";
+    hash = "sha256-xcWscldogSI7vmljg8uU0zV8gREVe5rLHj0l6X+0z9E=";
   };
   buildInputs = [
     icu
diff --git a/pkgs/by-name/ev/everest/package.nix b/pkgs/by-name/ev/everest/package.nix
index a2608874d785..dcf359861840 100644
--- a/pkgs/by-name/ev/everest/package.nix
+++ b/pkgs/by-name/ev/everest/package.nix
@@ -11,8 +11,8 @@
 
 let
   pname = "everest";
-  version = "6194";
-  rev = "5adc0e7ae6087ba90f9dd1cad487cf4dde1d493b";
+  version = "6249";
+  rev = "201a0dc2e0851f2bc601ed48cc1a64b17952e5ea";
   phome = "$out/lib/Celeste";
 in
 buildDotnetModule {
@@ -25,7 +25,7 @@ buildDotnetModule {
     fetchSubmodules = true;
     # TODO: use leaveDotGit = true and modify external/MonoMod in postFetch to please SourceLink
     # Microsoft.SourceLink.Common.targets(53,5): warning : Source control information is not available - the generated source link is empty.
-    hash = "sha256-GG3cxrMZRSHoUzewHEQvljXSgHWcF9GNunlyWbiKrQo=";
+    hash = "sha256-ISCL6C1Zj18fMsfBAte9cqAWCA6/4eewKmefYmTm2uA=";
   };
 
   nativeBuildInputs = [ autoPatchelfHook ];

From 30eec28a3e289b26542742775b0251b070f215a8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Apr 2026 15:48:31 +0000
Subject: [PATCH 51/52] justbuild: 1.6.4 -> 1.6.5

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

diff --git a/pkgs/by-name/ju/justbuild/package.nix b/pkgs/by-name/ju/justbuild/package.nix
index 2758556027a4..2192558735b4 100644
--- a/pkgs/by-name/ju/justbuild/package.nix
+++ b/pkgs/by-name/ju/justbuild/package.nix
@@ -34,13 +34,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "justbuild";
-  version = "1.6.4";
+  version = "1.6.5";
 
   src = fetchFromGitHub {
     owner = "just-buildsystem";
     repo = "justbuild";
     tag = "v${version}";
-    hash = "sha256-WJg6zDgDKJjxbR7fdFUY6f2uNHntYPZT8lIt2kAJqAo=";
+    hash = "sha256-aeBIgbjSD9iVhwtkOOs63Xrpn8OshoABtOZhrjn3/jw=";
   };
 
   bazelapi = fetchurl {

From efdf5e1f017f25b72bdf9994b6bc119a61294dcd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Apr 2026 16:02:54 +0000
Subject: [PATCH 52/52] trilium-desktop: 0.102.1 -> 0.102.2

---
 pkgs/by-name/tr/trilium-desktop/package.nix | 10 +++++-----
 pkgs/by-name/tr/trilium-server/package.nix  |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/tr/trilium-desktop/package.nix b/pkgs/by-name/tr/trilium-desktop/package.nix
index be13017ad1bb..f2dc554703e3 100644
--- a/pkgs/by-name/tr/trilium-desktop/package.nix
+++ b/pkgs/by-name/tr/trilium-desktop/package.nix
@@ -15,7 +15,7 @@
 
 let
   pname = "trilium-desktop";
-  version = "0.102.1";
+  version = "0.102.2";
 
   triliumSource = os: arch: hash: {
     url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-v${version}-${os}-${arch}.zip";
@@ -26,10 +26,10 @@ let
   darwinSource = triliumSource "macos";
 
   # exposed like this for update.sh
-  x86_64-linux.hash = "sha256-whGKMEruDqQjXEwYa3xlaoZPERWMmI541X4HZSzLla0=";
-  aarch64-linux.hash = "sha256-mTs+5j2jYKRW1cMQgs9SLp4UxpaE0lT41HG4AhIb+xE=";
-  x86_64-darwin.hash = "sha256-lkebqEMY37A6y3W2KjENIPys0cH+fGPFYeK/n4nPd1Y=";
-  aarch64-darwin.hash = "sha256-nIodFvyPI7LJUE4PI1BMwI3Xnz/OfzMrgaHHkltUgKw=";
+  x86_64-linux.hash = "sha256-OVkF/iDpbtcyv8ZXVtp9QYeKrA3rolQSWBUIBaJn74Q=";
+  aarch64-linux.hash = "sha256-85HlQsd/YjuVCYSO6wP9u8dNul87weq2IYDYR7N0gls=";
+  x86_64-darwin.hash = "sha256-S28eV7NUunWsE6kpKN2h7KKRCSFaMgIr7Ofj5pjJRhI=";
+  aarch64-darwin.hash = "sha256-GghYjS7Env8IQcNS8ZwIX4bmc6iZgGeL1W4IvCGMiBw=";
 
   sources = {
     x86_64-linux = linuxSource "x64" x86_64-linux.hash;
diff --git a/pkgs/by-name/tr/trilium-server/package.nix b/pkgs/by-name/tr/trilium-server/package.nix
index d117c280891f..88cd03372c20 100644
--- a/pkgs/by-name/tr/trilium-server/package.nix
+++ b/pkgs/by-name/tr/trilium-server/package.nix
@@ -7,12 +7,12 @@
 }:
 
 let
-  version = "0.102.1";
+  version = "0.102.2";
 
   serverSource_x64.url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-x64.tar.xz";
-  serverSource_x64.hash = "sha256-5UW+3VrexXbtfVEcoPGEl1cu44nX89a88ny5o2pSv1I=";
+  serverSource_x64.hash = "sha256-2/Skk4I8CwttF5SEs8gPW6KyNxcrYcTuQBQ7irNL1lw=";
   serverSource_arm64.url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-arm64.tar.xz";
-  serverSource_arm64.hash = "sha256-uwOYXCoWmpRK2XQfSYervEzdbwHy0qQ+OkRh6izvDNM=";
+  serverSource_arm64.hash = "sha256-MQlYci2Z45qSYGxgSTWN3P017GImUqkv24DBn8usDm8=";
 
   serverSource =
     if stdenv.hostPlatform.isx86_64 then