From bd4128c317acdd6f68b94f675ee4d408a3dbd13f Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Tue, 26 Apr 2022 21:23:31 +0300
Subject: [PATCH 01/54] zfs: reduce closure size

---
 pkgs/os-specific/linux/zfs/generic.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix
index 31742d4f7cb9..3360b2cc7319 100644
--- a/pkgs/os-specific/linux/zfs/generic.nix
+++ b/pkgs/os-specific/linux/zfs/generic.nix
@@ -20,7 +20,6 @@ let
       openssl,
       libtirpc,
       nfs-utils,
-      samba,
       gawk,
       gnugrep,
       gnused,
@@ -112,7 +111,7 @@ let
               enablePython = old.enablePython or true && enablePython;
             })
           }/bin/exportfs"
-          substituteInPlace ./lib/libshare/smb.h        --replace-fail "/usr/bin/net"            "${samba}/bin/net"
+          substituteInPlace ./lib/libshare/smb.h        --replace-fail "/usr/bin/net"            "/run/current-system/sw/bin/net"
           # Disable dynamic loading of libcurl
           substituteInPlace ./config/user-libfetch.m4   --replace-fail "curl-config --built-shared" "true"
           substituteInPlace ./config/user-systemd.m4    --replace-fail "/usr/lib/modules-load.d" "$out/etc/modules-load.d"

From 85951e2457267f10c3c47be1d49ed6cc3867ba03 Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Thu, 13 Mar 2025 12:10:08 +0000
Subject: [PATCH 02/54] python312Packages.typecode: fix build against file 5.46

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

diff --git a/pkgs/development/python-modules/typecode/default.nix b/pkgs/development/python-modules/typecode/default.nix
index 751f5b715a04..148fb1566f01 100644
--- a/pkgs/development/python-modules/typecode/default.nix
+++ b/pkgs/development/python-modules/typecode/default.nix
@@ -61,6 +61,11 @@ buildPythonPackage rec {
     # fails due to change in file (libmagic) 5.45
     "test_doc_postscript_eps"
     "test_package_debian"
+
+    # fails due to change in file (libmagic) 5.46
+    "test_media_image_img"
+    "test_compiled_elf_so"
+    "test_compiled_elf_so_2"
   ];
 
   pythonImportsCheck = [ "typecode" ];

From c7968cf14075c62330b09bfa61e9d8a93da3b984 Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Thu, 13 Mar 2025 15:30:32 +0000
Subject: [PATCH 03/54] nixos/wakapi: harden systemd service

when using `systemd-analyze security wakapi.service` we went from a 5.9
to a 3.
---
 nixos/modules/services/web-apps/wakapi.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/wakapi.nix b/nixos/modules/services/web-apps/wakapi.nix
index 6067fd35b790..f833c0c0e45f 100644
--- a/nixos/modules/services/web-apps/wakapi.nix
+++ b/nixos/modules/services/web-apps/wakapi.nix
@@ -159,18 +159,25 @@ in
         Group = config.users.users.wakapi.group;
 
         DynamicUser = true;
+        PrivateTmp = true;
+        PrivateUsers = true;
+        PrivateDevices = true;
         ProtectHome = true;
         ProtectHostname = true;
+        ProtectClock = true;
         ProtectKernelLogs = true;
         ProtectKernelModules = true;
         ProtectKernelTunables = true;
+        ProtectControlGroups = true;
+        NoNewPrivileges = true;
         ProtectProc = "invisible";
-        ProtectSystem = "strict";
+        ProtectSystem = "full";
         RestrictAddressFamilies = [
           "AF_INET"
           "AF_INET6"
           "AF_UNIX"
         ];
+        CapabilityBoundingSet = "CAP_NET_BIND_SERVICE";
         RestrictNamespaces = true;
         RestrictRealtime = true;
         RestrictSUIDSGID = true;

From 05958f27e2b9a99a058ef5db5f2be1d73c4afd96 Mon Sep 17 00:00:00 2001
From: Johannes Kirschbauer <hsjobeki@gmail.com>
Date: Sun, 19 Jan 2025 16:07:39 +0100
Subject: [PATCH 04/54] lib/types: types.{unique,uniq} deprecate
 functor.wrapped in favor of functor.payload.elemType

---
 doc/release-notes/rl-2505.section.md     |  1 +
 lib/tests/modules.sh                     | 10 ++++++++--
 lib/tests/modules/deprecated-wrapped.nix | 11 +++++++++++
 lib/types.nix                            |  4 +++-
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md
index 58bb1371f1bc..2a44045fecb3 100644
--- a/doc/release-notes/rl-2505.section.md
+++ b/doc/release-notes/rl-2505.section.md
@@ -75,6 +75,7 @@
   - `functor.wrapped` is now deprecated for some types and using it will give a warning with migration instructions. It is deprecated for these types:
     - `lib.types.attrsWith`
     - `lib.types.listOf`
+    - `lib.types.unique` and `lib.types.uniq`
 
 - Plasma 5 and Qt 5 based versions of associated software are deprecated in NixOS 25.05, and will be removed in NixOS 25.11. Users are encouraged to upgrade to Plasma 6.
 
diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh
index 1505782547f5..dbbb92d4400d 100755
--- a/lib/tests/modules.sh
+++ b/lib/tests/modules.sh
@@ -413,8 +413,14 @@ NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribu
 NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.listOf.type.functor.wrapped ./deprecated-wrapped.nix
 NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedListOf.type.functor.wrapped ./deprecated-wrapped.nix
 
-NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.listOf.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix
-NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedListOf.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix
+NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.unique.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix
+NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedUnique.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix
+# unique / uniq
+NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.unique.type.functor.wrapped ./deprecated-wrapped.nix
+NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedUnique.type.functor.wrapped ./deprecated-wrapped.nix
+
+NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.unique.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix
+NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedUnique.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix
 
 # Even with multiple assignments, a type error should be thrown if any of them aren't valid
 checkConfigError 'A definition for option .* is not of type .*' \
diff --git a/lib/tests/modules/deprecated-wrapped.nix b/lib/tests/modules/deprecated-wrapped.nix
index 8d363a2ad344..dc9771ec38c1 100644
--- a/lib/tests/modules/deprecated-wrapped.nix
+++ b/lib/tests/modules/deprecated-wrapped.nix
@@ -6,6 +6,7 @@ let
     # attrsOf uses attrsWith internally
     attrsOf
     listOf
+    unique
     ;
 in
 {
@@ -26,6 +27,13 @@ in
         options.mergedListOf = mkOption {
           type = listOf (listOf types.str);
         };
+        # unique
+        options.unique = mkOption {
+          type = unique { message = ""; } (listOf types.str);
+        };
+        options.mergedUnique = mkOption {
+          type = unique { message = ""; } (listOf types.str);
+        };
       }
     )
     # Module B
@@ -38,6 +46,9 @@ in
         options.mergedListOf = mkOption {
           type = listOf (listOf types.str);
         };
+        options.mergedUnique = mkOption {
+          type = unique { message = ""; } (listOf types.str);
+        };
       }
     )
   ];
diff --git a/lib/types.nix b/lib/types.nix
index cdba500ae07f..62aa337c167a 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -844,7 +844,9 @@ rec {
       getSubOptions = type.getSubOptions;
       getSubModules = type.getSubModules;
       substSubModules = m: uniq (type.substSubModules m);
-      functor = (defaultFunctor name) // { wrapped = type; };
+      functor = elemTypeFunctor name { elemType = type; } // {
+        type = payload: types.unique { inherit message; } payload.elemType;
+      };
       nestedTypes.elemType = type;
     };
 

From 4fe25460e13eeb6b78d41dabd5c95da024698d0b Mon Sep 17 00:00:00 2001
From: Johannes Kirschbauer <hsjobeki@gmail.com>
Date: Sun, 19 Jan 2025 16:21:33 +0100
Subject: [PATCH 05/54] lib/types: types.nullOr deprecate functor.wrapped in
 favor of functor.payload.elemType

---
 doc/release-notes/rl-2505.section.md     |  1 +
 lib/tests/modules.sh                     | 10 ++++++++--
 lib/tests/modules/deprecated-wrapped.nix | 11 +++++++++++
 lib/types.nix                            |  4 +++-
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md
index 2a44045fecb3..c71ac169d78b 100644
--- a/doc/release-notes/rl-2505.section.md
+++ b/doc/release-notes/rl-2505.section.md
@@ -76,6 +76,7 @@
     - `lib.types.attrsWith`
     - `lib.types.listOf`
     - `lib.types.unique` and `lib.types.uniq`
+    - `lib.types.nullOr`
 
 - Plasma 5 and Qt 5 based versions of associated software are deprecated in NixOS 25.05, and will be removed in NixOS 25.11. Users are encouraged to upgrade to Plasma 6.
 
diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh
index dbbb92d4400d..5bdc6e983501 100755
--- a/lib/tests/modules.sh
+++ b/lib/tests/modules.sh
@@ -413,14 +413,20 @@ NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribu
 NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.listOf.type.functor.wrapped ./deprecated-wrapped.nix
 NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedListOf.type.functor.wrapped ./deprecated-wrapped.nix
 
-NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.unique.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix
-NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedUnique.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix
+NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.listOf.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix
+NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedListOf.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix
 # unique / uniq
 NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.unique.type.functor.wrapped ./deprecated-wrapped.nix
 NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedUnique.type.functor.wrapped ./deprecated-wrapped.nix
 
 NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.unique.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix
 NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedUnique.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix
+# nullOr
+NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.nullOr.type.functor.wrapped ./deprecated-wrapped.nix
+NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedNullOr.type.functor.wrapped ./deprecated-wrapped.nix
+
+NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.nullOr.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix
+NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedNullOr.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix
 
 # Even with multiple assignments, a type error should be thrown if any of them aren't valid
 checkConfigError 'A definition for option .* is not of type .*' \
diff --git a/lib/tests/modules/deprecated-wrapped.nix b/lib/tests/modules/deprecated-wrapped.nix
index dc9771ec38c1..fcdfef7dea71 100644
--- a/lib/tests/modules/deprecated-wrapped.nix
+++ b/lib/tests/modules/deprecated-wrapped.nix
@@ -7,6 +7,7 @@ let
     attrsOf
     listOf
     unique
+    nullOr
     ;
 in
 {
@@ -34,6 +35,13 @@ in
         options.mergedUnique = mkOption {
           type = unique { message = ""; } (listOf types.str);
         };
+        # nullOr
+        options.nullOr = mkOption {
+          type = nullOr (listOf types.str);
+        };
+        options.mergedNullOr = mkOption {
+          type = nullOr (listOf types.str);
+        };
       }
     )
     # Module B
@@ -49,6 +57,9 @@ in
         options.mergedUnique = mkOption {
           type = unique { message = ""; } (listOf types.str);
         };
+        options.mergedNullOr = mkOption {
+          type = nullOr (listOf types.str);
+        };
       }
     )
   ];
diff --git a/lib/types.nix b/lib/types.nix
index 62aa337c167a..f38f96c33786 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -866,7 +866,9 @@ rec {
       getSubOptions = elemType.getSubOptions;
       getSubModules = elemType.getSubModules;
       substSubModules = m: nullOr (elemType.substSubModules m);
-      functor = (defaultFunctor name) // { wrapped = elemType; };
+      functor = (elemTypeFunctor name { inherit elemType; }) // {
+        type = payload: types.nullOr payload.elemType;
+      };
       nestedTypes.elemType = elemType;
     };
 

From f6214eb786bffd05a17941bfe68cdecb0c0438af Mon Sep 17 00:00:00 2001
From: Johannes Kirschbauer <hsjobeki@gmail.com>
Date: Sun, 19 Jan 2025 16:22:24 +0100
Subject: [PATCH 06/54] lib/types: types.functionTo deprecate functor.wrapped
 in favor of functor.payload.elemType

---
 doc/release-notes/rl-2505.section.md     |  1 +
 lib/tests/modules.sh                     |  6 ++++++
 lib/tests/modules/deprecated-wrapped.nix | 11 +++++++++++
 lib/types.nix                            |  4 +++-
 4 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md
index c71ac169d78b..240cda17b1eb 100644
--- a/doc/release-notes/rl-2505.section.md
+++ b/doc/release-notes/rl-2505.section.md
@@ -77,6 +77,7 @@
     - `lib.types.listOf`
     - `lib.types.unique` and `lib.types.uniq`
     - `lib.types.nullOr`
+    - `lib.types.functionTo`
 
 - Plasma 5 and Qt 5 based versions of associated software are deprecated in NixOS 25.05, and will be removed in NixOS 25.11. Users are encouraged to upgrade to Plasma 6.
 
diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh
index 5bdc6e983501..ffdc1505f06d 100755
--- a/lib/tests/modules.sh
+++ b/lib/tests/modules.sh
@@ -427,6 +427,12 @@ NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribu
 
 NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.nullOr.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix
 NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedNullOr.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix
+# functionTo
+NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.functionTo.type.functor.wrapped ./deprecated-wrapped.nix
+NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedFunctionTo.type.functor.wrapped ./deprecated-wrapped.nix
+
+NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.functionTo.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix
+NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedFunctionTo.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix
 
 # Even with multiple assignments, a type error should be thrown if any of them aren't valid
 checkConfigError 'A definition for option .* is not of type .*' \
diff --git a/lib/tests/modules/deprecated-wrapped.nix b/lib/tests/modules/deprecated-wrapped.nix
index fcdfef7dea71..7db64edfcce3 100644
--- a/lib/tests/modules/deprecated-wrapped.nix
+++ b/lib/tests/modules/deprecated-wrapped.nix
@@ -8,6 +8,7 @@ let
     listOf
     unique
     nullOr
+    functionTo
     ;
 in
 {
@@ -42,6 +43,13 @@ in
         options.mergedNullOr = mkOption {
           type = nullOr (listOf types.str);
         };
+        # nullOr
+        options.functionTo = mkOption {
+          type = functionTo (listOf types.str);
+        };
+        options.mergedFunctionTo = mkOption {
+          type = functionTo (listOf types.str);
+        };
       }
     )
     # Module B
@@ -60,6 +68,9 @@ in
         options.mergedNullOr = mkOption {
           type = nullOr (listOf types.str);
         };
+        options.mergedFunctionTo = mkOption {
+          type = functionTo (listOf types.str);
+        };
       }
     )
   ];
diff --git a/lib/types.nix b/lib/types.nix
index f38f96c33786..24d5192225a3 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -887,7 +887,9 @@ rec {
       getSubOptions = prefix: elemType.getSubOptions (prefix ++ [ "<function body>" ]);
       getSubModules = elemType.getSubModules;
       substSubModules = m: functionTo (elemType.substSubModules m);
-      functor = (defaultFunctor "functionTo") // { wrapped = elemType; };
+      functor = (elemTypeFunctor "functionTo" { inherit elemType; }) // {
+        type = payload: types.functionTo payload.elemType;
+      };
       nestedTypes.elemType = elemType;
     };
 

From 4f123107b47e6cdb137e64b1b361a26f6eb5ae6d Mon Sep 17 00:00:00 2001
From: Johannes Kirschbauer <hsjobeki@gmail.com>
Date: Sun, 19 Jan 2025 16:24:43 +0100
Subject: [PATCH 07/54] lib/types: types.coercedTo deprecate functor.wrapped in
 favor of functor.payload.elemType

---
 doc/release-notes/rl-2505.section.md     |  1 +
 lib/tests/modules.sh                     |  6 ++++++
 lib/tests/modules/deprecated-wrapped.nix |  8 +++++++-
 lib/types.nix                            | 11 +++++++----
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md
index 240cda17b1eb..2f9c4a00d6f4 100644
--- a/doc/release-notes/rl-2505.section.md
+++ b/doc/release-notes/rl-2505.section.md
@@ -78,6 +78,7 @@
     - `lib.types.unique` and `lib.types.uniq`
     - `lib.types.nullOr`
     - `lib.types.functionTo`
+    - `lib.types.coercedTo`
 
 - Plasma 5 and Qt 5 based versions of associated software are deprecated in NixOS 25.05, and will be removed in NixOS 25.11. Users are encouraged to upgrade to Plasma 6.
 
diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh
index ffdc1505f06d..2f21e466450d 100755
--- a/lib/tests/modules.sh
+++ b/lib/tests/modules.sh
@@ -434,6 +434,12 @@ NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribu
 NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.functionTo.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix
 NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedFunctionTo.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix
 
+# coercedTo
+# Note: test 'nestedTypes.finalType' and 'nestedTypes.coercedType'
+NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.coercedTo.type.functor.wrapped ./deprecated-wrapped.nix
+NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.coercedTo.type.nestedTypes.finalType.functor.wrapped ./deprecated-wrapped.nix
+NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.coercedTo.type.nestedTypes.coercedType.functor.wrapped ./deprecated-wrapped.nix
+
 # Even with multiple assignments, a type error should be thrown if any of them aren't valid
 checkConfigError 'A definition for option .* is not of type .*' \
   config.value ./declare-int-unsigned-value.nix ./define-value-list.nix ./define-value-int-positive.nix
diff --git a/lib/tests/modules/deprecated-wrapped.nix b/lib/tests/modules/deprecated-wrapped.nix
index 7db64edfcce3..5559cd3e9332 100644
--- a/lib/tests/modules/deprecated-wrapped.nix
+++ b/lib/tests/modules/deprecated-wrapped.nix
@@ -9,6 +9,7 @@ let
     unique
     nullOr
     functionTo
+    coercedTo
     ;
 in
 {
@@ -43,13 +44,18 @@ in
         options.mergedNullOr = mkOption {
           type = nullOr (listOf types.str);
         };
-        # nullOr
+        # functionTo
         options.functionTo = mkOption {
           type = functionTo (listOf types.str);
         };
         options.mergedFunctionTo = mkOption {
           type = functionTo (listOf types.str);
         };
+        # coercedTo
+        # Note: coercedTo is a non-mergeable option-type
+        options.coercedTo = mkOption {
+          type = coercedTo (listOf types.str) lib.id (listOf types.str);
+        };
       }
     )
     # Module B
diff --git a/lib/types.nix b/lib/types.nix
index 24d5192225a3..dee93a62e398 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -75,6 +75,7 @@ let
   # Note that individual attributes can be overriden if needed.
   elemTypeFunctor = name: { elemType, ... }@payload: {
     inherit name payload;
+    wrappedDeprecationMessage = makeWrappedDeprecationMessage payload;
     type    = outer_types.types.${name};
     binOp   = a: b:
       let
@@ -85,10 +86,10 @@ let
           null
         else
           { elemType = merged; };
-    wrappedDeprecationMessage = { loc }: lib.warn ''
-      The deprecated `${lib.optionalString (loc != null) "type."}functor.wrapped` attribute ${lib.optionalString (loc != null) "of the option `${showOption loc}` "}is accessed, use `${lib.optionalString (loc != null) "type."}nestedTypes.elemType` instead.
-    '' payload.elemType;
   };
+  makeWrappedDeprecationMessage = payload: { loc }: lib.warn ''
+    The deprecated `${lib.optionalString (loc != null) "type."}functor.wrapped` attribute ${lib.optionalString (loc != null) "of the option `${showOption loc}` "}is accessed, use `${lib.optionalString (loc != null) "type."}nestedTypes.elemType` instead.
+  '' payload.elemType;
 
 
   outer_types =
@@ -1163,7 +1164,9 @@ rec {
         getSubModules = finalType.getSubModules;
         substSubModules = m: coercedTo coercedType coerceFunc (finalType.substSubModules m);
         typeMerge = t: null;
-        functor = (defaultFunctor name) // { wrapped = finalType; };
+        functor = (defaultFunctor name) // {
+          wrappedDeprecationMessage = makeWrappedDeprecationMessage { elemType = finalType; };
+        };
         nestedTypes.coercedType = coercedType;
         nestedTypes.finalType = finalType;
       };

From 4cb534bc68567b28d5204f9885fdbd031ec75ef9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 18 Mar 2025 15:54:40 +0000
Subject: [PATCH 08/54] libgedit-gtksourceview: 299.4.0 -> 299.5.0

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

diff --git a/pkgs/by-name/li/libgedit-gtksourceview/package.nix b/pkgs/by-name/li/libgedit-gtksourceview/package.nix
index 722c0d19d0a4..68a47e60bfcc 100644
--- a/pkgs/by-name/li/libgedit-gtksourceview/package.nix
+++ b/pkgs/by-name/li/libgedit-gtksourceview/package.nix
@@ -16,7 +16,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libgedit-gtksourceview";
-  version = "299.4.0";
+  version = "299.5.0";
 
   outputs = [ "out" "dev" "devdoc" ];
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "gedit";
     repo = "libgedit-gtksourceview";
     rev = finalAttrs.version;
-    hash = "sha256-befm5UIXh2aCpKN2NH0aJhCYLf9j/ug0kVDAD5xNt4k=";
+    hash = "sha256-3HnlYLa1Zy1GRpX5fjEoXUzfB9X6nydpVjZTzJyhvIs=";
   };
 
   patches = [

From 48a407177a754ccf4da3e230ac76bc41aabbefac Mon Sep 17 00:00:00 2001
From: "Shahar \"Dawn\" Or" <mightyiampresence@gmail.com>
Date: Tue, 18 Mar 2025 20:32:43 +0000
Subject: [PATCH 09/54] nixos: add simple vm-variant test

---
 nixos/tests/all-tests.nix  |  1 +
 nixos/tests/vm-variant.nix | 31 +++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 nixos/tests/vm-variant.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 83bd0c45c6f7..86a350bb5744 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1279,6 +1279,7 @@ in {
   victoriametrics = handleTest ./victoriametrics {};
   vikunja = handleTest ./vikunja.nix {};
   virtualbox = handleTestOn ["x86_64-linux"] ./virtualbox.nix {};
+  vm-variant = handleTest ./vm-variant.nix {};
   vscode-remote-ssh = handleTestOn ["x86_64-linux"] ./vscode-remote-ssh.nix {};
   vscodium = discoverTests (import ./vscodium.nix);
   vsftpd = handleTest ./vsftpd.nix {};
diff --git a/nixos/tests/vm-variant.nix b/nixos/tests/vm-variant.nix
new file mode 100644
index 000000000000..cc95a3e6ed69
--- /dev/null
+++ b/nixos/tests/vm-variant.nix
@@ -0,0 +1,31 @@
+{
+  pkgs,
+  ...
+}:
+let
+  evalConfig = import ../lib/eval-config.nix;
+
+  nixos = evalConfig {
+    modules = [
+      {
+        system.stateVersion = "25.05";
+        fileSystems."/".device = "/dev/null";
+        boot.loader.grub.device = "nodev";
+        nixpkgs.hostPlatform = pkgs.system;
+        virtualisation.vmVariant.networking.hostName = "vm";
+        virtualisation.vmVariantWithBootLoader.networking.hostName = "vm-w-bl";
+      }
+    ];
+  };
+in
+assert nixos.config.virtualisation.vmVariant.networking.hostName == "vm";
+assert nixos.config.virtualisation.vmVariantWithBootLoader.networking.hostName == "vm-w-bl";
+assert nixos.config.networking.hostName == "nixos";
+pkgs.symlinkJoin {
+  name = "nixos-test-vm-variant-drvs";
+  paths = with nixos.config.system.build; [
+    toplevel
+    vm
+    vmWithBootLoader
+  ];
+}

From 38449d478dcaa22de460884368ef09d23a8e78ac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 18 Mar 2025 23:30:45 +0000
Subject: [PATCH 10/54] tidal-hifi: 5.17.0 -> 5.18.0

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

diff --git a/pkgs/by-name/ti/tidal-hifi/package.nix b/pkgs/by-name/ti/tidal-hifi/package.nix
index 7165e3249c93..d9584664bdbb 100644
--- a/pkgs/by-name/ti/tidal-hifi/package.nix
+++ b/pkgs/by-name/ti/tidal-hifi/package.nix
@@ -38,11 +38,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "tidal-hifi";
-  version = "5.17.0";
+  version = "5.18.0";
 
   src = fetchurl {
     url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${finalAttrs.version}/tidal-hifi_${finalAttrs.version}_amd64.deb";
-    sha256 = "sha256-oM0hXimXSrV33tntV+DeYdV0WyyRqioKSm+rL+Oce6Y=";
+    sha256 = "sha256-R5Xw9uIptVPYEZ73TtdWarQNtn8nhAUN+zA5tnzTaCU=";
   };
 
   nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper wrapGAppsHook3 ];

From d913095e15d47c2e6067d104164ec4b64902f98e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 19 Mar 2025 06:08:50 +0000
Subject: [PATCH 11/54] latexminted: 0.4.0 -> 0.5.0

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

diff --git a/pkgs/by-name/la/latexminted/package.nix b/pkgs/by-name/la/latexminted/package.nix
index ff6521d1c4f9..850921ca5461 100644
--- a/pkgs/by-name/la/latexminted/package.nix
+++ b/pkgs/by-name/la/latexminted/package.nix
@@ -8,12 +8,12 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "latexminted";
-  version = "0.4.0";
+  version = "0.5.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-JI44VGAuSDDUBm7hH6huYdzXeMU2q1ZCixwJNTxBHHo=";
+    hash = "sha256-sQiIVAmqZBSyryBIvafsVTUVuXbfJJfpNwxD8slGJQA=";
   };
 
   build-system = with python3Packages; [

From ee1e417d88469317acbde0756831aa6c2ce3b693 Mon Sep 17 00:00:00 2001
From: Chris Moultrie <821688+tebriel@users.noreply.github.com>
Date: Tue, 18 Mar 2025 10:30:49 -0400
Subject: [PATCH 12/54] python312Packages.lap: init at 0.5.12

Co-Authored-By: Doron Behar <doron.behar@gmail.com>
---
 .../python-modules/lap/default.nix            | 52 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 54 insertions(+)
 create mode 100644 pkgs/development/python-modules/lap/default.nix

diff --git a/pkgs/development/python-modules/lap/default.nix b/pkgs/development/python-modules/lap/default.nix
new file mode 100644
index 000000000000..eb18a1f4bdb2
--- /dev/null
+++ b/pkgs/development/python-modules/lap/default.nix
@@ -0,0 +1,52 @@
+{
+  lib,
+  buildPythonPackage,
+  cython,
+  fetchPypi,
+  numpy,
+  pytestCheckHook,
+  python-utils,
+  pythonOlder,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "lap";
+  version = "0.5.12";
+  pyproject = true;
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-VwtBTqeubAS9SdDsjNrB3FY0c3dVeE1E43+fZourRP0=";
+  };
+
+  build-system = [ setuptools ];
+
+  nativeBuildInputs = [ cython ];
+
+  dependencies = [
+    numpy
+    python-utils
+  ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "lap" ];
+  # See https://github.com/NixOS/nixpkgs/issues/255262
+  preCheck = ''
+    cd "$out"
+  '';
+
+  meta = {
+    description = "Linear Assignment Problem solver (LAPJV/LAPMOD)";
+    homepage = "https://github.com/gatagat/lap";
+    changelog = "https://github.com/gatagat/lap/releases/tag/v${version}";
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [
+      doronbehar
+      tebriel
+    ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 04261021c475..be5072d7403b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7317,6 +7317,8 @@ self: super: with self; {
     inherit (pkgs.__splicedPackages) laszip;
   };
 
+  lap = callPackage ../development/python-modules/lap { };
+
   latex2mathml = callPackage ../development/python-modules/latex2mathml { };
 
   latex2pydata = callPackage ../development/python-modules/latex2pydata { };

From 25b6ffb800c13891658350030cab812cbe0f531c Mon Sep 17 00:00:00 2001
From: Chris Moultrie <821688+tebriel@users.noreply.github.com>
Date: Tue, 18 Mar 2025 11:04:43 -0400
Subject: [PATCH 13/54] beets-unstable: 2024-12-02 -> 2025-03-12

Co-Authored-By: Doron Behar <doron.behar@gmail.com>
---
 pkgs/tools/audio/beets/builtin-plugins.nix |  8 ++++++++
 pkgs/tools/audio/beets/common.nix          | 17 ++++++-----------
 pkgs/tools/audio/beets/default.nix         | 19 +++++++++++++++----
 3 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/pkgs/tools/audio/beets/builtin-plugins.nix b/pkgs/tools/audio/beets/builtin-plugins.nix
index bcb22caab20c..ece354ab29e7 100644
--- a/pkgs/tools/audio/beets/builtin-plugins.nix
+++ b/pkgs/tools/audio/beets/builtin-plugins.nix
@@ -7,6 +7,8 @@
   mp3gain,
   mp3val,
   python3Packages,
+  version,
+  lib,
   ...
 }:
 {
@@ -170,3 +172,9 @@
   ];
   zero = { };
 }
+# NOTE: There will be no need for this conditional once beets is updated.
+// lib.optionalAttrs (lib.versionAtLeast version "2.2.0-unstable-2025-03-12") {
+  _typing = {
+    testPaths = [ ];
+  };
+}
diff --git a/pkgs/tools/audio/beets/common.nix b/pkgs/tools/audio/beets/common.nix
index ed070d8fb4d5..d06e10494b59 100644
--- a/pkgs/tools/audio/beets/common.nix
+++ b/pkgs/tools/audio/beets/common.nix
@@ -82,17 +82,6 @@ python3Packages.buildPythonApplication {
   pyproject = true;
 
   patches = [
-    (fetchpatch {
-      # Already on master. TODO: remove when updating to the next release
-      # Issue: https://github.com/beetbox/beets/issues/5527
-      # PR: https://github.com/beetbox/beets/pull/5650
-      name = "fix-im-backend";
-      url = "https://github.com/beetbox/beets/commit/1f938674015ee71431fe9bd97c2214f58473efd2.patch";
-      hash = "sha256-koCYeiUhk1ifo6CptOSu3p7Nz0FFUeiuArTknM/tpVQ=";
-      excludes = [
-        "docs/changelog.rst"
-      ];
-    })
   ] ++ extraPatches;
 
   build-system = [
@@ -113,6 +102,9 @@ python3Packages.buildPythonApplication {
       unidecode
       typing-extensions
     ]
+    ++ lib.optionals (lib.versionAtLeast version "2.2.0-unstable-2025-03-12") [
+      lap
+    ]
     ++ (concatMap (p: p.propagatedBuildInputs) (attrValues enabledPlugins));
 
   nativeBuildInputs = [
@@ -160,6 +152,9 @@ python3Packages.buildPythonApplication {
       rarfile
       responses
     ]
+    ++ lib.optionals (lib.versionAtLeast version "2.2.0-unstable-2025-03-12") [
+      requests-mock
+    ]
     ++ [
       writableTmpDirAsHomeHook
     ]
diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index 2a4540681f6f..70d3b644d692 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -20,6 +20,17 @@
 */
 let
   extraPatches = [
+    (fetchpatch {
+      # Already on master. TODO: remove when updating to the next release
+      # Issue: https://github.com/beetbox/beets/issues/5527
+      # PR: https://github.com/beetbox/beets/pull/5650
+      name = "fix-im-backend";
+      url = "https://github.com/beetbox/beets/commit/1f938674015ee71431fe9bd97c2214f58473efd2.patch";
+      hash = "sha256-koCYeiUhk1ifo6CptOSu3p7Nz0FFUeiuArTknM/tpVQ=";
+      excludes = [
+        "docs/changelog.rst"
+      ];
+    })
     # Bash completion fix for Nix
     ./patches/bash-completion-always-print.patch
     # Remove after next release.
@@ -46,13 +57,13 @@ lib.makeExtensible (self: {
   beets-minimal = self.beets.override { disableAllPlugins = true; };
 
   beets-unstable = callPackage ./common.nix {
-    inherit python3Packages extraPatches;
-    version = "2.2.0-unstable-2024-12-02";
+    inherit python3Packages;
+    version = "2.2.0-unstable-2025-03-12";
     src = fetchFromGitHub {
       owner = "beetbox";
       repo = "beets";
-      rev = "f92c0ec8b14fbd59e58374fd123563123aef197b";
-      hash = "sha256-jhwXRgUUQJgQ/PLwvY1UfHCJ9UC8DcdBpE/janao0RM=";
+      rev = "670a3bcd17a46883c71cf07dd313fcd0dff4be9d";
+      hash = "sha256-hSY7FhpPL4poOY1/gqk7oLNgQ7KA/MJqx50xOLIP0QA=";
     };
   };
 

From c317d5e222882331eeeb2ea28d6a68313d2da8bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 19 Mar 2025 21:51:14 +0100
Subject: [PATCH 14/54] nixos/mobilizon: create sitemap directory

Mar 19 21:35:05 mobilizon mobilizon[1324]: 21:35:05.504 [info] {"args":{},"attempt":19,"duration":130905,"error":"** (File.Error) could not write to file \"/var/lib/mobilizon/sitemap/sitemap-00001.xml\": no such file or directory","event":"job:exception","id":178203,"max_attempts":20,"meta":{},"queue":"background","queue_time":510620016,"source":"oban","state":"failure","tags":[],"worker":"Mobilizon.Service.Workers.BuildSiteMap"}
---
 nixos/modules/services/web-apps/mobilizon.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/web-apps/mobilizon.nix b/nixos/modules/services/web-apps/mobilizon.nix
index 539f64ba94c6..584f6c7a04b0 100644
--- a/nixos/modules/services/web-apps/mobilizon.nix
+++ b/nixos/modules/services/web-apps/mobilizon.nix
@@ -398,6 +398,7 @@ in
     };
 
     systemd.tmpfiles.rules = [
+      "d /var/lib/mobilizon/sitemap 700 mobilizon mobilizon - -"
       "d /var/lib/mobilizon/uploads/exports/csv 700 mobilizon mobilizon - -"
       "Z /var/lib/mobilizon 700 mobilizon mobilizon - -"
     ];

From ff0cfa9d7bb91f9079fa53d2da554b29561aa54e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 19 Mar 2025 22:12:56 +0000
Subject: [PATCH 15/54] turn-rs: 3.3.4 -> 3.4.0

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

diff --git a/pkgs/by-name/tu/turn-rs/package.nix b/pkgs/by-name/tu/turn-rs/package.nix
index e499661dd786..fe76e4aad375 100644
--- a/pkgs/by-name/tu/turn-rs/package.nix
+++ b/pkgs/by-name/tu/turn-rs/package.nix
@@ -9,17 +9,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "turn-rs";
-  version = "3.3.4";
+  version = "3.4.0";
 
   src = fetchFromGitHub {
     owner = "mycrl";
     repo = "turn-rs";
     tag = "v${version}";
-    hash = "sha256-GAmer7uSCgHdVVvTafMfAgdvMCp/FUT/quF88VLcWgo=";
+    hash = "sha256-BW5dNPkf/JGrf00BI41rEoZRmqftoz+RMGiP6ECVEec=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-vLx6bvhb/Xq5BzKPOEqfx1BzGeDHx+47okdcW5Pu5YM=";
+  cargoHash = "sha256-wnbovuxh3wc1TU8BYZEOG/8SO9bCUd0eWRC81MtAdqo=";
 
   # By default, no features are enabled
   # https://github.com/mycrl/turn-rs?tab=readme-ov-file#features-1

From c6cfeba039b247aae8758c1cb0b35a485b294c23 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 20 Mar 2025 00:52:33 +0000
Subject: [PATCH 16/54] comet-gog: 0.2.0 -> 0.3.0

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

diff --git a/pkgs/by-name/co/comet-gog/package.nix b/pkgs/by-name/co/comet-gog/package.nix
index c5676da76151..49b5e7c4f2dd 100644
--- a/pkgs/by-name/co/comet-gog/package.nix
+++ b/pkgs/by-name/co/comet-gog/package.nix
@@ -7,18 +7,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "comet-gog";
-  version = "0.2.0";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "imLinguin";
     repo = "comet";
     tag = "v${version}";
-    hash = "sha256-LAEt2i/SRABrz+y2CTMudrugifLgHNxkMSdC8PXYF0E=";
+    hash = "sha256-oJSP/zqr4Jp09Rh15a3o1GWsTA0y22+Zu2mU0HXHLHY=";
     fetchSubmodules = true;
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-SvDE+QqaSK0+4XgB3bdmqOtwxBDTlf7yckTR8XjmMXc=";
+  cargoHash = "sha256-VY9+5QUJYYifLokf69laapCCBRYFo1BOd6kQpxO2wkc=";
 
   # error: linker `aarch64-linux-gnu-gcc` not found
   postPatch = ''

From 83102b89167d450182a6ff548a8272853f8b0be3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 20 Mar 2025 02:09:36 +0000
Subject: [PATCH 17/54] ginkgo: 2.23.0 -> 2.23.1

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

diff --git a/pkgs/by-name/gi/ginkgo/package.nix b/pkgs/by-name/gi/ginkgo/package.nix
index d2902ee8cc99..b7403ce96b37 100644
--- a/pkgs/by-name/gi/ginkgo/package.nix
+++ b/pkgs/by-name/gi/ginkgo/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "ginkgo";
-  version = "2.23.0";
+  version = "2.23.1";
 
   src = fetchFromGitHub {
     owner = "onsi";
     repo = "ginkgo";
     rev = "v${version}";
-    sha256 = "sha256-ku3pB9LLlDjwEEzJEVgCK+ar+L+beyMrjDtASfBWqLM=";
+    sha256 = "sha256-yQnkKh5RXzUIff4gSKDo79GZuRvjkT1vK0IUbvKdVjk=";
   };
   vendorHash = "sha256-uqpib3k5PtQOsndic0GV1rYBeVlY5Tpg931yHfU6dWI=";
 

From 502728235b7fc73f93aca3406cc1a62cbeab2098 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Wed, 19 Mar 2025 21:31:06 -0500
Subject: [PATCH 18/54] fastfetch: 2.38.0 -> 2.39.0

Changelog: https://github.com/fastfetch-cli/fastfetch/releases/tag/2.39.0
---
 pkgs/by-name/fa/fastfetch/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix
index c660d923c7df..d12fa778eb2a 100644
--- a/pkgs/by-name/fa/fastfetch/package.nix
+++ b/pkgs/by-name/fa/fastfetch/package.nix
@@ -45,13 +45,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "fastfetch";
-  version = "2.38.0";
+  version = "2.39.0";
 
   src = fetchFromGitHub {
     owner = "fastfetch-cli";
     repo = "fastfetch";
     tag = finalAttrs.version;
-    hash = "sha256-9ph6Zp1x/MP0apB39L+HFUCl7qQ9UfIU89/78+qy6Vc=";
+    hash = "sha256-2XuODYi3kC9d1rO1LFAdixS7SrrjTOgj+Tm3waMGa+M=";
   };
 
   outputs = [

From 4dbb2839dcac0b6d06b8e39d0058257ab5eaa344 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 20 Mar 2025 03:24:59 +0000
Subject: [PATCH 19/54] mpc-qt: 24.06 -> 24.12.1-flatpak

---
 pkgs/applications/video/mpc-qt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/mpc-qt/default.nix b/pkgs/applications/video/mpc-qt/default.nix
index 70d3a4c20073..7868257ffda7 100644
--- a/pkgs/applications/video/mpc-qt/default.nix
+++ b/pkgs/applications/video/mpc-qt/default.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mpc-qt";
-  version = "24.06";
+  version = "24.12.1-flatpak";
 
   src = fetchFromGitHub {
     owner = "mpc-qt";
     repo = "mpc-qt";
     rev = "v${version}";
-    hash = "sha256-kEG7B99io3BGjN94nEX1pN10Bcjj21rb46Vcn2OtpN8=";
+    hash = "sha256-gn94kVs3Lbd+ggj4jTacHpmnVO2lH/QDhFk+hJC1N/c=";
   };
 
   nativeBuildInputs = [

From 22f70327aee70f9182c5eae6e7561db6b889d79a Mon Sep 17 00:00:00 2001
From: Robin <github@spampert.com>
Date: Thu, 20 Mar 2025 08:31:52 +0100
Subject: [PATCH 20/54] dotnet-repl: 0.3.230 -> 0.3.239

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

diff --git a/pkgs/by-name/do/dotnet-repl/package.nix b/pkgs/by-name/do/dotnet-repl/package.nix
index 746819980117..3941b45926fa 100644
--- a/pkgs/by-name/do/dotnet-repl/package.nix
+++ b/pkgs/by-name/do/dotnet-repl/package.nix
@@ -6,12 +6,12 @@
 
 buildDotnetGlobalTool {
   pname = "dotnet-repl";
-  version = "0.3.230";
+  version = "0.3.239";
 
   dotnet-sdk = dotnetCorePackages.sdk_9_0;
   dotnet-runtime = dotnetCorePackages.runtime_9_0;
 
-  nugetHash = "sha256-FtITkDZ0Qbjo0XvQ8psRlIsbEZhMjIhk8mVrHmUxlIg=";
+  nugetHash = "sha256-wn4i0zC56gxnjsgjdiMxLinmUsSROhmimu0lmBZo1hA=";
 
   meta = {
     description = "A polyglot REPL built on .NET Interactive";

From c853644fa3396948c48b8db421b4a882dce6ffeb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 20 Mar 2025 07:58:53 +0000
Subject: [PATCH 21/54] mieru: 3.12.0 -> 3.13.0

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

diff --git a/pkgs/by-name/mi/mieru/package.nix b/pkgs/by-name/mi/mieru/package.nix
index 329687f31a4b..eff21c563892 100644
--- a/pkgs/by-name/mi/mieru/package.nix
+++ b/pkgs/by-name/mi/mieru/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "mieru";
-  version = "3.12.0";
+  version = "3.13.0";
 
   src = fetchFromGitHub {
     owner = "enfein";
     repo = "mieru";
     rev = "v${version}";
-    hash = "sha256-F7YawlcIH/V+qudXjfFKIrVNjds+fhw6BdlCe2VDdUc=";
+    hash = "sha256-Hy5Uy6lC3d8N2lsnGLrcN/D5/eiycp7X7h6V8vo3tPA=";
   };
 
   vendorHash = "sha256-pKcdvP38fZ2KFYNDx6I4TfmnnvWKzFDvz80xMkUojqM=";

From 3ec998bc509ac14778bafb7e39b2375b05051f7f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 20 Mar 2025 07:58:57 +0000
Subject: [PATCH 22/54] prrte: 3.0.8 -> 3.0.9

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

diff --git a/pkgs/by-name/pr/prrte/package.nix b/pkgs/by-name/pr/prrte/package.nix
index a4284b88168f..6e6089f50321 100644
--- a/pkgs/by-name/pr/prrte/package.nix
+++ b/pkgs/by-name/pr/prrte/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "prrte";
-  version = "3.0.8";
+  version = "3.0.9";
 
   src = fetchFromGitHub {
     owner = "openpmix";
     repo = "prrte";
     rev = "v${version}";
-    hash = "sha256-4Xc6We0mXpKCwfHlmqi+WbFjdQegWHGzWrEnMVqkqtU=";
+    hash = "sha256-wLM+txjngY5gh/+yiaSKrenG6oIzF2dPgMumIGyCsXU=";
     fetchSubmodules = true;
   };
 

From dd5d47dbfdb4ef22dd022da06e0f5c6720ae8fa9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 20 Mar 2025 07:59:07 +0000
Subject: [PATCH 23/54] pmix: 5.0.6 -> 5.0.7

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

diff --git a/pkgs/by-name/pm/pmix/package.nix b/pkgs/by-name/pm/pmix/package.nix
index 606c11ee1c64..d4eed1fef336 100644
--- a/pkgs/by-name/pm/pmix/package.nix
+++ b/pkgs/by-name/pm/pmix/package.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pmix";
-  version = "5.0.6";
+  version = "5.0.7";
 
   src = fetchFromGitHub {
     repo = "openpmix";
     owner = "openpmix";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-uzsUqf4ZmXmz3vTtD01RkILPxrtCiQ5RMyZ57KAKG1U=";
+    hash = "sha256-qj/exBi1siCHY1QqNY+ad6n3XI4JZuwnM93Vp+rj1AQ=";
     fetchSubmodules = true;
   };
 

From 5cd5fcbf419d42c3b774b64e6353298b23fb3b0c Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 19 Mar 2025 22:03:35 +0100
Subject: [PATCH 24/54] python312Packages.jaxlib: 0.5.1 -> 0.5.2

---
 .../development/python-modules/jaxlib/bin.nix | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/jaxlib/bin.nix b/pkgs/development/python-modules/jaxlib/bin.nix
index f969f398edae..4a8bfb8d31af 100644
--- a/pkgs/development/python-modules/jaxlib/bin.nix
+++ b/pkgs/development/python-modules/jaxlib/bin.nix
@@ -18,7 +18,7 @@
 }:
 
 let
-  version = "0.5.1";
+  version = "0.5.3";
   inherit (python) pythonVersion;
 
   # As of 2023-06-06, google/jax upstream is no longer publishing CPU-only wheels to their GCS bucket. Instead the
@@ -49,65 +49,65 @@ let
       "3.10-x86_64-linux" = getSrcFromPypi {
         platform = "manylinux2014_x86_64";
         dist = "cp310";
-        hash = "sha256-ZbxJAKBJHfxvubamLoEA0SFCnVjHQplF7CtCTBqCvyc=";
+        hash = "sha256-Ur5sl3Wv9zimEXDYwEdQXHW7eZpFUY5mp6CQgSexF4U=";
       };
       "3.10-aarch64-linux" = getSrcFromPypi {
         platform = "manylinux2014_aarch64";
         dist = "cp310";
-        hash = "sha256-CQ/n1LyOGXaHcdvIMZ3pAkdGu1Z/XZujebUQLxdljEE=";
+        hash = "sha256-lyQA20r26FJw2B215uYg0xOV8EcuUQxQ381Ms/crciA=";
       };
       "3.10-aarch64-darwin" = getSrcFromPypi {
         platform = "macosx_11_0_arm64";
         dist = "cp310";
-        hash = "sha256-LavMsIZHaBj3N80OYi/YjcT1u08N9Melxow0s2bohH8=";
+        hash = "sha256-SP9cifuKD+BNR16d3AdLSHmpHXq2ilHOxc0eh/gebEc=";
       };
 
       "3.11-x86_64-linux" = getSrcFromPypi {
         platform = "manylinux2014_x86_64";
         dist = "cp311";
-        hash = "sha256-gMDtVEZkSzg8qj5hdUCAO7DvNuVgnNd1bU0pE6jeUS4=";
+        hash = "sha256-KeFTD8gYMyFvHii1eNDFlpdlT3LuMcekTtd1O69axGY=";
       };
       "3.11-aarch64-linux" = getSrcFromPypi {
         platform = "manylinux2014_aarch64";
         dist = "cp311";
-        hash = "sha256-afS54HrQdNRBuZIbeoOu5PT/09VCAz/exQvhRW0GEcY=";
+        hash = "sha256-pGZvgdcsBg7T5YHe0RapyqmwpwoUilTLEqHTr8o2JLU=";
       };
       "3.11-aarch64-darwin" = getSrcFromPypi {
         platform = "macosx_11_0_arm64";
         dist = "cp311";
-        hash = "sha256-M0xJrUEfOaUFXCPxOVUq4yvZr+aWq7scrfnETr72B/c=";
+        hash = "sha256-tivYsp5aT5v6pXyNr24EggssmU9Ejz3sYC1kJVVF6fI=";
       };
 
       "3.12-x86_64-linux" = getSrcFromPypi {
         platform = "manylinux2014_x86_64";
         dist = "cp312";
-        hash = "sha256-Uee1n8QLsnBEDFBJs8gvn3/a2uMZnxaBhiDP24C5Z68=";
+        hash = "sha256-Wl6IqxzW/feNaavjVE6PCcziAN0zm7hfvjwupn8qXmg=";
       };
       "3.12-aarch64-linux" = getSrcFromPypi {
         platform = "manylinux2014_aarch64";
         dist = "cp312";
-        hash = "sha256-W0ulqj9ZtfLjfVJc7dav4P7suIQW5fQ+uacJz97YslA=";
+        hash = "sha256-vd9jYDd6oceS5H/YfzB8NC4zHl/zWC+UCxvKAPa0vHM=";
       };
       "3.12-aarch64-darwin" = getSrcFromPypi {
         platform = "macosx_11_0_arm64";
         dist = "cp312";
-        hash = "sha256-rj3ii/m4Z4HDCjLIi3y9HTIiqMIpqpbL4hBV3NCeuIk=";
+        hash = "sha256-05Tb3koca9Z1Ac+ynTgZoQuQDLU0zA/GAzGfcJLyTPo=";
       };
 
       "3.13-x86_64-linux" = getSrcFromPypi {
         platform = "manylinux2014_x86_64";
         dist = "cp313";
-        hash = "sha256-3BCf+mhzZAImw2DaeTqKe+r4xIdRrD/bKfprM3kB4YY=";
+        hash = "sha256-u3WTy3//yxOWPyL6UintlguPtK5ew7CCAEjL1n8ejjE=";
       };
       "3.13-aarch64-linux" = getSrcFromPypi {
         platform = "manylinux2014_aarch64";
         dist = "cp313";
-        hash = "sha256-3zcE8TXP+H/Z1BkwJIkl8vFjvu1u/qqrzNl0AVgNz9g=";
+        hash = "sha256-6QS5Le37x+VFclqNdnaYcDCunAaQAdlHAbwQnG2rQQA=";
       };
       "3.13-aarch64-darwin" = getSrcFromPypi {
         platform = "macosx_11_0_arm64";
         dist = "cp313";
-        hash = "sha256-jFf7vnmqPOOsLsZXp/F4Z7mzwsrYhbLIOQVnzJc47ug=";
+        hash = "sha256-MTIcJSgqBqbfyUBQe8FNCgrIONjO1sB6oAp/rjTOez8=";
       };
     };
 in

From 067aa11fac16cd74a08343b6c0cf2b35a02147fa Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 19 Mar 2025 22:03:51 +0100
Subject: [PATCH 25/54] python312Packages.jax-cuda12-plugin: 0.5.1 -> 0.5.3

---
 .../python-modules/jax-cuda12-plugin/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/jax-cuda12-plugin/default.nix b/pkgs/development/python-modules/jax-cuda12-plugin/default.nix
index e9d22d155f69..a1bcf01218da 100644
--- a/pkgs/development/python-modules/jax-cuda12-plugin/default.nix
+++ b/pkgs/development/python-modules/jax-cuda12-plugin/default.nix
@@ -40,42 +40,42 @@ let
     "3.10-x86_64-linux" = getSrcFromPypi {
       platform = "manylinux2014_x86_64";
       dist = "cp310";
-      hash = "sha256-ymCGSgWlzqRK51dthHtHeeTeYYUKmhgjg0H8Q6dY1Vs=";
+      hash = "sha256-uiVVln+bbDgci075+wPQW8Vewl7P7lz+RcWs4099QVI=";
     };
     "3.10-aarch64-linux" = getSrcFromPypi {
       platform = "manylinux2014_aarch64";
       dist = "cp310";
-      hash = "sha256-488emSaNinBBPw+sM1krh2nBPckdch+RxYeEa+nYhAM=";
+      hash = "sha256-YXGu0vSzvdX8E3gt4QcsamNPzhNzG3XQywpquPTm5lA=";
     };
     "3.11-x86_64-linux" = getSrcFromPypi {
       platform = "manylinux2014_x86_64";
       dist = "cp311";
-      hash = "sha256-NGVbjq/H2b/sMbB3rBPULgjY7YZV0kFHxa38AVFSaU8=";
+      hash = "sha256-qqcEpe9UdZXQItscHkh4oGdxFkEqk2DBFdZ/9LZOFZY=";
     };
     "3.11-aarch64-linux" = getSrcFromPypi {
       platform = "manylinux2014_aarch64";
       dist = "cp311";
-      hash = "sha256-ik8Mje8QnXb1uqwbKuRpCURFzS1/vYxZf83WI+sC/1Q=";
+      hash = "sha256-KY0tdo8QKbdKCx0BJw5Uk0nSw33Adlh5ZULNqWfre9M=";
     };
     "3.12-x86_64-linux" = getSrcFromPypi {
       platform = "manylinux2014_x86_64";
       dist = "cp312";
-      hash = "sha256-Fp22Rbr+whOO2YOvjxTk0RqElyivpXIC55qRBNmJLxY=";
+      hash = "sha256-IDDPEgjOTqcO5WysYd3SOfl5hpX8Obt3OcUKJdbp2kQ=";
     };
     "3.12-aarch64-linux" = getSrcFromPypi {
       platform = "manylinux2014_aarch64";
       dist = "cp312";
-      hash = "sha256-wqhtVj3AR5rLTHmuz/vuwYn6vY6XAP4/cxvwOV4dbBE=";
+      hash = "sha256-wlF6fCGG+HCIlGluJs+W69YLeHnOyjmLLEarso0slsg=";
     };
     "3.13-x86_64-linux" = getSrcFromPypi {
       platform = "manylinux2014_x86_64";
       dist = "cp313";
-      hash = "sha256-J0kTjLGHMZBoa7FPMxBIskwXjwXkdIo9L/fSA2c1rT0=";
+      hash = "sha256-GGJZWyttgVZ50R4OiJ5SMYXuVKRtRuAiaJ9w/EVU3ZE=";
     };
     "3.13-aarch64-linux" = getSrcFromPypi {
       platform = "manylinux2014_aarch64";
       dist = "cp313";
-      hash = "sha256-C7aXl3+NbGOS9WLDQF6D68xvXLfCCBQFCE9tXPoJ4yo=";
+      hash = "sha256-If7BtWyYeD6gVpt0elZ1Hx+f8hh7SKzBHHANO/xeGjE=";
     };
   };
 in

From fe66b5b6f22f93360cede5d6c7f7e95336131cf5 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 19 Mar 2025 22:04:14 +0100
Subject: [PATCH 26/54] python312Packages.jax-cuda12-pjrt: 0.5.1 -> 0.5.3

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

diff --git a/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix b/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix
index 6dff1eb69ef7..14c59787f06a 100644
--- a/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix
+++ b/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix
@@ -39,7 +39,7 @@ let
   srcs = {
     "x86_64-linux" = fetchurl {
       url = "https://storage.googleapis.com/jax-releases/cuda12_plugin/jax_cuda12_pjrt-${version}-py3-none-manylinux2014_x86_64.whl";
-      hash = "sha256-05Xe87NP1oSOEVlu8pdaiV0fUG31EuQbH8XS3lIMjlE=";
+      hash = "sha256-xTeDBlaLoMgbIwp3ndMZTJ3RAzmrY2CugJKBCNN+f3U=";
     };
     # "aarch64-linux" = fetchurl {
     #   url = "https://storage.googleapis.com/jax-releases/cuda12_plugin/jax_cuda12_pjrt-${version}-py3-none-manylinux2014_aarch64.whl";

From f35542a2c74cb2045788772894ea67b5d9dfcfef Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 19 Mar 2025 22:05:16 +0100
Subject: [PATCH 27/54] python312Packages.jax: 0.5.2 -> 0.5.3

Diff: https://github.com/jax-ml/jax/compare/jax-v0.5.2...jax-v0.5.3

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

diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix
index 7cf05a432916..30b6789692a9 100644
--- a/pkgs/development/python-modules/jax/default.nix
+++ b/pkgs/development/python-modules/jax/default.nix
@@ -40,7 +40,7 @@ let
 in
 buildPythonPackage rec {
   pname = "jax";
-  version = "0.5.2";
+  version = "0.5.3";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -48,7 +48,7 @@ buildPythonPackage rec {
     repo = "jax";
     # google/jax contains tags for jax and jaxlib. Only use jax tags!
     tag = "jax-v${version}";
-    hash = "sha256-Z7yMV4P423Pr574QPk0bVupWj2//RelLi/eLUqN/BlE=";
+    hash = "sha256-t4LHwpCz08zrQGWBehyPs2JnxsOvtV3L14MCdTqMeEI=";
   };
 
   build-system = [ setuptools ];

From 7c93e453118f4f4b56381880cbb6d0ed5447932b Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 20 Mar 2025 09:37:22 +0100
Subject: [PATCH 28/54] python312Packages.equinox: ignore DeprecationWarning in
 pytest

https://github.com/patrick-kidger/equinox/issues/979
---
 pkgs/development/python-modules/equinox/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/python-modules/equinox/default.nix b/pkgs/development/python-modules/equinox/default.nix
index d9bbc922431a..834e6f5d732b 100644
--- a/pkgs/development/python-modules/equinox/default.nix
+++ b/pkgs/development/python-modules/equinox/default.nix
@@ -56,6 +56,14 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  pytestFlagsArray = [
+    # Since jax 0.5.3:
+    # DeprecationWarning: shape requires ndarray or scalar arguments, got <class 'jax._src.api.ShapeDtypeStruct'> at position 0. In a future JAX release this will be an error.
+    # https://github.com/patrick-kidger/equinox/issues/979
+    "-W"
+    "ignore::DeprecationWarning"
+  ];
+
   disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
     # SystemError: nanobind::detail::nb_func_error_except(): exception could not be translated!
     "test_filter"

From a229ef5feb0a550816c5f78d8e7e7de5c408482c Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 20 Mar 2025 10:11:26 +0100
Subject: [PATCH 29/54] python312Packages.optimistix: ignore DeprecationWarning
 in pytest

---
 pkgs/development/python-modules/optimistix/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/optimistix/default.nix b/pkgs/development/python-modules/optimistix/default.nix
index c292b993e232..8b98dbe711c6 100644
--- a/pkgs/development/python-modules/optimistix/default.nix
+++ b/pkgs/development/python-modules/optimistix/default.nix
@@ -13,7 +13,7 @@
   lineax,
   typing-extensions,
 
-  # checks
+  # tests
   beartype,
   jaxlib,
   optax,
@@ -53,6 +53,13 @@ buildPythonPackage rec {
     pytest-xdist
   ];
 
+  pytestFlagsArray = [
+    # Since jax 0.5.3:
+    # DeprecationWarning: shape requires ndarray or scalar arguments, got <class 'jax._src.api.ShapeDtypeStruct'> at position 0. In a future JAX release this will be an error.
+    "-W"
+    "ignore::DeprecationWarning"
+  ];
+
   meta = {
     description = "Nonlinear optimisation (root-finding, least squares, ...) in JAX+Equinox";
     homepage = "https://github.com/patrick-kidger/optimistix";

From fdd3d82032bc42974a2f6718762e839054c8d97f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 20 Mar 2025 09:18:10 +0000
Subject: [PATCH 30/54] vacuum-go: 0.16.3 -> 0.16.4

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

diff --git a/pkgs/by-name/va/vacuum-go/package.nix b/pkgs/by-name/va/vacuum-go/package.nix
index 4fb520baedaf..32f0993d4eb2 100644
--- a/pkgs/by-name/va/vacuum-go/package.nix
+++ b/pkgs/by-name/va/vacuum-go/package.nix
@@ -8,14 +8,14 @@
 
 buildGoModule rec {
   pname = "vacuum-go";
-  version = "0.16.3";
+  version = "0.16.4";
 
   src = fetchFromGitHub {
     owner = "daveshanley";
     repo = "vacuum";
     # using refs/tags because simple version gives: 'the given path has multiple possibilities' error
     tag = "v${version}";
-    hash = "sha256-wlxEKAP8A8T+rBQ2HqoOdBlkqFBqrIxuuEidPAeUO3E=";
+    hash = "sha256-7nVDKR2H84SW6s97jgShylcc1degLzkjkeldlGBcQ/o=";
   };
 
   vendorHash = "sha256-1lr1VQU4JHg0PZbjAUmALFZJiYc+HTwrk0E/t/1qXqE=";

From c48d0033f755ac3d353c767ab8349d1ab7ee75d7 Mon Sep 17 00:00:00 2001
From: Kerstin Humm <kerstin@erictapen.name>
Date: Thu, 20 Mar 2025 11:02:10 +0100
Subject: [PATCH 31/54] nixos/radicale: assertion so that users set
 settings.auth.type explicitly

---
 nixos/modules/services/networking/radicale.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/nixos/modules/services/networking/radicale.nix b/nixos/modules/services/networking/radicale.nix
index 76e74e07a4e5..fd0a63212d49 100644
--- a/nixos/modules/services/networking/radicale.nix
+++ b/nixos/modules/services/networking/radicale.nix
@@ -119,6 +119,14 @@ in
           are mutually exclusive.
         '';
       }
+      {
+        assertion = cfg.config != "" || (cfg.settings ? auth && cfg.settings.auth ? type);
+        message = ''
+          Radicale 3.5.0 changed the default value for `auth.type` from `none` to `denyall`.
+          You probably don't want `denyall`, so please set this explicitly.
+          https://github.com/Kozea/Radicale/blob/v3.5.0/CHANGELOG.md
+        '';
+      }
     ];
 
     warnings =

From 9fae7dbfdfa3640b476ed8b348255d71e856564e Mon Sep 17 00:00:00 2001
From: Taliyah Webb <taliyahmail@proton.me>
Date: Thu, 20 Mar 2025 11:42:03 +0100
Subject: [PATCH 32/54] xdragon: sync short description with upstream

---
 pkgs/tools/X11/xdragon/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/X11/xdragon/default.nix b/pkgs/tools/X11/xdragon/default.nix
index babdb75224cb..9fa790b2048b 100644
--- a/pkgs/tools/X11/xdragon/default.nix
+++ b/pkgs/tools/X11/xdragon/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   meta = with lib; {
-    description = "Simple drag-and-drop source/sink for X (called dragon in upstream)";
+    description = "Simple drag-and-drop source/sink for X or Wayland (called dragon in upstream)";
     homepage = "https://github.com/mwh/dragon";
     license = licenses.gpl3;
     maintainers = with maintainers; [ das_j ];

From 13d60d66d7f373e7b782204a2bdb9a1ed9f426f9 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 26 Jan 2025 16:05:37 +0200
Subject: [PATCH 33/54] amtterm: allow compiling with gamt

This adds a graphical version of amtterm, called `gamt`, which
automatically gets built if gtk/gdk and vte are discovered.

It's gated behind a `withGamt` flag, defaulting to false, and available
as `gamt`.

This follows the same logic as qcam.
---
 pkgs/by-name/am/amtterm/package.nix | 10 +++++++++-
 pkgs/top-level/all-packages.nix     |  2 ++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/am/amtterm/package.nix b/pkgs/by-name/am/amtterm/package.nix
index 6d6788cd2238..8e90685b40c3 100644
--- a/pkgs/by-name/am/amtterm/package.nix
+++ b/pkgs/by-name/am/amtterm/package.nix
@@ -3,10 +3,13 @@
   lib,
   stdenv,
   makeWrapper,
+  gtk3,
   openssl,
   perl,
   perlPackages,
   pkg-config,
+  vte,
+  withGamt ? false,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -18,7 +21,12 @@ stdenv.mkDerivation (finalAttrs: {
       perl
       SOAPLite
     ])
-    ++ [ openssl ];
+    ++ [ openssl ]
+
+    ++ lib.optionals withGamt [
+      gtk3
+      vte
+    ];
   nativeBuildInputs = [
     makeWrapper
     pkg-config
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 093dff485087..3c0963d06bed 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8752,6 +8752,8 @@ with pkgs;
     protobuf = protobuf_21;
   };
 
+  gamt  = callPackage ../by-name/am/amtterm/package.nix { withGamt = true; };
+
   gcr = callPackage ../development/libraries/gcr { };
 
   gcr_4 = callPackage ../development/libraries/gcr/4.nix { };

From 309676a63ded3da1753f31e549145570c47f3fd2 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Thu, 20 Mar 2025 12:56:33 +0100
Subject: [PATCH 34/54] chromium,chromedriver: 134.0.6998.88 -> 134.0.6998.117

https://chromereleases.googleblog.com/2025/03/stable-channel-update-for-desktop_19.html

This update includes 2 security fixes.

CVEs:
CVE-2025-2476
---
 .../networking/browsers/chromium/info.json     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index f0434cc6c658..334a99b1dc1d 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -1,9 +1,9 @@
 {
   "chromium": {
-    "version": "134.0.6998.88",
+    "version": "134.0.6998.117",
     "chromedriver": {
-      "hash_darwin": "sha256-UtXlvBUnMZpCXT/xI7l4nfv3EgJZgugP1/fVg4rKgk4=",
-      "hash_darwin_aarch64": "sha256-yWRVP5LaEEhHfKkV0UmC7cpEuSnU5sgL3C/Aa2Ri3sc="
+      "hash_darwin": "sha256-/o95v3X6mot2yReOEazoCNvfhuDm6xy/O1ksb0blWzU=",
+      "hash_darwin_aarch64": "sha256-9CFDVWt/UPg1mgP1lc7uVrzNV6Eiy8Ze/svoJNmT8Mw="
     },
     "deps": {
       "depot_tools": {
@@ -19,8 +19,8 @@
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "7e3d5c978c6d3a6eda25692cfac7f893a2b20dd0",
-        "hash": "sha256-4RRB7uYI3I7c1dSypU2gzF9TCA2MJ7yStKEvm6vfSnE=",
+        "rev": "cbb247b860ca6b9b18dfa791157e274eab8cad6e",
+        "hash": "sha256-StWP7bsmD5Byn9uLZz6mo/OTChUsW1Y0RhxuofsPLbY=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -615,8 +615,8 @@
       },
       "src/third_party/skia": {
         "url": "https://skia.googlesource.com/skia.git",
-        "rev": "fb519f2fe5d4409bc0033a4ae00ab9a7095fe566",
-        "hash": "sha256-Y0KtUKn6DxpxVLRM+jPvUPhPzekTAma1HYs27xlJlkw="
+        "rev": "aefbd9403c1b3032ad4cd0281ef312ed262c7125",
+        "hash": "sha256-tP6DnMeOoVqfTSn6bYXMLiCb4wg5f9uB28KzYMAeBUw="
       },
       "src/third_party/smhasher/src": {
         "url": "https://chromium.googlesource.com/external/smhasher.git",
@@ -780,8 +780,8 @@
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "a57459aad9ec3ed5f78d9ded700d52e31029efd2",
-        "hash": "sha256-IE1X6lfMyoXsN+7ebJ3RWXAgpR98AjituL3faQbNag0="
+        "rev": "4f282ae4acae85cdcc8c167cbc296a86d24c1cf6",
+        "hash": "sha256-wpz9W/ZurpCT/dGIHGpmdkI3dsXbP8TPNeee2w9zBU8="
       }
     }
   },

From 90a8ed2d163780a60b7afa19374c44791531c4ec Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 20 Mar 2025 12:45:21 +0000
Subject: [PATCH 35/54] vpl-gpu-rt: 25.1.3 -> 25.1.4

---
 pkgs/by-name/vp/vpl-gpu-rt/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vp/vpl-gpu-rt/package.nix b/pkgs/by-name/vp/vpl-gpu-rt/package.nix
index 525100f2e2f5..ffb6cfe30a37 100644
--- a/pkgs/by-name/vp/vpl-gpu-rt/package.nix
+++ b/pkgs/by-name/vp/vpl-gpu-rt/package.nix
@@ -9,7 +9,7 @@
 
 stdenv.mkDerivation rec {
   pname = "vpl-gpu-rt";
-  version = "25.1.3";
+  version = "25.1.4";
 
   outputs = [ "out" "dev" ];
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     owner = "intel";
     repo = "vpl-gpu-rt";
     rev = "intel-onevpl-${version}";
-    hash = "sha256-9ycPPdXEa1bSpVG3mIJc8bq3pNNf0Iie1LGBRpv/Lto=";
+    hash = "sha256-pu9iEAhQE7eHmrjzsyWtIecT79vcZyr5QfPq/Ce3Xxg=";
   };
 
   nativeBuildInputs = [ cmake pkg-config ];

From ecbe4f7ff2acb1b3dc8d8322aa8b65d7adbc28ac Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Thu, 20 Mar 2025 13:13:09 +0000
Subject: [PATCH 36/54] umu-launcher-unwrapped: add update script

---
 pkgs/by-name/um/umu-launcher-unwrapped/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/um/umu-launcher-unwrapped/package.nix b/pkgs/by-name/um/umu-launcher-unwrapped/package.nix
index 967103de982f..0f775632bc07 100644
--- a/pkgs/by-name/um/umu-launcher-unwrapped/package.nix
+++ b/pkgs/by-name/um/umu-launcher-unwrapped/package.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   hatch,
   lib,
+  nix-update-script,
   python3Packages,
   rustPlatform,
   scdoc,
@@ -83,6 +84,8 @@ python3Packages.buildPythonPackage rec {
     "test_parse_args_noopts"
   ];
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Unified launcher for Windows games on Linux using the Steam Linux Runtime and Tools";
     changelog = "https://github.com/Open-Wine-Components/umu-launcher/releases/tag/${version}";

From feed8f206d30a93b4f21bae8b0b83ed3a5b5120d Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Thu, 20 Mar 2025 13:14:48 +0000
Subject: [PATCH 37/54] umu-launcher{-unwrapped}: 1.2.5 -> 1.2.6

---
 pkgs/by-name/um/umu-launcher-unwrapped/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/um/umu-launcher-unwrapped/package.nix b/pkgs/by-name/um/umu-launcher-unwrapped/package.nix
index 0f775632bc07..cb5f94e2922c 100644
--- a/pkgs/by-name/um/umu-launcher-unwrapped/package.nix
+++ b/pkgs/by-name/um/umu-launcher-unwrapped/package.nix
@@ -14,18 +14,18 @@
 }:
 python3Packages.buildPythonPackage rec {
   pname = "umu-launcher-unwrapped";
-  version = "1.2.5";
+  version = "1.2.6";
 
   src = fetchFromGitHub {
     owner = "Open-Wine-Components";
     repo = "umu-launcher";
     tag = version;
-    hash = "sha256-bZ6Ywc524NrapkFrwFiWbqmVe1j0hunEH9YKrYQ8R2E=";
+    hash = "sha256-DkfB78XhK9CXgN/OpJZTjwHB7IcLC4h2HM/1JW42ZO0=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit src;
-    hash = "sha256-nU4xZn9NPd7NgexiaNYLdo4BCbH98duZ07XYeUiceP0=";
+    hash = "sha256-JhNErFDJsM20BhgIgJSUBeNzAst8f+s1NzpLfl2m2es=";
   };
 
   nativeCheckInputs = [

From eb77f31202f9b98b645c0f53d0de699276310ca9 Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Thu, 20 Mar 2025 09:54:43 +0000
Subject: [PATCH 38/54] wakapi: 2.12.3 -> 2.13.1

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

diff --git a/pkgs/by-name/wa/wakapi/package.nix b/pkgs/by-name/wa/wakapi/package.nix
index 87aa0da39261..38b539035c56 100644
--- a/pkgs/by-name/wa/wakapi/package.nix
+++ b/pkgs/by-name/wa/wakapi/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
 }:
 let
-  version = "2.12.3";
+  version = "2.13.1";
 in
 buildGoModule {
   pname = "wakapi";
@@ -14,10 +14,10 @@ buildGoModule {
     owner = "muety";
     repo = "wakapi";
     tag = version;
-    hash = "sha256-kgzxeU5hM9fSidyJEmdTr26/w5OaBk1VdjSztmOgMYs=";
+    hash = "sha256-zasMqEvSqylJWKjS5TKYKmGJnGfCUEOq2UvsVUeizBw=";
   };
 
-  vendorHash = "sha256-q5o88fwc1S14ZwGyDS9aFtJMfPZ4pmMjffmeXODhajg=";
+  vendorHash = "sha256-b2FOdCXmSgFzdXLnxt/V7+cuESWXVXVRmT53DgLwZYI=";
 
   # Not a go module required by the project, contains development utilities
   excludedPackages = [ "scripts" ];

From a9be2d904d16da72366156fa467e268024c51fb9 Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Thu, 20 Mar 2025 09:55:31 +0000
Subject: [PATCH 39/54] wakapi: add update script

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

diff --git a/pkgs/by-name/wa/wakapi/package.nix b/pkgs/by-name/wa/wakapi/package.nix
index 38b539035c56..e6d9ac1b50f2 100644
--- a/pkgs/by-name/wa/wakapi/package.nix
+++ b/pkgs/by-name/wa/wakapi/package.nix
@@ -2,6 +2,7 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+  nix-update-script,
 }:
 let
   version = "2.13.1";
@@ -30,6 +31,10 @@ buildGoModule {
     "-w"
   ];
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     homepage = "https://wakapi.dev/";
     changelog = "https://github.com/muety/wakapi/releases/tag/${version}";

From e32e29f5249508f310eed6eb230b3f728ca99684 Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Thu, 20 Mar 2025 09:56:33 +0000
Subject: [PATCH 40/54] wakapi: add nixosTest to passthru

---
 pkgs/by-name/wa/wakapi/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/wa/wakapi/package.nix b/pkgs/by-name/wa/wakapi/package.nix
index e6d9ac1b50f2..af0f7680fe4d 100644
--- a/pkgs/by-name/wa/wakapi/package.nix
+++ b/pkgs/by-name/wa/wakapi/package.nix
@@ -2,6 +2,7 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+  nixosTests,
   nix-update-script,
 }:
 let
@@ -32,6 +33,7 @@ buildGoModule {
   ];
 
   passthru = {
+    nixos = nixosTests.wakapi;
     updateScript = nix-update-script { };
   };
 

From 484a0477d83c9369af0213b83d08a52e4a12f327 Mon Sep 17 00:00:00 2001
From: Johannes Kirschbauer <hsjobeki@gmail.com>
Date: Sun, 19 Jan 2025 16:39:44 +0100
Subject: [PATCH 41/54] lib/types: types.either deprecate functor.wrapped in
 favor of functor.payload.elemType

---
 doc/release-notes/rl-2505.section.md     |  1 +
 lib/tests/modules.sh                     |  8 ++++++++
 lib/tests/modules/deprecated-wrapped.nix | 10 ++++++++++
 lib/types.nix                            |  6 +++---
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md
index e949e7b451eb..e386ead66797 100644
--- a/doc/release-notes/rl-2505.section.md
+++ b/doc/release-notes/rl-2505.section.md
@@ -79,6 +79,7 @@
     - `lib.types.nullOr`
     - `lib.types.functionTo`
     - `lib.types.coercedTo`
+    - `lib.types.either`
 
 - Plasma 5 and Qt 5 based versions of associated software are deprecated in NixOS 25.05, and will be removed in NixOS 25.11. Users are encouraged to upgrade to Plasma 6.
 
diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh
index 2f21e466450d..e623c0fb55b8 100755
--- a/lib/tests/modules.sh
+++ b/lib/tests/modules.sh
@@ -439,6 +439,14 @@ NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribu
 NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.coercedTo.type.functor.wrapped ./deprecated-wrapped.nix
 NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.coercedTo.type.nestedTypes.finalType.functor.wrapped ./deprecated-wrapped.nix
 NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.coercedTo.type.nestedTypes.coercedType.functor.wrapped ./deprecated-wrapped.nix
+# either
+NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.either.type.functor.wrapped ./deprecated-wrapped.nix
+NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedEither.type.functor.wrapped ./deprecated-wrapped.nix
+
+NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.either.type.nestedTypes.left.functor.wrapped ./deprecated-wrapped.nix
+NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.either.type.nestedTypes.right.functor.wrapped ./deprecated-wrapped.nix
+NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedEither.type.nestedTypes.left.functor.wrapped ./deprecated-wrapped.nix
+NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedEither.type.nestedTypes.right.functor.wrapped ./deprecated-wrapped.nix
 
 # Even with multiple assignments, a type error should be thrown if any of them aren't valid
 checkConfigError 'A definition for option .* is not of type .*' \
diff --git a/lib/tests/modules/deprecated-wrapped.nix b/lib/tests/modules/deprecated-wrapped.nix
index 5559cd3e9332..c50a7d79f59f 100644
--- a/lib/tests/modules/deprecated-wrapped.nix
+++ b/lib/tests/modules/deprecated-wrapped.nix
@@ -10,6 +10,7 @@ let
     nullOr
     functionTo
     coercedTo
+    either
     ;
 in
 {
@@ -56,6 +57,12 @@ in
         options.coercedTo = mkOption {
           type = coercedTo (listOf types.str) lib.id (listOf types.str);
         };
+        options.either = mkOption {
+          type = either (listOf types.str) (listOf types.str);
+        };
+        options.mergedEither = mkOption {
+          type = either (listOf types.str) (listOf types.str);
+        };
       }
     )
     # Module B
@@ -77,6 +84,9 @@ in
         options.mergedFunctionTo = mkOption {
           type = functionTo (listOf types.str);
         };
+        options.mergedEither = mkOption {
+          type = either (listOf types.str) (listOf types.str);
+        };
       }
     )
   ];
diff --git a/lib/types.nix b/lib/types.nix
index a03c673c1068..ee1410127b1a 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -1134,13 +1134,13 @@ rec {
                then t2.merge loc defs
           else mergeOneOption loc defs;
       typeMerge = f':
-        let mt1 = t1.typeMerge (elemAt f'.wrapped 0).functor;
-            mt2 = t2.typeMerge (elemAt f'.wrapped 1).functor;
+        let mt1 = t1.typeMerge (elemAt f'.payload.elemType 0).functor;
+            mt2 = t2.typeMerge (elemAt f'.payload.elemType 1).functor;
         in
            if (name == f'.name) && (mt1 != null) && (mt2 != null)
            then functor.type mt1 mt2
            else null;
-      functor = (defaultFunctor name) // { wrapped = [ t1 t2 ]; };
+      functor = elemTypeFunctor name { elemType = [ t1 t2 ]; };
       nestedTypes.left = t1;
       nestedTypes.right = t2;
     };

From 8afffefda81459bb0ace792ac3efd84492eac7c7 Mon Sep 17 00:00:00 2001
From: DataHearth <dev@antoine-langlois.net>
Date: Mon, 13 Jan 2025 20:40:40 +0100
Subject: [PATCH 42/54] python3Packages.pylette: init at 4.0.0

---
 .../python-modules/pylette/default.nix        | 68 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 70 insertions(+)
 create mode 100644 pkgs/development/python-modules/pylette/default.nix

diff --git a/pkgs/development/python-modules/pylette/default.nix b/pkgs/development/python-modules/pylette/default.nix
new file mode 100644
index 000000000000..443295029ca0
--- /dev/null
+++ b/pkgs/development/python-modules/pylette/default.nix
@@ -0,0 +1,68 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  poetry-core,
+  scikit-learn,
+  typer,
+  requests,
+  pillow,
+  numpy,
+  pytestCheckHook,
+  opencv-python,
+  requests-mock,
+}:
+buildPythonPackage rec {
+  pname = "pylette";
+  version = "4.0.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "qTipTip";
+    repo = "Pylette";
+    tag = version;
+    hash = "sha256-i8+QQpYoRfgoV9Nm/FvXSJV+TEvmaaPsPIeG+PU838Q=";
+  };
+
+  build-system = [
+    poetry-core
+  ];
+
+  dependencies = [
+    scikit-learn
+    pillow
+    requests
+    typer
+    numpy
+  ];
+
+  pythonImportsCheck = [
+    "Pylette"
+  ];
+
+  pythonRelaxDeps = [
+    "numpy"
+    "Pillow"
+    "typer"
+  ];
+
+  disabledTests = [
+    # hangs forever
+    "test_color_extraction_deterministic_kmeans"
+  ];
+
+  nativeCheckInputs = [
+    opencv-python
+    pytestCheckHook
+    requests-mock
+    typer
+  ];
+
+  meta = {
+    changelog = "https://github.com/qTipTip/Pylette/releases/tag/${version}";
+    description = "Python library for extracting color palettes from images";
+    homepage = "https://qtiptip.github.io/Pylette/";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ DataHearth ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2a96787ebe0e..91c1643f8a60 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12357,6 +12357,8 @@ self: super: with self; {
 
   pyleri = callPackage ../development/python-modules/pyleri { };
 
+  pylette = callPackage ../development/python-modules/pylette { };
+
   pylev = callPackage ../development/python-modules/pylev { };
 
   pylgnetcast = callPackage ../development/python-modules/pylgnetcast { };

From 32fc03cbf1318c21803673d74c09c0ef656a5446 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 20 Mar 2025 14:50:20 +0000
Subject: [PATCH 43/54] lon: init at 0.2.0

Adds a package for lon, a minimal Nix dependency / lockfile manager.
---
 pkgs/by-name/lo/lon/package.nix | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 pkgs/by-name/lo/lon/package.nix

diff --git a/pkgs/by-name/lo/lon/package.nix b/pkgs/by-name/lo/lon/package.nix
new file mode 100644
index 000000000000..9fa33e864e1f
--- /dev/null
+++ b/pkgs/by-name/lo/lon/package.nix
@@ -0,0 +1,30 @@
+{
+  rustPlatform,
+  lib,
+  fetchFromGitHub,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "lon";
+  version = "0.2.0";
+
+  src = fetchFromGitHub {
+    owner = "nikstur";
+    repo = "lon";
+    tag = version;
+    hash = "sha256-VGvK0ahBl440NMs03WqmP7T4a1DP13yfX47YI84rlGU=";
+  };
+
+  sourceRoot = "source/rust/lon";
+
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-YzQ6A1dH2D56/3inAmsE6G5rCnpWhDawxk6+FMWfhkc=";
+
+  meta = {
+    description = "Lock & update Nix dependencies";
+    homepage = "https://github.com/nikstur/lon";
+    maintainers = with lib.maintainers; [ ma27 ];
+    license = lib.licenses.mit;
+    mainProgram = "lon";
+  };
+}

From a8fe3576eccb50f8bc08beb3396704582c7f7d58 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 20 Mar 2025 16:25:37 +0100
Subject: [PATCH 44/54] ruff: 0.11.0 -> 0.11.1

Diff: https://github.com/astral-sh/ruff/compare/refs/tags/0.11.0...0.11.1

Changelog: https://github.com/astral-sh/ruff/releases/tag/0.11.1
---
 pkgs/by-name/ru/ruff/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix
index 4f6def011fd7..69de5c5fecb8 100644
--- a/pkgs/by-name/ru/ruff/package.nix
+++ b/pkgs/by-name/ru/ruff/package.nix
@@ -17,17 +17,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ruff";
-  version = "0.11.0";
+  version = "0.11.1";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "ruff";
     tag = finalAttrs.version;
-    hash = "sha256-/CVpNBOBpvQhz7X80nUHC2x7ZxxCJH8O0WAABJKEriA=";
+    hash = "sha256-uouy47Lzrrht3wBUiQePW7x6QJfpIce9ny/p6HNwCNY=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-t2VRNmuKdl1kgZ5g2BS79PFKhJsxDHwxxuMRDcjt//k=";
+  cargoHash = "sha256-EaMNkliJmeKwxrnlK+aCFGvzbvVIjS0qHc9h9z9m47I=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From bacbce25972440534a7f3352a418d41eebcb6f17 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 20 Mar 2025 10:44:53 -0500
Subject: [PATCH 45/54] vimPlugins: update on 2025-03-20

---
 .../editors/vim/plugins/generated.nix         | 556 +++++++++---------
 .../editors/vim/plugins/overrides.nix         |   9 +-
 2 files changed, 285 insertions(+), 280 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 76b1ecbdd148..946f79b86085 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -70,12 +70,12 @@ final: prev:
 
   CopilotChat-nvim = buildVimPlugin {
     pname = "CopilotChat.nvim";
-    version = "2025-03-14";
+    version = "2025-03-20";
     src = fetchFromGitHub {
       owner = "CopilotC-Nvim";
       repo = "CopilotChat.nvim";
-      rev = "b0893fff5f2d3b22155f3113381a614fd4f65a8a";
-      sha256 = "1viqnzcjifpd2w00fmq66bw7mbg9wd9dh35iwacvapf524k6rk3q";
+      rev = "0b0838e31fda8a52e792a5fb6b79ab68e711bc10";
+      sha256 = "0d6j042hallc7g7q278i3adi14ziv6d593avl2ykxd0h9njdca4p";
     };
     meta.homepage = "https://github.com/CopilotC-Nvim/CopilotChat.nvim/";
     meta.hydraPlatforms = [ ];
@@ -200,12 +200,12 @@ final: prev:
 
   LeaderF = buildVimPlugin {
     pname = "LeaderF";
-    version = "2025-03-05";
+    version = "2025-03-17";
     src = fetchFromGitHub {
       owner = "Yggdroot";
       repo = "LeaderF";
-      rev = "17cb04b2fbb817e899ba057c0f3d794134a0c35d";
-      sha256 = "1yhaxfjlsya3hpzxk7349ld02wz5mzjfl1130l8ifr18r7fcb855";
+      rev = "675cd53462759796e5e410a9f25b9c39c286941c";
+      sha256 = "0g7zx8qgxn7m8ffnm198115v0yyf3ggvh6gbvs16v618na0cqw5a";
     };
     meta.homepage = "https://github.com/Yggdroot/LeaderF/";
     meta.hydraPlatforms = [ ];
@@ -369,12 +369,12 @@ final: prev:
 
   SchemaStore-nvim = buildVimPlugin {
     pname = "SchemaStore.nvim";
-    version = "2025-03-10";
+    version = "2025-03-20";
     src = fetchFromGitHub {
       owner = "b0o";
       repo = "SchemaStore.nvim";
-      rev = "e03b50ce453b1ce9f6b7805239c52db604d740dc";
-      sha256 = "17pj6lnl9dwzv5s2a40dnflxd8sx2dq0w1mm9zdx5r93m9wkxxsb";
+      rev = "39015717d8b25262119df1a8dd4069b17aea8d82";
+      sha256 = "11gyidsfvzpqynlx7r6bbw4qhs6ldjgkj2pj4qg3m833n0da0h3g";
     };
     meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
     meta.hydraPlatforms = [ ];
@@ -617,12 +617,12 @@ final: prev:
 
   aerial-nvim = buildVimPlugin {
     pname = "aerial.nvim";
-    version = "2025-03-06";
+    version = "2025-03-19";
     src = fetchFromGitHub {
       owner = "stevearc";
       repo = "aerial.nvim";
-      rev = "2204cf08791449a6a2fd2ef187a29112eeefd989";
-      sha256 = "1482md9kzyrr7mjkca3nnyqgy64q8clhi6xbvgql8qjw7ifz51mx";
+      rev = "9ebc13583cff447f5493a63e99dfca526b3c3088";
+      sha256 = "17mjs95jnnvsg1ihwbsa3z6hr88rvfh36pv1x4cad7hsaal3dcrg";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/stevearc/aerial.nvim/";
@@ -709,12 +709,12 @@ final: prev:
 
   ale = buildVimPlugin {
     pname = "ale";
-    version = "2025-03-14";
+    version = "2025-03-18";
     src = fetchFromGitHub {
       owner = "dense-analysis";
       repo = "ale";
-      rev = "1c91102112ac5addbdbf178268c61a2ead64fb2a";
-      sha256 = "06nbwzjr85vxly8xanm96k9fims29ybxydzw4jywqx9awz18cfch";
+      rev = "7fcc0548b03e1c7d7d269af76ea3e27b9a59f8bd";
+      sha256 = "00is4hbxxk9wsd3z33gs5f2n1ll84l3myxs4vljx4n5ah6g9rc5m";
     };
     meta.homepage = "https://github.com/dense-analysis/ale/";
     meta.hydraPlatforms = [ ];
@@ -839,12 +839,12 @@ final: prev:
 
   arrow-nvim = buildVimPlugin {
     pname = "arrow.nvim";
-    version = "2024-10-15";
+    version = "2025-03-19";
     src = fetchFromGitHub {
       owner = "otavioschwanck";
       repo = "arrow.nvim";
-      rev = "5438c977e729a29d96bd54c8da3103154e80dbd1";
-      sha256 = "1sjd0gv7ka6by3fkgh8h48jwwfxmbgm21xcj7637349mj2ciaz7c";
+      rev = "9608ce6d7e6935efd423946a319f7f4041cbde93";
+      sha256 = "00xz4wnmllw8pc707py0n8a5avag5wyrk165i9yl0al2y92fw5fn";
     };
     meta.homepage = "https://github.com/otavioschwanck/arrow.nvim/";
     meta.hydraPlatforms = [ ];
@@ -1060,12 +1060,12 @@ final: prev:
 
   augment-vim = buildVimPlugin {
     pname = "augment.vim";
-    version = "2025-02-12";
+    version = "2025-03-18";
     src = fetchFromGitHub {
       owner = "augmentcode";
       repo = "augment.vim";
-      rev = "a50e362f6c16a0c43da20f613e337a6dfd3fb94a";
-      sha256 = "1m1nfiij7wxw63zjh09hc14dxd45rwb6pf48ls101fh461gffdpr";
+      rev = "97418c9dfc1918fa9bdd23863ea3d2e49130727f";
+      sha256 = "1sq4lpwzd2xc97l4h7zyglhg0jwg3xfw9qfidi26rz28dd1v2ivs";
     };
     meta.homepage = "https://github.com/augmentcode/augment.vim/";
     meta.hydraPlatforms = [ ];
@@ -1138,12 +1138,12 @@ final: prev:
 
   auto-session = buildVimPlugin {
     pname = "auto-session";
-    version = "2025-03-12";
+    version = "2025-03-16";
     src = fetchFromGitHub {
       owner = "rmagatti";
       repo = "auto-session";
-      rev = "79ef41274354a486cf4f100a7adf4a7575802ccf";
-      sha256 = "15f1h1pl1jsi86d2k182lbcjaqymixjgv395x7ga0zz09k1alwdm";
+      rev = "317412742990371f8e4709074da5c378456a27ff";
+      sha256 = "06kxf9carklffzar4q62hgdid60v5a38w4d5wrz0864wrdyh9kjd";
     };
     meta.homepage = "https://github.com/rmagatti/auto-session/";
     meta.hydraPlatforms = [ ];
@@ -1503,12 +1503,12 @@ final: prev:
 
   blink-cmp-git = buildVimPlugin {
     pname = "blink-cmp-git";
-    version = "2025-03-07";
+    version = "2025-03-20";
     src = fetchFromGitHub {
       owner = "Kaiser-Yang";
       repo = "blink-cmp-git";
-      rev = "2b12fe6599f85e36d4c810ebcf64e30985c6b852";
-      sha256 = "0s859j7p6128lwc9p22nq59g3zhzp3m132n03qpj6h6lrrvlz6fw";
+      rev = "863e0670217d0dffb9edc6ab41b676a4128f813b";
+      sha256 = "0g66rhd5yd3mk2shysliz7k0sh76nr1rbfv0rqxl8kjm7jnc5nh5";
     };
     meta.homepage = "https://github.com/Kaiser-Yang/blink-cmp-git/";
     meta.hydraPlatforms = [ ];
@@ -1529,12 +1529,12 @@ final: prev:
 
   blink-compat = buildVimPlugin {
     pname = "blink.compat";
-    version = "2025-02-11";
+    version = "2025-03-17";
     src = fetchFromGitHub {
       owner = "Saghen";
       repo = "blink.compat";
-      rev = "4104671562c663d059d91a99da3780bead5bc467";
-      sha256 = "0bsf8kg5s3m1xk9d4n0yl0h5xyk484hip3z8va547f6ibim9ccv4";
+      rev = "2ed6d9a28b07fa6f3bface818470605f8896408c";
+      sha256 = "009475xy41l4dpayswhx65q6a7djzw7rz2ycbrbpyg041y0qynqs";
     };
     meta.homepage = "https://github.com/Saghen/blink.compat/";
     meta.hydraPlatforms = [ ];
@@ -1542,12 +1542,12 @@ final: prev:
 
   blink-copilot = buildVimPlugin {
     pname = "blink-copilot";
-    version = "2025-03-03";
+    version = "2025-03-15";
     src = fetchFromGitHub {
       owner = "fang2hou";
       repo = "blink-copilot";
-      rev = "ba25d377b567232e2a2995776500fe149ca2c072";
-      sha256 = "18grp9b8afrzcs95cv1mbiz030r74i7anw9yl25ckrwvibn4ppkf";
+      rev = "100691cd842ff0bd957683424ad0e829f71ce262";
+      sha256 = "07bmzhx053yp2ygv07d1csbdcwqzkifcd8as54fwxcmymmr7j4wf";
     };
     meta.homepage = "https://github.com/fang2hou/blink-copilot/";
     meta.hydraPlatforms = [ ];
@@ -1581,12 +1581,12 @@ final: prev:
 
   blink-ripgrep-nvim = buildVimPlugin {
     pname = "blink-ripgrep.nvim";
-    version = "2025-03-08";
+    version = "2025-03-16";
     src = fetchFromGitHub {
       owner = "mikavilpas";
       repo = "blink-ripgrep.nvim";
-      rev = "91aee73557237b0cc1313e4ed2b32f10de6cc65e";
-      sha256 = "1jg4559946rzsvvny1r7jki1gmr70yjxr8qlnsjkjyxj8h0pjjwl";
+      rev = "c80675996d6c7c021a7a13dc2c8c8b9b255efdab";
+      sha256 = "06c680x1ppnpz38kq0w40x732clls6403c5dx659rakksd19mif4";
     };
     meta.homepage = "https://github.com/mikavilpas/blink-ripgrep.nvim/";
     meta.hydraPlatforms = [ ];
@@ -1698,12 +1698,12 @@ final: prev:
 
   bufexplorer = buildVimPlugin {
     pname = "bufexplorer";
-    version = "2025-03-05";
+    version = "2025-03-20";
     src = fetchFromGitHub {
       owner = "jlanzarotta";
       repo = "bufexplorer";
-      rev = "0ea8aece81c3373578cf72cdcdd34a7bd64171c0";
-      sha256 = "0v3fpl7jj6asx2qlnan8zkpznzg8kbn6f0ii7j8lb8nnzbahz32w";
+      rev = "974252b1a3b4ba008457f178a92e1ff4f38985a6";
+      sha256 = "09hxfbx76fvmbqsi4b2lpjr5vv9mx21qjvnnfi1r2dmdznnbikbd";
     };
     meta.homepage = "https://github.com/jlanzarotta/bufexplorer/";
     meta.hydraPlatforms = [ ];
@@ -2803,12 +2803,12 @@ final: prev:
 
   coc-nvim = buildVimPlugin {
     pname = "coc.nvim";
-    version = "2025-03-12";
+    version = "2025-03-20";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc.nvim";
-      rev = "385758859b6fe348f9b6c214ec35e1d9b9f46cd2";
-      sha256 = "0pg5ya9qcr5iw1l9nm4pyhps1cpq5izbpavqwdni2swym5p8ba5l";
+      rev = "3660d653bf24ed9555fb1ccb59b7504e7f152440";
+      sha256 = "1dv1yh07d9b8f7an005am1s3n915r9xhiyv728nlxxdnsbd8cn48";
     };
     meta.homepage = "https://github.com/neoclide/coc.nvim/";
     meta.hydraPlatforms = [ ];
@@ -2855,12 +2855,12 @@ final: prev:
 
   codecompanion-nvim = buildVimPlugin {
     pname = "codecompanion.nvim";
-    version = "2025-03-13";
+    version = "2025-03-20";
     src = fetchFromGitHub {
       owner = "olimorris";
       repo = "codecompanion.nvim";
-      rev = "4f56b047f03bf5edc0d71bf0ca694243a49b912f";
-      sha256 = "1mrb8qxd6mz5dlly9bh30pcd599gfy173f6pd4p8lszs3xhp598k";
+      rev = "a344661b8c1eaae9a56db5c36e7f5d2101b69128";
+      sha256 = "1gyakqjxxfxd27wc570c3qprinsgb7c9faq5fwx94nzybyi63ik3";
     };
     meta.homepage = "https://github.com/olimorris/codecompanion.nvim/";
     meta.hydraPlatforms = [ ];
@@ -2972,12 +2972,12 @@ final: prev:
 
   command-t = buildVimPlugin {
     pname = "command-t";
-    version = "2025-03-14";
+    version = "2025-03-16";
     src = fetchFromGitHub {
       owner = "wincent";
       repo = "command-t";
-      rev = "6033ca8e3c4ed39f8d0ca7cee134b1a4dd4ae7d9";
-      sha256 = "0ic4xfhpqvxcyz9qi613hdin6mspb4abh0vfds1ck1g4mx8inwr6";
+      rev = "27760ac90e0b554e3a066fe60127e45f924cc973";
+      sha256 = "1rfkpzlvxh545j0s97hw138rf71a707ih4q2s70li8kqi5fissqi";
     };
     meta.homepage = "https://github.com/wincent/command-t/";
     meta.hydraPlatforms = [ ];
@@ -3141,12 +3141,12 @@ final: prev:
 
   conform-nvim = buildVimPlugin {
     pname = "conform.nvim";
-    version = "2025-03-05";
+    version = "2025-03-20";
     src = fetchFromGitHub {
       owner = "stevearc";
       repo = "conform.nvim";
-      rev = "db8a4a9edb217067b1d7a2e0362c74bfe9cc944d";
-      sha256 = "13vpizk8ani64d3a9yrm0g3bz8m6m6cxnpzr2xgslbhxnkmbxq7j";
+      rev = "f9ef25a7ef00267b7d13bfc00b0dea22d78702d5";
+      sha256 = "1942dsg83skxnm3jrqyxx9mvzgiq1v68i9z43hpar4bmqvggviif";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/stevearc/conform.nvim/";
@@ -3350,12 +3350,12 @@ final: prev:
 
   crates-nvim = buildVimPlugin {
     pname = "crates.nvim";
-    version = "2025-03-10";
+    version = "2025-03-19";
     src = fetchFromGitHub {
       owner = "saecki";
       repo = "crates.nvim";
-      rev = "403a0abef0e2aec12749a534dc468d6fd50c6741";
-      sha256 = "19ix86nbww5vljinfwfpjkz806j7dzw4pgjyjya201jb0n22lrc6";
+      rev = "fd2bbca7aa588f24ffc3517831934b4c4a9588e9";
+      sha256 = "1l2z447svf1ldpnsb9sn5b4q1a22g3wx126yw9hj7rcqrv50xw6i";
     };
     meta.homepage = "https://github.com/saecki/crates.nvim/";
     meta.hydraPlatforms = [ ];
@@ -3415,12 +3415,12 @@ final: prev:
 
   csvview-nvim = buildVimPlugin {
     pname = "csvview.nvim";
-    version = "2025-02-26";
+    version = "2025-03-17";
     src = fetchFromGitHub {
       owner = "hat0uma";
       repo = "csvview.nvim";
-      rev = "ed446a55b4ff9297d9b94a955db3a2eca6cdb2b2";
-      sha256 = "075qxyny89xi5awcd5blp2s8qjlafmnhw7d3vifj05g8yl76zya5";
+      rev = "02edaf830c2225ec39b889173f09cbbf89da3b87";
+      sha256 = "1gpw7acb2gp7xbrqkmmxwr8lldzvp4hiaqd0pv80799ny2vqr71j";
     };
     meta.homepage = "https://github.com/hat0uma/csvview.nvim/";
     meta.hydraPlatforms = [ ];
@@ -3493,12 +3493,12 @@ final: prev:
 
   cyberdream-nvim = buildVimPlugin {
     pname = "cyberdream.nvim";
-    version = "2025-03-09";
+    version = "2025-03-18";
     src = fetchFromGitHub {
       owner = "scottmckendry";
       repo = "cyberdream.nvim";
-      rev = "094e4eb33e7d078cbf2105604a4246092eb8046e";
-      sha256 = "1nh1nxy6wqn0vlk9lpp8v8p24rlrzlcwl7y9lvhbhmlisyr5yrvj";
+      rev = "339a7b1293568405847b3627247da82a6030a852";
+      sha256 = "1rm1fay8r36kh32qmbsmhp1vjs9xynyqi43zn9aak6wzzpvcabmp";
     };
     meta.homepage = "https://github.com/scottmckendry/cyberdream.nvim/";
     meta.hydraPlatforms = [ ];
@@ -4132,12 +4132,12 @@ final: prev:
 
   dial-nvim = buildVimPlugin {
     pname = "dial.nvim";
-    version = "2025-01-14";
+    version = "2025-03-19";
     src = fetchFromGitHub {
       owner = "monaqa";
       repo = "dial.nvim";
-      rev = "34bbd9c387c358190e61ce71017faad3dffa7a74";
-      sha256 = "0y020a3hw48ldsqaccsp5ygfb16l5i6yz718nifgds2x5cpd87m6";
+      rev = "1fc4475c66b794aad3dde39414f73b2e2b26230e";
+      sha256 = "0f8y11l7pxp07vdjll1vsmzi1phj05q1dwlxbsx3z25sf4hixq9h";
     };
     meta.homepage = "https://github.com/monaqa/dial.nvim/";
     meta.hydraPlatforms = [ ];
@@ -4275,12 +4275,12 @@ final: prev:
 
   dropbar-nvim = buildVimPlugin {
     pname = "dropbar.nvim";
-    version = "2025-03-05";
+    version = "2025-03-20";
     src = fetchFromGitHub {
       owner = "Bekaboo";
       repo = "dropbar.nvim";
-      rev = "009c214b6eadf49ec50fc81055ceb08ca3fcb8e1";
-      sha256 = "1k969a0dycc5mkhci5v54xywmrpa97320yp2si53cza43alx9q95";
+      rev = "a2f1b275fdf185567ab976d27749d4e8cc21fe4c";
+      sha256 = "02a7wnkvvbivbwrfill3j97mdykb53pahhm7gqsk3lvqlxg1qfga";
     };
     meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/";
     meta.hydraPlatforms = [ ];
@@ -4301,12 +4301,12 @@ final: prev:
 
   easy-dotnet-nvim = buildVimPlugin {
     pname = "easy-dotnet.nvim";
-    version = "2025-03-14";
+    version = "2025-03-20";
     src = fetchFromGitHub {
       owner = "GustavEikaas";
       repo = "easy-dotnet.nvim";
-      rev = "b27ec1dda7cbb0ebb224e5136005d2a48a8ad442";
-      sha256 = "04js572pqwqkjcnpbpygjg3kc0cnci2j44kvij8r6yg30vnxdbab";
+      rev = "dcf5d4c9a1ee634f76acfd3429b4dc2e9642042b";
+      sha256 = "086khcd38d6ay0n6c1f9bhk9vn585hn7pqwprmy8ibmpynzvf0a8";
     };
     meta.homepage = "https://github.com/GustavEikaas/easy-dotnet.nvim/";
     meta.hydraPlatforms = [ ];
@@ -4811,12 +4811,12 @@ final: prev:
 
   flutter-tools-nvim = buildVimPlugin {
     pname = "flutter-tools.nvim";
-    version = "2025-03-06";
+    version = "2025-03-16";
     src = fetchFromGitHub {
       owner = "nvim-flutter";
       repo = "flutter-tools.nvim";
-      rev = "70430c32d176f4a15c6e2c80586cd2791e3a664e";
-      sha256 = "01p721ca4as9b9nn4qibb6s775fn66j13zsx2d3flhkssii06v45";
+      rev = "8edcdabfe982c77482ebde2ba3f46f2adc677e64";
+      sha256 = "0v8xlylc7h926wrni78m4zzlxgjnm6ff1ckx730yjg9b2rajg7kr";
     };
     meta.homepage = "https://github.com/nvim-flutter/flutter-tools.nvim/";
     meta.hydraPlatforms = [ ];
@@ -5293,12 +5293,12 @@ final: prev:
 
   go-nvim = buildVimPlugin {
     pname = "go.nvim";
-    version = "2025-03-13";
+    version = "2025-03-18";
     src = fetchFromGitHub {
       owner = "ray-x";
       repo = "go.nvim";
-      rev = "da15ca55705c57ca10de1fbc1f0b6d6327c13e55";
-      sha256 = "1h5lf0ba2bpyn28wiy33gv8f9fkbjmpcz6hdsifarpgqgrfz2rby";
+      rev = "f058a8c622edf24d27b8ef82fabffdbbc1d55707";
+      sha256 = "1rs9frzbywlq509r33kd9rxgpn6mrdyx4byn1zbcqhj1pdfkq7rv";
     };
     meta.homepage = "https://github.com/ray-x/go.nvim/";
     meta.hydraPlatforms = [ ];
@@ -5423,12 +5423,12 @@ final: prev:
 
   grug-far-nvim = buildVimPlugin {
     pname = "grug-far.nvim";
-    version = "2025-03-12";
+    version = "2025-03-19";
     src = fetchFromGitHub {
       owner = "MagicDuck";
       repo = "grug-far.nvim";
-      rev = "0ec6c3a9ef63703975e800d7386b6114863e1f9d";
-      sha256 = "1kpilvxszp4larhw9xy663wb8sajp729iwi4jclb2sw332cr77b0";
+      rev = "6b1aca6018cb6ce18a46b9e8583074a2f820b51e";
+      sha256 = "156hk1mxq0v2fy2ibw1bg4n6anhg9jxgq0fq7q7kh9rms8xin6ws";
     };
     meta.homepage = "https://github.com/MagicDuck/grug-far.nvim/";
     meta.hydraPlatforms = [ ];
@@ -5671,12 +5671,12 @@ final: prev:
 
   haskell-snippets-nvim = buildVimPlugin {
     pname = "haskell-snippets.nvim";
-    version = "2024-10-07";
+    version = "2025-03-17";
     src = fetchFromGitHub {
       owner = "mrcjkb";
       repo = "haskell-snippets.nvim";
-      rev = "bd893770dd7a0c1a473601c3c919e61670745b36";
-      sha256 = "1xqv1kj86rv2xmbsb4zahzvaanaha67ghwh2n24fdjx2d202f8af";
+      rev = "27ac316463b9807496cd03e65289d3e79aa23528";
+      sha256 = "1z49df35vzccq5jnckbmrsfpr8g6cjiq020jbwprzj8hrb769bqh";
     };
     meta.homepage = "https://github.com/mrcjkb/haskell-snippets.nvim/";
     meta.hydraPlatforms = [ ];
@@ -6114,12 +6114,12 @@ final: prev:
 
   indent-blankline-nvim = buildVimPlugin {
     pname = "indent-blankline.nvim";
-    version = "2025-01-20";
+    version = "2025-03-17";
     src = fetchFromGitHub {
       owner = "lukas-reineke";
       repo = "indent-blankline.nvim";
-      rev = "e10626f7fcd51ccd56d7ffc00883ba7e0aa28f78";
-      sha256 = "1whsjd715rr59warfy7nmw0hzkxfkxgzx9c8r6k2vka4flifirnk";
+      rev = "005b56001b2cb30bfa61b7986bc50657816ba4ba";
+      sha256 = "1rmpi866bg7hyw620hbgmmmksxgll9ilbpigd1kk9b0lpvwxbbyj";
     };
     meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/";
     meta.hydraPlatforms = [ ];
@@ -6192,12 +6192,12 @@ final: prev:
 
   intellitab-nvim = buildVimPlugin {
     pname = "intellitab.nvim";
-    version = "2024-11-01";
+    version = "2025-03-18";
     src = fetchFromGitHub {
       owner = "pta2002";
       repo = "intellitab.nvim";
-      rev = "698ea483eb91e314f472c9c119915c034479ea08";
-      sha256 = "1z3vlbccwlq1z322yxnjgq8kvr3rkhj604ng6jlgccl06482vksa";
+      rev = "955af8d74b07109d36729c623cb1bb232e25e16e";
+      sha256 = "1cpzw7yli1ykli4ix1y2ym7qpi6m45qji4cmxns2whc5r84h84sa";
     };
     meta.homepage = "https://github.com/pta2002/intellitab.nvim/";
     meta.hydraPlatforms = [ ];
@@ -6416,12 +6416,12 @@ final: prev:
 
   kanagawa-nvim = buildVimPlugin {
     pname = "kanagawa.nvim";
-    version = "2025-02-24";
+    version = "2025-03-18";
     src = fetchFromGitHub {
       owner = "rebelot";
       repo = "kanagawa.nvim";
-      rev = "cfd67b0e1eeaa04302b8c7eb072253d24bf22d84";
-      sha256 = "1qhmqn41vr496flcrji20wq6kjgsbxpzdwi8v34kd95v7b11h2d1";
+      rev = "709018d5af92d2e5780bfb8a6d36e9cad01a6402";
+      sha256 = "0p0bwydhpvjx5fdya10iwqkk2d0ihmkdkc1kkpi6i1cjk4ipkxws";
     };
     meta.homepage = "https://github.com/rebelot/kanagawa.nvim/";
     meta.hydraPlatforms = [ ];
@@ -6507,12 +6507,12 @@ final: prev:
 
   kulala-nvim = buildVimPlugin {
     pname = "kulala.nvim";
-    version = "2025-03-12";
+    version = "2025-03-20";
     src = fetchFromGitHub {
       owner = "mistweaverco";
       repo = "kulala.nvim";
-      rev = "12f2ce784c31fbba748bf230e048e1764626f3fa";
-      sha256 = "1r7b2rzb14zyyd72xbwmk80vh3ilxkfpv2b04kdir31s1466n4wj";
+      rev = "7defd3663afce220c7de4fe0af6deaece90faef8";
+      sha256 = "0m7c3wq5qf7n9c94lckk0ryf6p65l8j53z2n1lbrlk7mrbhsv99s";
     };
     meta.homepage = "https://github.com/mistweaverco/kulala.nvim/";
     meta.hydraPlatforms = [ ];
@@ -6637,12 +6637,12 @@ final: prev:
 
   lean-nvim = buildVimPlugin {
     pname = "lean.nvim";
-    version = "2025-03-12";
+    version = "2025-03-19";
     src = fetchFromGitHub {
       owner = "Julian";
       repo = "lean.nvim";
-      rev = "c40bb6bd313b686526744b06f8e87aa71f3a2a26";
-      sha256 = "1x2h8vjiv6ppdgg35xxk5qpmk29r58vxkw8k5pc0fvdm70s0jbrx";
+      rev = "977c4cc16afe63c56919d296a75ea09e6d7a136c";
+      sha256 = "18vi4sps7l845ldyhvrpdnqrqgjlinvb2fi5zdm43ssas1vxy7g7";
     };
     meta.homepage = "https://github.com/Julian/lean.nvim/";
     meta.hydraPlatforms = [ ];
@@ -6702,12 +6702,12 @@ final: prev:
 
   legendary-nvim = buildVimPlugin {
     pname = "legendary.nvim";
-    version = "2025-03-07";
+    version = "2025-03-20";
     src = fetchFromGitHub {
       owner = "mrjones2014";
       repo = "legendary.nvim";
-      rev = "2e0c367392cb060f75f85590c2d6008aa9e31fbf";
-      sha256 = "0dggn9ilv80cnrqshflv2iqcx62wph5cqn555b7pzsb3fkcycwx1";
+      rev = "6de819bc285eb8c420e49e82c21d5bb696b5a727";
+      sha256 = "01g87ywljszq8glzszz05hhqp83g7hfrq7fcas258fmkmdaryhp1";
     };
     meta.homepage = "https://github.com/mrjones2014/legendary.nvim/";
     meta.hydraPlatforms = [ ];
@@ -6780,12 +6780,12 @@ final: prev:
 
   lh-vim-lib = buildVimPlugin {
     pname = "lh-vim-lib";
-    version = "2025-02-13";
+    version = "2025-03-16";
     src = fetchFromGitHub {
       owner = "LucHermitte";
       repo = "lh-vim-lib";
-      rev = "4ad6216fff79bbda07d578cfe232f6c92110b361";
-      sha256 = "0ra9pijlmxlxg9kvykq3yvhp5q0lx0xv2lrxywg9p9qsvh0q2v2y";
+      rev = "4e22e197368a2e0d031489cb0f777f7c7a6c1884";
+      sha256 = "1hmdn8ziin659s7pjm4z6nsvszc63iz7gp90a176xs4nsi2va3sx";
     };
     meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/";
     meta.hydraPlatforms = [ ];
@@ -7001,12 +7001,12 @@ final: prev:
 
   llama-vim = buildVimPlugin {
     pname = "llama.vim";
-    version = "2025-03-11";
+    version = "2025-03-14";
     src = fetchFromGitHub {
       owner = "ggml-org";
       repo = "llama.vim";
-      rev = "5bc35980d3b054153eaeb19403853ed576bf4513";
-      sha256 = "1p05b26w44vswz0xbq7hkj05x2x3jxs5z8i15vg8kyzj661qiqn8";
+      rev = "dafa50acc4df4fe8b173c7cbfa3c5901fb7e0dec";
+      sha256 = "04ksf82sfd8dnbwkk4mqzgg1xwc294im9i9isym4ziw0yman64hj";
     };
     meta.homepage = "https://github.com/ggml-org/llama.vim/";
     meta.hydraPlatforms = [ ];
@@ -7365,12 +7365,12 @@ final: prev:
 
   markview-nvim = buildVimPlugin {
     pname = "markview.nvim";
-    version = "2025-03-14";
+    version = "2025-03-18";
     src = fetchFromGitHub {
       owner = "OXY2DEV";
       repo = "markview.nvim";
-      rev = "8c6b0af556a3e58a831384a3b7bcca9ea77882ee";
-      sha256 = "1s35qq9hsd3ah6jxmb0lmhnl7ak2vsdn4k7dmris4qsn0ppqh7wk";
+      rev = "7a7d3ed0d276b32e121d791f73d850aae6d61b42";
+      sha256 = "0zn7p5j8c9qp4abj6kywk6j2waf2dg9i397wxrbs8prykq2n12pn";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/OXY2DEV/markview.nvim/";
@@ -7418,12 +7418,12 @@ final: prev:
 
   mason-nvim-dap-nvim = buildVimPlugin {
     pname = "mason-nvim-dap.nvim";
-    version = "2025-02-19";
+    version = "2025-03-17";
     src = fetchFromGitHub {
       owner = "jay-babu";
       repo = "mason-nvim-dap.nvim";
-      rev = "09220b99d63d5363f219daa2785242ee5fddba7f";
-      sha256 = "0csay0rb2wyzx233d9ai5v38vwbqcg713rns7ldq1h63bcndsdfg";
+      rev = "444aad7977ee713a4049e9d1dd9b377967d67a4c";
+      sha256 = "16yfc27d02vg37ahbx9q8rjgdbqfay7p1935dh5qk7blcs510295";
     };
     meta.homepage = "https://github.com/jay-babu/mason-nvim-dap.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7457,12 +7457,12 @@ final: prev:
 
   material-nvim = buildVimPlugin {
     pname = "material.nvim";
-    version = "2024-12-29";
+    version = "2025-03-14";
     src = fetchFromGitHub {
       owner = "marko-cerovac";
       repo = "material.nvim";
-      rev = "c8ff153d2c2b22f8b2c9bcce0d741ab55c00cfed";
-      sha256 = "17vcjv48fyza9gfrz4j0hdlm26ybvmf5mz0xck730n9255hp1hkv";
+      rev = "96285a62923ea8e38aea7b603099752da2a97e97";
+      sha256 = "1j1asmzhikwam2dvh45r0ixqznagsh1zbjq493gqwgddbx6fi6c9";
     };
     meta.homepage = "https://github.com/marko-cerovac/material.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7717,12 +7717,12 @@ final: prev:
 
   mini-completion = buildVimPlugin {
     pname = "mini.completion";
-    version = "2025-03-13";
+    version = "2025-03-16";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.completion";
-      rev = "3b14571c9febed20f386c39c07ca85c7b7a5358f";
-      sha256 = "0n0pzbcmsx3qw2p17dy0vl15b6n2fml9rqfaakfqjzrkhjl3q10q";
+      rev = "732b097d395e316ed5d4eeadc19837fbaf59ad7e";
+      sha256 = "07ypcjw4qzqv9jjsn1qv0g1kwgv3x8590v3wkhab54529nb4rxy7";
     };
     meta.homepage = "https://github.com/echasnovski/mini.completion/";
     meta.hydraPlatforms = [ ];
@@ -7808,12 +7808,12 @@ final: prev:
 
   mini-fuzzy = buildVimPlugin {
     pname = "mini.fuzzy";
-    version = "2025-01-31";
+    version = "2025-03-15";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.fuzzy";
-      rev = "345ff7f65f50177c5567c43ec2c79973cb1278fe";
-      sha256 = "18ylb8v7g21r87qkl86hng3zvw9c2q163z535m5m85dxnrxzlgcm";
+      rev = "fb42763285075e316fd4250739af9b8c442503de";
+      sha256 = "0hl5ygzlf73g70j7pdd1x4975368sqpynpja1zx7bc5jln698vr4";
     };
     meta.homepage = "https://github.com/echasnovski/mini.fuzzy/";
     meta.hydraPlatforms = [ ];
@@ -7964,12 +7964,12 @@ final: prev:
 
   mini-nvim = buildVimPlugin {
     pname = "mini.nvim";
-    version = "2025-03-13";
+    version = "2025-03-16";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.nvim";
-      rev = "b21cd5b1b330844e4c4b93d65e99ecb7c79a63c9";
-      sha256 = "0h5j0ppfm61iwhyrh2vqsqssw7s2ghryap9cwak9w3cbmaabmqkz";
+      rev = "88f18a7d018d8bb4d32f6be4c712134a10e826d3";
+      sha256 = "15sgzl2wr9pqp31qy17w4dzcrcmncavh1i8ihldhsyi4hn08zlrk";
     };
     meta.homepage = "https://github.com/echasnovski/mini.nvim/";
     meta.hydraPlatforms = [ ];
@@ -8146,12 +8146,12 @@ final: prev:
 
   minuet-ai-nvim = buildVimPlugin {
     pname = "minuet-ai.nvim";
-    version = "2025-03-08";
+    version = "2025-03-20";
     src = fetchFromGitHub {
       owner = "milanglacier";
       repo = "minuet-ai.nvim";
-      rev = "b5a366a5c3d46b60eb780c9cd86cf62eb0a13891";
-      sha256 = "0z8hy7gm0wipcrj0wkrb5l8bhv228fp5iihr3vr7scmn0sjd7wk2";
+      rev = "a9f5269184070434669d8195a78c8f72f8229a2e";
+      sha256 = "1cw43ay6n4hg6mmmfr5v00yncwm0s0w0z1x6kz4k95zw08g650y3";
     };
     meta.homepage = "https://github.com/milanglacier/minuet-ai.nvim/";
     meta.hydraPlatforms = [ ];
@@ -8211,12 +8211,12 @@ final: prev:
 
   modus-themes-nvim = buildVimPlugin {
     pname = "modus-themes.nvim";
-    version = "2025-02-10";
+    version = "2025-03-17";
     src = fetchFromGitHub {
       owner = "miikanissi";
       repo = "modus-themes.nvim";
-      rev = "1f9ba82c732a49cdafc80f904286dd70f02c4310";
-      sha256 = "1mlzdw5q49iggpp4r2rqqb6q2am5ds1f82d1lmz7nlk325skk48z";
+      rev = "b6c46f8066b2d96cb75d5bc7202a9a4c097b5e9f";
+      sha256 = "15sqscfkhy0rxycql1y2iwc6hirfvbfxww3j17586jxflj3nh0lq";
     };
     meta.homepage = "https://github.com/miikanissi/modus-themes.nvim/";
     meta.hydraPlatforms = [ ];
@@ -8601,12 +8601,12 @@ final: prev:
 
   neo-tree-nvim = buildVimPlugin {
     pname = "neo-tree.nvim";
-    version = "2025-03-11";
+    version = "2025-03-18";
     src = fetchFromGitHub {
       owner = "nvim-neo-tree";
       repo = "neo-tree.nvim";
-      rev = "8c6349bceb1d8a863964dd25dc7944d588a56aaa";
-      sha256 = "03lgpp5vyiyfbzig5w24ph84xbakahbfg1hqv148p0i34qf6mcbn";
+      rev = "876c3298a6f822123b9b81b101d5809b1b5aa0c8";
+      sha256 = "0g8hbqki1fjcqv5nzwmrdlsny9q46asvis3yw0zxq6567byyq8r4";
     };
     meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/";
     meta.hydraPlatforms = [ ];
@@ -8627,12 +8627,12 @@ final: prev:
 
   neoconf-nvim = buildVimPlugin {
     pname = "neoconf.nvim";
-    version = "2025-03-14";
+    version = "2025-03-20";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "neoconf.nvim";
-      rev = "5f0689934f788fc5a76a27a3873d660cea5429c9";
-      sha256 = "0xkpy5mds8mj0zj3v7035hpjk8lymmav0f39kb4q95b7hparn92y";
+      rev = "367600076c04a8f6b8060f61de57299c8ff0a9c3";
+      sha256 = "08c0wchdmr0cg2ix42v7n2kcr6qyn9546x089rp7n83y2ml6p3zv";
     };
     meta.homepage = "https://github.com/folke/neoconf.nvim/";
     meta.hydraPlatforms = [ ];
@@ -8679,12 +8679,12 @@ final: prev:
 
   neoformat = buildVimPlugin {
     pname = "neoformat";
-    version = "2025-02-28";
+    version = "2025-03-17";
     src = fetchFromGitHub {
       owner = "sbdchd";
       repo = "neoformat";
-      rev = "6a0dc851893c8bf9c932a69c4277e82b88120009";
-      sha256 = "1w6bdan4hixzm26jgr9ixhvmsal5nyaa8x6rbi87j64pxrm6i0pw";
+      rev = "874dcd0995db340278c41860e0209bef29d6ef87";
+      sha256 = "1mgs0mgpfirn02z2ffkxv20cpffr5b3vp4np0rya5fv2v991h5x2";
     };
     meta.homepage = "https://github.com/sbdchd/neoformat/";
     meta.hydraPlatforms = [ ];
@@ -8709,8 +8709,8 @@ final: prev:
     src = fetchFromGitHub {
       owner = "NeogitOrg";
       repo = "neogit";
-      rev = "0b756dd80c82da28fd7ed500eac642710ab21909";
-      sha256 = "1d35xr0hm5d8gjdhg1rxqylfqkywjl6qabdgig1xbpx8l7lqfqcc";
+      rev = "333968f8222fda475d3e4545a9b15fe9912ca26a";
+      sha256 = "16qjyv0qcwngi9185p5bzb4xjvb2c7xpv6qnmn2hi7kald6d4wp0";
     };
     meta.homepage = "https://github.com/NeogitOrg/neogit/";
     meta.hydraPlatforms = [ ];
@@ -8981,12 +8981,12 @@ final: prev:
 
   neotest-haskell = buildVimPlugin {
     pname = "neotest-haskell";
-    version = "2025-03-09";
+    version = "2025-03-17";
     src = fetchFromGitHub {
       owner = "MrcJkb";
       repo = "neotest-haskell";
-      rev = "b1fec5e156a7403d12cc9d429920e492fecb0755";
-      sha256 = "08wnn3z44w0qnqa9bcxj6890lhs9qgb8jx42qgfw5x728drnw781";
+      rev = "ef8cdce17319ea90669066fa7e0f13729e39303c";
+      sha256 = "0jxqakg6dhx49g2fhy5nxk2ap2hgj4kr6y032axw6xkn5kb79a7i";
     };
     meta.homepage = "https://github.com/MrcJkb/neotest-haskell/";
     meta.hydraPlatforms = [ ];
@@ -9176,12 +9176,12 @@ final: prev:
 
   neotest-zig = buildVimPlugin {
     pname = "neotest-zig";
-    version = "2024-12-27";
+    version = "2025-03-16";
     src = fetchFromGitHub {
       owner = "lawrence-laz";
       repo = "neotest-zig";
-      rev = "c7a1a39626fa90e639fb640b6322739060a2acf3";
-      sha256 = "095jv4m81qpgnak4rzp2y8kd4cwgfx2aw31am9m0nsv8mmp1i5w3";
+      rev = "de63f3b9a182d374d2e71cf44385326682ec90e7";
+      sha256 = "0bjqpxz6fa4m4gsx8qnkxy99r573hyhwj0d079m4wrg43n9n6vcx";
     };
     meta.homepage = "https://github.com/lawrence-laz/neotest-zig/";
     meta.hydraPlatforms = [ ];
@@ -9189,12 +9189,12 @@ final: prev:
 
   neovim-ayu = buildVimPlugin {
     pname = "neovim-ayu";
-    version = "2024-12-29";
+    version = "2025-03-19";
     src = fetchFromGitHub {
       owner = "Shatur";
       repo = "neovim-ayu";
-      rev = "283badaa983234c90e857c12c1f1c18e1544360a";
-      sha256 = "16pj4pkv04ff7wx5dnkzqzv69im16bgc686qbwrs5qazph702zh0";
+      rev = "f5da37a8ddd62fc3a7b28900c4d1b807a3582584";
+      sha256 = "0is9gibh6lrf7x3903v06l33l8nrq1hix0sm7clc2576pk2sp050";
     };
     meta.homepage = "https://github.com/Shatur/neovim-ayu/";
     meta.hydraPlatforms = [ ];
@@ -9384,12 +9384,12 @@ final: prev:
 
   nightfly = buildVimPlugin {
     pname = "nightfly";
-    version = "2025-03-09";
+    version = "2025-03-18";
     src = fetchFromGitHub {
       owner = "bluz71";
       repo = "vim-nightfly-colors";
-      rev = "43cd633951ea75cad622a881953b02094fdd4b46";
-      sha256 = "1wn1r7jqz23b43qpyrmfcr4bvzfk5ajnffh9z555ca3m0zvgzsl1";
+      rev = "275532b004ddda91be7626fae227aaf33302d6f0";
+      sha256 = "1i7idcgw0amrrxnfr7jkh5hcdl0j4dj1zv94jvlrdkaz27hprmqi";
     };
     meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/";
     meta.hydraPlatforms = [ ];
@@ -9449,12 +9449,12 @@ final: prev:
 
   nlsp-settings-nvim = buildVimPlugin {
     pname = "nlsp-settings.nvim";
-    version = "2025-03-11";
+    version = "2025-03-19";
     src = fetchFromGitHub {
       owner = "tamago324";
       repo = "nlsp-settings.nvim";
-      rev = "a1c208fb30dc8dd0be2badf99fe076fa75284338";
-      sha256 = "0digp6bmzg0gls8m5gnwci5czhmszw5m3nd8x7zq7g57dlbx46p8";
+      rev = "288141e4eec5437fe2f484fce086d84f53ec88a1";
+      sha256 = "0sw7dy0dqkk338n38kr2634qv3pxh619nn70ncsw9k5wnxbw99pr";
     };
     meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/";
     meta.hydraPlatforms = [ ];
@@ -9696,12 +9696,12 @@ final: prev:
 
   nvim-autopairs = buildVimPlugin {
     pname = "nvim-autopairs";
-    version = "2025-02-14";
+    version = "2025-03-20";
     src = fetchFromGitHub {
       owner = "windwp";
       repo = "nvim-autopairs";
-      rev = "68f0e5c3dab23261a945272032ee6700af86227a";
-      sha256 = "1ai3s1083dx6bddhrkv7d3hyq3zsrblizbvpgl09r1w9cijxhj8m";
+      rev = "6522027785b305269fa17088395dfc0f456cedd2";
+      sha256 = "1i63wdgm54n3iiiix0y18mjvy2rsswc4iybqppsfpvi8cg2xjpa6";
     };
     meta.homepage = "https://github.com/windwp/nvim-autopairs/";
     meta.hydraPlatforms = [ ];
@@ -9878,12 +9878,12 @@ final: prev:
 
   nvim-dap = buildVimPlugin {
     pname = "nvim-dap";
-    version = "2025-03-12";
+    version = "2025-03-17";
     src = fetchFromGitHub {
       owner = "mfussenegger";
       repo = "nvim-dap";
-      rev = "a720d4966f758ab22e8ec28812b6df90a53e0f02";
-      sha256 = "0b979dhl5jr3kx9j5zih39jbrv22d554ws6y8g1cgsm2i3412s4h";
+      rev = "6a5bba0ddea5d419a783e170c20988046376090d";
+      sha256 = "0i10mybxpz0vjkyspv8jkxawph9c823ryf0khb4g8zwpixwhrpmx";
     };
     meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
     meta.hydraPlatforms = [ ];
@@ -9956,12 +9956,12 @@ final: prev:
 
   nvim-dap-rr = buildVimPlugin {
     pname = "nvim-dap-rr";
-    version = "2024-12-14";
+    version = "2025-03-20";
     src = fetchFromGitHub {
       owner = "jonboh";
       repo = "nvim-dap-rr";
-      rev = "920e4931e383dddaa82539b4697b752fae7ff82d";
-      sha256 = "1jmx08r1jrshijshls4jizhcplm1skjp1kxflm3505vz8dx4jrf7";
+      rev = "9d4cb40d04b7822b075482b4fad9742aa43a87b2";
+      sha256 = "1nnnk05cn7h6dv49zpwiwqzj1v3bmh56acpb6gklg28xdf4jd2v0";
     };
     meta.homepage = "https://github.com/jonboh/nvim-dap-rr/";
     meta.hydraPlatforms = [ ];
@@ -10099,12 +10099,12 @@ final: prev:
 
   nvim-highlight-colors = buildVimPlugin {
     pname = "nvim-highlight-colors";
-    version = "2025-03-14";
+    version = "2025-03-19";
     src = fetchFromGitHub {
       owner = "brenoprata10";
       repo = "nvim-highlight-colors";
-      rev = "af94cd45b0608755d1affa6c36851fc1e73b48bc";
-      sha256 = "0v8gmnb80wgad8a24yzk03ly66lx8nj8ww06d00r4kzd5rak7gdg";
+      rev = "d41a2211b8ba982c74bc190b40ba7686c2e3ffd0";
+      sha256 = "0aw8vjnxydv6as5qv1sjsrj142xc4d7w1szjg6wfk7a37l24rhhm";
     };
     meta.homepage = "https://github.com/brenoprata10/nvim-highlight-colors/";
     meta.hydraPlatforms = [ ];
@@ -10112,12 +10112,12 @@ final: prev:
 
   nvim-highlite = buildVimPlugin {
     pname = "nvim-highlite";
-    version = "2025-01-30";
+    version = "2025-03-20";
     src = fetchFromGitHub {
       owner = "Iron-E";
       repo = "nvim-highlite";
-      rev = "2bf72fbc24eecd4c32a44771dfc6c1ab5b5dbf30";
-      sha256 = "0nm0jxfl8yvw7q03pl7wg18401vl6kpxbpxh5f7z9pzi5s3kq10j";
+      rev = "3cb6fed3095fcc2a47c9f9843582ec0ab08736fd";
+      sha256 = "1hkadfl2prh4v4npk0cyqsjdgh3b529zsvdmnng1gykjwfs06h71";
     };
     meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
     meta.hydraPlatforms = [ ];
@@ -10307,12 +10307,12 @@ final: prev:
 
   nvim-lint = buildVimPlugin {
     pname = "nvim-lint";
-    version = "2025-02-06";
+    version = "2025-03-17";
     src = fetchFromGitHub {
       owner = "mfussenegger";
       repo = "nvim-lint";
-      rev = "6e9dd545a1af204c4022a8fcd99727ea41ffdcc8";
-      sha256 = "0b318dahzf9kd043mjsa41rj44zfbs7k8i4bz0rqhcqipr19rwhk";
+      rev = "936197073214c26a347fb933c9459c8766376b23";
+      sha256 = "0wvdyabxqjxm8mx07lw37j99hq4hvxhwiyzjiasi5fgq8xawb2md";
     };
     meta.homepage = "https://github.com/mfussenegger/nvim-lint/";
     meta.hydraPlatforms = [ ];
@@ -10359,12 +10359,12 @@ final: prev:
 
   nvim-lspconfig = buildVimPlugin {
     pname = "nvim-lspconfig";
-    version = "2025-03-11";
+    version = "2025-03-20";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lspconfig";
-      rev = "8a1529e46eef5efc86c34c8d9bdd313abc2ecba0";
-      sha256 = "0l9mns71hh0jssxblr1q286z8hmxwbgyq1nw6scki9ffn23jwnz0";
+      rev = "699cf2ce74e40e7c5068cf93a6bd6a74b24c5ec3";
+      sha256 = "0jkqc431485rmj21pd2xahrha5dbr802ikfmjbxnax7wnqkaqbp4";
     };
     meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
     meta.hydraPlatforms = [ ];
@@ -10632,12 +10632,12 @@ final: prev:
 
   nvim-rip-substitute = buildVimPlugin {
     pname = "nvim-rip-substitute";
-    version = "2025-02-28";
+    version = "2025-03-19";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-rip-substitute";
-      rev = "ede145f6fc318dc0e15ed9a40d2a60112eaf0b5f";
-      sha256 = "1ppqig48yyhpfbghgisggcsk18q9v0yannzq48yxb4pvxnjrk52r";
+      rev = "ddd3562bbd93b02eb43ddfe18af7438abe46dd98";
+      sha256 = "1iwgl28pdipyk4a7hbhsm7wb1a0sglsk7zb5dgc2k2kq526yn7hr";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-rip-substitute/";
     meta.hydraPlatforms = [ ];
@@ -10645,12 +10645,12 @@ final: prev:
 
   nvim-scissors = buildVimPlugin {
     pname = "nvim-scissors";
-    version = "2025-03-12";
+    version = "2025-03-19";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-scissors";
-      rev = "c2457e8c0163fc2d00226f78c95acb2c2bd2a549";
-      sha256 = "1f7mayjgair07jia15f1ckm9adlbzrplhbhgcxix0gfa2vmzv775";
+      rev = "445deedd9cc8eb91275ac15e3d6c6df5bc08bff3";
+      sha256 = "1y332f5sd7fjg2kf9v8wx3dgf0c3kjdfx2s2gv90r6a7p7p83idd";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-scissors/";
     meta.hydraPlatforms = [ ];
@@ -10671,12 +10671,12 @@ final: prev:
 
   nvim-scrollview = buildVimPlugin {
     pname = "nvim-scrollview";
-    version = "2025-03-12";
+    version = "2025-03-16";
     src = fetchFromGitHub {
       owner = "dstein64";
       repo = "nvim-scrollview";
-      rev = "24a1995392f845e8e222c1ffcaca140a9623b2a7";
-      sha256 = "0qq9lzrqy0gizzn4s12hijf8f1yjdpwvh5c81f05my5nsad5h090";
+      rev = "5cdf84c85b7d9664ca5b7fd6ebe5dd2c973ba876";
+      sha256 = "07npxvnxhmivymns0mhzfq3i78ik5dkz8gv3d0cgpakhyj22d6sj";
     };
     meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
     meta.hydraPlatforms = [ ];
@@ -10762,12 +10762,12 @@ final: prev:
 
   nvim-surround = buildVimPlugin {
     pname = "nvim-surround";
-    version = "2025-03-13";
+    version = "2025-03-16";
     src = fetchFromGitHub {
       owner = "kylechui";
       repo = "nvim-surround";
-      rev = "f70d56275710e202af59148f52100d34b786aecb";
-      sha256 = "1a20q9hfv1gh7si2ai68zf4m9jnggvvja4vqxvrimbnzx73vxrrl";
+      rev = "6c54643ef42016b744888b06d2381abd23f9b7ea";
+      sha256 = "1c5agqfffmjxc73bv8d4hmrnzx62ikqpv7pii19v5alfdcnh5j48";
     };
     meta.homepage = "https://github.com/kylechui/nvim-surround/";
     meta.hydraPlatforms = [ ];
@@ -10827,12 +10827,12 @@ final: prev:
 
   nvim-treesitter = buildVimPlugin {
     pname = "nvim-treesitter";
-    version = "2025-03-14";
+    version = "2025-03-20";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter";
-      rev = "8b79cddc708cb8549562f0101f7f509ad7cebf97";
-      sha256 = "1b2sr6250gwfgakjqh48fyydq3nmdd96nfhz1rccrns1f7nqwcdy";
+      rev = "ff553df2f4c5641be2b282e1a0a072c46cf03591";
+      sha256 = "0xgibfj73j2241mj6vab4sbw5zxxcnfls2lahsadg0r5z7cj01lk";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
     meta.hydraPlatforms = [ ];
@@ -10840,12 +10840,12 @@ final: prev:
 
   nvim-treesitter-context = buildVimPlugin {
     pname = "nvim-treesitter-context";
-    version = "2025-02-17";
+    version = "2025-03-19";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter-context";
-      rev = "198720b4016af04c9590f375d714d5bf8afecc1a";
-      sha256 = "13msw9i509ncysbgkqbl2wr1c23iw3f4mxkw30sc1yk9x9nx49ri";
+      rev = "93b29a32d5f4be10e39226c6b796f28d68a8b483";
+      sha256 = "12ixiqb4bj7n3kkzqi81hyhn3bjsb93250gvfy12bxya2l5bi20g";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/";
     meta.hydraPlatforms = [ ];
@@ -10918,12 +10918,12 @@ final: prev:
 
   nvim-treesitter-textobjects = buildVimPlugin {
     pname = "nvim-treesitter-textobjects";
-    version = "2025-03-08";
+    version = "2025-03-17";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter-textobjects";
-      rev = "143856b1cee509a190cc8c17ddb0638002171235";
-      sha256 = "1j5h87vrvkzgy01gijr22g6nh478naiyxw1g77gav82awgmb3pyx";
+      rev = "9937e5e356e5b227ec56d83d0a9d0a0f6bc9cad4";
+      sha256 = "1lqxvz39d3xd6rrzazydbfg7gqd6143zz6pvq23ivgy9jan8fbfs";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
     meta.hydraPlatforms = [ ];
@@ -11009,12 +11009,12 @@ final: prev:
 
   nvim-various-textobjs = buildVimPlugin {
     pname = "nvim-various-textobjs";
-    version = "2025-02-23";
+    version = "2025-03-18";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-various-textobjs";
-      rev = "ea78fbdac4a2ca10e2922721233a769770afb45b";
-      sha256 = "0w67k4jxp10nmkxf9b313r73j5clcpm45xqg2512lv0br6478llk";
+      rev = "2788ce64fcfaa702ae3340180be592dfcd733c86";
+      sha256 = "12y2j2rzxi5mfyq1qca30dznprr9db4gljmr34xwrz3v3q84dqzd";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-various-textobjs/";
     meta.hydraPlatforms = [ ];
@@ -11191,12 +11191,12 @@ final: prev:
 
   octo-nvim = buildVimPlugin {
     pname = "octo.nvim";
-    version = "2025-03-14";
+    version = "2025-03-20";
     src = fetchFromGitHub {
       owner = "pwntester";
       repo = "octo.nvim";
-      rev = "a4cae62fd4370f544cb597df2a767945f78a120a";
-      sha256 = "0k5p66z1kb42602mh38j6vyxkawlywisn1wzydaf40zd86p8nlvr";
+      rev = "3dfbc7936a9057b8370b903c9e3a115f07dae00d";
+      sha256 = "1m24zzy11526vbydfl00k5z7zhmdlagckkp5lwynicsm4hz0m74m";
     };
     meta.homepage = "https://github.com/pwntester/octo.nvim/";
     meta.hydraPlatforms = [ ];
@@ -11425,12 +11425,12 @@ final: prev:
 
   otter-nvim = buildVimPlugin {
     pname = "otter.nvim";
-    version = "2025-03-07";
+    version = "2025-03-17";
     src = fetchFromGitHub {
       owner = "jmbuhr";
       repo = "otter.nvim";
-      rev = "e37053d2c6a17463e705483122eee04d41e3d4af";
-      sha256 = "0sq7x2mcxl7z0j4s3a395fy0bzz13h4rxd03lp6674y6hsjxcm55";
+      rev = "16fc46671b5c4e059e9f3a06d593d34d30e571c9";
+      sha256 = "0k4bv870pzx5dlm16fljrmdwnw5ihda04krmcqi9pznp7harvg2g";
     };
     meta.homepage = "https://github.com/jmbuhr/otter.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12013,12 +12013,12 @@ final: prev:
 
   quarto-nvim = buildVimPlugin {
     pname = "quarto-nvim";
-    version = "2025-02-20";
+    version = "2025-03-14";
     src = fetchFromGitHub {
       owner = "quarto-dev";
       repo = "quarto-nvim";
-      rev = "93b1f5a1abc1b1da653f353947f62b294574759c";
-      sha256 = "05jk3m4xxyvx90wls442fp949hij6095n8vr93dx4yyzrcghk217";
+      rev = "7fd12a6c57d4575cadbf4f97552b616d62ac7e03";
+      sha256 = "0r27n55bngrkcx5p0ang7yw2c0gj821sxgvawxnnp090hlb4pswi";
     };
     meta.homepage = "https://github.com/quarto-dev/quarto-nvim/";
     meta.hydraPlatforms = [ ];
@@ -12130,12 +12130,12 @@ final: prev:
 
   range-highlight-nvim = buildVimPlugin {
     pname = "range-highlight.nvim";
-    version = "2021-08-03";
+    version = "2025-03-20";
     src = fetchFromGitHub {
       owner = "winston0410";
       repo = "range-highlight.nvim";
-      rev = "8b5e8ccb3460b2c3675f4639b9f54e64eaab36d9";
-      sha256 = "1yswni0p1w7ja6cddxyd3m4hi8gsdyh8hm8rlk878b096maxkgw1";
+      rev = "24078ab22d5ba8503dd8c21690db9adc3c22d28b";
+      sha256 = "1f4y0hpic77bqsfxxaslqdcvv734kqpwnvgbh2rd9y2wgi44ala4";
     };
     meta.homepage = "https://github.com/winston0410/range-highlight.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12273,12 +12273,12 @@ final: prev:
 
   render-markdown-nvim = buildVimPlugin {
     pname = "render-markdown.nvim";
-    version = "2025-03-11";
+    version = "2025-03-20";
     src = fetchFromGitHub {
       owner = "MeanderingProgrammer";
       repo = "render-markdown.nvim";
-      rev = "c065031d030955e1d071a7fcdd8c59e0fd2f0343";
-      sha256 = "0yjyixvz0d239clbj8f7d09lzpz10lkvyvdwcc1g1d4ygsh6pbjr";
+      rev = "62d6681332365cfddbe916c888752834d9f7ad0c";
+      sha256 = "1vs9y74743dm9025sgzl27arxs50mkihyc2bbmhi7vhggwf4j0hr";
     };
     meta.homepage = "https://github.com/MeanderingProgrammer/render-markdown.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12756,12 +12756,12 @@ final: prev:
 
   smart-splits-nvim = buildVimPlugin {
     pname = "smart-splits.nvim";
-    version = "2025-03-07";
+    version = "2025-03-18";
     src = fetchFromGitHub {
       owner = "mrjones2014";
       repo = "smart-splits.nvim";
-      rev = "1698623b36953cd0d6e1e648570e16e4ee8981c8";
-      sha256 = "0r3a1h5adp1qjc53afjcb7jpfirrpcclrn19q513hwdwykcr86fb";
+      rev = "a3ccaa1ea09e21712ded3ffdabdbdc577f784054";
+      sha256 = "03sp4sd2xajnrwsj5nfby6zi8964hbvsp98rvzm5f9gknph79z8f";
     };
     meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12808,12 +12808,12 @@ final: prev:
 
   smear-cursor-nvim = buildVimPlugin {
     pname = "smear-cursor.nvim";
-    version = "2025-03-09";
+    version = "2025-03-19";
     src = fetchFromGitHub {
       owner = "sphamba";
       repo = "smear-cursor.nvim";
-      rev = "81638007bf7bbe79a78a3bfcbe8c640ec83344c0";
-      sha256 = "0sns7qpcz4lfsyxpq2r37pz6hi79wbg5n1k57jrgva3dmnlvl47k";
+      rev = "483ec950ebe77ef92f3e7543945285ffb49093b6";
+      sha256 = "15y8rxwfm3gwdd5p632vdbvb0njfyr70366k9g1z71if787mdzmm";
     };
     meta.homepage = "https://github.com/sphamba/smear-cursor.nvim/";
     meta.hydraPlatforms = [ ];
@@ -13056,12 +13056,12 @@ final: prev:
 
   srcery-vim = buildVimPlugin {
     pname = "srcery-vim";
-    version = "2025-03-11";
+    version = "2025-03-15";
     src = fetchFromGitHub {
       owner = "srcery-colors";
       repo = "srcery-vim";
-      rev = "d705764b3945d856c7867b613a4570635b8bfdcf";
-      sha256 = "1szf5vi783kmpm58mymdf7swkbha2zhzyjcskhai93cz7c4gjjzc";
+      rev = "11cf04466429385a63e05ccea1841f82bcfc13e0";
+      sha256 = "1pmwqsykkxzsrj73s9f3nnzx6d3mfzjwcaj6a384bj6n3dz2fhfq";
     };
     meta.homepage = "https://github.com/srcery-colors/srcery-vim/";
     meta.hydraPlatforms = [ ];
@@ -13382,12 +13382,12 @@ final: prev:
 
   tabby-nvim = buildVimPlugin {
     pname = "tabby.nvim";
-    version = "2025-02-19";
+    version = "2025-03-19";
     src = fetchFromGitHub {
       owner = "nanozuki";
       repo = "tabby.nvim";
-      rev = "d5bcb49109634720e05dd1aeff1c95578c8aa5b2";
-      sha256 = "17ip40fa6vjqaygh3zvp8ij02jpc9jmnm1mv85biwgzddfzi8dgx";
+      rev = "21b01d26627ee5fe94c8ae560bd1b0797dff3c40";
+      sha256 = "1qfmlafp7yjby1qmfimrrxy479c0gh4biyxv38pb0ciglwl927gn";
     };
     meta.homepage = "https://github.com/nanozuki/tabby.nvim/";
     meta.hydraPlatforms = [ ];
@@ -13683,12 +13683,12 @@ final: prev:
 
   telescope-frecency-nvim = buildVimPlugin {
     pname = "telescope-frecency.nvim";
-    version = "2025-03-03";
+    version = "2025-03-16";
     src = fetchFromGitHub {
       owner = "nvim-telescope";
       repo = "telescope-frecency.nvim";
-      rev = "dd6ab9b6a5a26e239f268a06ef5bb1e69928ac5b";
-      sha256 = "1dgdya9g9n1gdnjakpwl24l0xq9h0jfisry22v0d5crvy6mh37gz";
+      rev = "eeda21e429c86bd38ea287700e77f96058331be7";
+      sha256 = "1wm70kvk1as623jdy0pgd2kgw4db0fd66f6k1z3s76mz1y8kdma1";
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/";
     meta.hydraPlatforms = [ ];
@@ -14244,12 +14244,12 @@ final: prev:
 
   tmux-nvim = buildVimPlugin {
     pname = "tmux.nvim";
-    version = "2025-02-24";
+    version = "2025-03-19";
     src = fetchFromGitHub {
       owner = "aserowy";
       repo = "tmux.nvim";
-      rev = "b2f509311e4cbdc06a93c0da66a8b7b33aa6bec9";
-      sha256 = "1agqqsjv6hbga7zlldb1plwdx5ysjv33x3a2aca6gznbl6iqavg7";
+      rev = "2c1c3be0ef287073cef963f2aefa31a15c8b9cd8";
+      sha256 = "0md775rhl7cxkfdbrkrsirr2093dfsf6jhvn9naqb5px1alj6wpx";
     };
     meta.homepage = "https://github.com/aserowy/tmux.nvim/";
     meta.hydraPlatforms = [ ];
@@ -14375,12 +14375,12 @@ final: prev:
 
   treewalker-nvim = buildVimPlugin {
     pname = "treewalker.nvim";
-    version = "2025-03-08";
+    version = "2025-03-20";
     src = fetchFromGitHub {
       owner = "aaronik";
       repo = "treewalker.nvim";
-      rev = "0bad88a449642fca1080930260482628b692841a";
-      sha256 = "088ksm6rvj4vabrisbpg2xngc11bbqihms57rz0dw22mbr7chy6q";
+      rev = "b9e6520a08dc8e62891dcb759fce29f988e68da9";
+      sha256 = "0vp7kzf790qsasnrxlhx1qvqhvwski3h889lhbmm1yj8pz71jvzf";
     };
     meta.homepage = "https://github.com/aaronik/treewalker.nvim/";
     meta.hydraPlatforms = [ ];
@@ -14688,12 +14688,12 @@ final: prev:
 
   unison = buildVimPlugin {
     pname = "unison";
-    version = "2025-03-06";
+    version = "2025-03-19";
     src = fetchFromGitHub {
       owner = "unisonweb";
       repo = "unison";
-      rev = "af2ff1088ccbf98d944c9131dbddcc21c279ebf7";
-      sha256 = "1nlf7pnh2rkiwapc7306knqxfqns32y2dp4iwy1q9xg6sf195qy2";
+      rev = "d67de6f71353df51510a232f55390445d944c3c4";
+      sha256 = "116d3s2pix6vnqi5408xfac3jhrz1z5zmnflxx5gzdmpvik2jmbp";
     };
     meta.homepage = "https://github.com/unisonweb/unison/";
     meta.hydraPlatforms = [ ];
@@ -14805,12 +14805,12 @@ final: prev:
 
   vifm-vim = buildVimPlugin {
     pname = "vifm.vim";
-    version = "2025-02-08";
+    version = "2025-03-18";
     src = fetchFromGitHub {
       owner = "vifm";
       repo = "vifm.vim";
-      rev = "617e3dc7c9af1f03cc664124aff2fe98fafcf1b2";
-      sha256 = "0w2yhyg5m2pr8c5zjn86f2ms4vh748h503cdvgbiyk33ina3708v";
+      rev = "14d81758ff57420a961c7a8d10d7d672d2e00fe4";
+      sha256 = "13iv8hwd9xczdc6qraghq7bf82xkqndzndi8sk00xfiizsc1rbdm";
     };
     meta.homepage = "https://github.com/vifm/vifm.vim/";
     meta.hydraPlatforms = [ ];
@@ -16027,12 +16027,12 @@ final: prev:
 
   vim-dadbod-completion = buildVimPlugin {
     pname = "vim-dadbod-completion";
-    version = "2025-02-28";
+    version = "2025-03-19";
     src = fetchFromGitHub {
       owner = "kristijanhusak";
       repo = "vim-dadbod-completion";
-      rev = "3f5783c12e184e4b6f05dfcbd7c1a6da05b4d66e";
-      sha256 = "0vml575g6i2r5l4gwg490q2kwvkfqr45v6dqm8kl05vwip1lqqp1";
+      rev = "a8dac0b3cf6132c80dc9b18bef36d4cf7a9e1fe6";
+      sha256 = "0gzhn6px019kd955di3540ngfn050hwll37wd5hdpj6i1apc5rhp";
     };
     meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-completion/";
     meta.hydraPlatforms = [ ];
@@ -16404,12 +16404,12 @@ final: prev:
 
   vim-erlang-runtime = buildVimPlugin {
     pname = "vim-erlang-runtime";
-    version = "2024-01-24";
+    version = "2025-03-16";
     src = fetchFromGitHub {
       owner = "vim-erlang";
       repo = "vim-erlang-runtime";
-      rev = "275454182752162ac680c214675cb2a45d010cdc";
-      sha256 = "0crg7sf2ziz1zkjf794fnyb5rfcc0s48g3qngc4in44d71b7gc16";
+      rev = "eff3cbd3306892b23ad2e55f5252061c1aad0871";
+      sha256 = "0jwny8a4rrmdqvx9i55wzpxvni3q233mmjs7kkfwb3galwddz1fn";
     };
     meta.homepage = "https://github.com/vim-erlang/vim-erlang-runtime/";
     meta.hydraPlatforms = [ ];
@@ -16599,12 +16599,12 @@ final: prev:
 
   vim-flog = buildVimPlugin {
     pname = "vim-flog";
-    version = "2025-02-27";
+    version = "2025-03-19";
     src = fetchFromGitHub {
       owner = "rbong";
       repo = "vim-flog";
-      rev = "77c86cb5db8960d224f2a866120893e61d62f5e8";
-      sha256 = "03ggb5b05wpl5axgkilgkchj91ql25fwkm9kmyqrrax95z8vsw9j";
+      rev = "665b16ac8915f746bc43c9572b4581a5e9047216";
+      sha256 = "1qr6ys7qapjkd9la6sqix6kfk4wy380yx9izchq48b41rfcx9iy7";
     };
     meta.homepage = "https://github.com/rbong/vim-flog/";
     meta.hydraPlatforms = [ ];
@@ -17823,12 +17823,12 @@ final: prev:
 
   vim-lsp-settings = buildVimPlugin {
     pname = "vim-lsp-settings";
-    version = "2025-01-16";
+    version = "2025-03-19";
     src = fetchFromGitHub {
       owner = "mattn";
       repo = "vim-lsp-settings";
-      rev = "4f8471dfd3d34a3d1547b755afed8a673b236b2c";
-      sha256 = "0h08dbik2pvv90vfy2f17bi5700yxmknkvirxl8aab36mk5zy5r1";
+      rev = "82cae9df8f2ffca5f66a2947fee15da575838413";
+      sha256 = "06jvs613g5yb2sf2037zj6izjbydxw9r87izl8i4srvrh54v5xda";
     };
     meta.homepage = "https://github.com/mattn/vim-lsp-settings/";
     meta.hydraPlatforms = [ ];
@@ -18512,12 +18512,12 @@ final: prev:
 
   vim-pandoc-syntax = buildVimPlugin {
     pname = "vim-pandoc-syntax";
-    version = "2023-11-26";
+    version = "2025-03-15";
     src = fetchFromGitHub {
       owner = "vim-pandoc";
       repo = "vim-pandoc-syntax";
-      rev = "16939cda184ff555938cc895cc62477c172997f9";
-      sha256 = "1rk3iqqzckrni1qznv1rmi63lf2h2qcis6z7priqn7zi2v41jgpa";
+      rev = "05ef7f44ebaea37159db8d365058c0a9e2ef14b5";
+      sha256 = "0w48hmcs0dfpc28v9bxslxgvizppkcvw0zpj6sxha747bbi715fc";
     };
     meta.homepage = "https://github.com/vim-pandoc/vim-pandoc-syntax/";
     meta.hydraPlatforms = [ ];
@@ -19448,12 +19448,12 @@ final: prev:
 
   vim-spirv = buildVimPlugin {
     pname = "vim-spirv";
-    version = "2025-03-13";
+    version = "2025-03-20";
     src = fetchFromGitHub {
       owner = "kbenzie";
       repo = "vim-spirv";
-      rev = "a2bc578485759f79c38c6b3e573b4f5db7f354bb";
-      sha256 = "19lif6z7bgm92n9bdbhvy242jp4px1ikkn4fvn913jih2r6h05gd";
+      rev = "3a21e6ce512ee88bf892294bc6d05fdf1a860cb4";
+      sha256 = "1xzkw0vlnpgfl59czgmylxkcvsn84ligaz6ggkypg58vgnyvbz0a";
     };
     meta.homepage = "https://github.com/kbenzie/vim-spirv/";
     meta.hydraPlatforms = [ ];
@@ -20203,12 +20203,12 @@ final: prev:
 
   vim-wayland-clipboard = buildVimPlugin {
     pname = "vim-wayland-clipboard";
-    version = "2024-01-18";
+    version = "2025-03-15";
     src = fetchFromGitHub {
       owner = "jasonccox";
       repo = "vim-wayland-clipboard";
-      rev = "cd4efac3e77177afdf220146948d0e06245946de";
-      sha256 = "02kn9dry67jckzwan4rqd4nsycrpvg62vg23prg8wc2i9j0p389p";
+      rev = "f5c1aa97c6f757c958572507ca2a6032f92974e3";
+      sha256 = "14b1h18nypa6gq2123mm24adxxq0f9ljljacxg0fmkd98ipv46l6";
     };
     meta.homepage = "https://github.com/jasonccox/vim-wayland-clipboard/";
     meta.hydraPlatforms = [ ];
@@ -20542,12 +20542,12 @@ final: prev:
 
   vimtex = buildVimPlugin {
     pname = "vimtex";
-    version = "2025-03-11";
+    version = "2025-03-19";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "691ee15e1459e4420d207cfbc4a79b383f32b411";
-      sha256 = "0ylyzhdx6fpbkdba0sr7lm7w3z501x1d6x9hxpb00rfyii3cslz4";
+      rev = "ae6d6ce6c962ffcabe6d1776341b055a85b18bd6";
+      sha256 = "0j0n9h91v4bsr7yfkj5cnr6xvkifgzk9lpj8ngyq64wvnimysk7p";
     };
     meta.homepage = "https://github.com/lervag/vimtex/";
     meta.hydraPlatforms = [ ];
@@ -20893,12 +20893,12 @@ final: prev:
 
   wtf-nvim = buildVimPlugin {
     pname = "wtf.nvim";
-    version = "2024-09-19";
+    version = "2025-03-17";
     src = fetchFromGitHub {
       owner = "piersolenski";
       repo = "wtf.nvim";
-      rev = "16eec1f32c3608bd8519e9e520041fe34201abb0";
-      sha256 = "1clpik3z79mvxxph5z4ghiwrq560jy0zdr0yxmp9byl2r0ggfa64";
+      rev = "22dac666c8847c9cb03afe99229d459f1d0822c4";
+      sha256 = "0hraiw10ia93ryhfb207kha6hhhnsbmfdid6h44dsg87mkixm3c8";
     };
     meta.homepage = "https://github.com/piersolenski/wtf.nvim/";
     meta.hydraPlatforms = [ ];
@@ -20932,12 +20932,12 @@ final: prev:
 
   yanky-nvim = buildVimPlugin {
     pname = "yanky.nvim";
-    version = "2025-03-05";
+    version = "2025-03-19";
     src = fetchFromGitHub {
       owner = "gbprod";
       repo = "yanky.nvim";
-      rev = "80d9385dbebe7049fd1961d7909b835a58ce9dcc";
-      sha256 = "1lg9nxc01shkazqk5g3j0iskiqbwr9sxv07sqrwkwlh36jn59rcp";
+      rev = "a21a0b4f593e1fb17b17882f1ab3a3c1b943b831";
+      sha256 = "1sk3acrwwmx9wfxnfymgvl88bnp0xh8a30pyx040czrj3zl5l920";
     };
     meta.homepage = "https://github.com/gbprod/yanky.nvim/";
     meta.hydraPlatforms = [ ];
@@ -20959,12 +20959,12 @@ final: prev:
 
   yazi-nvim = buildVimPlugin {
     pname = "yazi.nvim";
-    version = "2025-03-08";
+    version = "2025-03-20";
     src = fetchFromGitHub {
       owner = "mikavilpas";
       repo = "yazi.nvim";
-      rev = "0e4e699496a5ee1c37bdca2f216f8e956c04de56";
-      sha256 = "0n3qaxldy25y0chlbvw5cvqfppfh8s47amv1jxd2763v1z1qxbmj";
+      rev = "a4c14eab6787b13ab14ef1c2fbb44a0383b9c9c2";
+      sha256 = "1485xpw2mg55sy9c2qpjym1f3l8xv4dmw4j7i0cbahlmpk3zgjhz";
     };
     meta.homepage = "https://github.com/mikavilpas/yazi.nvim/";
     meta.hydraPlatforms = [ ];
@@ -21141,12 +21141,12 @@ final: prev:
 
   zotcite = buildVimPlugin {
     pname = "zotcite";
-    version = "2025-02-20";
+    version = "2025-03-17";
     src = fetchFromGitHub {
       owner = "jalvesaq";
       repo = "zotcite";
-      rev = "618d44b2478defd1898d96cc8722cc9c39bd5d50";
-      sha256 = "1r1r4nyv6lnfaafmgq6ysdbj2bs5mvvmkb5b0h40f838jbp5aix8";
+      rev = "67d4bef627854c418dfae7ef121e8752e82d7440";
+      sha256 = "0f6x1x8bwl54i2294kxcqji6f5kigj4af13gqxgpyl3apmbqxqdm";
     };
     meta.homepage = "https://github.com/jalvesaq/zotcite/";
     meta.hydraPlatforms = [ ];
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index ffa18c0da167..9fd7bd9b7d3b 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -1161,9 +1161,9 @@ in
   };
 
   flutter-tools-nvim = super.flutter-tools-nvim.overrideAttrs {
+    # Optional dap integration
+    checkInputs = [ self.nvim-dap ];
     dependencies = [ self.plenary-nvim ];
-    # Optional nvim-dap module
-    nvimSkipModule = "flutter-tools.dap";
   };
 
   follow-md-links-nvim = super.follow-md-links-nvim.overrideAttrs {
@@ -2382,6 +2382,11 @@ in
     dependencies = [ self.nvim-treesitter ];
   };
 
+  nvim-highlight-colors = super.nvim-highlight-colors.overrideAttrs {
+    # Test module
+    nvimSkipModule = [ "nvim-highlight-colors.color.converters_spec" ];
+  };
+
   nvim-java = super.nvim-java.overrideAttrs {
     dependencies = with self; [
       lua-async

From 1461468a68619822bd16a77915b1285e6c9c8d44 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 20 Mar 2025 10:44:54 -0500
Subject: [PATCH 46/54] vimPlugins.nvim-treesitter: update grammars

---
 .../vim/plugins/nvim-treesitter/generated.nix | 108 +++++++++---------
 1 file changed, 54 insertions(+), 54 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
index 71d53fb3ab93..7d384b760c3d 100644
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
@@ -303,12 +303,12 @@
   };
   commonlisp = buildGrammar {
     language = "commonlisp";
-    version = "0.0.0+rev=bf2a65b";
+    version = "0.0.0+rev=3232350";
     src = fetchFromGitHub {
       owner = "theHamsta";
       repo = "tree-sitter-commonlisp";
-      rev = "bf2a65b1c119898a1a17389e07f2a399c05cdc0c";
-      hash = "sha256-dCrHrNfJoHfOt3sS2fUqbrw4snHMu+MoPumLYTGfoho=";
+      rev = "32323509b3d9fe96607d151c2da2c9009eb13a2f";
+      hash = "sha256-cNGxZXoxhnXGo4yhMHDSjF/j43JNXg1ClpqN2xJgLQU=";
     };
     meta.homepage = "https://github.com/theHamsta/tree-sitter-commonlisp";
   };
@@ -381,12 +381,12 @@
   };
   cuda = buildGrammar {
     language = "cuda";
-    version = "0.0.0+rev=757e0a6";
+    version = "0.0.0+rev=014628a";
     src = fetchFromGitHub {
       owner = "theHamsta";
       repo = "tree-sitter-cuda";
-      rev = "757e0a61f9d38b3d9eaa299e8d866e8283ffc284";
-      hash = "sha256-66tJ1GVAWKqXBCzBXUGdzG/Rl2vw/eJ6mQnWnnnpBcU=";
+      rev = "014628ae8d2df391b88ddb9fa0260fd97f770829";
+      hash = "sha256-zlG7/ERVZFLRBqu7q/wjcYG+iBlDY7s/SwKyqzIA0OM=";
     };
     meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda";
   };
@@ -535,12 +535,12 @@
   };
   dtd = buildGrammar {
     language = "dtd";
-    version = "0.0.0+rev=2128a0b";
+    version = "0.0.0+rev=0d9a809";
     src = fetchFromGitHub {
       owner = "tree-sitter-grammars";
       repo = "tree-sitter-xml";
-      rev = "2128a0b249263e238d88cb894dad00c3168fea37";
-      hash = "sha256-qGMRslGqMEZpTMHmmB0sOWNHzpOBJgVhX+oPnphLxUc=";
+      rev = "0d9a8099c963ed53e183425c1b47fa2622c8eaf7";
+      hash = "sha256-0kqCDLCxsvrqu5pKrDZDJt9lSlxU6fzM/CxrWb/oodw=";
     };
     location = "dtd";
     meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xml";
@@ -768,12 +768,12 @@
   };
   fortran = buildGrammar {
     language = "fortran";
-    version = "0.0.0+rev=21b7408";
+    version = "0.0.0+rev=64e1100";
     src = fetchFromGitHub {
       owner = "stadelmanma";
       repo = "tree-sitter-fortran";
-      rev = "21b740801794b6570a0380f8aef22bb67214ea65";
-      hash = "sha256-/PEl7Cl/SIbwEo88gFppPCBjBU/dfovN5J7PXNu7CBw=";
+      rev = "64e11001d7ef3e8ac18e55a3a2d811fe36430923";
+      hash = "sha256-6l+cfLVbs8geKIYhnfuZDac8uzmNHOZf2rFANdl4tDs=";
     };
     meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran";
   };
@@ -945,34 +945,34 @@
   };
   glimmer_javascript = buildGrammar {
     language = "glimmer_javascript";
-    version = "0.0.0+rev=7e8ea8c";
+    version = "0.0.0+rev=4801ac4";
     src = fetchFromGitHub {
       owner = "NullVoxPopuli";
       repo = "tree-sitter-glimmer-javascript";
-      rev = "7e8ea8cf39fc360cb97bd253442cd48e4f7a9ce3";
-      hash = "sha256-gqadIB5tB7aIOl3g6pxDeOsuENAwzb5RLVFn4d0G9MY=";
+      rev = "4801ac4d0a611502001035f45d1cba5cb57d272f";
+      hash = "sha256-wK8buxg2Yil6eS4u+m/iursdx9GHcj6CTCRz1nhdCNs=";
     };
     meta.homepage = "https://github.com/NullVoxPopuli/tree-sitter-glimmer-javascript";
   };
   glimmer_typescript = buildGrammar {
     language = "glimmer_typescript";
-    version = "0.0.0+rev=4006128";
+    version = "0.0.0+rev=c011b05";
     src = fetchFromGitHub {
       owner = "NullVoxPopuli";
       repo = "tree-sitter-glimmer-typescript";
-      rev = "4006128790efb58ca82a4492d8ef0983b260fc6a";
-      hash = "sha256-oOF36q09hcOCdFWrFQlhDX79tS9xBNVgcp1vmxjRdGM=";
+      rev = "c011b053626f27a0fe5cc99eeae4185399a572f9";
+      hash = "sha256-vRxR86NmIVv5iO1C5xb/n8k3qaILaUnnWne5Hnszgyk=";
     };
     meta.homepage = "https://github.com/NullVoxPopuli/tree-sitter-glimmer-typescript";
   };
   glsl = buildGrammar {
     language = "glsl";
-    version = "0.0.0+rev=66aec57";
+    version = "0.0.0+rev=24a6c8e";
     src = fetchFromGitHub {
       owner = "theHamsta";
       repo = "tree-sitter-glsl";
-      rev = "66aec57f7119c7e8e40665b723cd7af5594f15ee";
-      hash = "sha256-EO8p3BhoyemCXlWq4BI5Y1KqU04F9KpEwbn8HoZd4z4=";
+      rev = "24a6c8ef698e4480fecf8340d771fbcb5de8fbb4";
+      hash = "sha256-TjF79WH3bX4nueYr8CbPptkNb2lNkHQNB0VZoMB35Nk=";
     };
     meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl";
   };
@@ -1809,12 +1809,12 @@
   };
   meson = buildGrammar {
     language = "meson";
-    version = "0.0.0+rev=03fd221";
+    version = "0.0.0+rev=9c74e8e";
     src = fetchFromGitHub {
       owner = "Decodetalkers";
       repo = "tree-sitter-meson";
-      rev = "03fd2216bc52976c9b92ca64b5ec2e1f06408f7e";
-      hash = "sha256-EhpqSS0R8aCqUnmDHtmfwzyMZMsqkGC/6U3zJpjuVAc=";
+      rev = "9c74e8e8917b83d90e38ac040949079437ec0043";
+      hash = "sha256-uxJfDIsqTROc5YSZkVwr2zZEcpqt3IEdGVkzwp59gnI=";
     };
     meta.homepage = "https://github.com/Decodetalkers/tree-sitter-meson";
   };
@@ -1999,12 +1999,12 @@
   };
   ocamllex = buildGrammar {
     language = "ocamllex";
-    version = "0.0.0+rev=5da5bb7";
+    version = "0.0.0+rev=c5cf996";
     src = fetchFromGitHub {
       owner = "atom-ocaml";
       repo = "tree-sitter-ocamllex";
-      rev = "5da5bb7508ac9fd3317561670ef18c126a0fe2aa";
-      hash = "sha256-qfmIfcZ3zktYzuNNYP7Z6u6c7XoKsKD86MRMxe/qkpY=";
+      rev = "c5cf996c23e38a1537069fbe2d4bb83a75fc7b2f";
+      hash = "sha256-eDJRTLYKHcL7yAgFL8vZQh9zp5fBxcZRsWChp8y3Am0=";
     };
     generate = true;
     meta.homepage = "https://github.com/atom-ocaml/tree-sitter-ocamllex";
@@ -2156,12 +2156,12 @@
   };
   powershell = buildGrammar {
     language = "powershell";
-    version = "0.0.0+rev=e904962";
+    version = "0.0.0+rev=66d5e61";
     src = fetchFromGitHub {
       owner = "airbus-cert";
       repo = "tree-sitter-powershell";
-      rev = "e904962e25858b7e8e19c653e737ad3b7d1c55bd";
-      hash = "sha256-RlzGW09DE6gLM1G+y57gkEDPzMHc5Vi1jTHROUxMOt8=";
+      rev = "66d5e61126989c0aca57ff77d19b2064919b51e1";
+      hash = "sha256-M2vOS2UleHpZC8PbUf+PHxjWz4BMBhyVxcuUsuMx34Q=";
     };
     meta.homepage = "https://github.com/airbus-cert/tree-sitter-powershell";
   };
@@ -2357,12 +2357,12 @@
   };
   query = buildGrammar {
     language = "query";
-    version = "0.0.0+rev=0555ac0";
+    version = "0.0.0+rev=930202c";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "tree-sitter-query";
-      rev = "0555ac0da902abff06076e40501102cee3ba68bd";
-      hash = "sha256-2JxX4KntUP/DvoCik0NYzfrU/qzs43uDwy21JkU8Hjc=";
+      rev = "930202c2a80965a7a9ca018b5b2a08b25dfa7f12";
+      hash = "sha256-uXApakOZy9Gd/fl9C9qFZgptlT6rUlOmT6KW8sWP5Ag=";
     };
     meta.homepage = "https://github.com/nvim-treesitter/tree-sitter-query";
   };
@@ -2599,12 +2599,12 @@
   };
   scala = buildGrammar {
     language = "scala";
-    version = "0.0.0+rev=ed939ed";
+    version = "0.0.0+rev=041dea1";
     src = fetchFromGitHub {
       owner = "tree-sitter";
       repo = "tree-sitter-scala";
-      rev = "ed939ed550ebff7d4ad8aafb4d5aad44de69965d";
-      hash = "sha256-OR0GIC7bDOkUZZvbvd1XdyOdYnjUAXhbYnOhNddH8wU=";
+      rev = "041dea1ca8b25f20fa564854922ac6a99c050ec6";
+      hash = "sha256-hK4/FeB11H2x1c2rbYH2IoejgDSyrvlnObgeN3TVASU=";
     };
     meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala";
   };
@@ -2856,12 +2856,12 @@
   };
   superhtml = buildGrammar {
     language = "superhtml";
-    version = "0.0.0+rev=91d9284";
+    version = "0.0.0+rev=fc7c594";
     src = fetchFromGitHub {
       owner = "kristoff-it";
       repo = "superhtml";
-      rev = "91d92846e8baaafc8854d2b9d0ac436bc16234db";
-      hash = "sha256-vBquZJOfE4HBsUKIG3o/Wo9s6wMSJ8U77u7e8n2Gc0M=";
+      rev = "fc7c594f52528e4a4a08671137850143d55a5bf2";
+      hash = "sha256-SEaefbbQFd+Viks55eijUT3YHaEZJMvmZcXm3V6R05I=";
     };
     location = "tree-sitter-superhtml";
     meta.homepage = "https://github.com/kristoff-it/superhtml";
@@ -2901,12 +2901,12 @@
   };
   swift = buildGrammar {
     language = "swift";
-    version = "0.0.0+rev=02db52e";
+    version = "0.0.0+rev=6b1ebb8";
     src = fetchFromGitHub {
       owner = "alex-pinkus";
       repo = "tree-sitter-swift";
-      rev = "02db52e14bc303322d22019fff7823d72904dfe5";
-      hash = "sha256-Uh1YVc871KdYXeAhF/lRDv58NW/XdHqasfZw0jDUSBE=";
+      rev = "6b1ebb86c97fca00835e7fce4a95c5069172145e";
+      hash = "sha256-VR6GmMWueFa/4PXRtnTNWeI0N19vD1qd5XBM+e9HalM=";
     };
     generate = true;
     meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift";
@@ -3327,12 +3327,12 @@
   };
   vimdoc = buildGrammar {
     language = "vimdoc";
-    version = "0.0.0+rev=d2e4b5c";
+    version = "0.0.0+rev=2694c3d";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "tree-sitter-vimdoc";
-      rev = "d2e4b5c172a109966c2ce0378f73df6cede39400";
-      hash = "sha256-Vrl4/cZL+TWlUMEeWZoHCAWhvlefcl3ajGcwyTNKOhI=";
+      rev = "2694c3d27e2ca98a0ccde72f33887394300d524e";
+      hash = "sha256-DAHOhNqd9DQ9KNkJdjbUmSV6qhTOmPrIaC/7rBNCqzY=";
     };
     meta.homepage = "https://github.com/neovim/tree-sitter-vimdoc";
   };
@@ -3415,12 +3415,12 @@
   };
   xml = buildGrammar {
     language = "xml";
-    version = "0.0.0+rev=2128a0b";
+    version = "0.0.0+rev=0d9a809";
     src = fetchFromGitHub {
       owner = "tree-sitter-grammars";
       repo = "tree-sitter-xml";
-      rev = "2128a0b249263e238d88cb894dad00c3168fea37";
-      hash = "sha256-qGMRslGqMEZpTMHmmB0sOWNHzpOBJgVhX+oPnphLxUc=";
+      rev = "0d9a8099c963ed53e183425c1b47fa2622c8eaf7";
+      hash = "sha256-0kqCDLCxsvrqu5pKrDZDJt9lSlxU6fzM/CxrWb/oodw=";
     };
     location = "xml";
     meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xml";
@@ -3493,24 +3493,24 @@
   };
   ziggy = buildGrammar {
     language = "ziggy";
-    version = "0.0.0+rev=00958fa";
+    version = "0.0.0+rev=8a29017";
     src = fetchFromGitHub {
       owner = "kristoff-it";
       repo = "ziggy";
-      rev = "00958faeaeb97d9b7beb76f128a5401441182204";
-      hash = "sha256-G1Wo3Az5qQdSQU5OXE5GaahgXFjuj43o3UfmUXjjSF4=";
+      rev = "8a29017169f43dc2c3526817e98142eb9a335087";
+      hash = "sha256-w4qq/SBlRQw3r9iIZ2RY3infa/ysopOQX5QDS7+8kt8=";
     };
     location = "tree-sitter-ziggy";
     meta.homepage = "https://github.com/kristoff-it/ziggy";
   };
   ziggy_schema = buildGrammar {
     language = "ziggy_schema";
-    version = "0.0.0+rev=00958fa";
+    version = "0.0.0+rev=8a29017";
     src = fetchFromGitHub {
       owner = "kristoff-it";
       repo = "ziggy";
-      rev = "00958faeaeb97d9b7beb76f128a5401441182204";
-      hash = "sha256-G1Wo3Az5qQdSQU5OXE5GaahgXFjuj43o3UfmUXjjSF4=";
+      rev = "8a29017169f43dc2c3526817e98142eb9a335087";
+      hash = "sha256-w4qq/SBlRQw3r9iIZ2RY3infa/ysopOQX5QDS7+8kt8=";
     };
     location = "tree-sitter-ziggy-schema";
     meta.homepage = "https://github.com/kristoff-it/ziggy";

From cb30883c59bd46fe3f10c93ecdc7421ff8a6bf55 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 20 Mar 2025 11:51:53 +0100
Subject: [PATCH 47/54] ngn-k: remove unused argument

---
 pkgs/by-name/ng/ngn-k/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/ng/ngn-k/package.nix b/pkgs/by-name/ng/ngn-k/package.nix
index 4268f816f087..7ba248eb34ed 100644
--- a/pkgs/by-name/ng/ngn-k/package.nix
+++ b/pkgs/by-name/ng/ngn-k/package.nix
@@ -1,6 +1,5 @@
 { lib
 , stdenv
-, stdenvNoLibs
 , fetchFromGitea
 , runtimeShell
 }:

From 46a13b407fe3cba41b1f074749d903e02d595683 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Thu, 20 Mar 2025 12:07:44 -0400
Subject: [PATCH 48/54] OWNERS: set ZFS owners

We are not being notified for PRs to some of these files, presumably
because maintainers are specified in a non-standard way and we have
multiple versions.

See e.g.
https://github.com/NixOS/nixpkgs/pull/389010#issuecomment-2715134629
---
 ci/OWNERS | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ci/OWNERS b/ci/OWNERS
index ace82519d0d1..3b54070c55d9 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -399,6 +399,10 @@ pkgs/by-name/fo/forgejo/                @adamcstephens @bendlas @emilylange
 /pkgs/development/compilers/ocaml   @ulrikstrid
 /pkgs/development/ocaml-modules     @ulrikstrid
 
+# ZFS
+/nixos/tests/zfs.nix        @adamcstephens @amarshall
+/pkgs/os-specific/linux/zfs @adamcstephens @amarshall
+
 # Zig
 /pkgs/development/compilers/zig @figsoda @RossComputerGuy
 /doc/hooks/zig.section.md       @figsoda @RossComputerGuy

From b17c2972b4270aafa192b658019e7b3b307ad969 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 20 Mar 2025 17:23:17 +0100
Subject: [PATCH 49/54] typstyle: 0.13.0 -> 0.13.1

Diff: https://github.com/Enter-tainer/typstyle/compare/refs/tags/v0.13.0...v0.13.1

Changelog: https://github.com/Enter-tainer/typstyle/blob/v0.13.1/CHANGELOG.md
---
 pkgs/by-name/ty/typstyle/package.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ty/typstyle/package.nix b/pkgs/by-name/ty/typstyle/package.nix
index 4419a621f759..7714a10691f3 100644
--- a/pkgs/by-name/ty/typstyle/package.nix
+++ b/pkgs/by-name/ty/typstyle/package.nix
@@ -6,19 +6,19 @@
   versionCheckHook,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "typstyle";
-  version = "0.13.0";
+  version = "0.13.1";
 
   src = fetchFromGitHub {
     owner = "Enter-tainer";
     repo = "typstyle";
-    tag = "v${version}";
-    hash = "sha256-lrGqNc9SJ6TlTTqiwzVWrHndY/oxY8t3mOfGBMF7vac=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-dYhdrxyyndGhJID0WKwvW6KFQ3ubC917UG9rhDnrAfM=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-V79jKheEms0CBTzt9h7+9/+F+TXSTlp8NGXe5OeFCX4=";
+  cargoHash = "sha256-Eb+qN7hBECESlTElN0uQtOg4uyuaWQw3ikFb8po+ubQ=";
 
   # Disabling tests requiring network access
   checkFlags = [
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = [ "--version" ];
+  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
@@ -36,11 +36,11 @@ rustPlatform.buildRustPackage rec {
   };
 
   meta = {
-    changelog = "https://github.com/Enter-tainer/typstyle/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/Enter-tainer/typstyle/blob/v${finalAttrs.version}/CHANGELOG.md";
     description = "Format your typst source code";
     homepage = "https://github.com/Enter-tainer/typstyle";
     license = lib.licenses.asl20;
     mainProgram = "typstyle";
     maintainers = with lib.maintainers; [ drupol ];
   };
-}
+})

From 9c024b01aeb718e103521cca457a74f8191a54d5 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 20 Mar 2025 19:29:33 +0300
Subject: [PATCH 50/54] mesa: 25.0.1 -> 25.0.2

Diff: https://gitlab.freedesktop.org/mesa/mesa/-/compare/mesa-25.0.1...mesa-25.0.2

Changelog: https://docs.mesa3d.org/relnotes/25.0.2.html
---
 pkgs/development/libraries/mesa/common.nix  | 4 ++--
 pkgs/development/libraries/mesa/default.nix | 7 -------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix
index 23e5104ffcf6..eed15cbcbc93 100644
--- a/pkgs/development/libraries/mesa/common.nix
+++ b/pkgs/development/libraries/mesa/common.nix
@@ -5,14 +5,14 @@
 # nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa
 rec {
   pname = "mesa";
-  version = "25.0.1";
+  version = "25.0.2";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "mesa";
     repo = "mesa";
     rev = "mesa-${version}";
-    hash = "sha256-9D4d7EEdZysvXDRcmpbyt85Lo64sldNRomp6/HUVORo=";
+    hash = "sha256-NW2Xntdpt4Iec3z0E8j+omNRH/46IMYNuyD2MIFMs2M=";
   };
 
   meta = {
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 1e2d92f1b7f6..c636a32cf13f 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -6,7 +6,6 @@
 , expat
 , fetchCrate
 , fetchFromGitLab
-, fetchpatch
 , file
 , flex
 , glslang
@@ -142,12 +141,6 @@ in stdenv.mkDerivation {
   patches = [
     ./opencl.patch
     ./system-gbm.patch
-    # Fix graphical corruption in FFXIV
-    # Remove when updating to 25.0.2
-    (fetchpatch {
-      url = "https://gitlab.freedesktop.org/mesa/mesa/-/commit/0ec174afd56fe48bcfa071d4b8ed704106f46f91.patch";
-      hash = "sha256-6A9AkCa+DeUO683hlsNTvSWGFJJ+zfqYA2BThaqCEoU=";
-    })
   ];
 
   postPatch = ''

From b2ec32b3c3fcfdfbf6c96d039d92aa60a677b4d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillaume=20Cl=C3=A9roux?=
 <73357644+gcleroux@users.noreply.github.com>
Date: Thu, 20 Mar 2025 13:06:47 -0400
Subject: [PATCH 51/54] river: 0.3.7 -> 0.3.9

https://codeberg.org/river/river/releases/tag/v0.3.9
---
 pkgs/by-name/ri/river/build.zig.zon.nix | 72 ++++++++++++-------------
 pkgs/by-name/ri/river/package.nix       | 10 ++--
 2 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/pkgs/by-name/ri/river/build.zig.zon.nix b/pkgs/by-name/ri/river/build.zig.zon.nix
index 38529cfe603b..99979073f69d 100644
--- a/pkgs/by-name/ri/river/build.zig.zon.nix
+++ b/pkgs/by-name/ri/river/build.zig.zon.nix
@@ -16,15 +16,11 @@ with lib;
 let
   unpackZigArtifact =
     { name, artifact }:
-    runCommandLocal name
-      {
-        nativeBuildInputs = [ zig ];
-      }
-      ''
-        hash="$(zig fetch --global-cache-dir "$TMPDIR" ${artifact})"
-        mv "$TMPDIR/p/$hash" "$out"
-        chmod 755 "$out"
-      '';
+    runCommandLocal name { nativeBuildInputs = [ zig ]; } ''
+      hash="$(zig fetch --global-cache-dir "$TMPDIR" ${artifact})"
+      mv "$TMPDIR/p/$hash" "$out"
+      chmod 755 "$out"
+    '';
 
   fetchZig =
     {
@@ -42,13 +38,12 @@ let
       name,
       url,
       hash,
+      rev ? throw "rev is required, remove and regenerate the zon2json-lock file",
     }:
     let
       parts = splitString "#" url;
       url_base = elemAt parts 0;
       url_without_query = elemAt (splitString "?" url_base) 0;
-      rev_base = elemAt parts 1;
-      rev = if match "^[a-fA-F0-9]{40}$" rev_base != null then rev_base else "refs/heads/${rev_base}";
     in
     fetchgit {
       inherit name rev hash;
@@ -61,20 +56,25 @@ let
       name,
       url,
       hash,
-    }:
+      ...
+    }@args:
     let
       parts = splitString "://" url;
       proto = elemAt parts 0;
       path = elemAt parts 1;
       fetcher = {
-        "git+http" = fetchGitZig {
-          inherit name hash;
-          url = "http://${path}";
-        };
-        "git+https" = fetchGitZig {
-          inherit name hash;
-          url = "https://${path}";
-        };
+        "git+http" = fetchGitZig (
+          args
+          // {
+            url = "http://${path}";
+          }
+        );
+        "git+https" = fetchGitZig (
+          args
+          // {
+            url = "https://${path}";
+          }
+        );
         http = fetchZig {
           inherit name hash;
           url = "http://${path}";
@@ -89,35 +89,35 @@ let
 in
 linkFarm name [
   {
-    name = "12209db20ce873af176138b76632931def33a10539387cba745db72933c43d274d56";
+    name = "pixman-0.3.0-LClMnz2VAAAs7QSCGwLimV5VUYx0JFnX5xWU6HwtMuDX";
     path = fetchZigArtifact {
-      name = "zig-pixman";
-      url = "https://codeberg.org/ifreund/zig-pixman/archive/v0.2.0.tar.gz";
-      hash = "sha256-CYgFIOR9H5q8UUpFglaixOocCMT6FGpcKQQBUVWpDKQ=";
+      name = "pixman";
+      url = "https://codeberg.org/ifreund/zig-pixman/archive/v0.3.0.tar.gz";
+      hash = "sha256-zX/jQV1NWGhalP3t0wjpmUo38BKCiUDPtgNGHefyxq0=";
     };
   }
   {
-    name = "1220687c8c47a48ba285d26a05600f8700d37fc637e223ced3aa8324f3650bf52242";
+    name = "wayland-0.3.0-lQa1kjPIAQDmhGYpY-zxiRzQJFHQ2VqhJkQLbKKdt5wl";
     path = fetchZigArtifact {
-      name = "zig-wayland";
-      url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.2.0.tar.gz";
-      hash = "sha256-gxzkHLCq2NqX3l4nEly92ARU5dqP1SqnjpGMDgx4TXA=";
+      name = "wayland";
+      url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.3.0.tar.gz";
+      hash = "sha256-xU8IrETSFOKKQQMgwVyRKLwGaek4USaKXg49S9oHSTQ=";
     };
   }
   {
-    name = "122083317b028705b5d27be12976feebf17066a4e51802b3b5e9f970bec580e433e1";
+    name = "wlroots-0.18.2-jmOlchnIAwBq45_cxU1V3OWErxxJjQZlc9PyJfR-l3uk";
     path = fetchZigArtifact {
-      name = "zig-wlroots";
-      url = "https://codeberg.org/ifreund/zig-wlroots/archive/v0.18.1.tar.gz";
-      hash = "sha256-S77/Own9/GjhLCCE/eI56pdpmhlvMVP41WZ27b+Sook=";
+      name = "wlroots";
+      url = "https://codeberg.org/ifreund/zig-wlroots/archive/v0.18.2.tar.gz";
+      hash = "sha256-4/MGFCCgMeN6+oCaj0Z5dsbVo3s88oYk1+q0mMXrj8I=";
     };
   }
   {
-    name = "1220c90b2228d65fd8427a837d31b0add83e9fade1dcfa539bb56fd06f1f8461605f";
+    name = "xkbcommon-0.3.0-VDqIe3K9AQB2fG5ZeRcMC9i7kfrp5m2rWgLrmdNn9azr";
     path = fetchZigArtifact {
-      name = "zig-xkbcommon";
-      url = "https://codeberg.org/ifreund/zig-xkbcommon/archive/v0.2.0.tar.gz";
-      hash = "sha256-f5oEJU5i2qeVN3GBrnQcqzEJCiOT7l4ak7GQ6gw5cH0=";
+      name = "xkbcommon";
+      url = "https://codeberg.org/ifreund/zig-xkbcommon/archive/v0.3.0.tar.gz";
+      hash = "sha256-HhhUI+ayPtlylhTmZ1GrdSLbRIffTg3MeisGN1qs2iM=";
     };
   }
 ]
diff --git a/pkgs/by-name/ri/river/package.nix b/pkgs/by-name/ri/river/package.nix
index fb24693c0b45..22272a9cc550 100644
--- a/pkgs/by-name/ri/river/package.nix
+++ b/pkgs/by-name/ri/river/package.nix
@@ -17,14 +17,14 @@
   wayland-scanner,
   wlroots_0_18,
   xwayland,
-  zig_0_13,
+  zig_0_14,
   withManpages ? true,
   xwaylandSupport ? true,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "river";
-  version = "0.3.7";
+  version = "0.3.9";
 
   outputs = [ "out" ] ++ lib.optionals withManpages [ "man" ];
 
@@ -34,18 +34,18 @@ stdenv.mkDerivation (finalAttrs: {
     repo = "river";
     rev = "refs/tags/v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-4ac0LGQtLldHyXJ2GIRMHV+VZfUrRFdBYLiAHX5lWcw=";
+    hash = "sha256-g6qjSkvcA2Ud4W+/NVzYZjiWoWkAuKvuD20KlO/zGhE=";
   };
 
   deps = callPackage ./build.zig.zon.nix {
-    zig = zig_0_13;
+    zig = zig_0_14;
   };
 
   nativeBuildInputs = [
     pkg-config
     wayland-scanner
     xwayland
-    zig_0_13.hook
+    zig_0_14.hook
   ] ++ lib.optional withManpages scdoc;
 
   buildInputs = [

From f8e07853eaaef6f0ff64baf8bbe7b21806560361 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Thu, 20 Mar 2025 14:46:34 +0000
Subject: [PATCH 52/54] vimPlugins.kitty-scrollback-nvim: init at 2025-03-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 76b1ecbdd148..c0e8acb32c49 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -6453,6 +6453,19 @@ final: prev:
     meta.hydraPlatforms = [ ];
   };
 
+  kitty-scrollback-nvim = buildVimPlugin {
+    pname = "kitty-scrollback.nvim";
+    version = "2025-03-20";
+    src = fetchFromGitHub {
+      owner = "mikesmithgh";
+      repo = "kitty-scrollback.nvim";
+      rev = "9b70b5f73b653745ddca4a8e49b9477fc33b817f";
+      sha256 = "0570ng60dzwdbbq76vpkdrww6jnm15vbcyy79885fvb0sjwcpf1a";
+    };
+    meta.homepage = "https://github.com/mikesmithgh/kitty-scrollback.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
   kmonad-vim = buildVimPlugin {
     pname = "kmonad-vim";
     version = "2022-03-20";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index cb5f07e43aa3..8079b2b5e95a 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -494,6 +494,7 @@ https://github.com/GCBallesteros/jupytext.nvim/,HEAD,
 https://github.com/rebelot/kanagawa.nvim/,,
 https://github.com/imsnif/kdl.vim/,HEAD,
 https://github.com/anuvyklack/keymap-layer.nvim/,HEAD,
+https://github.com/mikesmithgh/kitty-scrollback.nvim/,HEAD,
 https://github.com/kmonad/kmonad-vim/,,
 https://github.com/frabjous/knap/,HEAD,
 https://github.com/b3nj5m1n/kommentary/,,

From d55697c370be5210541961c3f1a2e135cb693abc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 21 Mar 2025 03:33:14 +1000
Subject: [PATCH 53/54] melonDS: 1.0rc-unstable-2025-02-21 ->
 1.0rc-unstable-2025-03-09 (#391198)

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

diff --git a/pkgs/by-name/me/melonDS/package.nix b/pkgs/by-name/me/melonDS/package.nix
index 94db2dd0f64a..8c8159dec617 100644
--- a/pkgs/by-name/me/melonDS/package.nix
+++ b/pkgs/by-name/me/melonDS/package.nix
@@ -27,13 +27,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "melonDS";
-  version = "1.0rc-unstable-2025-02-21";
+  version = "1.0rc-unstable-2025-03-09";
 
   src = fetchFromGitHub {
     owner = "melonDS-emu";
     repo = "melonDS";
-    rev = "63b468927e1c744e21057ccb4c5677f52502b442";
-    hash = "sha256-LylUfcgYC3CZTycfq/qqEAZ4ajrj90bUSXAkA9SbMqE=";
+    rev = "0fcf1f6e3a443cb249f85d948ff6e58dc58501d6";
+    hash = "sha256-llRmW596UHs/q/DjqG8qQ1RqjvmGMsOO1IUkpjPW4h4=";
   };
 
   nativeBuildInputs = [

From dd45b0fd9e1df3565f4e14daf0e8cd9eb16fcb9a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 20 Mar 2025 12:38:01 +0000
Subject: [PATCH 54/54] gdmap: 1.2.0 -> 1.3.1

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

diff --git a/pkgs/by-name/gd/gdmap/package.nix b/pkgs/by-name/gd/gdmap/package.nix
index 8e64fad0d086..0704b6ae8dc9 100644
--- a/pkgs/by-name/gd/gdmap/package.nix
+++ b/pkgs/by-name/gd/gdmap/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation {
   pname = "gdmap";
-  version = "1.2.0";
+  version = "1.3.1";
 
   src = fetchFromGitLab {
     owner = "sjohannes";
     repo = "gdmap";
-    tag = "v1.2.0";
-    sha256 = "1p96pps4yflj6a42g61pcqpllx7vcjlh417kwjy0b4mqp16vmrzr";
+    tag = "v1.3.1";
+    sha256 = "sha256-dgZ+EDk7O+nuqrBsTPVW7BHufvkqLnWbXrIOOn7YlW4=";
   };
 
   nativeBuildInputs = [