From 41f1eadb7350d7fac73bcb71cf4cddacd416d28e Mon Sep 17 00:00:00 2001
From: ferres <justferres@yandex.ru>
Date: Wed, 19 Mar 2025 12:16:10 +0300
Subject: [PATCH 01/52] nixos/zeronsd: fix acl permissions

---
 nixos/modules/services/networking/zeronsd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/zeronsd.nix b/nixos/modules/services/networking/zeronsd.nix
index 23f1a5fa7e4f..25e7c03395bf 100644
--- a/nixos/modules/services/networking/zeronsd.nix
+++ b/nixos/modules/services/networking/zeronsd.nix
@@ -102,7 +102,7 @@ in
     }) cfg.servedNetworks;
 
     systemd.tmpfiles.rules = [
-      "a+ /var/lib/zerotier-one - - - - u:zeronsd:x"
+      "a+ /var/lib/zerotier-one - - - - mask::x,u:zeronsd:x"
       "a+ /var/lib/zerotier-one/authtoken.secret - - - - mask::r,u:zeronsd:r"
     ];
 

From 5ea55be1150850ea4cf48c3d0be6bad59399fa52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sat, 19 Apr 2025 21:43:05 +0200
Subject: [PATCH 02/52] nextcloud31Packages.apps.recognize: fix compilation

---
 pkgs/servers/nextcloud/packages/apps/recognize.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/nextcloud/packages/apps/recognize.nix b/pkgs/servers/nextcloud/packages/apps/recognize.nix
index 5c799daed73f..204c1cd187c7 100644
--- a/pkgs/servers/nextcloud/packages/apps/recognize.nix
+++ b/pkgs/servers/nextcloud/packages/apps/recognize.nix
@@ -108,7 +108,7 @@ stdenv.mkDerivation rec {
     # Install tfjs dependency
     export CPPFLAGS="-I${lib.getDev nodejs}/include/node -Ideps/include"
     cd node_modules/@tensorflow/tfjs-node
-    node-pre-gyp install --prefer-offline --build-from-source --nodedir=${nodejs}/include/node
+    node-pre-gyp install --prefer-offline --build-from-source --nodedir=${nodejs}
     cd -
 
     # Test tfjs returns exit code 0

From 7970325edbd3ec479b86907bce31f3af885858ba Mon Sep 17 00:00:00 2001
From: Jonas Meurer <jmpunkt@outlook.com>
Date: Tue, 13 May 2025 21:35:19 +0200
Subject: [PATCH 03/52] pidginPackages.pidgin-sipe: fix compilation error with
 libxml2

---
 .../0001-fix-libxml-error-signature.patch     | 21 +++++++++++++++++++
 .../pidgin/pidgin-plugins/sipe/default.nix    |  1 +
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/sipe/0001-fix-libxml-error-signature.patch

diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/sipe/0001-fix-libxml-error-signature.patch b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/sipe/0001-fix-libxml-error-signature.patch
new file mode 100644
index 000000000000..2ff8821e6119
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/sipe/0001-fix-libxml-error-signature.patch
@@ -0,0 +1,21 @@
+diff --git a/src/core/sipe-xml.c b/src/core/sipe-xml.c
+index cfc5311..c38f6e8 100644
+--- a/src/core/sipe-xml.c
++++ b/src/core/sipe-xml.c
+@@ -29,6 +29,7 @@
+ #include <time.h>
+ 
+ #include "libxml/parser.h"
++#include "libxml/xmlerror.h"
+ #include "libxml/c14n.h"
+ #include "libxml/xmlversion.h"
+ 
+@@ -154,7 +155,7 @@ static void callback_error(void *user_data, const char *msg, ...)
+ 	g_free(errmsg);
+ }
+ 
+-static void callback_serror(void *user_data, xmlErrorPtr error)
++static void callback_serror(void *user_data, const xmlError *error)
+ {
+ 	struct _parser_data *pd = user_data;
+ 
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/sipe/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/sipe/default.nix
index 37e69759286f..15706024b23c 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/sipe/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/sipe/default.nix
@@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
       url = "https://repo.or.cz/siplcs.git/patch/583a734e63833f03d11798b7b0d59a17d08ae60f";
       sha256 = "Ai6Czpy/FYvBi4GZR7yzch6OcouJgfreI9HcojhGVV4=";
     })
+    ./0001-fix-libxml-error-signature.patch
   ];
 
   nativeBuildInputs = [ intltool ];

From ab5bbdad9ce7dea4e9495d156837dca97eca6c76 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 26 Apr 2025 17:21:18 +0000
Subject: [PATCH 04/52] hydra: 0-unstable-2025-04-16 -> 0-unstable-2025-04-23

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

diff --git a/pkgs/by-name/hy/hydra/package.nix b/pkgs/by-name/hy/hydra/package.nix
index 84d326b54865..3c8422635c82 100644
--- a/pkgs/by-name/hy/hydra/package.nix
+++ b/pkgs/by-name/hy/hydra/package.nix
@@ -130,13 +130,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "hydra";
-  version = "0-unstable-2025-04-16";
+  version = "0-unstable-2025-04-23";
 
   src = fetchFromGitHub {
     owner = "NixOS";
     repo = "hydra";
-    rev = "bdde73acbd66c569e8171b42b810adf92a56f76a";
-    hash = "sha256-1hj8JJ4ngqzJ8Xt3WvCBnQmwTnzzaZaQlCJcPWQvvM4=";
+    rev = "455f1a0665c6ca55df2a17679f6103402a9e9431";
+    hash = "sha256-rn9ZE4ERml8ZkT9ziDrqGEJfzr0rJlzYfu2PHL71oiI=";
   };
 
   outputs = [

From 2e68a674bd80c8ac26013552dbb7abd2bab052c6 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Sun, 18 May 2025 10:12:21 +0200
Subject: [PATCH 05/52] nixos/bees: fix option example

The attribute name usually corresponds to the path of the filesystem.
---
 nixos/modules/services/misc/bees.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/bees.nix b/nixos/modules/services/misc/bees.nix
index 2815bb035cb7..96c4789f86e0 100644
--- a/nixos/modules/services/misc/bees.nix
+++ b/nixos/modules/services/misc/bees.nix
@@ -87,7 +87,7 @@ in
       default = { };
       example = lib.literalExpression ''
         {
-          root = {
+          "-" = {
             spec = "LABEL=root";
             hashTableSizeMB = 2048;
             verbosity = "crit";

From 472eb192b073f6e39bee661353cfc0251b10b9b6 Mon Sep 17 00:00:00 2001
From: Atemu <git@atemu.net>
Date: Sun, 18 May 2025 15:35:45 +0200
Subject: [PATCH 06/52] ath9k: fix build of old gmp by disabling compiler
 warnings

---
 pkgs/os-specific/linux/firmware/ath9k/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/firmware/ath9k/default.nix b/pkgs/os-specific/linux/firmware/ath9k/default.nix
index 44a5d65358b4..87448530fb11 100644
--- a/pkgs/os-specific/linux/firmware/ath9k/default.nix
+++ b/pkgs/os-specific/linux/firmware/ath9k/default.nix
@@ -47,7 +47,12 @@ stdenv.mkDerivation (finalAttrs: {
     perl
   ];
 
-  env.NIX_CFLAGS_COMPILE = "-w"; # old libiberty emits fatal warnings
+  env.NIX_CFLAGS_COMPILE =
+    # old libiberty emits fatal warnings
+    "-w"
+    # old gmp fails to compile with newer gcc
+    # FIXME remove when the normal version has moved on
+    + lib.optionalString (!enableUnstable) " -fpermissive";
 
   dontUseCmakeConfigure = true;
   enableParallelBuilding = true;

From 3303249ed2aa2131480737497abcee373e373216 Mon Sep 17 00:00:00 2001
From: Sveske_Juice <carl.benjamin.dreyer@gmail.com>
Date: Mon, 19 May 2025 11:01:38 +0200
Subject: [PATCH 07/52] nixos/syncthing: fix cert/key permission error

---
 nixos/modules/services/networking/syncthing.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix
index 0a901148dc9c..70a96e4740d6 100644
--- a/nixos/modules/services/networking/syncthing.nix
+++ b/nixos/modules/services/networking/syncthing.nix
@@ -886,10 +886,10 @@ in
               "+${pkgs.writers.writeBash "syncthing-copy-keys" ''
                 install -dm700 -o ${cfg.user} -g ${cfg.group} ${cfg.configDir}
                 ${optionalString (cfg.cert != null) ''
-                  install -Dm400 -o ${cfg.user} -g ${cfg.group} ${toString cfg.cert} ${cfg.configDir}/cert.pem
+                  install -Dm644 -o ${cfg.user} -g ${cfg.group} ${toString cfg.cert} ${cfg.configDir}/cert.pem
                 ''}
                 ${optionalString (cfg.key != null) ''
-                  install -Dm400 -o ${cfg.user} -g ${cfg.group} ${toString cfg.key} ${cfg.configDir}/key.pem
+                  install -Dm600 -o ${cfg.user} -g ${cfg.group} ${toString cfg.key} ${cfg.configDir}/key.pem
                 ''}
               ''}";
           ExecStart = ''

From 7ba227244aaa7ddb238d764ce5b4ae5a630ef584 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 20 May 2025 03:42:32 +0800
Subject: [PATCH 08/52] ocrad: 0.27 -> 0.29

---
 pkgs/by-name/oc/ocrad/package.nix | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/oc/ocrad/package.nix b/pkgs/by-name/oc/ocrad/package.nix
index 8ffd4ecf8a16..32cbf8b034e0 100644
--- a/pkgs/by-name/oc/ocrad/package.nix
+++ b/pkgs/by-name/oc/ocrad/package.nix
@@ -1,28 +1,33 @@
 {
-  fetchurl,
   lib,
   stdenv,
+  fetchurl,
   lzip,
   texinfo,
+  libpng,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "ocrad";
-  version = "0.27";
+  version = "0.29";
 
   src = fetchurl {
-    url = "mirror://gnu/ocrad/${pname}-${version}.tar.lz";
-    sha256 = "0divffvcaim89g4pvqs8kslbcxi475bcl3b4ynphf284k9zfdgx9";
+    url = "mirror://gnu/ocrad/ocrad-${finalAttrs.version}.tar.lz";
+    hash = "sha256-ESAMxrC3uhaISnLcy1jvaU96omzSsgQeVVWA8GTS2ek=";
   };
 
   nativeBuildInputs = [
     lzip # unpack
   ];
-  buildInputs = [ texinfo ];
+
+  buildInputs = [
+    texinfo
+    libpng
+  ];
 
   doCheck = true;
 
-  meta = with lib; {
+  meta = {
     description = "Optical character recognition (OCR) program & library";
     longDescription = ''
       GNU Ocrad is an OCR (Optical Character Recognition) program based on
@@ -37,9 +42,9 @@ stdenv.mkDerivation rec {
       backend to other programs.
     '';
 
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ pSub ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ pSub ];
+    platforms = lib.platforms.unix;
     mainProgram = "ocrad";
   };
-}
+})

From d04bf863816f00125de04500f8c8a4c0a090f93b Mon Sep 17 00:00:00 2001
From: Shogo Takata <peshogo@gmail.com>
Date: Tue, 20 May 2025 15:14:55 +0900
Subject: [PATCH 09/52] nixos.tests.pam-file-contents: fix build failure

This fixes the test for pam file contents.
The pam file started using fully-qualified paths in the following
commit.
7306423158ba8d6e5d5674c4d6a7fcfea3c75f84
---
 nixos/tests/pam/pam-file-contents.nix |  4 ++--
 nixos/tests/pam/test_chfn.py          | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/nixos/tests/pam/pam-file-contents.nix b/nixos/tests/pam/pam-file-contents.nix
index 18f61d0b0beb..50551d8fd340 100644
--- a/nixos/tests/pam/pam-file-contents.nix
+++ b/nixos/tests/pam/pam-file-contents.nix
@@ -25,8 +25,8 @@ import ../make-test-python.nix (
 
     testScript =
       builtins.replaceStrings
-        [ "@@pam_ccreds@@" "@@pam_krb5@@" ]
-        [ pkgs.pam_ccreds.outPath pkgs.pam_krb5.outPath ]
+        [ "@@pam@@" "@@pam_ccreds@@" "@@pam_krb5@@" ]
+        [ pkgs.pam.outPath pkgs.pam_ccreds.outPath pkgs.pam_krb5.outPath ]
         (builtins.readFile ./test_chfn.py);
   }
 )
diff --git a/nixos/tests/pam/test_chfn.py b/nixos/tests/pam/test_chfn.py
index 3cfbb3908e9d..900feb35f4b3 100644
--- a/nixos/tests/pam/test_chfn.py
+++ b/nixos/tests/pam/test_chfn.py
@@ -1,17 +1,17 @@
 expected_lines = {
-    "account required pam_unix.so",
+    "account required @@pam@@/lib/security/pam_unix.so",
     "account sufficient @@pam_krb5@@/lib/security/pam_krb5.so",
     "auth [default=die success=done] @@pam_ccreds@@/lib/security/pam_ccreds.so action=validate use_first_pass",
     "auth [default=ignore success=1 service_err=reset] @@pam_krb5@@/lib/security/pam_krb5.so use_first_pass",
-    "auth required pam_deny.so",
+    "auth required @@pam@@/lib/security/pam_deny.so",
     "auth sufficient @@pam_ccreds@@/lib/security/pam_ccreds.so action=store use_first_pass",
-    "auth sufficient pam_rootok.so",
-    "auth sufficient pam_unix.so likeauth try_first_pass",
+    "auth sufficient @@pam@@/lib/security/pam_rootok.so",
+    "auth sufficient @@pam@@/lib/security/pam_unix.so likeauth try_first_pass",
     "password sufficient @@pam_krb5@@/lib/security/pam_krb5.so use_first_pass",
-    "password sufficient pam_unix.so nullok yescrypt",
+    "password sufficient @@pam@@/lib/security/pam_unix.so nullok yescrypt",
     "session optional @@pam_krb5@@/lib/security/pam_krb5.so",
-    "session required pam_env.so conffile=/etc/pam/environment readenv=0",
-    "session required pam_unix.so",
+    "session required @@pam@@/lib/security/pam_env.so conffile=/etc/pam/environment readenv=0",
+    "session required @@pam@@/lib/security/pam_unix.so",
 }
 actual_lines = set(machine.succeed("cat /etc/pam.d/chfn").splitlines())
 

From 5c1b7f1975bdd15289f3f15f43c7db587d9b08e2 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Mon, 19 May 2025 18:45:01 +0200
Subject: [PATCH 10/52] lapack: fix static build

---
 pkgs/by-name/la/lapack/package.nix | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/la/lapack/package.nix b/pkgs/by-name/la/lapack/package.nix
index 017c84213760..ba24b000b827 100644
--- a/pkgs/by-name/la/lapack/package.nix
+++ b/pkgs/by-name/la/lapack/package.nix
@@ -9,12 +9,16 @@
 
 let
 
+  libraryExtension = stdenv.hostPlatform.extensions.sharedLibrary or ".a";
   version = "3";
   canonicalExtension =
     if stdenv.hostPlatform.isLinux then
-      "${stdenv.hostPlatform.extensions.sharedLibrary}.${version}"
+      if stdenv.hostPlatform.extensions ? sharedLibrary then
+        "${stdenv.hostPlatform.extensions.sharedLibrary}.${version}"
+      else
+        ".a"
     else
-      stdenv.hostPlatform.extensions.sharedLibrary;
+      libraryExtension;
 
   lapackImplementation = lib.getName lapackProvider;
   lapackProvider' =
@@ -71,14 +75,14 @@ stdenv.mkDerivation {
       chmod +w $out/lib/liblapack${canonicalExtension}
 
     ''
-    + (lib.optionalString stdenv.hostPlatform.isElf ''
+    + (lib.optionalString (stdenv.hostPlatform.isElf && !stdenv.hostPlatform.isStatic) ''
       patchelf --set-soname liblapack${canonicalExtension} $out/lib/liblapack${canonicalExtension}
       patchelf --set-rpath "$(patchelf --print-rpath $out/lib/liblapack${canonicalExtension}):${lapackProvider'}/lib" $out/lib/liblapack${canonicalExtension}
     '')
     + ''
 
-        if [ "$out/lib/liblapack${canonicalExtension}" != "$out/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}" ]; then
-          ln -s $out/lib/liblapack${canonicalExtension} "$out/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}"
+        if [ "$out/lib/liblapack${canonicalExtension}" != "$out/lib/liblapack${libraryExtension}" ]; then
+          ln -s $out/lib/liblapack${canonicalExtension} "$out/lib/liblapack${libraryExtension}"
         fi
 
         install -D ${lib.getDev lapack-reference}/include/lapack.h $dev/include/lapack.h
@@ -102,7 +106,7 @@ stdenv.mkDerivation {
         chmod +w $out/lib/liblapacke${canonicalExtension}
 
     ''
-    + (lib.optionalString stdenv.hostPlatform.isElf ''
+    + (lib.optionalString (stdenv.hostPlatform.isElf && !stdenv.hostPlatform.isStatic) ''
       patchelf --set-soname liblapacke${canonicalExtension} $out/lib/liblapacke${canonicalExtension}
       patchelf --set-rpath "$(patchelf --print-rpath $out/lib/liblapacke${canonicalExtension}):${lib.getLib lapackProvider'}/lib" $out/lib/liblapacke${canonicalExtension}
     '')
@@ -125,7 +129,7 @@ stdenv.mkDerivation {
     + lib.optionalString (lapackImplementation == "mkl") ''
       mkdir -p $out/nix-support
       echo 'export MKL_INTERFACE_LAYER=${lib.optionalString isILP64 "I"}LP64,GNU' > $out/nix-support/setup-hook
-      ln -s $out/lib/liblapack${canonicalExtension} $out/lib/libmkl_rt${stdenv.hostPlatform.extensions.sharedLibrary}
+      ln -s $out/lib/liblapack${canonicalExtension} $out/lib/libmkl_rt${libraryExtension}
       ln -sf ${lapackProvider'}/include/* $dev/include
     ''
   );

From ecc5126fd0629d6a20c42af5fb0ba080894e0a51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 22 May 2025 14:01:05 -0700
Subject: [PATCH 11/52] python3Packages.igloohome-api: 0.1.0 -> 0.1.1

Diff: https://github.com/keithle888/igloohome-api/compare/refs/tags/v0.1.0...refs/tags/v0.1.1

Changelog: https://github.com/keithle888/igloohome-api/releases/tag/v0.1.1
---
 pkgs/development/python-modules/igloohome-api/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/igloohome-api/default.nix b/pkgs/development/python-modules/igloohome-api/default.nix
index e119d7d8b0f2..18b82b492eae 100644
--- a/pkgs/development/python-modules/igloohome-api/default.nix
+++ b/pkgs/development/python-modules/igloohome-api/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "igloohome-api";
-  version = "0.1.0";
+  version = "0.1.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "keithle888";
     repo = "igloohome-api";
     tag = "v${version}";
-    hash = "sha256-CFxVZiga6008oNbacK12t7U8mOvL8YgEgQ82MsvZ46w=";
+    hash = "sha256-BLmmypbvYTgQisT0+9Ym1ZTK6asAP2tWXP2DWhKYM7U=";
   };
 
   build-system = [ hatchling ];

From 598138a191db76f50a98635e68f7722b03fd2718 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Thu, 22 May 2025 23:19:17 +0200
Subject: [PATCH 12/52] tokei: don't use pname in src

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

diff --git a/pkgs/by-name/to/tokei/package.nix b/pkgs/by-name/to/tokei/package.nix
index 42e0ba450c75..7764c722fe22 100644
--- a/pkgs/by-name/to/tokei/package.nix
+++ b/pkgs/by-name/to/tokei/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
 
   src = fetchFromGitHub {
     owner = "XAMPPRocky";
-    repo = pname;
+    repo = "tokei";
     rev = "v${version}";
     sha256 = "sha256-jCI9VM3y76RI65E5UGuAPuPkDRTMyi+ydx64JWHcGfE=";
   };

From f7057320c7d4825436d7248d5317fdf6763bb663 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Thu, 22 May 2025 23:18:38 +0200
Subject: [PATCH 13/52] tokei: use finalAttrs pattern

---
 pkgs/by-name/to/tokei/package.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/to/tokei/package.nix b/pkgs/by-name/to/tokei/package.nix
index 7764c722fe22..91c49ed7eba8 100644
--- a/pkgs/by-name/to/tokei/package.nix
+++ b/pkgs/by-name/to/tokei/package.nix
@@ -7,23 +7,21 @@
   zlib,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tokei";
   version = "13.0.0-alpha.8";
 
   src = fetchFromGitHub {
     owner = "XAMPPRocky";
     repo = "tokei";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     sha256 = "sha256-jCI9VM3y76RI65E5UGuAPuPkDRTMyi+ydx64JWHcGfE=";
   };
 
   useFetchCargoVendor = true;
   cargoHash = "sha256-LzlyrKaRjUo6JnVLQnHidtI4OWa+GrhAc4D8RkL+nmQ=";
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    libiconv
-  ];
+  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
 
   checkInputs = lib.optionals stdenv.hostPlatform.isDarwin [ zlib ];
 
@@ -43,4 +41,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = with maintainers; [ ];
     mainProgram = "tokei";
   };
-}
+})

From a83df17a078ca97b2ca8d9785aab9418e278b450 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Thu, 22 May 2025 23:21:40 +0200
Subject: [PATCH 14/52] tokei: use tag and hash in fetchFromGitHub

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

diff --git a/pkgs/by-name/to/tokei/package.nix b/pkgs/by-name/to/tokei/package.nix
index 91c49ed7eba8..7d0efd22480f 100644
--- a/pkgs/by-name/to/tokei/package.nix
+++ b/pkgs/by-name/to/tokei/package.nix
@@ -14,8 +14,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   src = fetchFromGitHub {
     owner = "XAMPPRocky";
     repo = "tokei";
-    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-jCI9VM3y76RI65E5UGuAPuPkDRTMyi+ydx64JWHcGfE=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-jCI9VM3y76RI65E5UGuAPuPkDRTMyi+ydx64JWHcGfE=";
   };
 
   useFetchCargoVendor = true;

From 5d6cb0e410b21605f48bdacd63976d3325b10830 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Thu, 22 May 2025 23:23:26 +0200
Subject: [PATCH 15/52] tokei: remove `with lib;`

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

diff --git a/pkgs/by-name/to/tokei/package.nix b/pkgs/by-name/to/tokei/package.nix
index 7d0efd22480f..7021d548e472 100644
--- a/pkgs/by-name/to/tokei/package.nix
+++ b/pkgs/by-name/to/tokei/package.nix
@@ -28,17 +28,17 @@ rustPlatform.buildRustPackage (finalAttrs: {
   # enable all output formats
   buildFeatures = [ "all" ];
 
-  meta = with lib; {
+  meta = {
     description = "Program that allows you to count your code, quickly";
     longDescription = ''
       Tokei is a program that displays statistics about your code. Tokei will show number of files, total lines within those files and code, comments, and blanks grouped by language.
     '';
     homepage = "https://github.com/XAMPPRocky/tokei";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20 # or
       mit
     ];
-    maintainers = with maintainers; [ ];
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "tokei";
   };
 })

From 09c5bb16d8c34bfe3f84dbab7f02c04825adcbeb Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Thu, 22 May 2025 23:26:20 +0200
Subject: [PATCH 16/52] tokei: improve meta.description

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

diff --git a/pkgs/by-name/to/tokei/package.nix b/pkgs/by-name/to/tokei/package.nix
index 7021d548e472..f9991f01e485 100644
--- a/pkgs/by-name/to/tokei/package.nix
+++ b/pkgs/by-name/to/tokei/package.nix
@@ -29,9 +29,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
   buildFeatures = [ "all" ];
 
   meta = {
-    description = "Program that allows you to count your code, quickly";
+    description = "Count your code, quickly";
     longDescription = ''
-      Tokei is a program that displays statistics about your code. Tokei will show number of files, total lines within those files and code, comments, and blanks grouped by language.
+      Tokei is a program that displays statistics about your code. Tokei will show the number of files, total lines within those files and code, comments, and blanks grouped by language.
     '';
     homepage = "https://github.com/XAMPPRocky/tokei";
     license = with lib.licenses; [

From dee1607ccced1e05fe9c3121e1893832e4c09667 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Thu, 22 May 2025 23:28:38 +0200
Subject: [PATCH 17/52] tokei: add meta.changelog

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

diff --git a/pkgs/by-name/to/tokei/package.nix b/pkgs/by-name/to/tokei/package.nix
index f9991f01e485..932a7a616274 100644
--- a/pkgs/by-name/to/tokei/package.nix
+++ b/pkgs/by-name/to/tokei/package.nix
@@ -34,6 +34,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       Tokei is a program that displays statistics about your code. Tokei will show the number of files, total lines within those files and code, comments, and blanks grouped by language.
     '';
     homepage = "https://github.com/XAMPPRocky/tokei";
+    changelog = "https://github.com/XAMPPRocky/tokei/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = with lib.licenses; [
       asl20 # or
       mit

From ec4ef6302c05ce4b5240fe657aade79f56c911a3 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Thu, 22 May 2025 23:34:21 +0200
Subject: [PATCH 18/52] tokei: add versionCheckHook

---
 pkgs/by-name/to/tokei/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/to/tokei/package.nix b/pkgs/by-name/to/tokei/package.nix
index 932a7a616274..0564e498891f 100644
--- a/pkgs/by-name/to/tokei/package.nix
+++ b/pkgs/by-name/to/tokei/package.nix
@@ -5,6 +5,7 @@
   rustPlatform,
   libiconv,
   zlib,
+  versionCheckHook,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -28,6 +29,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
   # enable all output formats
   buildFeatures = [ "all" ];
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
   meta = {
     description = "Count your code, quickly";
     longDescription = ''

From 732bec3fe4cde6d1702227e029f6c143f3e11add Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Thu, 22 May 2025 23:36:53 +0200
Subject: [PATCH 19/52] tokei: add nix-update-script

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

diff --git a/pkgs/by-name/to/tokei/package.nix b/pkgs/by-name/to/tokei/package.nix
index 0564e498891f..7205d245dd54 100644
--- a/pkgs/by-name/to/tokei/package.nix
+++ b/pkgs/by-name/to/tokei/package.nix
@@ -6,6 +6,7 @@
   libiconv,
   zlib,
   versionCheckHook,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -33,6 +34,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version=unstable" ]; };
+
   meta = {
     description = "Count your code, quickly";
     longDescription = ''

From d29618c87379d75ade9d62e7c111a1d2b76e5510 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Thu, 22 May 2025 23:22:53 +0200
Subject: [PATCH 20/52] tokei: add defelo as maintainer

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

diff --git a/pkgs/by-name/to/tokei/package.nix b/pkgs/by-name/to/tokei/package.nix
index 7205d245dd54..da60731d9992 100644
--- a/pkgs/by-name/to/tokei/package.nix
+++ b/pkgs/by-name/to/tokei/package.nix
@@ -47,7 +47,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       asl20 # or
       mit
     ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = with lib.maintainers; [ defelo ];
     mainProgram = "tokei";
   };
 })

From 974c38747ba338e28515e81d24cb3829121aceb6 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Thu, 22 May 2025 17:01:58 -0700
Subject: [PATCH 21/52] llvmPackages_20.libc: fix by removing scudo

---
 pkgs/development/compilers/llvm/common/libc/default.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/llvm/common/libc/default.nix b/pkgs/development/compilers/llvm/common/libc/default.nix
index ecb70c783431..69d830a19d71 100644
--- a/pkgs/development/compilers/llvm/common/libc/default.nix
+++ b/pkgs/development/compilers/llvm/common/libc/default.nix
@@ -79,12 +79,8 @@ stdenv.mkDerivation (finalAttrs: {
       (lib.cmakeFeature "LLVM_ENABLE_RUNTIMES" "libc;compiler-rt")
       # Tests requires the host to have a libc.
       (lib.cmakeBool "LLVM_INCLUDE_TESTS" (stdenv.cc.libc != null))
-      (lib.cmakeBool "LLVM_LIBC_INCLUDE_SCUDO" true)
-      (lib.cmakeBool "COMPILER_RT_BUILD_SCUDO_STANDALONE_WITH_LLVM_LIBC" true)
-      (lib.cmakeBool "COMPILER_RT_BUILD_GWP_ASAN" false)
-      (lib.cmakeBool "COMPILER_RT_SCUDO_STANDALONE_BUILD_SHARED" false)
     ]
-    ++ lib.optional (isFullBuild && stdenv.cc.libc == null) [
+    ++ lib.optionals (isFullBuild && stdenv.cc.libc == null) [
       # CMake runs a check to see if the compiler works.
       # This includes including headers which requires a libc.
       # Skip these checks because a libc cannot be used when one doesn't exist.

From 4ba4f6f308d6dc9c45e7d3d371e28ff53cacf614 Mon Sep 17 00:00:00 2001
From: a-kenji <aks.kenji@protonmail.com>
Date: Fri, 23 May 2025 15:27:44 +0200
Subject: [PATCH 22/52] git-annex-utils: Fix typo in deprecation throw

---
 pkgs/top-level/aliases.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6282093db163..03d8ef1cfbf4 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -735,7 +735,7 @@ mapAliases {
   gg = go-graft; # Added 2025-03-07
   ggobi = throw "'ggobi' has been removed from Nixpkgs, as it is unmaintained and broken"; # Added 2025-05-18
   ghostwriter = makePlasma5Throw "ghostwriter"; # Added 2023-03-18
-  git-annex-utils = throw "'git-annex-utiks' has been removed as it is unmaintained"; # Added 2025-05-18
+  git-annex-utils = throw "'git-annex-utils' has been removed as it is unmaintained"; # Added 2025-05-18
   git-codeowners = throw "'git-codeowners' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   gmni = throw "gmni has been removed as it is no longer maintained upstream"; # Added 2025-05-02
   gmp5 = throw "'gmp5' has been removed as it is unmaintained. Consider using 'gmp' instead"; # Added 2024-10-28

From 09ae6dfdd5994c694a8f40e7a199e9092abd9cf9 Mon Sep 17 00:00:00 2001
From: Nicky Mouha <nmouha@users.noreply.github.com>
Date: Fri, 23 May 2025 14:51:06 -0400
Subject: [PATCH 23/52] gallery-dl: fix missing dependency for SOCKS support

---
 pkgs/by-name/ga/gallery-dl/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ga/gallery-dl/package.nix b/pkgs/by-name/ga/gallery-dl/package.nix
index d0fbd3fd6571..a1d16594344b 100644
--- a/pkgs/by-name/ga/gallery-dl/package.nix
+++ b/pkgs/by-name/ga/gallery-dl/package.nix
@@ -25,6 +25,7 @@ python3Packages.buildPythonApplication {
 
   dependencies = [
     python3Packages.requests
+    python3Packages.pysocks
     yt-dlp
   ];
 

From 0475645fb0539260552416a0fe6760fea47b8bda Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Wed, 21 May 2025 17:43:52 -0700
Subject: [PATCH 24/52] python3Packages.google-search-results: build from
 GitHub, modernize

---
 .../google-search-results/default.nix         | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/google-search-results/default.nix b/pkgs/development/python-modules/google-search-results/default.nix
index 7a982370ec86..fdef24f6c6dd 100644
--- a/pkgs/development/python-modules/google-search-results/default.nix
+++ b/pkgs/development/python-modules/google-search-results/default.nix
@@ -1,36 +1,37 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
-  pythonOlder,
+  fetchFromGitHub,
   requests,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "google-search-results";
   version = "2.4.2";
-  format = "setuptools";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
-  src = fetchPypi {
-    inherit version;
-    pname = builtins.replaceStrings [ "-" ] [ "_" ] pname;
-    hash = "sha256-YDow7K4q+OYAsiY1dXpt8nXa1Lk0+XXmeHjM1kC3gkU=";
+  src = fetchFromGitHub {
+    owner = "serpapi";
+    repo = "google-search-results-python";
+    tag = version;
+    hash = "sha256-2GRhBaRE0KHNFsdMrIC87dx6yMzql+QQFSSm2Gf7xHU=";
   };
 
-  propagatedBuildInputs = [ requests ];
+  build-system = [ setuptools ];
+
+  dependencies = [ requests ];
 
   # almost all tests require an API key or network access
   doCheck = false;
 
   pythonImportsCheck = [ "serpapi" ];
 
-  meta = with lib; {
+  meta = {
     description = "Scrape and search localized results from Google, Bing, Baidu, Yahoo, Yandex, Ebay, Homedepot, youtube at scale using SerpApi.com";
     homepage = "https://github.com/serpapi/google-search-results-python";
     changelog = "https://github.com/serpapi/google-search-results-python/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ natsukium ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ natsukium ];
   };
 }

From c84885bc051137319cf0e01579d5a188a7790792 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sat, 24 May 2025 01:11:48 +0200
Subject: [PATCH 25/52] rusty-man: use finalAttrs pattern

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

diff --git a/pkgs/by-name/ru/rusty-man/package.nix b/pkgs/by-name/ru/rusty-man/package.nix
index 1f9d78b7ca21..2d19529a0e5d 100644
--- a/pkgs/by-name/ru/rusty-man/package.nix
+++ b/pkgs/by-name/ru/rusty-man/package.nix
@@ -4,14 +4,14 @@
   fetchFromSourcehut,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rusty-man";
   version = "0.5.0";
 
   src = fetchFromSourcehut {
     owner = "~ireas";
     repo = "rusty-man";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     sha256 = "sha256-djprzmogT1OEf0/+twdxzx30YaMNzFjXkZd4IDsH8oo=";
   };
 
@@ -22,8 +22,8 @@ rustPlatform.buildRustPackage rec {
     description = "Command-line viewer for documentation generated by rustdoc";
     mainProgram = "rusty-man";
     homepage = "https://git.sr.ht/~ireas/rusty-man";
-    changelog = "https://git.sr.ht/~ireas/rusty-man/tree/v${version}/item/CHANGELOG.md";
+    changelog = "https://git.sr.ht/~ireas/rusty-man/tree/v${finalAttrs.version}/item/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ figsoda ];
   };
-}
+})

From e954bf812adb7303eb12a170be5e80eef0789abd Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sat, 24 May 2025 01:18:28 +0200
Subject: [PATCH 26/52] rusty-man: use hash in fetchFromSourcehut

---
 pkgs/by-name/ru/rusty-man/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ru/rusty-man/package.nix b/pkgs/by-name/ru/rusty-man/package.nix
index 2d19529a0e5d..c991326d15c6 100644
--- a/pkgs/by-name/ru/rusty-man/package.nix
+++ b/pkgs/by-name/ru/rusty-man/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "~ireas";
     repo = "rusty-man";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-djprzmogT1OEf0/+twdxzx30YaMNzFjXkZd4IDsH8oo=";
+    hash = "sha256-djprzmogT1OEf0/+twdxzx30YaMNzFjXkZd4IDsH8oo=";
   };
 
   useFetchCargoVendor = true;

From 6c4a09dd8947d0c9180fc56b0ada91dd87bb2d5b Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sat, 24 May 2025 01:21:38 +0200
Subject: [PATCH 27/52] rusty-man: remove `with lib;`

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

diff --git a/pkgs/by-name/ru/rusty-man/package.nix b/pkgs/by-name/ru/rusty-man/package.nix
index c991326d15c6..468a59954a8c 100644
--- a/pkgs/by-name/ru/rusty-man/package.nix
+++ b/pkgs/by-name/ru/rusty-man/package.nix
@@ -18,12 +18,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
   useFetchCargoVendor = true;
   cargoHash = "sha256-ZIRwp5AJugMDxg3DyFIH5VlD0m4Si2tJdspKE5QEB4M=";
 
-  meta = with lib; {
+  meta = {
     description = "Command-line viewer for documentation generated by rustdoc";
     mainProgram = "rusty-man";
     homepage = "https://git.sr.ht/~ireas/rusty-man";
     changelog = "https://git.sr.ht/~ireas/rusty-man/tree/v${finalAttrs.version}/item/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ figsoda ];
   };
 })

From 453d5d7fcdd80888488202a41e4ab59288298224 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sat, 24 May 2025 01:25:11 +0200
Subject: [PATCH 28/52] rusty-man: add versionCheckHook

---
 pkgs/by-name/ru/rusty-man/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/ru/rusty-man/package.nix b/pkgs/by-name/ru/rusty-man/package.nix
index 468a59954a8c..3018b3e4522c 100644
--- a/pkgs/by-name/ru/rusty-man/package.nix
+++ b/pkgs/by-name/ru/rusty-man/package.nix
@@ -2,6 +2,7 @@
   lib,
   rustPlatform,
   fetchFromSourcehut,
+  versionCheckHook,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -18,6 +19,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
   useFetchCargoVendor = true;
   cargoHash = "sha256-ZIRwp5AJugMDxg3DyFIH5VlD0m4Si2tJdspKE5QEB4M=";
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
   meta = {
     description = "Command-line viewer for documentation generated by rustdoc";
     mainProgram = "rusty-man";

From 83e095396ead1045d283bfa8fab69caeb66f9e4d Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sat, 24 May 2025 01:25:11 +0200
Subject: [PATCH 29/52] rusty-man: add updateScript

---
 pkgs/by-name/ru/rusty-man/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/ru/rusty-man/package.nix b/pkgs/by-name/ru/rusty-man/package.nix
index 3018b3e4522c..88115098800c 100644
--- a/pkgs/by-name/ru/rusty-man/package.nix
+++ b/pkgs/by-name/ru/rusty-man/package.nix
@@ -3,6 +3,7 @@
   rustPlatform,
   fetchFromSourcehut,
   versionCheckHook,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -23,6 +24,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Command-line viewer for documentation generated by rustdoc";
     mainProgram = "rusty-man";

From a37e5702f29d34d79a184301b7f538be0a6f53a3 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sat, 24 May 2025 01:20:42 +0200
Subject: [PATCH 30/52] rusty-man: add defelo as maintainer

---
 pkgs/by-name/ru/rusty-man/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ru/rusty-man/package.nix b/pkgs/by-name/ru/rusty-man/package.nix
index 88115098800c..748c717ad514 100644
--- a/pkgs/by-name/ru/rusty-man/package.nix
+++ b/pkgs/by-name/ru/rusty-man/package.nix
@@ -32,6 +32,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://git.sr.ht/~ireas/rusty-man";
     changelog = "https://git.sr.ht/~ireas/rusty-man/tree/v${finalAttrs.version}/item/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = with lib.maintainers; [
+      figsoda
+      defelo
+    ];
   };
 })

From 02b305e083ade13e61496b16872d7375392d8da0 Mon Sep 17 00:00:00 2001
From: euxane <euxane.trangirard@euxane.eu>
Date: Sun, 25 May 2025 00:19:23 +0200
Subject: [PATCH 31/52] matrix-appservice-discord: fix build by pinning
 nodejs_20

Build is failing with newer versions; From upstream's readme:

    The bridge supports any version of Node.js between v18.X - v20.X.
---
 pkgs/by-name/ma/matrix-appservice-discord/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ma/matrix-appservice-discord/package.nix b/pkgs/by-name/ma/matrix-appservice-discord/package.nix
index dcd43ba0d852..d80e578bf0a1 100644
--- a/pkgs/by-name/ma/matrix-appservice-discord/package.nix
+++ b/pkgs/by-name/ma/matrix-appservice-discord/package.nix
@@ -7,11 +7,12 @@
   makeWrapper,
   removeReferencesTo,
   python3,
-  nodejs,
+  nodejs_20,
   matrix-sdk-crypto-nodejs,
 }:
 
 let
+  nodejs = nodejs_20; # only supports nodejs v18.X - v20.X
   pin = lib.importJSON ./pin.json;
   nodeSources = srcOnly nodejs;
 
@@ -19,6 +20,7 @@ in
 mkYarnPackage rec {
   pname = "matrix-appservice-discord";
   inherit (pin) version;
+  inherit nodejs;
 
   src = fetchFromGitHub {
     owner = "matrix-org";

From 41a2f2ad56fc94f33fa30eb1206620e67ad88ad3 Mon Sep 17 00:00:00 2001
From: euxane <euxane.trangirard@euxane.eu>
Date: Sun, 25 May 2025 00:22:01 +0200
Subject: [PATCH 32/52] matrix-appservice-discord: update meta.homepage

---
 pkgs/by-name/ma/matrix-appservice-discord/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ma/matrix-appservice-discord/package.nix b/pkgs/by-name/ma/matrix-appservice-discord/package.nix
index d80e578bf0a1..bd8f6d9c5db4 100644
--- a/pkgs/by-name/ma/matrix-appservice-discord/package.nix
+++ b/pkgs/by-name/ma/matrix-appservice-discord/package.nix
@@ -103,7 +103,7 @@ mkYarnPackage rec {
 
   meta = {
     description = "Bridge between Matrix and Discord";
-    homepage = "https://github.com/Half-Shot/matrix-appservice-discord";
+    homepage = "https://github.com/matrix-org/matrix-appservice-discord";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ euxane ];
     platforms = lib.platforms.linux;

From 5fcf27a29bcb5fbe67e66870084f966de4edac68 Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Sun, 25 May 2025 07:47:14 +0000
Subject: [PATCH 33/52] font-manager: 0.9.2 -> 0.9.4

https://github.com/FontManager/font-manager/raw/refs/tags/0.9.4/CHANGELOG
https://github.com/FontManager/font-manager/compare/refs/tags/0.9.2...refs/tags/0.9.4
---
 pkgs/by-name/fo/font-manager/package.nix | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/fo/font-manager/package.nix b/pkgs/by-name/fo/font-manager/package.nix
index 243c36a26c87..c74d5b86e39f 100644
--- a/pkgs/by-name/fo/font-manager/package.nix
+++ b/pkgs/by-name/fo/font-manager/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   meson,
   ninja,
   gettext,
@@ -16,6 +17,7 @@
   gsettings-desktop-schemas,
   gtk4,
   adwaita-icon-theme,
+  libarchive,
   desktop-file-utils,
   nix-update-script,
   wrapGAppsHook4,
@@ -27,17 +29,26 @@
   webkitgtk_6_0,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "font-manager";
-  version = "0.9.2";
+  version = "0.9.4";
 
   src = fetchFromGitHub {
     owner = "FontManager";
     repo = "font-manager";
-    rev = version;
-    hash = "sha256-x7ZRC/xwF6Y2BhbtApVZ4hPZGNGaJiilqpxLyax9r2g=";
+    tag = finalAttrs.version;
+    hash = "sha256-hggRvwMy/D2jc98CQPc7GChTV9+zYbYHPMENf/8Uq9s=";
   };
 
+  patches = [
+    # TODO: drop this patch when updating beyond version 0.9.4
+    (fetchpatch {
+      name = "fix-reproducible-build-issue.patch";
+      url = "https://github.com/FontManager/font-manager/commit/cc0c148d90741e39615e3380d283f684a052dd94.patch";
+      hash = "sha256-bRn+jVjBu6ZqmQCErgcqxv6OyFa4hkPYB5bvK7rEibA=";
+    })
+  ];
+
   nativeBuildInputs = [
     pkg-config
     meson
@@ -61,6 +72,7 @@ stdenv.mkDerivation rec {
       gsettings-desktop-schemas # for font settings
       gtk4
       adwaita-icon-theme
+      libarchive
     ]
     ++ lib.optionals withWebkit [
       glib-networking # for SSL so that Google Fonts can load
@@ -77,6 +89,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://fontmanager.github.io/";
+    changelog = "https://github.com/FontManager/font-manager/raw/refs/tags/${finalAttrs.version}/CHANGELOG";
     description = "Simple font management for GTK desktop environments";
     mainProgram = "font-manager";
     longDescription = ''
@@ -92,4 +105,4 @@ stdenv.mkDerivation rec {
     platforms = platforms.unix;
     maintainers = [ maintainers.romildo ];
   };
-}
+})

From e32ab66ae1bff15d6a3ed9f6814ad514dd62e0ed Mon Sep 17 00:00:00 2001
From: John Rodewald <jnrodewald99@gmail.com>
Date: Sun, 25 May 2025 11:17:51 +0200
Subject: [PATCH 34/52] gcli: fix Darwin build

Darwin builds are fixed in master, but the change is unreleased.
---
 pkgs/by-name/gc/gcli/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/gc/gcli/package.nix b/pkgs/by-name/gc/gcli/package.nix
index 135790f60afc..36b9e3b2cf93 100644
--- a/pkgs/by-name/gc/gcli/package.nix
+++ b/pkgs/by-name/gc/gcli/package.nix
@@ -6,6 +6,7 @@
   pkg-config,
   byacc,
   flex,
+  fetchpatch,
 }:
 
 stdenv.mkDerivation rec {
@@ -19,6 +20,15 @@ stdenv.mkDerivation rec {
     hash = "sha256-N5dzGhyXPDWcm/cNUSUQt4rR+PzaD1OUssRO3Sdfmoo=";
   };
 
+  patches = [
+    # Darwin builds are fixed in master, but the change is unreleased.
+    (fetchpatch {
+      name = "darwin-build-fix.patch";
+      url = "https://github.com/herrhotzenplotz/gcli/commit/720e372250fd363bdd90e9452907508563e30f93.patch";
+      hash = "sha256-TpjIisje20YObN2wf8iQlwHlY5kg0S7xTkUWxAmK+po=";
+    })
+  ];
+
   nativeBuildInputs = [
     pkg-config
     byacc

From 4cf6ac7f244cc38eb7d7a1bc8e147462d3982bc8 Mon Sep 17 00:00:00 2001
From: Linus Vettiger <linus4123@gmail.com>
Date: Sun, 25 May 2025 11:27:43 +0200
Subject: [PATCH 35/52] ugarit: fix build on darwin

---
 .../ugarit/posix-extras-add-sysmacros-include.patch       | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/backup/ugarit/posix-extras-add-sysmacros-include.patch b/pkgs/tools/backup/ugarit/posix-extras-add-sysmacros-include.patch
index bd374b679d84..7a1ec8429049 100644
--- a/pkgs/tools/backup/ugarit/posix-extras-add-sysmacros-include.patch
+++ b/pkgs/tools/backup/ugarit/posix-extras-add-sysmacros-include.patch
@@ -1,10 +1,12 @@
 --- a/posix-extras.scm	1970-01-01 01:00:01.000000000 +0100
 +++ b/posix-extras.scm	1970-01-01 01:00:01.000000000 +0100
-@@ -110,6 +110,7 @@ static void *C_not_implemented_ptr(void)
+@@ -110,6 +110,9 @@ static void *C_not_implemented_ptr(void)
  #endif
- 
- #if defined (__unix__) || defined (C_XXXBSD)
+
++#if defined (__unix__) 
 +#include <sys/sysmacros.h>
++#endif
+ #if defined (__unix__) || defined (C_XXXBSD)
  #include <sys/types.h>
  #define C_mknod(fn, m, d) C_fix(mknod(C_data_pointer(fn), C_unfix(m), C_unfix(d)))
  #define C_mknod64(fn, m, maj, min) C_fix(mknod(C_data_pointer(fn), C_unfix(m), makedev(C_num_to_int(maj), C_num_to_int(min))))

From b722a78968a33a9ac87f0f002d079a81fd351e75 Mon Sep 17 00:00:00 2001
From: Manuel Frischknecht <manuel.frischknecht@gmail.com>
Date: Sat, 24 May 2025 15:37:47 +0200
Subject: [PATCH 36/52] commandergenius: fix X11 includes

The SDL2 compatibility layer still includes X11 libraries in some
of its headers [1], which breaks the build of commandergenius if
`xorg.libX11` is not included as build input.

[1]: https://github.com/libsdl-org/sdl2-compat/blob/291749630d731d45f7a5ff3d4b2429fbeb58ac4c/include/SDL2/SDL_syswm.h#L68
---
 pkgs/by-name/co/commandergenius/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/co/commandergenius/package.nix b/pkgs/by-name/co/commandergenius/package.nix
index a9b0afe5d19d..d528beecca68 100644
--- a/pkgs/by-name/co/commandergenius/package.nix
+++ b/pkgs/by-name/co/commandergenius/package.nix
@@ -14,6 +14,7 @@
   SDL2_mixer,
   SDL2_ttf,
   python3,
+  xorg,
 }:
 
 stdenv.mkDerivation rec {
@@ -38,6 +39,7 @@ stdenv.mkDerivation rec {
     zlib
     curl
     python3
+    xorg.libX11
   ];
 
   cmakeFlags = [

From 5cc6a9481cb8b7acea9a66621e593b7ffcfd5257 Mon Sep 17 00:00:00 2001
From: Manuel Frischknecht <manuel.frischknecht@gmail.com>
Date: Sat, 24 May 2025 16:26:53 +0200
Subject: [PATCH 37/52] commandergenius: fix broken build due to renamed
 `_TTF_Font` struct in SDL_ttf

SDL_ttf renamed the internal `_TTF_Font` struct in v. 2.24 [^1] and
3.2.2 [^2], breaking current builds for commandergenius.

Upstream already merged my pull request fixing the error [^3].
This pulls in the fix temporarily using `fetchpatch`; as soon as
upstreams a new release, we'll likely be able to remove it again.

[^1]: https://github.com/libsdl-org/SDL_ttf/commit/7185085beb39b9e8b17d18685a2a58a14b7c53ef
[^2]: https://github.com/libsdl-org/SDL_ttf/commit/22347419ee08e49d77411c680f15e314ef870ab7
[^3]: https://github.com/gerstrong/Commander-Genius/pull/376
---
 pkgs/by-name/co/commandergenius/package.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/by-name/co/commandergenius/package.nix b/pkgs/by-name/co/commandergenius/package.nix
index d528beecca68..5c60cde73927 100644
--- a/pkgs/by-name/co/commandergenius/package.nix
+++ b/pkgs/by-name/co/commandergenius/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitLab,
+  fetchpatch,
   SDL2,
   SDL2_image,
   pkg-config,
@@ -56,6 +57,16 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
+  patches = [
+    # Fixes a broken build due to a renamed inner struct of SDL_ttf.
+    # Should be removable as soon as upstream releases v. 3.5.3.
+    (fetchpatch {
+      name = "fix-sdl-ttf_font_rename.patch";
+      url = "https://github.com/gerstrong/Commander-Genius/commit/e8af0d16970d75e94392f57de0992dfddc509bc3.patch";
+      hash = "sha256-bcCzXzh9yDngwHMfQTrnvyDal4YBiBcMTtKTgt9BtDk=";
+    })
+  ];
+
   postPatch = ''
     NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(sdl2-config --cflags)"
     sed -i 's,APPDIR games,APPDIR bin,' src/install.cmake

From 1c1bcd24d6d54254d50ea581f00c7ff44ace75b4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 May 2025 12:56:42 +0000
Subject: [PATCH 38/52] vopono: 0.10.11 -> 0.10.12

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

diff --git a/pkgs/by-name/vo/vopono/package.nix b/pkgs/by-name/vo/vopono/package.nix
index 94f933a03327..f40fae3d24b1 100644
--- a/pkgs/by-name/vo/vopono/package.nix
+++ b/pkgs/by-name/vo/vopono/package.nix
@@ -6,15 +6,15 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "vopono";
-  version = "0.10.11";
+  version = "0.10.12";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-qgsfTniikrdykFSFqZATp7ewPZm5z5p5FMztNKWzPIY=";
+    hash = "sha256-bn3I5Yx9Kzj9ZQWn0fQUeDa6qjFAhWM38wJ/Oz3Q72k=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-hQfLj2wbCjI2O/6hh9IJk9ehakGrvF2IbY8aVAPPT0o=";
+  cargoHash = "sha256-vtZeL8XjsdzJcuHAVZKoI4GpcqHaOucX9qkjToIVqfQ=";
 
   meta = with lib; {
     description = "Run applications through VPN connections in network namespaces";

From def4373ad704172e44b289c9c0c91486bed646b5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 May 2025 16:05:48 +0000
Subject: [PATCH 39/52] beam26Packages.elixir-ls: 0.27.2 -> 0.28.1

---
 pkgs/development/beam-modules/elixir-ls/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/beam-modules/elixir-ls/default.nix b/pkgs/development/beam-modules/elixir-ls/default.nix
index 75e73ffbe75d..a683c6b126cd 100644
--- a/pkgs/development/beam-modules/elixir-ls/default.nix
+++ b/pkgs/development/beam-modules/elixir-ls/default.nix
@@ -11,12 +11,12 @@
 
 let
   pname = "elixir-ls";
-  version = "0.27.2";
+  version = "0.28.1";
   src = fetchFromGitHub {
     owner = "elixir-lsp";
     repo = "elixir-ls";
     rev = "v${version}";
-    hash = "sha256-y1QT+wRFc+++OVFJwEheqcDIwaKHlyjbhEjhLJ2rYaI=";
+    hash = "sha256-r4P+3MPniDNdF3SG2jfBbzHsoxn826eYd2tsv6bJBoI=";
   };
 in
 mixRelease {
@@ -32,7 +32,7 @@ mixRelease {
   mixFodDeps = fetchMixDeps {
     pname = "mix-deps-${pname}";
     inherit src version elixir;
-    hash = "sha256-een28zUukN8H/8bZNc3pqtg1NXmkU9zv89muCAF93Xk=";
+    hash = "sha256-8zs+99jwf+YX5SwD65FCPmfrYhTCx4AQGCGsDeCKxKc=";
   };
 
   # elixir-ls is an umbrella app

From 3d990b364cf04e7c6b8b9bccfbda5b5cfbb1d22d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 May 2025 17:48:34 +0000
Subject: [PATCH 40/52] rime-wanxiang: 6.7.9 -> 6.8.7

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

diff --git a/pkgs/by-name/ri/rime-wanxiang/package.nix b/pkgs/by-name/ri/rime-wanxiang/package.nix
index b835ac901c1c..a0b08f99b4df 100644
--- a/pkgs/by-name/ri/rime-wanxiang/package.nix
+++ b/pkgs/by-name/ri/rime-wanxiang/package.nix
@@ -9,13 +9,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "rime-wanxiang";
-  version = "6.7.9";
+  version = "6.8.7";
 
   src = fetchFromGitHub {
     owner = "amzxyz";
     repo = "rime_wanxiang";
     tag = "v" + finalAttrs.version;
-    hash = "sha256-cOHwgy0rjqce7MedL0hK59royKlAPmZRGcVHRx0FrRU=";
+    hash = "sha256-t3A79jvNxroq+aeHwwc24rvzPDJbKxkOgrb9mgdN340=";
   };
 
   nativeBuildInputs = [

From 125c99afd43a53ed48736776898b2fc15f9812e6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 May 2025 18:44:41 +0000
Subject: [PATCH 41/52] ddev: 1.24.5 -> 1.24.6

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

diff --git a/pkgs/by-name/dd/ddev/package.nix b/pkgs/by-name/dd/ddev/package.nix
index 2df598aa57f6..85d1f0e837e8 100644
--- a/pkgs/by-name/dd/ddev/package.nix
+++ b/pkgs/by-name/dd/ddev/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule rec {
   pname = "ddev";
-  version = "1.24.5";
+  version = "1.24.6";
 
   src = fetchFromGitHub {
     owner = "ddev";
     repo = "ddev";
     rev = "v${version}";
-    hash = "sha256-CyYGmxYJ5ef+H1qt0CiFcGOslBwkeHqdDQcmuqu4g9M=";
+    hash = "sha256-vOf500/HdOWn24MdXDfbetqAyKbEsaut707O+Rndks8=";
   };
 
   nativeBuildInputs = [

From deb0b2908f176a365a872164d8e36f286b5daf5b Mon Sep 17 00:00:00 2001
From: Dmitry Bogatov <serenity@kaction.cc>
Date: Sat, 3 May 2025 20:00:00 -0400
Subject: [PATCH 42/52] libcgroup: fix static build

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

diff --git a/pkgs/by-name/li/libcgroup/package.nix b/pkgs/by-name/li/libcgroup/package.nix
index 69f2238df1b8..c2032d1511db 100644
--- a/pkgs/by-name/li/libcgroup/package.nix
+++ b/pkgs/by-name/li/libcgroup/package.nix
@@ -5,7 +5,9 @@
   pam,
   bison,
   flex,
+  enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemdLibs,
   systemdLibs,
+  musl-fts,
   autoreconfHook,
 }:
 
@@ -21,15 +23,30 @@ stdenv.mkDerivation rec {
     hash = "sha256-kWW9ID/eYZH0O/Ge8pf3Cso4yu644R5EiQFYfZMcizs=";
   };
 
+  configureFlags =
+    [
+      (lib.enableFeature enableSystemd "systemd")
+    ]
+    # implicit declaration of function 'rpl_malloc', ; did you mean 'realloc'
+    #
+    # It looks like in case of cross-compilation, autoconf assumes that malloc of the
+    # target platform is broken.
+    ++ lib.optionals (!lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform) [
+      "ac_cv_func_malloc_0_nonnull=yes"
+      "ac_cv_func_realloc_0_nonnull=yes"
+    ];
+
   nativeBuildInputs = [
     autoreconfHook
     bison
     flex
   ];
-  buildInputs = [
-    pam
-    systemdLibs
-  ];
+  buildInputs =
+    [
+      pam
+    ]
+    ++ lib.optional enableSystemd systemdLibs
+    ++ lib.optional stdenv.hostPlatform.isMusl musl-fts;
 
   postPatch = ''
     substituteInPlace src/tools/Makefile.am \

From c8cfad40015954b0a0df3ba83d7beb06ccd42b49 Mon Sep 17 00:00:00 2001
From: "\"Heitor Augusto\"" <"IAm.HeitorALN@proton.me">
Date: Sun, 25 May 2025 16:45:26 -0300
Subject: [PATCH 43/52] vimPlugins.mini-keymap: init at 2025-05-20

---
 pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++
 .../editors/vim/plugins/vim-plugin-names            |  1 +
 2 files changed, 14 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 28a3bec2e046..fe343e2881de 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -8162,6 +8162,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  mini-keymap = buildVimPlugin {
+    pname = "mini.keymap";
+    version = "2025-05-20";
+    src = fetchFromGitHub {
+      owner = "echasnovski";
+      repo = "mini.keymap";
+      rev = "2aa0a66d6cbf15c9cea331d976ac4d4b9f01621e";
+      sha256 = "18samb1yjvmw2yjl0l4csl484aqah71qr19zspx46z5dk3jib908";
+    };
+    meta.homepage = "https://github.com/echasnovski/mini.keymap/";
+    meta.hydraPlatforms = [ ];
+  };
+
   mini-map = buildVimPlugin {
     pname = "mini.map";
     version = "2025-04-01";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index ea00dc8180fd..1b622615869f 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -626,6 +626,7 @@ https://github.com/echasnovski/mini.icons/,HEAD,
 https://github.com/echasnovski/mini.indentscope/,HEAD,
 https://github.com/echasnovski/mini.jump/,HEAD,
 https://github.com/echasnovski/mini.jump2d/,HEAD,
+https://github.com/echasnovski/mini.keymap/,HEAD,
 https://github.com/echasnovski/mini.map/,HEAD,
 https://github.com/echasnovski/mini.misc/,HEAD,
 https://github.com/echasnovski/mini.move/,HEAD,

From ade7dc60ced6c802cd18ca2be32982f089c2391e Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Sun, 25 May 2025 16:19:18 -0400
Subject: [PATCH 44/52] libcs50: adopt and modernize

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

diff --git a/pkgs/by-name/li/libcs50/package.nix b/pkgs/by-name/li/libcs50/package.nix
index becca7221ef6..ffb201859600 100644
--- a/pkgs/by-name/li/libcs50/package.nix
+++ b/pkgs/by-name/li/libcs50/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -11,22 +12,25 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "cs50";
     repo = "libcs50";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-G6QayPGR4lkeFuUYsFszekLAzzpA3hhIRmqt/OB0cdY=";
   };
 
   installPhase = ''
     runHook preInstall
-    mkdir $out
+    mkdir -p $out
     cp -R build/lib $out/lib
     cp -R build/include $out/include
     ln -sf $out/lib/libcs50.so.11.0.3 $out/lib/libcs50.so.11
     runHook postInstall
   '';
 
-  meta = with lib; {
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
     homepage = "https://github.com/cs50/libcs50";
     description = "CS50 Library for C";
-    license = licenses.gpl3Only;
+    license = lib.licenses.gpl3Only;
+    maintainers = [ lib.maintainers.ethancedwards8 ];
   };
 })

From b0c322c62ef0f1fca12fffcf22f5fd7ccbbf0328 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 25 May 2025 14:34:17 -0700
Subject: [PATCH 45/52] python3Packages.flask-silk: remove

Not used by anything else, unmaintained since 2018.
---
 .../python-modules/flask-silk/default.nix     | 45 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 -
 3 files changed, 1 insertion(+), 47 deletions(-)
 delete mode 100644 pkgs/development/python-modules/flask-silk/default.nix

diff --git a/pkgs/development/python-modules/flask-silk/default.nix b/pkgs/development/python-modules/flask-silk/default.nix
deleted file mode 100644
index 22d5075280d0..000000000000
--- a/pkgs/development/python-modules/flask-silk/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  setuptools,
-  flask,
-  pytestCheckHook,
-}:
-
-buildPythonPackage {
-  pname = "flask-silk";
-  version = "0.2-unstable-2018-06-14";
-  pyproject = true;
-
-  # master fixes flask import syntax and has no major changes
-  # new release requested: https://github.com/sublee/flask-silk/pull/6
-  src = fetchFromGitHub {
-    owner = "sublee";
-    repo = "flask-silk";
-    rev = "3a8166550f9a0ec52edae7bf31d9818c4c15c531";
-    hash = "sha256-AFbGp/d+3Tci8Kj2BuT7GPdKQRBVb6PV1U6KwnH89FY=";
-  };
-
-  build-system = [ setuptools ];
-
-  dependencies = [ flask ];
-
-  pythonImportsCheck = [ "flask_silk" ];
-
-  nativeCheckInputs = [ pytestCheckHook ];
-
-  pytestFlagsArray = [ "test.py" ];
-
-  disabledTests = [
-    # requires network access
-    "test_subdomain"
-  ];
-
-  meta = {
-    description = "Adds silk icons to your Flask application or module, or extension";
-    license = lib.licenses.bsd3;
-    teams = [ lib.teams.sage ];
-    homepage = "https://github.com/sublee/flask-silk";
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index b94e26f4121e..06bcf1a15c0d 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -266,6 +266,7 @@ mapAliases ({
   flask-common = throw "flask-common was removed, as it is not compatible with flask 3.0 and unmaintained since 2018."; # added 2025-01-11
   flask-basicauth = throw "flask-basicauth was removed, as it is not compatible with flask 3.0 and unmaintained since 2016.";
   flask-sessionstore = throw "flask-sessionstore was removed, as it is not compatible with flask 3.0 and unmaintained since 2017.";
+  flask-silk = throw "flask-silk was removed, as it is unmaintained since 2018."; # added 2025-05-25
   flask-sockets = throw "flask-sockets has been removed as the upstream repository was archived in 2022"; # Added 2025-01-01
   flowlogs_reader = flowlogs-reader; # added 2024-01-03
   flufl_bounce = flufl-bounce; # added 2023-11-03
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7517bfd26122..e13b26e93746 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5125,8 +5125,6 @@ self: super: with self; {
 
   flask-session-captcha = callPackage ../development/python-modules/flask-session-captcha { };
 
-  flask-silk = callPackage ../development/python-modules/flask-silk { };
-
   flask-simpleldap = callPackage ../development/python-modules/flask-simpleldap { };
 
   flask-sock = callPackage ../development/python-modules/flask-sock { };

From 0736438ef86dff359a2ad51ba1090f99ea2f5b55 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 25 May 2025 14:41:52 -0700
Subject: [PATCH 46/52] python3Packages.testing-postgresql: remove

Not used by other packages and unmaintained since 2017.
---
 .../testing-postgresql/default.nix            | 71 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 -
 3 files changed, 1 insertion(+), 73 deletions(-)
 delete mode 100644 pkgs/development/python-modules/testing-postgresql/default.nix

diff --git a/pkgs/development/python-modules/testing-postgresql/default.nix b/pkgs/development/python-modules/testing-postgresql/default.nix
deleted file mode 100644
index 5a786a4b01d2..000000000000
--- a/pkgs/development/python-modules/testing-postgresql/default.nix
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  setuptools,
-  pg8000,
-  postgresql,
-  psycopg2,
-  pytestCheckHook,
-  pythonOlder,
-  sqlalchemy,
-  testing-common-database,
-}:
-
-buildPythonPackage {
-  pname = "testing-postgresql";
-  # Version 1.3.0 isn't working so let's use the latest commit from GitHub
-  version = "unstable-2017-10-31";
-  pyproject = true;
-
-  disabled = pythonOlder "3.7";
-
-  src = fetchFromGitHub {
-    owner = "tk0miya";
-    repo = "testing.postgresql";
-    rev = "c81ded434d00ec8424de0f9e1f4063c778c6aaa8";
-    hash = "sha256-A4tahAaa98X66ZYa3QxIQDZkwAwVB6ZDRObEhkbUWKs=";
-  };
-
-  build-system = [ setuptools ];
-
-  dependencies = [
-    testing-common-database
-    pg8000
-  ];
-
-  nativeCheckInputs = [
-    pytestCheckHook
-    psycopg2
-    sqlalchemy
-  ];
-
-  # Add PostgreSQL to search path
-  prePatch = ''
-    substituteInPlace src/testing/postgresql.py \
-      --replace-fail "/usr/local/pgsql" "${postgresql}"
-  '';
-
-  pythonRelaxDeps = [ "pg8000" ];
-
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace-fail "pg8000 >= 1.10" "pg8000"
-    substituteInPlace tests/test_postgresql.py \
-      --replace-fail "self.assertRegexpMatches" "self.assertRegex"
-  '';
-
-  pythonImportsCheck = [ "testing.postgresql" ];
-
-  # Fix tests for Darwin build. See:
-  # https://github.com/NixOS/nixpkgs/pull/74716#issuecomment-598546916
-  __darwinAllowLocalNetworking = true;
-
-  meta = with lib; {
-    description = "Use temporary postgresql instance in testing";
-    homepage = "https://github.com/tk0miya/testing.postgresql";
-    license = licenses.asl20;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ jluttine ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index b94e26f4121e..d26929abb41b 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -751,6 +751,7 @@ mapAliases ({
   tensorflow-estimator_2 = tensorflow-estimator; # added 2021-11-25
   tensorflow-tensorboard = tensorboard; # added 2022-03-06
   tensorflow-tensorboard_2 = tensorflow-tensorboard; # added 2021-11-25
+  testing-postgresql = throw "testing-postgresql has been removed, since it is unmaintained since 2017"; # added 2025-05-25
   tilestache = throw "tilestache is unmaintained and Python3 compatibility is unknown"; # Added 2025-03-23
   Theano = theano; # added 2023-02-19
   TheanoWithCuda = theanoWithCuda; # added 2023-02-19
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7517bfd26122..2da8c8953ede 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17288,8 +17288,6 @@ self: super: with self; {
 
   testing-common-database = callPackage ../development/python-modules/testing-common-database { };
 
-  testing-postgresql = callPackage ../development/python-modules/testing-postgresql { };
-
   testpath = callPackage ../development/python-modules/testpath { };
 
   testrail-api = callPackage ../development/python-modules/testrail-api { };

From 507024d6f9ce5993ed2e957661876a190e23c42f Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Mon, 26 May 2025 05:54:59 +0800
Subject: [PATCH 47/52] dart.sentry_flutter: fix

---
 .../dart/package-source-builders/sentry_flutter/default.nix    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/dart/package-source-builders/sentry_flutter/default.nix b/pkgs/development/compilers/dart/package-source-builders/sentry_flutter/default.nix
index dec8882e59d0..11a2f3c6ad6b 100644
--- a/pkgs/development/compilers/dart/package-source-builders/sentry_flutter/default.nix
+++ b/pkgs/development/compilers/dart/package-source-builders/sentry_flutter/default.nix
@@ -1,4 +1,5 @@
 {
+  lib,
   stdenv,
   fetchFromGitHub,
 }:
@@ -18,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   inherit version src;
   inherit (src) passthru;
 
-  postPatch = ''
+  postPatch = lib.optionalString (lib.versionAtLeast version "8.10.0") ''
     sed -i "s|GIT_REPOSITORY.*|SOURCE_DIR "${sentry-native}"|" sentry-native/sentry-native.cmake
     sed -i '/GIT_TAG/d' sentry-native/sentry-native.cmake
   '';

From 0271935b80f3b94588e40dee1b7abc3c6cb6e18d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 26 May 2025 02:37:42 +0000
Subject: [PATCH 48/52] immich-go: 0.26.2 -> 0.26.3

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

diff --git a/pkgs/by-name/im/immich-go/package.nix b/pkgs/by-name/im/immich-go/package.nix
index 9e58949dde7f..38f8ef761218 100644
--- a/pkgs/by-name/im/immich-go/package.nix
+++ b/pkgs/by-name/im/immich-go/package.nix
@@ -9,13 +9,13 @@
 }:
 buildGoModule rec {
   pname = "immich-go";
-  version = "0.26.2";
+  version = "0.26.3";
 
   src = fetchFromGitHub {
     owner = "simulot";
     repo = "immich-go";
     tag = "v${version}";
-    hash = "sha256-mC7C5B2e57xWrqbyaLM2n79BgdmlgiF2TxTmxT/McSA=";
+    hash = "sha256-M7hvT7y11X6BN6WJqTIlb5b5x7kaa7MAdhbztZAvJ48=";
 
     # Inspired by: https://github.com/NixOS/nixpkgs/blob/f2d7a289c5a5ece8521dd082b81ac7e4a57c2c5c/pkgs/applications/graphics/pdfcpu/default.nix#L20-L32
     # The intention here is to write the information into files in the `src`'s
@@ -32,7 +32,7 @@ buildGoModule rec {
     '';
   };
 
-  vendorHash = "sha256-z9gS8i9GatDq4flomPcBUpf7b/6BJZ42lGOmpfpdmao=";
+  vendorHash = "sha256-7zOW1nRhxh+jpGNxAxgepC67NCBA3IIfcOKmniGjkwM=";
 
   # options used by upstream:
   # https://github.com/simulot/immich-go/blob/v0.25.0/.goreleaser.yaml

From c5a5348915a5b4750673eb273849992ef6dbb59c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 26 May 2025 03:31:40 +0000
Subject: [PATCH 49/52] phpExtensions.mongodb: 2.0.0 -> 2.1.0

---
 pkgs/development/php-packages/mongodb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/php-packages/mongodb/default.nix b/pkgs/development/php-packages/mongodb/default.nix
index 93fa1969b4c0..5d7f0f492e52 100644
--- a/pkgs/development/php-packages/mongodb/default.nix
+++ b/pkgs/development/php-packages/mongodb/default.nix
@@ -15,13 +15,13 @@
 
 buildPecl rec {
   pname = "mongodb";
-  version = "2.0.0";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "mongodb";
     repo = "mongo-php-driver";
     rev = version;
-    hash = "sha256-o4fy46oh3iWLAcszcFo1m5GdalQs6OswT+OQTYo2cZc=";
+    hash = "sha256-YCQdScBCgmyallocGB8JGgkNkKTfy53/KPStq97S6wU=";
     fetchSubmodules = true;
   };
 

From 06cb14c949a38bc5be554a1603d01f0cfee14428 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 26 May 2025 00:47:06 +0000
Subject: [PATCH 50/52] android-udev-rules: 20250314 -> 20250525

---
 pkgs/by-name/an/android-udev-rules/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/an/android-udev-rules/package.nix b/pkgs/by-name/an/android-udev-rules/package.nix
index 402f598a10d5..9e8eb2f5a069 100644
--- a/pkgs/by-name/an/android-udev-rules/package.nix
+++ b/pkgs/by-name/an/android-udev-rules/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "android-udev-rules";
-  version = "20250314";
+  version = "20250525";
 
   src = fetchFromGitHub {
     owner = "M0Rf30";
     repo = "android-udev-rules";
     rev = version;
-    hash = "sha256-QADyZ3FHVuxX/PfsRt2ijwJRCksQb1Hz5lSgYJlyb1Q=";
+    hash = "sha256-4ODU9EoVYV+iSu6+M9ePed45QkOZgWkDUlFTlWJ8ttQ=";
   };
 
   installPhase = ''

From 57263c6cb43d530f86a986a4cc851aee8b84db1d Mon Sep 17 00:00:00 2001
From: Corey O'Connor <coreyoconnor@gmail.com>
Date: Mon, 26 May 2025 04:53:18 +0000
Subject: [PATCH 51/52] jenkins: remove coconnor as maintainer

I no longer use jenkins at all.
---
 nixos/tests/jenkins.nix             | 1 -
 pkgs/by-name/je/jenkins/package.nix | 1 -
 2 files changed, 2 deletions(-)

diff --git a/nixos/tests/jenkins.nix b/nixos/tests/jenkins.nix
index 0b941e1617b0..cd82214fb3ac 100644
--- a/nixos/tests/jenkins.nix
+++ b/nixos/tests/jenkins.nix
@@ -11,7 +11,6 @@ import ./make-test-python.nix (
     meta = with pkgs.lib.maintainers; {
       maintainers = [
         bjornfor
-        coconnor
         domenkozar
       ];
     };
diff --git a/pkgs/by-name/je/jenkins/package.nix b/pkgs/by-name/je/jenkins/package.nix
index 9a284e9e6881..c692d25eda70 100644
--- a/pkgs/by-name/je/jenkins/package.nix
+++ b/pkgs/by-name/je/jenkins/package.nix
@@ -80,7 +80,6 @@ stdenv.mkDerivation (finalAttrs: {
     sourceProvenance = with sourceTypes; [ binaryBytecode ];
     license = licenses.mit;
     maintainers = with maintainers; [
-      coconnor
       earldouglas
       nequissimus
     ];

From 1f834fe65205e501cf7f437d0c1a630f3fb11360 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 26 May 2025 05:28:23 +0000
Subject: [PATCH 52/52] gose: 0.10.5 -> 0.10.6

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

diff --git a/pkgs/by-name/go/gose/package.nix b/pkgs/by-name/go/gose/package.nix
index c5a47ee46be1..2a5cec699716 100644
--- a/pkgs/by-name/go/gose/package.nix
+++ b/pkgs/by-name/go/gose/package.nix
@@ -7,13 +7,13 @@
   lib,
 }:
 let
-  version = "0.10.5";
+  version = "0.10.6";
 
   src = fetchFromGitHub {
     repo = "gose";
     owner = "stv0g";
     tag = "v${version}";
-    hash = "sha256-8ghz2CpHNUUUpxg7VFi4DwDFa0GlPKaRJ3zC4XC0IyA=";
+    hash = "sha256-H+15d0wCfL+jd+xjKSOrimLIAG1Mh8vO+5MaHaVocJg=";
   };
 
   frontend = buildNpmPackage {
@@ -37,7 +37,7 @@ buildGoModule {
   inherit version;
   inherit src;
 
-  vendorHash = "sha256-6AfLoIRDO3diKZ9yFpVVIsRUFxQfLbmk91Cs5336OIE=";
+  vendorHash = "sha256-HsYF4v7RUzGDJvZEoq0qTo9iPGJoqK4YqTsXSv8SwKQ=";
 
   env.CGO_ENABLED = 0;