From 970afe19fabcda832109efd4dd693a9f7c935c2a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 17 Feb 2025 09:53:25 +0000
Subject: [PATCH 001/108] jdk11: 11.0.25+9 -> 11.0.26+4

---
 pkgs/development/compilers/openjdk/11/source.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/11/source.json b/pkgs/development/compilers/openjdk/11/source.json
index 68080694d667..f9a8b2d90a4b 100644
--- a/pkgs/development/compilers/openjdk/11/source.json
+++ b/pkgs/development/compilers/openjdk/11/source.json
@@ -1,6 +1,6 @@
 {
-  "hash": "sha256-HqFm4qESB5T4Y1FLgfHZxURi7l7NkLzx2w8GzmB1jSY=",
+  "hash": "sha256-7yeyr2UbMntuOtEjRLdLoiyN0zC+fZZSGL9XxI2D7GU=",
   "owner": "openjdk",
   "repo": "jdk11u",
-  "rev": "refs/tags/jdk-11.0.25+9"
+  "rev": "refs/tags/jdk-11.0.26+4"
 }

From 532bb82d5aa84c847ba5e40a8fa7e45ae3ae6f69 Mon Sep 17 00:00:00 2001
From: Rhys-T <108157737+Rhys-T@users.noreply.github.com>
Date: Wed, 26 Feb 2025 14:54:07 -0500
Subject: [PATCH 002/108] picolisp: fix darwin build

Also use the default `buildPhase` to let `makeFlags` etc. work, and
change the deprecated `substituteInPlace --replace` to `--replace-fail`.
---
 pkgs/by-name/pi/picolisp/package.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/pi/picolisp/package.nix b/pkgs/by-name/pi/picolisp/package.nix
index d211fd3afcb6..237649250e24 100644
--- a/pkgs/by-name/pi/picolisp/package.nix
+++ b/pkgs/by-name/pi/picolisp/package.nix
@@ -29,10 +29,16 @@ stdenv.mkDerivation {
     readline
   ];
   sourceRoot = ''pil21'';
-  buildPhase = ''
-    cd src
-    make
-  '';
+  preBuild =
+    ''
+      cd src
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      # Flags taken from instructions at: https://picolisp.com/wiki/?alternativeMacOSRepository
+      makeFlagsArray+=(
+        SHARED='-dynamiclib -undefined dynamic_lookup'
+      )
+    '';
 
   installPhase = ''
     cd ..
@@ -42,7 +48,7 @@ stdenv.mkDerivation {
     ln -s "$out/lib/picolisp/bin/pil" "$out/bin/pil"
     ln -s "$out/lib/picolisp/man/man1/pil.1" "$out/man/pil.1"
     ln -s "$out/lib/picolisp/man/man1/picolisp.1" "$out/man/picolisp.1"
-    substituteInPlace $out/bin/pil --replace /usr $out
+    substituteInPlace $out/bin/pil --replace-fail /usr $out
   '';
 
   meta = with lib; {

From cc3258675b6dd9a4cb2008195824243565aa9ea7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Mar 2025 01:35:07 +0000
Subject: [PATCH 003/108] ghdl: 4.1.0 -> 5.0.1

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

diff --git a/pkgs/by-name/gh/ghdl/package.nix b/pkgs/by-name/gh/ghdl/package.nix
index 32bed81d06bb..10fc7f1cf713 100644
--- a/pkgs/by-name/gh/ghdl/package.nix
+++ b/pkgs/by-name/gh/ghdl/package.nix
@@ -21,13 +21,13 @@ assert backend == "mcode" || backend == "llvm" || backend == "gcc";
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ghdl-${backend}";
-  version = "4.1.0";
+  version = "5.0.1";
 
   src = fetchFromGitHub {
     owner = "ghdl";
     repo = "ghdl";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-tPSHer3qdtEZoPh9BsEyuTOrXgyENFUyJqnUS3UYAvM=";
+    hash = "sha256-v3wl+tn92Bks0VnW80Q1KwHwUtUxlbeMSI3WWvgDky4=";
   };
 
   LIBRARY_PATH = "${stdenv.cc.libc}/lib";

From e4ad8c2a71df14fd6a4ad5e4f4179b88da057348 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 10 Mar 2025 10:18:15 +0100
Subject: [PATCH 004/108] wpscan: 3.8.27 -> 3.8.28

---
 pkgs/tools/security/wpscan/Gemfile.lock |  49 +++++++-----
 pkgs/tools/security/wpscan/gemset.nix   | 102 ++++++++++++++++--------
 2 files changed, 97 insertions(+), 54 deletions(-)

diff --git a/pkgs/tools/security/wpscan/Gemfile.lock b/pkgs/tools/security/wpscan/Gemfile.lock
index e7161e433970..e67bb515a23c 100644
--- a/pkgs/tools/security/wpscan/Gemfile.lock
+++ b/pkgs/tools/security/wpscan/Gemfile.lock
@@ -1,8 +1,9 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.2.1)
+    activesupport (8.0.1)
       base64
+      benchmark (>= 0.3)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
@@ -12,53 +13,59 @@ GEM
       minitest (>= 5.1)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     base64 (0.2.0)
-    bigdecimal (3.1.8)
-    cms_scanner (0.14.3)
+    benchmark (0.4.0)
+    bigdecimal (3.1.9)
+    cms_scanner (0.15.0)
       ethon (>= 0.14, < 0.17)
-      get_process_mem (~> 0.2.5)
+      get_process_mem (>= 0.2.5, < 1.1.0)
       nokogiri (~> 1.16)
-      opt_parse_validator (~> 1.10.0)
+      opt_parse_validator (~> 1.10.1)
       public_suffix (>= 4.0.3, < 6.1)
       ruby-progressbar (>= 1.10, < 1.14)
       sys-proctable (>= 1.2.2, < 1.4.0)
       typhoeus (>= 1.3, < 1.5)
       xmlrpc (~> 0.3)
       yajl-ruby (~> 1.4.1)
-    concurrent-ruby (1.3.4)
-    connection_pool (2.4.1)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.0)
     drb (2.2.1)
     ethon (0.16.0)
       ffi (>= 1.15.0)
-    ffi (1.17.0)
-    get_process_mem (0.2.7)
+    ffi (1.17.1)
+    get_process_mem (1.0.0)
+      bigdecimal (>= 2.0)
       ffi (~> 1.0)
-    i18n (1.14.6)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    logger (1.6.1)
-    mini_portile2 (2.8.7)
-    minitest (5.25.1)
-    nokogiri (1.16.7)
+    logger (1.6.6)
+    mini_portile2 (2.8.8)
+    minitest (5.25.4)
+    nokogiri (1.18.3)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    opt_parse_validator (1.10.0)
-      activesupport (>= 5.2, < 7.3.0)
+    opt_parse_validator (1.10.1)
+      activesupport (>= 5.2, < 8.1.0)
       addressable (>= 2.5, < 2.9)
+      ostruct (~> 0.6)
+    ostruct (0.6.1)
     public_suffix (6.0.1)
     racc (1.8.1)
     ruby-progressbar (1.13.0)
-    securerandom (0.3.1)
+    securerandom (0.4.1)
     sys-proctable (1.3.0)
       ffi (~> 1.1)
     typhoeus (1.4.1)
       ethon (>= 0.9.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    webrick (1.8.2)
-    wpscan (3.8.27)
-      cms_scanner (~> 0.14.3)
+    uri (1.0.3)
+    webrick (1.9.1)
+    wpscan (3.8.28)
+      cms_scanner (~> 0.15.0)
     xmlrpc (0.3.3)
       webrick
     yajl-ruby (1.4.3)
@@ -70,4 +77,4 @@ DEPENDENCIES
   wpscan
 
 BUNDLED WITH
-   2.5.16
+   2.5.22
diff --git a/pkgs/tools/security/wpscan/gemset.nix b/pkgs/tools/security/wpscan/gemset.nix
index 8fc1e9032d77..d48750a39314 100644
--- a/pkgs/tools/security/wpscan/gemset.nix
+++ b/pkgs/tools/security/wpscan/gemset.nix
@@ -2,6 +2,7 @@
   activesupport = {
     dependencies = [
       "base64"
+      "benchmark"
       "bigdecimal"
       "concurrent-ruby"
       "connection_pool"
@@ -11,15 +12,16 @@
       "minitest"
       "securerandom"
       "tzinfo"
+      "uri"
     ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "094cv9kxa8hwlsw3c0njkvvayd0wszcz9b6xywv4yajrg83zlmvm";
+      sha256 = "0drfj44a16r86clrrqz3vqmg93qri6bqghjm21ac6jn2853cfnzx";
       type = "gem";
     };
-    version = "7.2.1";
+    version = "8.0.1";
   };
   addressable = {
     dependencies = [ "public_suffix" ];
@@ -42,15 +44,25 @@
     };
     version = "0.2.0";
   };
+  benchmark = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0jl71qcgamm96dzyqk695j24qszhcc7liw74qc83fpjljp2gh4hg";
+      type = "gem";
+    };
+    version = "0.4.0";
+  };
   bigdecimal = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558";
+      sha256 = "1k6qzammv9r6b2cw3siasaik18i6wjc5m0gw5nfdc6jj64h79z1g";
       type = "gem";
     };
-    version = "3.1.8";
+    version = "3.1.9";
   };
   cms_scanner = {
     dependencies = [
@@ -69,30 +81,30 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1bkmxxxz0q8brfivm7li1hmk2yrdl8wpi25qi4c2rhzfk361ass3";
+      sha256 = "1bcsb0ifl31zh3mli8kgxxk1ii76cxcp414g4blwy4zh2732y84m";
       type = "gem";
     };
-    version = "0.14.3";
+    version = "0.15.0";
   };
   concurrent-ruby = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl";
+      sha256 = "1ipbrgvf0pp6zxdk5ascp6i29aybz2bx9wdrlchjmpx6mhvkwfw1";
       type = "gem";
     };
-    version = "1.3.4";
+    version = "1.3.5";
   };
   connection_pool = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1x32mcpm2cl5492kd6lbjbaf17qsssmpx9kdyr7z1wcif2cwyh0g";
+      sha256 = "1z7bag6zb2vwi7wp2bkdkmk7swkj6zfnbsnc949qq0wfsgw94fr3";
       type = "gem";
     };
-    version = "2.4.1";
+    version = "2.5.0";
   };
   drb = {
     groups = [ "default" ];
@@ -120,21 +132,24 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi";
+      sha256 = "0fgwn1grxf4zxmyqmb9i4z2hr111585n9jnk17y6y7hhs7dv1xi6";
       type = "gem";
     };
-    version = "1.17.0";
+    version = "1.17.1";
   };
   get_process_mem = {
-    dependencies = [ "ffi" ];
+    dependencies = [
+      "bigdecimal"
+      "ffi"
+    ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1fkyyyxjcx4iigm8vhraa629k2lxa1npsv4015y82snx84v3rzaa";
+      sha256 = "1amlw0v8mal01k0c8n6i5x7a8fxw44myqm81dr6nlxxzpkrj8h6m";
       type = "gem";
     };
-    version = "0.2.7";
+    version = "1.0.0";
   };
   i18n = {
     dependencies = [ "concurrent-ruby" ];
@@ -142,40 +157,40 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0k31wcgnvcvd14snz0pfqj976zv6drfsnq6x8acz10fiyms9l8nw";
+      sha256 = "03sx3ahz1v5kbqjwxj48msw3maplpp2iyzs22l4jrzrqh4zmgfnf";
       type = "gem";
     };
-    version = "1.14.6";
+    version = "1.14.7";
   };
   logger = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s";
+      sha256 = "05s008w9vy7is3njblmavrbdzyrwwc1fsziffdr58w9pwqj8sqfx";
       type = "gem";
     };
-    version = "1.6.1";
+    version = "1.6.6";
   };
   mini_portile2 = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1q1f2sdw3y3y9mnym9dhjgsjr72sq975cfg5c4yx7gwv8nmzbvhk";
+      sha256 = "0x8asxl83msn815lwmb2d7q5p29p7drhjv5va0byhk60v9n16iwf";
       type = "gem";
     };
-    version = "2.8.7";
+    version = "2.8.8";
   };
   minitest = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1n1akmc6bibkbxkzm1p1wmfb4n9vv397knkgz0ffykb3h1d7kdix";
+      sha256 = "0izrg03wn2yj3gd76ck7ifbm9h2kgy8kpg4fk06ckpy4bbicmwlw";
       type = "gem";
     };
-    version = "5.25.1";
+    version = "5.25.4";
   };
   nokogiri = {
     dependencies = [
@@ -186,24 +201,35 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "15gysw8rassqgdq3kwgl4mhqmrgh7nk2qvrcqp4ijyqazgywn6gq";
+      sha256 = "0npx535cs8qc33n0lpbbwl0p9fi3a5bczn6ayqhxvknh9yqw77vb";
       type = "gem";
     };
-    version = "1.16.7";
+    version = "1.18.3";
   };
   opt_parse_validator = {
     dependencies = [
       "activesupport"
       "addressable"
+      "ostruct"
     ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0x2pn1c8h5sn3j5x05n2l1wnd56vp28jzg8pap1dj7ddmhlv12p4";
+      sha256 = "1ffvp04wyzxjkarzg5nbq2hqgdnw77drmb56dhgzmb2wrjpw52sk";
       type = "gem";
     };
-    version = "1.10.0";
+    version = "1.10.1";
+  };
+  ostruct = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "05xqijcf80sza5pnlp1c8whdaay8x5dc13214ngh790zrizgp8q9";
+      type = "gem";
+    };
+    version = "0.6.1";
   };
   public_suffix = {
     groups = [ "default" ];
@@ -240,10 +266,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1phv6kh417vkanhssbjr960c0gfqvf8z7d3d9fd2yvd41q64bw4q";
+      sha256 = "1cd0iriqfsf1z91qg271sm88xjnfd92b832z49p1nd542ka96lfc";
       type = "gem";
     };
-    version = "0.3.1";
+    version = "0.4.1";
   };
   sys-proctable = {
     dependencies = [ "ffi" ];
@@ -278,15 +304,25 @@
     };
     version = "2.0.6";
   };
+  uri = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "04bhfvc25b07jaiaf62yrach7khhr5jlr5bx6nygg8pf11329wp9";
+      type = "gem";
+    };
+    version = "1.0.3";
+  };
   webrick = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "089gy5494j560b242vi173wnbj2913hwlwnjkpzld58r96ilc5s3";
+      sha256 = "12d9n8hll67j737ym2zw4v23cn4vxyfkb6vyv1rzpwv6y6a3qbdl";
       type = "gem";
     };
-    version = "1.8.2";
+    version = "1.9.1";
   };
   wpscan = {
     dependencies = [ "cms_scanner" ];
@@ -294,10 +330,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "14d2kp01fnbm88ny6wvzr1v8za2mv4wvx8k0iz8cb5z15nlldk78";
+      sha256 = "0m7blxgyamk09zk5b6q6drbqwdnirgfj1r8mm6gmff8qri3cwxnh";
       type = "gem";
     };
-    version = "3.8.27";
+    version = "3.8.28";
   };
   xmlrpc = {
     dependencies = [ "webrick" ];

From 5db3f8fa4fafd6f21c2e36afceac78719f319a9b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 13 Mar 2025 14:40:51 +0000
Subject: [PATCH 005/108] gnomeExtensions.pop-shell: 1.2.0-unstable-2025-02-20
 -> 1.2.0-unstable-2025-03-10

---
 pkgs/desktops/gnome/extensions/pop-shell/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome/extensions/pop-shell/default.nix b/pkgs/desktops/gnome/extensions/pop-shell/default.nix
index aa932eb719b8..e3e43002f35c 100644
--- a/pkgs/desktops/gnome/extensions/pop-shell/default.nix
+++ b/pkgs/desktops/gnome/extensions/pop-shell/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-pop-shell";
-  version = "1.2.0-unstable-2025-02-20";
+  version = "1.2.0-unstable-2025-03-10";
 
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "shell";
-    rev = "29869118d1b89e5fa2ee97d11f36f20343ecba4c";
-    hash = "sha256-I1DegY+vG/Yt6jE0cjH3lrzeLsS5Ce43p/zWE+5yYJo=";
+    rev = "b3fc4253dc29b30fb52ac5eef5d3af643a46d18c";
+    hash = "sha256-EMX1AREpOO3DgxV/EbF2hP5JLggzlgFu1gsbhF3W1os=";
   };
 
   nativeBuildInputs = [

From 028efd9234d3c5d4bef64d554c981f02e72f7639 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 14 Mar 2025 21:13:59 +0000
Subject: [PATCH 006/108] python312Packages.smart-open: 7.1.0 -> 7.2.0

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

diff --git a/pkgs/development/python-modules/smart-open/default.nix b/pkgs/development/python-modules/smart-open/default.nix
index 14ab3f7d467b..475835eb6948 100644
--- a/pkgs/development/python-modules/smart-open/default.nix
+++ b/pkgs/development/python-modules/smart-open/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "smart-open";
-  version = "7.1.0";
+  version = "7.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "RaRe-Technologies";
     repo = "smart_open";
     tag = "v${version}";
-    hash = "sha256-ANbM0bKmkK25WCKxV7KHlPjzfTAY7dP67mmahRwtXI8=";
+    hash = "sha256-/16Is90235scTAYUW/65QxcTddD0+aiG5TLzYsBUE1A=";
   };
 
   build-system = [ setuptools ];

From 2c21aa9551687de397694879af02a11580e7ad46 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 17 Mar 2025 10:40:42 +0000
Subject: [PATCH 007/108] libretro.pcsx2: 0-unstable-2025-01-12 ->
 0-unstable-2025-03-15

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

diff --git a/pkgs/applications/emulators/libretro/cores/pcsx2.nix b/pkgs/applications/emulators/libretro/cores/pcsx2.nix
index 489048c4a249..fbec108e92a7 100644
--- a/pkgs/applications/emulators/libretro/cores/pcsx2.nix
+++ b/pkgs/applications/emulators/libretro/cores/pcsx2.nix
@@ -11,13 +11,13 @@
 }:
 mkLibretroCore {
   core = "pcsx2";
-  version = "0-unstable-2025-01-12";
+  version = "0-unstable-2025-03-15";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "ps2";
-    rev = "3fda2d1bb58564e2c814289036a7e4b10bf53357";
-    hash = "sha256-06cbF/Mhq2Gf87EQBiptHzqayOm0BA1c2dx6fu795RI=";
+    rev = "6cc162de2162a0ffe92a4e0470141b9c7c095bf3";
+    hash = "sha256-hzM4nt7Cp7l2fLtG60YmqVchuFskqVDyaZPHIO0E6Ws=";
     fetchSubmodules = true;
   };
 

From 01170a87627d60cba20c689edf8f474a147719b2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 17 Mar 2025 11:00:20 +0000
Subject: [PATCH 008/108] libretro.nestopia: 0-unstable-2025-02-22 ->
 0-unstable-2025-03-16

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

diff --git a/pkgs/applications/emulators/libretro/cores/nestopia.nix b/pkgs/applications/emulators/libretro/cores/nestopia.nix
index a9ee83800e62..43a3483f2850 100644
--- a/pkgs/applications/emulators/libretro/cores/nestopia.nix
+++ b/pkgs/applications/emulators/libretro/cores/nestopia.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "nestopia";
-  version = "0-unstable-2025-02-22";
+  version = "0-unstable-2025-03-16";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "nestopia";
-    rev = "72003d06eb9fbc2191f5a7a874abc039bde3157f";
-    hash = "sha256-fo9ZNqgMDt9s/18WDhD+7kGb9O8LF47Xk5yuIP3trqY=";
+    rev = "83d4f6227d14c817c8c75d2b6ad69514acb8fc4b";
+    hash = "sha256-3BTQbtascDymbJK1ECjaoE9z1fVMnmvcdO+c4aCWuFE=";
   };
 
   makefile = "Makefile";

From e1dc3132ff275f54cbde82f4dd52025a5944f37b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 17 Mar 2025 13:05:22 +0000
Subject: [PATCH 009/108] libretro.mame: 0-unstable-2025-01-04 ->
 0-unstable-2025-03-06

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

diff --git a/pkgs/applications/emulators/libretro/cores/mame.nix b/pkgs/applications/emulators/libretro/cores/mame.nix
index 26874d903694..82855f07f20f 100644
--- a/pkgs/applications/emulators/libretro/cores/mame.nix
+++ b/pkgs/applications/emulators/libretro/cores/mame.nix
@@ -9,13 +9,13 @@
 }:
 mkLibretroCore {
   core = "mame";
-  version = "0-unstable-2025-01-04";
+  version = "0-unstable-2025-03-06";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "mame";
-    rev = "20db0f242e4e11a476b548dd57d2ef9cc3e84f03";
-    hash = "sha256-+xShU96m+KCHrFleEy55fBD5vCM+hsYMqIvRZQtzsr8=";
+    rev = "40edadab2e445bfda9d206def9508b43b11fb96a";
+    hash = "sha256-TrDx77VCdtLuihwhlz+sYkUvegTxsG8eAn3h6KYO3z0=";
     fetchSubmodules = true;
   };
 

From 836932ec789f4e2b32d61266411c1b2e56d3dbd9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 19 Mar 2025 07:48:47 +0000
Subject: [PATCH 010/108] opencolorio: 2.4.1 -> 2.4.2

---
 pkgs/development/libraries/opencolorio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix
index 8797c2962fbc..5b5a45b6c372 100644
--- a/pkgs/development/libraries/opencolorio/default.nix
+++ b/pkgs/development/libraries/opencolorio/default.nix
@@ -27,13 +27,13 @@
 
 stdenv.mkDerivation rec {
   pname = "opencolorio";
-  version = "2.4.1";
+  version = "2.4.2";
 
   src = fetchFromGitHub {
     owner = "AcademySoftwareFoundation";
     repo = "OpenColorIO";
     rev = "v${version}";
-    hash = "sha256-Ytqvd4qSqO+6hId3v7X9cd+zrOElcqTBev5miJL/07M=";
+    hash = "sha256-+P7T8UZuQEVmsMykSWtUxg0vC7Sr4fQJpovCU5sKtsA=";
   };
 
   patches = [

From 740d9d65cfff05755618643fcf53be1a5340f5fb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 19 Mar 2025 20:25:55 +0000
Subject: [PATCH 011/108] dart: 3.7.1 -> 3.7.2

---
 pkgs/development/compilers/dart/sources.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/dart/sources.nix b/pkgs/development/compilers/dart/sources.nix
index d591326858f7..5fcc0a68849c 100644
--- a/pkgs/development/compilers/dart/sources.nix
+++ b/pkgs/development/compilers/dart/sources.nix
@@ -1,27 +1,27 @@
 let
-  version = "3.7.1";
+  version = "3.7.2";
 in
 { fetchurl }:
 {
   versionUsed = version;
   "${version}-x86_64-darwin" = fetchurl {
     url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-x64-release.zip";
-    sha256 = "0bldcn4j99cv2a6g3s263929r7wqhjaxylwm26nd2jdfnqbmjxm2";
+    sha256 = "1bj9libb4bnmgm4544876xz512i1nvp73fbxrs4jz0xfp398c206";
   };
   "${version}-aarch64-darwin" = fetchurl {
     url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-arm64-release.zip";
-    sha256 = "191jig17mnk0gjys2xd0qr267idjv2h50qnaz0cciflj60b2az7m";
+    sha256 = "0z35ndh7mdaz1dnd2yvv5g50jbfy563yclgfjlx9k400b7cn6vhh";
   };
   "${version}-aarch64-linux" = fetchurl {
     url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-arm64-release.zip";
-    sha256 = "1zj7k2bczb9yy63vjj8xm3ljd9sx9z77awf4wdvv6y02gnzxv4ga";
+    sha256 = "1a2cwr3qyy8paxjhgb1xwcv4rm1ml0dfv1byl5zynmz0c6nwqlil";
   };
   "${version}-x86_64-linux" = fetchurl {
     url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-x64-release.zip";
-    sha256 = "0wgfl118j7s7xjz4i0m4gyzxzsjv7x9wq9xr2m036l4ngng9a4r8";
+    sha256 = "133q4jz5wszs0bja7pnfgjd7mvawdspgz866ip3m0v351zbzs5n2";
   };
   "${version}-i686-linux" = fetchurl {
     url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-ia32-release.zip";
-    sha256 = "1zj60jqpnv1apl4439vvxxrgfvg3azwaaizdmq8chfmrg97vr85x";
+    sha256 = "0y3slablp94lbcm9bafg0p407axrdqxf33vpxc420ifqczpidmh2";
   };
 }

From cea7608bbf22154f9f0df6edf5e5bfa0901efa76 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 20 Mar 2025 16:14:24 +0000
Subject: [PATCH 012/108] tinyxml-2: 10.0.0 -> 11.0.0

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

diff --git a/pkgs/by-name/ti/tinyxml-2/package.nix b/pkgs/by-name/ti/tinyxml-2/package.nix
index df45e1e60fe8..9b56e8f64d0b 100644
--- a/pkgs/by-name/ti/tinyxml-2/package.nix
+++ b/pkgs/by-name/ti/tinyxml-2/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "tinyxml2";
-  version = "10.0.0";
+  version = "11.0.0";
 
   src = fetchFromGitHub {
     owner = "leethomason";
     repo = "tinyxml2";
     rev = finalAttrs.version;
-    hash = "sha256-9xrpPFMxkAecg3hMHzzThuy0iDt970Iqhxs57Od+g2g=";
+    hash = "sha256-rYVQSvxA0nxlZFHwGcOWkxcXZWEvTxR9P+d8E7CSm6U=";
   };
 
   nativeBuildInputs = [ cmake ];

From a7b4cd943a6cbd622f5eadc93bd1d1f8892b2038 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 20 Mar 2025 19:47:30 +0000
Subject: [PATCH 013/108] glaze: 5.0.0 -> 5.0.1

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

diff --git a/pkgs/by-name/gl/glaze/package.nix b/pkgs/by-name/gl/glaze/package.nix
index 64a308184d93..453cdd80532c 100644
--- a/pkgs/by-name/gl/glaze/package.nix
+++ b/pkgs/by-name/gl/glaze/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (final: {
   pname = "glaze";
-  version = "5.0.0";
+  version = "5.0.1";
 
   src = fetchFromGitHub {
     owner = "stephenberry";
     repo = "glaze";
     rev = "v${final.version}";
-    hash = "sha256-NjR/MsjnnLH2jVHrQXyWnyWOvsDQYbP/V9mWSII8mnc=";
+    hash = "sha256-9ru8T0xUmkKBg6rNg+myzU8bjqWkQGG2B0APPHjyAAE=";
   };
 
   nativeBuildInputs = [ cmake ];

From 9e0b90b2db7f1209dec6d5555e9776f316b64a14 Mon Sep 17 00:00:00 2001
From: Benno Bielmeier <nix@bbenno.com>
Date: Fri, 21 Mar 2025 00:43:15 +0100
Subject: [PATCH 014/108] graylog-5_2: remove

Graylog 5.2 is EOL since October 18th 2024.
https://endoflife.date/graylog
---
 pkgs/tools/misc/graylog/5.2.nix | 9 ---------
 pkgs/top-level/aliases.nix      | 3 ++-
 pkgs/top-level/all-packages.nix | 2 --
 3 files changed, 2 insertions(+), 12 deletions(-)
 delete mode 100644 pkgs/tools/misc/graylog/5.2.nix

diff --git a/pkgs/tools/misc/graylog/5.2.nix b/pkgs/tools/misc/graylog/5.2.nix
deleted file mode 100644
index b93603c1366c..000000000000
--- a/pkgs/tools/misc/graylog/5.2.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ callPackage, lib, ...}:
-let
-  buildGraylog = callPackage ./graylog.nix {};
-in buildGraylog {
-  version = "5.2.12";
-  hash = "sha256-VF6eLOYfnIROPj1pvyV1G3TKGj/rAa2spc/oel4LFwk=";
-  maintainers = [ lib.maintainers.f2k1de ];
-  license = lib.licenses.sspl;
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 712e0e62d8b5..407389f7ddbd 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -642,8 +642,9 @@ mapAliases {
   graylog-4_0 = throw "graylog 4.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 4.x to latest series."; # Added 2023-10-09
   graylog-4_3 = throw "graylog 4.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 4.x to latest series."; # Added 2023-10-09
   graylog-5_0 = throw "graylog 5.0.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 5.0.x to latest series."; # Added 2024-02-15
-  green-pdfviewer = throw "'green-pdfviewer' has been removed due to lack of maintenance upstream."; # Added 2024-12-04
   graylog-5_1 = throw "graylog 5.1.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 5.1.x to latest series."; # Added 2024-10-16
+  graylog-5_2 = throw "graylog 5.2 is EOL. Please consider downgrading nixpkgs if you need an upgrade from 5.2 to latest series."; # Added 2025-03-21
+  green-pdfviewer = throw "'green-pdfviewer' has been removed due to lack of maintenance upstream."; # Added 2024-12-04
   gringo = clingo; # added 2022-11-27
   grub2_full = grub2; # Added 2022-11-18
   gtetrinet = throw "'gtetrinet' has been removed because it depends on GNOME 2 libraries"; # Added 2024-06-27
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 34ef087548c4..fac7599ff51d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3473,8 +3473,6 @@ with pkgs;
 
   grails = callPackage ../development/web/grails { jdk = null; };
 
-  graylog-5_2 = callPackage ../tools/misc/graylog/5.2.nix { };
-
   graylog-6_0 = callPackage ../tools/misc/graylog/6.0.nix { };
 
   graylogPlugins = recurseIntoAttrs (

From 5571878c247b1e17691f162abe006a2e4adadb02 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 21 Mar 2025 00:36:23 +0000
Subject: [PATCH 015/108] gitlab-release-cli: 0.22.0 -> 0.23.0

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

diff --git a/pkgs/by-name/gi/gitlab-release-cli/package.nix b/pkgs/by-name/gi/gitlab-release-cli/package.nix
index f8a5b4724795..7e827c7d3c38 100644
--- a/pkgs/by-name/gi/gitlab-release-cli/package.nix
+++ b/pkgs/by-name/gi/gitlab-release-cli/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "gitlab-release-cli";
-  version = "0.22.0";
+  version = "0.23.0";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "release-cli";
     rev = "v${version}";
-    hash = "sha256-LFzZLg6AaYyvB/YOe8EATHs1t0m9Y2tYzRaS2CQ7WpY=";
+    hash = "sha256-J+9BbzZYLR4Ie01NtjZRCcL/HtR78BiTEqFimfni/ps=";
   };
 
   vendorHash = "sha256-UwDMRsWbk8rEv2d5FssIzCLby68YZULoxd3/JGLsCQU=";

From ad8e10d700064c38b97009590187112309cc7bc2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 21 Mar 2025 07:12:02 +0000
Subject: [PATCH 016/108] git-town: 18.0.0 -> 18.1.0

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

diff --git a/pkgs/by-name/gi/git-town/package.nix b/pkgs/by-name/gi/git-town/package.nix
index a79513d9de7f..40decb9bb968 100644
--- a/pkgs/by-name/gi/git-town/package.nix
+++ b/pkgs/by-name/gi/git-town/package.nix
@@ -12,13 +12,13 @@
 
 buildGoModule rec {
   pname = "git-town";
-  version = "18.0.0";
+  version = "18.1.0";
 
   src = fetchFromGitHub {
     owner = "git-town";
     repo = "git-town";
     tag = "v${version}";
-    hash = "sha256-vn0Cq53gqe0HGrtYMUHCFsE13CpaBJqC4LxrkJSel1Y=";
+    hash = "sha256-dx19gzHhCCcdlI80CYhbfKHRS0AQB0DnHphV2mqmI/Y=";
   };
 
   vendorHash = null;

From b828ba3247e9d6adf09d5614eec235796d91a8c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=B9=82=E0=B8=97=E0=B8=AA=E0=B8=BA=E0=B8=95=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=A5?= <toastal@posteo.net>
Date: Fri, 21 Mar 2025 19:03:57 +0700
Subject: [PATCH 017/108] nixos/h2o: wait for open ports in tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Hydra can sometimes timeout here. It’s a better practice anyhow.
---
 nixos/tests/web-servers/h2o/basic.nix         | 19 +++++++++++++------
 nixos/tests/web-servers/h2o/mruby.nix         | 11 ++++++++---
 .../web-servers/h2o/tls-recommendations.nix   |  3 +++
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/nixos/tests/web-servers/h2o/basic.nix b/nixos/tests/web-servers/h2o/basic.nix
index 5432a3b04172..d15682afa731 100644
--- a/nixos/tests/web-servers/h2o/basic.nix
+++ b/nixos/tests/web-servers/h2o/basic.nix
@@ -110,27 +110,34 @@ import ../../make-test-python.nix (
         };
     };
 
-    testScript = # python
+    testScript =
+      let
+        portStrHTTP = builtins.toString port.HTTP;
+        portStrTLS = builtins.toString port.TLS;
+      in
+      # python
       ''
         server.wait_for_unit("h2o.service")
+        server.wait_for_open_port(${portStrHTTP})
+        server.wait_for_open_port(${portStrTLS})
 
-        http_hello_world_body = server.succeed("curl --fail-with-body 'http://${domain.HTTP}:${builtins.toString port.HTTP}/hello_world.txt'")
+        http_hello_world_body = server.succeed("curl --fail-with-body 'http://${domain.HTTP}:${portStrHTTP}/hello_world.txt'")
         assert "${sawatdi_chao_lok}" in http_hello_world_body
 
-        tls_hello_world_head = server.succeed("curl -v --head --compressed --http2 --tlsv1.3 --fail-with-body 'https://${domain.TLS}:${builtins.toString port.TLS}/hello_world.rst'").lower()
+        tls_hello_world_head = server.succeed("curl -v --head --compressed --http2 --tlsv1.3 --fail-with-body 'https://${domain.TLS}:${portStrTLS}/hello_world.rst'").lower()
         assert "http/2 200" in tls_hello_world_head
         assert "server: h2o" in tls_hello_world_head
         assert "content-type: text/x-rst" in tls_hello_world_head
 
-        tls_hello_world_body = server.succeed("curl -v --http2 --tlsv1.3 --compressed --fail-with-body 'https://${domain.TLS}:${builtins.toString port.TLS}/hello_world.rst'")
+        tls_hello_world_body = server.succeed("curl -v --http2 --tlsv1.3 --compressed --fail-with-body 'https://${domain.TLS}:${portStrTLS}/hello_world.rst'")
         assert "${sawatdi_chao_lok}" in tls_hello_world_body
 
         tls_hello_world_head_redirected = server.succeed("curl -v --head --fail-with-body 'http://${domain.TLS}:${builtins.toString port.HTTP}/hello_world.rst'").lower()
         assert "redirected" in tls_hello_world_head_redirected
 
-        server.fail("curl --location --max-redirs 0 'http://${domain.TLS}:${builtins.toString port.HTTP}/hello_world.rst'")
+        server.fail("curl --location --max-redirs 0 'http://${domain.TLS}:${portStrHTTP}/hello_world.rst'")
 
-        tls_hello_world_body_redirected = server.succeed("curl -v --location --fail-with-body 'http://${domain.TLS}:${builtins.toString port.HTTP}/hello_world.rst'")
+        tls_hello_world_body_redirected = server.succeed("curl -v --location --fail-with-body 'http://${domain.TLS}:${portStrHTTP}/hello_world.rst'")
         assert "${sawatdi_chao_lok}" in tls_hello_world_body_redirected
       '';
   }
diff --git a/nixos/tests/web-servers/h2o/mruby.nix b/nixos/tests/web-servers/h2o/mruby.nix
index e8cedf300446..8a5493f33a24 100644
--- a/nixos/tests/web-servers/h2o/mruby.nix
+++ b/nixos/tests/web-servers/h2o/mruby.nix
@@ -50,14 +50,19 @@ import ../../make-test-python.nix (
         };
     };
 
-    testScript = # python
+    testScript =
+      let
+        portStr = builtins.toString port;
+      in
+      # python
       ''
         server.wait_for_unit("h2o.service")
+        server.wait_for_open_port(${portStr})
 
-        hello_world = server.succeed("curl --fail-with-body http://${domain}:${builtins.toString port}/hello_world")
+        hello_world = server.succeed("curl --fail-with-body http://${domain}:${portStr}/hello_world")
         assert "${sawatdi_chao_lok}" in hello_world
 
-        file_handler = server.succeed("curl --fail-with-body http://${domain}:${builtins.toString port}/file_handler")
+        file_handler = server.succeed("curl --fail-with-body http://${domain}:${portStr}/file_handler")
         assert "FILE_HANDLER" in file_handler
       '';
   }
diff --git a/nixos/tests/web-servers/h2o/tls-recommendations.nix b/nixos/tests/web-servers/h2o/tls-recommendations.nix
index 489dd2c70d31..6b988079857f 100644
--- a/nixos/tests/web-servers/h2o/tls-recommendations.nix
+++ b/nixos/tests/web-servers/h2o/tls-recommendations.nix
@@ -87,6 +87,7 @@ import ../../make-test-python.nix (
         curl_max_tls1_2_old_cipher ="curl -v --tlsv1.0 --tls-max 1.2 --ciphers 'ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA256' 'https://${domain}:${portStr}/'"
 
         server_modern.wait_for_unit("h2o.service")
+        server_modern.wait_for_open_port(${portStr})
         modern_response = server_modern.succeed(curl_basic)
         assert "Hello, modern!" in modern_response
         modern_head = server_modern.succeed(curl_head)
@@ -94,6 +95,7 @@ import ../../make-test-python.nix (
         server_modern.fail(curl_max_tls1_2)
 
         server_intermediate.wait_for_unit("h2o.service")
+        server_intermediate.wait_for_open_port(${portStr})
         intermediate_response = server_intermediate.succeed(curl_basic)
         assert "Hello, intermediate!" in intermediate_response
         intermediate_head = server_modern.succeed(curl_head)
@@ -103,6 +105,7 @@ import ../../make-test-python.nix (
         server_intermediate.fail(curl_max_tls1_2_old_cipher)
 
         server_old.wait_for_unit("h2o.service")
+        server_old.wait_for_open_port(${portStr})
         old_response = server_old.succeed(curl_basic)
         assert "Hello, old!" in old_response
         old_head = server_modern.succeed(curl_head)

From 1905cd89f8ed8467c95e359595114aa3437a5ade Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=B9=82=E0=B8=97=E0=B8=AA=E0=B8=BA=E0=B8=95=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=A5?= <toastal@posteo.net>
Date: Fri, 21 Mar 2025 22:23:01 +0700
Subject: [PATCH 018/108] nixos/h2o: move to runTest

---
 nixos/tests/all-tests.nix                     |   2 +-
 nixos/tests/web-servers/h2o/basic.nix         | 234 +++++++++---------
 nixos/tests/web-servers/h2o/default.nix       |  20 +-
 nixos/tests/web-servers/h2o/mruby.nix         | 108 ++++----
 .../web-servers/h2o/tls-recommendations.nix   | 204 ++++++++-------
 5 files changed, 276 insertions(+), 292 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 2884fdc09d32..90158dd1bbda 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -502,7 +502,7 @@ in {
   guacamole-server = handleTest ./guacamole-server.nix {};
   guix = handleTest ./guix {};
   gvisor = handleTest ./gvisor.nix {};
-  h2o = discoverTests (import ./web-servers/h2o { inherit handleTestOn; });
+  h2o = import ./web-servers/h2o { inherit recurseIntoAttrs runTest; };
   hadoop = import ./hadoop { inherit handleTestOn; package=pkgs.hadoop; };
   hadoop_3_3 = import ./hadoop { inherit handleTestOn; package=pkgs.hadoop_3_3; };
   hadoop2 = import ./hadoop { inherit handleTestOn; package=pkgs.hadoop2; };
diff --git a/nixos/tests/web-servers/h2o/basic.nix b/nixos/tests/web-servers/h2o/basic.nix
index d15682afa731..20cbae987744 100644
--- a/nixos/tests/web-servers/h2o/basic.nix
+++ b/nixos/tests/web-servers/h2o/basic.nix
@@ -1,144 +1,142 @@
-import ../../make-test-python.nix (
-  { lib, pkgs, ... }:
+{ hostPkgs, lib, ... }:
 
-  # Tests basics such as TLS, creating a mime-type & serving Unicode characters.
+# Tests basics such as TLS, creating a mime-type & serving Unicode characters.
 
-  let
-    domain = {
-      HTTP = "h2o.local";
-      TLS = "acme.test";
-    };
+let
+  domain = {
+    HTTP = "h2o.local";
+    TLS = "acme.test";
+  };
 
-    port = {
-      HTTP = 8080;
-      TLS = 8443;
-    };
+  port = {
+    HTTP = 8080;
+    TLS = 8443;
+  };
 
-    sawatdi_chao_lok = "สวัสดีชาวโลก";
+  sawatdi_chao_lok = "สวัสดีชาวโลก";
 
-    hello_world_txt = pkgs.writeTextFile {
-      name = "/hello_world.txt";
-      text = sawatdi_chao_lok;
-    };
+  hello_world_txt = hostPkgs.writeTextFile {
+    name = "/hello_world.txt";
+    text = sawatdi_chao_lok;
+  };
 
-    hello_world_rst = pkgs.writeTextFile {
-      name = "/hello_world.rst";
-      text = # rst
-        ''
-          ====================
-          Thaiger Sprint 2025‼
-          ====================
+  hello_world_rst = hostPkgs.writeTextFile {
+    name = "/hello_world.rst";
+    text = # rst
+      ''
+        ====================
+        Thaiger Sprint 2025‼
+        ====================
 
-          ${sawatdi_chao_lok}
-        '';
-    };
-  in
-  {
-    name = "h2o-basic";
+        ${sawatdi_chao_lok}
+      '';
+  };
+in
+{
+  name = "h2o-basic";
 
-    meta = {
-      maintainers = with lib.maintainers; [ toastal ];
-    };
+  meta = {
+    maintainers = with lib.maintainers; [ toastal ];
+  };
 
-    nodes = {
-      server =
-        { pkgs, ... }:
-        {
-          services.h2o = {
-            enable = true;
-            defaultHTTPListenPort = port.HTTP;
-            defaultTLSListenPort = port.TLS;
-            hosts = {
-              "${domain.HTTP}" = {
-                settings = {
-                  paths = {
-                    "/hello_world.txt" = {
-                      "file.file" = "${hello_world_txt}";
-                    };
-                  };
-                };
-              };
-              "${domain.TLS}" = {
-                tls = {
-                  policy = "force";
-                  identity = [
-                    {
-                      key-file = ../../common/acme/server/acme.test.key.pem;
-                      certificate-file = ../../common/acme/server/acme.test.cert.pem;
-                    }
-                  ];
-                  extraSettings = {
-                    minimum-version = "TLSv1.3";
-                  };
-                };
-                settings = {
-                  paths = {
-                    "/hello_world.rst" = {
-                      "file.file" = "${hello_world_rst}";
-                    };
+  nodes = {
+    server =
+      { pkgs, ... }:
+      {
+        services.h2o = {
+          enable = true;
+          defaultHTTPListenPort = port.HTTP;
+          defaultTLSListenPort = port.TLS;
+          hosts = {
+            "${domain.HTTP}" = {
+              settings = {
+                paths = {
+                  "/hello_world.txt" = {
+                    "file.file" = "${hello_world_txt}";
                   };
                 };
               };
             };
-            settings = {
-              compress = "ON";
-              compress-minimum-size = 32;
-              "file.mime.addtypes" = {
-                "text/x-rst" = {
-                  extensions = [ ".rst" ];
-                  is_compressible = "YES";
+            "${domain.TLS}" = {
+              tls = {
+                policy = "force";
+                identity = [
+                  {
+                    key-file = ../../common/acme/server/acme.test.key.pem;
+                    certificate-file = ../../common/acme/server/acme.test.cert.pem;
+                  }
+                ];
+                extraSettings = {
+                  minimum-version = "TLSv1.3";
+                };
+              };
+              settings = {
+                paths = {
+                  "/hello_world.rst" = {
+                    "file.file" = "${hello_world_rst}";
+                  };
                 };
               };
-              ssl-offload = "kernel";
             };
           };
-
-          security.pki.certificates = [
-            (builtins.readFile ../../common/acme/server/ca.cert.pem)
-          ];
-
-          networking = {
-            firewall.allowedTCPPorts = with port; [
-              HTTP
-              TLS
-            ];
-            extraHosts = ''
-              127.0.0.1 ${domain.HTTP}
-              127.0.0.1 ${domain.TLS}
-            '';
+          settings = {
+            compress = "ON";
+            compress-minimum-size = 32;
+            "file.mime.addtypes" = {
+              "text/x-rst" = {
+                extensions = [ ".rst" ];
+                is_compressible = "YES";
+              };
+            };
+            ssl-offload = "kernel";
           };
         };
-    };
 
-    testScript =
-      let
-        portStrHTTP = builtins.toString port.HTTP;
-        portStrTLS = builtins.toString port.TLS;
-      in
-      # python
-      ''
-        server.wait_for_unit("h2o.service")
-        server.wait_for_open_port(${portStrHTTP})
-        server.wait_for_open_port(${portStrTLS})
+        security.pki.certificates = [
+          (builtins.readFile ../../common/acme/server/ca.cert.pem)
+        ];
 
-        http_hello_world_body = server.succeed("curl --fail-with-body 'http://${domain.HTTP}:${portStrHTTP}/hello_world.txt'")
-        assert "${sawatdi_chao_lok}" in http_hello_world_body
+        networking = {
+          firewall.allowedTCPPorts = with port; [
+            HTTP
+            TLS
+          ];
+          extraHosts = ''
+            127.0.0.1 ${domain.HTTP}
+            127.0.0.1 ${domain.TLS}
+          '';
+        };
+      };
+  };
 
-        tls_hello_world_head = server.succeed("curl -v --head --compressed --http2 --tlsv1.3 --fail-with-body 'https://${domain.TLS}:${portStrTLS}/hello_world.rst'").lower()
-        assert "http/2 200" in tls_hello_world_head
-        assert "server: h2o" in tls_hello_world_head
-        assert "content-type: text/x-rst" in tls_hello_world_head
+  testScript =
+    let
+      portStrHTTP = builtins.toString port.HTTP;
+      portStrTLS = builtins.toString port.TLS;
+    in
+    # python
+    ''
+      server.wait_for_unit("h2o.service")
+      server.wait_for_open_port(${portStrHTTP})
+      server.wait_for_open_port(${portStrTLS})
 
-        tls_hello_world_body = server.succeed("curl -v --http2 --tlsv1.3 --compressed --fail-with-body 'https://${domain.TLS}:${portStrTLS}/hello_world.rst'")
-        assert "${sawatdi_chao_lok}" in tls_hello_world_body
+      http_hello_world_body = server.succeed("curl --fail-with-body 'http://${domain.HTTP}:${portStrHTTP}/hello_world.txt'")
+      assert "${sawatdi_chao_lok}" in http_hello_world_body
 
-        tls_hello_world_head_redirected = server.succeed("curl -v --head --fail-with-body 'http://${domain.TLS}:${builtins.toString port.HTTP}/hello_world.rst'").lower()
-        assert "redirected" in tls_hello_world_head_redirected
+      tls_hello_world_head = server.succeed("curl -v --head --compressed --http2 --tlsv1.3 --fail-with-body 'https://${domain.TLS}:${portStrTLS}/hello_world.rst'").lower()
+      assert "http/2 200" in tls_hello_world_head
+      assert "server: h2o" in tls_hello_world_head
+      assert "content-type: text/x-rst" in tls_hello_world_head
 
-        server.fail("curl --location --max-redirs 0 'http://${domain.TLS}:${portStrHTTP}/hello_world.rst'")
+      tls_hello_world_body = server.succeed("curl -v --http2 --tlsv1.3 --compressed --fail-with-body 'https://${domain.TLS}:${portStrTLS}/hello_world.rst'")
+      assert "${sawatdi_chao_lok}" in tls_hello_world_body
 
-        tls_hello_world_body_redirected = server.succeed("curl -v --location --fail-with-body 'http://${domain.TLS}:${portStrHTTP}/hello_world.rst'")
-        assert "${sawatdi_chao_lok}" in tls_hello_world_body_redirected
-      '';
-  }
-)
+      tls_hello_world_head_redirected = server.succeed("curl -v --head --fail-with-body 'http://${domain.TLS}:${builtins.toString port.HTTP}/hello_world.rst'").lower()
+      assert "redirected" in tls_hello_world_head_redirected
+
+      server.fail("curl --location --max-redirs 0 'http://${domain.TLS}:${portStrHTTP}/hello_world.rst'")
+
+      tls_hello_world_body_redirected = server.succeed("curl -v --location --fail-with-body 'http://${domain.TLS}:${portStrHTTP}/hello_world.rst'")
+      assert "${sawatdi_chao_lok}" in tls_hello_world_body_redirected
+    '';
+}
diff --git a/nixos/tests/web-servers/h2o/default.nix b/nixos/tests/web-servers/h2o/default.nix
index e5f8e71103d2..d4a74ba71728 100644
--- a/nixos/tests/web-servers/h2o/default.nix
+++ b/nixos/tests/web-servers/h2o/default.nix
@@ -1,17 +1,7 @@
-{
-  system ? builtins.currentSystem,
-  handleTestOn,
-}:
+{ recurseIntoAttrs, runTest }:
 
-let
-  supportedSystems = [
-    "x86_64-linux"
-    "i686-linux"
-    "aarch64-linux"
-  ];
-in
-{
-  basic = handleTestOn supportedSystems ./basic.nix { inherit system; };
-  mruby = handleTestOn supportedSystems ./mruby.nix { inherit system; };
-  tls-recommendations = handleTestOn supportedSystems ./tls-recommendations.nix { inherit system; };
+recurseIntoAttrs {
+  basic = runTest ./basic.nix;
+  mruby = runTest ./mruby.nix;
+  tls-recommendations = runTest ./tls-recommendations.nix;
 }
diff --git a/nixos/tests/web-servers/h2o/mruby.nix b/nixos/tests/web-servers/h2o/mruby.nix
index 8a5493f33a24..20c2e2231007 100644
--- a/nixos/tests/web-servers/h2o/mruby.nix
+++ b/nixos/tests/web-servers/h2o/mruby.nix
@@ -1,69 +1,67 @@
-import ../../make-test-python.nix (
-  { lib, pkgs, ... }:
+{ lib, ... }:
 
-  let
-    domain = "h2o.local";
+let
+  domain = "h2o.local";
 
-    port = 8080;
+  port = 8080;
 
-    sawatdi_chao_lok = "สวัสดีชาวโลก";
-  in
-  {
-    name = "h2o-mruby";
+  sawatdi_chao_lok = "สวัสดีชาวโลก";
+in
+{
+  name = "h2o-mruby";
 
-    meta = {
-      maintainers = with lib.maintainers; [ toastal ];
-    };
+  meta = {
+    maintainers = with lib.maintainers; [ toastal ];
+  };
 
-    nodes = {
-      server =
-        { pkgs, ... }:
-        {
-          services.h2o = {
-            enable = true;
-            package = pkgs.h2o.override { withMruby = true; };
-            settings = {
-              listen = port;
-              hosts = {
-                "${domain}" = {
-                  paths = {
-                    "/hello_world" = {
-                      "mruby.handler" = # ruby
-                        ''
-                          Proc.new do |env|
-                            [200, {'content-type' => 'text/plain'}, ["${sawatdi_chao_lok}"]]
-                          end
-                        '';
-                    };
-                    "/file_handler" = {
-                      "mruby.handler-file" = ./file_handler.rb;
-                    };
+  nodes = {
+    server =
+      { pkgs, ... }:
+      {
+        services.h2o = {
+          enable = true;
+          package = pkgs.h2o.override { withMruby = true; };
+          settings = {
+            listen = port;
+            hosts = {
+              "${domain}" = {
+                paths = {
+                  "/hello_world" = {
+                    "mruby.handler" = # ruby
+                      ''
+                        Proc.new do |env|
+                          [200, {'content-type' => 'text/plain'}, ["${sawatdi_chao_lok}"]]
+                        end
+                      '';
+                  };
+                  "/file_handler" = {
+                    "mruby.handler-file" = ./file_handler.rb;
                   };
                 };
               };
             };
           };
-
-          networking.extraHosts = ''
-            127.0.0.1 ${domain}
-          '';
         };
-    };
 
-    testScript =
-      let
-        portStr = builtins.toString port;
-      in
-      # python
-      ''
-        server.wait_for_unit("h2o.service")
-        server.wait_for_open_port(${portStr})
+        networking.extraHosts = ''
+          127.0.0.1 ${domain}
+        '';
+      };
+  };
 
-        hello_world = server.succeed("curl --fail-with-body http://${domain}:${portStr}/hello_world")
-        assert "${sawatdi_chao_lok}" in hello_world
+  testScript =
+    let
+      portStr = builtins.toString port;
+    in
+    # python
+    ''
+      server.wait_for_unit("h2o.service")
+      server.wait_for_open_port(${portStr})
 
-        file_handler = server.succeed("curl --fail-with-body http://${domain}:${portStr}/file_handler")
-        assert "FILE_HANDLER" in file_handler
-      '';
-  }
-)
+      hello_world = server.succeed("curl --fail-with-body http://${domain}:${portStr}/hello_world")
+      assert "${sawatdi_chao_lok}" in hello_world
+
+      file_handler = server.succeed("curl --fail-with-body http://${domain}:${portStr}/file_handler")
+      assert "FILE_HANDLER" in file_handler
+    '';
+}
diff --git a/nixos/tests/web-servers/h2o/tls-recommendations.nix b/nixos/tests/web-servers/h2o/tls-recommendations.nix
index 6b988079857f..0bdfc68dcbe4 100644
--- a/nixos/tests/web-servers/h2o/tls-recommendations.nix
+++ b/nixos/tests/web-servers/h2o/tls-recommendations.nix
@@ -1,118 +1,116 @@
-import ../../make-test-python.nix (
-  { lib, pkgs, ... }:
+{ hostPkgs, lib, ... }:
 
-  let
-    domain = "acme.test";
-    port = 8443;
+let
+  domain = "acme.test";
+  port = 8443;
 
-    hello_txt =
-      name:
-      pkgs.writeTextFile {
-        name = "/hello_${name}.txt";
-        text = "Hello, ${name}!";
-      };
+  hello_txt =
+    name:
+    hostPkgs.writeTextFile {
+      name = "/hello_${name}.txt";
+      text = "Hello, ${name}!";
+    };
 
-    mkH2OServer =
-      recommendations:
-      { pkgs, lib, ... }:
-      {
-        services.h2o = {
-          enable = true;
-          package = pkgs.h2o.override (
-            lib.optionalAttrs
-              (builtins.elem recommendations [
-                "intermediate"
-                "old"
-              ])
-              {
-                openssl = pkgs.openssl_legacy;
-              }
-          );
-          defaultTLSRecommendations = "modern"; # prove overridden
-          hosts = {
-            "${domain}" = {
-              tls = {
-                inherit port recommendations;
-                policy = "force";
-                identity = [
-                  {
-                    key-file = ../../common/acme/server/acme.test.key.pem;
-                    certificate-file = ../../common/acme/server/acme.test.cert.pem;
-                  }
-                ];
-              };
-              settings = {
-                paths."/"."file.file" = "${hello_txt recommendations}";
-              };
+  mkH2OServer =
+    recommendations:
+    { pkgs, lib, ... }:
+    {
+      services.h2o = {
+        enable = true;
+        package = pkgs.h2o.override (
+          lib.optionalAttrs
+            (builtins.elem recommendations [
+              "intermediate"
+              "old"
+            ])
+            {
+              openssl = pkgs.openssl_legacy;
+            }
+        );
+        defaultTLSRecommendations = "modern"; # prove overridden
+        hosts = {
+          "${domain}" = {
+            tls = {
+              inherit port recommendations;
+              policy = "force";
+              identity = [
+                {
+                  key-file = ../../common/acme/server/acme.test.key.pem;
+                  certificate-file = ../../common/acme/server/acme.test.cert.pem;
+                }
+              ];
+            };
+            settings = {
+              paths."/"."file.file" = "${hello_txt recommendations}";
             };
           };
-          settings = {
-            ssl-offload = "kernel";
-          };
         };
-
-        security.pki.certificates = [
-          (builtins.readFile ../../common/acme/server/ca.cert.pem)
-        ];
-
-        networking = {
-          firewall.allowedTCPPorts = [ port ];
-          extraHosts = "127.0.0.1 ${domain}";
+        settings = {
+          ssl-offload = "kernel";
         };
       };
-  in
-  {
-    name = "h2o-tls-recommendations";
 
-    meta = {
-      maintainers = with lib.maintainers; [ toastal ];
+      security.pki.certificates = [
+        (builtins.readFile ../../common/acme/server/ca.cert.pem)
+      ];
+
+      networking = {
+        firewall.allowedTCPPorts = [ port ];
+        extraHosts = "127.0.0.1 ${domain}";
+      };
     };
+in
+{
+  name = "h2o-tls-recommendations";
 
-    nodes = {
-      server_modern = mkH2OServer "modern";
-      server_intermediate = mkH2OServer "intermediate";
-      server_old = mkH2OServer "old";
-    };
+  meta = {
+    maintainers = with lib.maintainers; [ toastal ];
+  };
 
-    testScript =
-      let
-        portStr = builtins.toString port;
-      in
-      # python
-      ''
-        curl_basic = "curl -v --tlsv1.3 --http2 'https://${domain}:${portStr}/'"
-        curl_head = "curl -v --head 'https://${domain}:${portStr}/'"
-        curl_max_tls1_2 ="curl -v --tlsv1.0 --tls-max 1.2 'https://${domain}:${portStr}/'"
-        curl_max_tls1_2_intermediate_cipher ="curl -v --tlsv1.0 --tls-max 1.2 --ciphers 'ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256' 'https://${domain}:${portStr}/'"
-        curl_max_tls1_2_old_cipher ="curl -v --tlsv1.0 --tls-max 1.2 --ciphers 'ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA256' 'https://${domain}:${portStr}/'"
+  nodes = {
+    server_modern = mkH2OServer "modern";
+    server_intermediate = mkH2OServer "intermediate";
+    server_old = mkH2OServer "old";
+  };
 
-        server_modern.wait_for_unit("h2o.service")
-        server_modern.wait_for_open_port(${portStr})
-        modern_response = server_modern.succeed(curl_basic)
-        assert "Hello, modern!" in modern_response
-        modern_head = server_modern.succeed(curl_head)
-        assert "strict-transport-security" in modern_head
-        server_modern.fail(curl_max_tls1_2)
+  testScript =
+    let
+      portStr = builtins.toString port;
+    in
+    # python
+    ''
+      curl_basic = "curl -v --tlsv1.3 --http2 'https://${domain}:${portStr}/'"
+      curl_head = "curl -v --head 'https://${domain}:${portStr}/'"
+      curl_max_tls1_2 ="curl -v --tlsv1.0 --tls-max 1.2 'https://${domain}:${portStr}/'"
+      curl_max_tls1_2_intermediate_cipher ="curl -v --tlsv1.0 --tls-max 1.2 --ciphers 'ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256' 'https://${domain}:${portStr}/'"
+      curl_max_tls1_2_old_cipher ="curl -v --tlsv1.0 --tls-max 1.2 --ciphers 'ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA256' 'https://${domain}:${portStr}/'"
 
-        server_intermediate.wait_for_unit("h2o.service")
-        server_intermediate.wait_for_open_port(${portStr})
-        intermediate_response = server_intermediate.succeed(curl_basic)
-        assert "Hello, intermediate!" in intermediate_response
-        intermediate_head = server_modern.succeed(curl_head)
-        assert "strict-transport-security" in intermediate_head
-        server_intermediate.succeed(curl_max_tls1_2)
-        server_intermediate.succeed(curl_max_tls1_2_intermediate_cipher)
-        server_intermediate.fail(curl_max_tls1_2_old_cipher)
+      server_modern.wait_for_unit("h2o.service")
+      server_modern.wait_for_open_port(${portStr})
+      modern_response = server_modern.succeed(curl_basic)
+      assert "Hello, modern!" in modern_response
+      modern_head = server_modern.succeed(curl_head)
+      assert "strict-transport-security" in modern_head
+      server_modern.fail(curl_max_tls1_2)
 
-        server_old.wait_for_unit("h2o.service")
-        server_old.wait_for_open_port(${portStr})
-        old_response = server_old.succeed(curl_basic)
-        assert "Hello, old!" in old_response
-        old_head = server_modern.succeed(curl_head)
-        assert "strict-transport-security" in old_head
-        server_old.succeed(curl_max_tls1_2)
-        server_old.succeed(curl_max_tls1_2_intermediate_cipher)
-        server_old.succeed(curl_max_tls1_2_old_cipher)
-      '';
-  }
-)
+      server_intermediate.wait_for_unit("h2o.service")
+      server_intermediate.wait_for_open_port(${portStr})
+      intermediate_response = server_intermediate.succeed(curl_basic)
+      assert "Hello, intermediate!" in intermediate_response
+      intermediate_head = server_modern.succeed(curl_head)
+      assert "strict-transport-security" in intermediate_head
+      server_intermediate.succeed(curl_max_tls1_2)
+      server_intermediate.succeed(curl_max_tls1_2_intermediate_cipher)
+      server_intermediate.fail(curl_max_tls1_2_old_cipher)
+
+      server_old.wait_for_unit("h2o.service")
+      server_old.wait_for_open_port(${portStr})
+      old_response = server_old.succeed(curl_basic)
+      assert "Hello, old!" in old_response
+      old_head = server_modern.succeed(curl_head)
+      assert "strict-transport-security" in old_head
+      server_old.succeed(curl_max_tls1_2)
+      server_old.succeed(curl_max_tls1_2_intermediate_cipher)
+      server_old.succeed(curl_max_tls1_2_old_cipher)
+    '';
+}

From 357a75fda7058668434fa46f118e71a15f52c608 Mon Sep 17 00:00:00 2001
From: Kovacsics Robert <kovirobi@gmail.com>
Date: Fri, 21 Mar 2025 17:42:58 +0000
Subject: [PATCH 019/108] xdg/portals/lxqt: Fix documentation string indent

I just spotted this while browsing the code, but double checked and it
looks badly indented in the manpages and on the web too.
---
 nixos/modules/config/xdg/portals/lxqt.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/config/xdg/portals/lxqt.nix b/nixos/modules/config/xdg/portals/lxqt.nix
index 7549666cb733..77a5f144730d 100644
--- a/nixos/modules/config/xdg/portals/lxqt.nix
+++ b/nixos/modules/config/xdg/portals/lxqt.nix
@@ -27,10 +27,10 @@ in
       default = [ ];
       example = lib.literalExpression ''
         [
-                pkgs.libsForQt5.qtstyleplugin-kvantum
-                pkgs.breeze-qt5
-                pkgs.qtcurve
-              ];
+          pkgs.libsForQt5.qtstyleplugin-kvantum
+          pkgs.breeze-qt5
+          pkgs.qtcurve
+        ];
       '';
       description = ''
         Extra Qt styles that will be available to the

From a600481a0a58689bf35ffafcf9b9037957b087f7 Mon Sep 17 00:00:00 2001
From: Tobias Berger <toby@tobot.dev>
Date: Fri, 21 Mar 2025 20:16:49 +0100
Subject: [PATCH 020/108] leptosfmt: 0.1.30 -> 0.1.33

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

diff --git a/pkgs/by-name/le/leptosfmt/package.nix b/pkgs/by-name/le/leptosfmt/package.nix
index 64c24e1c676a..99e546aa1600 100644
--- a/pkgs/by-name/le/leptosfmt/package.nix
+++ b/pkgs/by-name/le/leptosfmt/package.nix
@@ -6,18 +6,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "leptosfmt";
-  version = "0.1.30";
+  version = "0.1.33";
 
   src = fetchFromGitHub {
     owner = "bram209";
     repo = "leptosfmt";
-    rev = "85b06b9a8bb0616b6a03ba43517245c79e1dd4cf";
-    hash = "sha256-PiVPnni7W8SIhO6L9698RSMTD4VVTB+klLrqMzEtWWo=";
+    rev = version;
+    hash = "sha256-+trLQFU8oP45xHQ3DsEESQzQX2WpvQcfpgGC9o5ITcY=";
     fetchSubmodules = true;
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-u0PtqWcQdt3vjoarqyiLZa8g5I+GWXPuHW6a/EtbB7o=";
+  cargoHash = "sha256-m9426zuxp9GfbYoljW49BVgetLTqqcqGHCb7I+Yw+bc=";
 
   meta = with lib; {
     description = "Formatter for the leptos view! macro";

From a07fc16d4809e4f2bd8a5423048ed2796afae539 Mon Sep 17 00:00:00 2001
From: Assistant <assistant.moetron@gmail.com>
Date: Fri, 21 Mar 2025 19:42:54 +0000
Subject: [PATCH 021/108] syncplay: 1.7.3 -> 1.7.4

---
 pkgs/applications/networking/syncplay/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix
index a86bd5899076..cbe24744f029 100644
--- a/pkgs/applications/networking/syncplay/default.nix
+++ b/pkgs/applications/networking/syncplay/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonApplication rec {
   pname = "syncplay";
-  version = "1.7.3";
+  version = "1.7.4";
 
   format = "other";
 
@@ -22,7 +22,7 @@ buildPythonApplication rec {
     owner = "Syncplay";
     repo = "syncplay";
     tag = "v${version}";
-    sha256 = "sha256-ipo027XyN4BpMkxzXznbnaufsaG/YkHxFJYo+XWzbyE=";
+    sha256 = "sha256-23OTj+KUmYtrhzIS4A9Gq/tClOLwaeo50+Fcm1tn47M=";
   };
 
   patches = [

From 3f72a67d9a2060444b45ba0167879c1b494c4764 Mon Sep 17 00:00:00 2001
From: Petr Zahradnik <junior@zahradnik.cz>
Date: Sat, 22 Mar 2025 20:41:36 +0100
Subject: [PATCH 022/108] msieve: unbreak on GCC 14

---
 pkgs/by-name/ms/msieve/package.nix            |  4 +++
 .../ms/msieve/savefile_t-pointer-type.patch   | 31 +++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/by-name/ms/msieve/savefile_t-pointer-type.patch

diff --git a/pkgs/by-name/ms/msieve/package.nix b/pkgs/by-name/ms/msieve/package.nix
index 2562eea0c80b..b449c4e64c9b 100644
--- a/pkgs/by-name/ms/msieve/package.nix
+++ b/pkgs/by-name/ms/msieve/package.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
     hash = "sha256-6ErVn4pYPMG5VFjOQURLsHNpN0pGdp55+rjY8988onU=";
   };
 
+  patches = [ ./savefile_t-pointer-type.patch ];
+
   buildInputs = [
     zlib
     gmp
@@ -31,6 +33,8 @@ stdenv.mkDerivation rec {
     "all"
   ];
 
+  enableParallelBuilding = true;
+
   installPhase = ''
     mkdir -p $out/bin/
     cp msieve $out/bin/
diff --git a/pkgs/by-name/ms/msieve/savefile_t-pointer-type.patch b/pkgs/by-name/ms/msieve/savefile_t-pointer-type.patch
new file mode 100644
index 000000000000..32f5514328ba
--- /dev/null
+++ b/pkgs/by-name/ms/msieve/savefile_t-pointer-type.patch
@@ -0,0 +1,31 @@
+Index: include/msieve.h
+===================================================================
+--- a/include/msieve.h
++++ b/include/msieve.h
+@@ -100,9 +100,9 @@
+ 	HANDLE file_handle;
+ 	uint32 read_size;
+ 	uint32 eof;
+ #else
+-	gzFile *fp;
++	gzFile fp;
+ 	char isCompressed;
+ 	char is_a_FILE;
+ #endif
+ 	char *name;
+
+Index: common/savefile.c
+===================================================================
+--- a/common/savefile.c
++++ b/common/savefile.c
+@@ -151,9 +151,9 @@
+ 			   so we will fopen a FILE to append plainly */
+ 			fclose(fp);
+ 		}
+ 		if (s->is_a_FILE) {
+-			s->fp = (gzFile *)fopen(s->name, "a");
++			s->fp = (gzFile)fopen(s->name, "a");
+ 		} else {
+ 			s->fp = gzopen(s->name, "a");
+ 			s->isCompressed = 1;
+ 		}

From eedf68f2cd8c910b62cf29f2cba6202346ca1c8a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 23 Mar 2025 12:44:32 +0000
Subject: [PATCH 023/108] inferno: 0.12.1 -> 0.12.2

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

diff --git a/pkgs/by-name/in/inferno/package.nix b/pkgs/by-name/in/inferno/package.nix
index 426fbde5711f..2d12b2fb7a89 100644
--- a/pkgs/by-name/in/inferno/package.nix
+++ b/pkgs/by-name/in/inferno/package.nix
@@ -2,18 +2,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "inferno";
-  version = "0.12.1";
+  version = "0.12.2";
 
   src = fetchFromGitHub {
     owner = "jonhoo";
     repo = "inferno";
     rev = "v${version}";
-    hash = "sha256-lnNS3+2VZ+DgbmaM8/9X79vhqoxw3G8M9macLILX//w=";
+    hash = "sha256-NDxgWHTMyntNtUb/+7bvrR64PNRPcovQd/IIgcLo5JQ=";
     fetchSubmodules = true;
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-hm10LAyvlrME2lYSRs/ji2Tt+Z5f8MTFSL3h7Aulaas=";
+  cargoHash = "sha256-xtWNIbWvYSSuvmq+IYADnpnBHuVeXBolRqc9JrIoiis=";
 
   # skip flaky tests
   checkFlags = [

From e58434f1d2c9bce68309440f1a5adfad80545b74 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 23 Mar 2025 14:38:15 +0100
Subject: [PATCH 024/108] python313Packages.mediafile: 0.12.0 -> 0.13.0

Diff: beetbox/mediafile@refs/tags/v0.12.0...v0.13.0

Changelog: https://github.com/beetbox/mediafile/releases/tag/v0.13.0
---
 .../python-modules/mediafile/default.nix      | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/mediafile/default.nix b/pkgs/development/python-modules/mediafile/default.nix
index a8c82e79235b..ddf3f147eaff 100644
--- a/pkgs/development/python-modules/mediafile/default.nix
+++ b/pkgs/development/python-modules/mediafile/default.nix
@@ -3,31 +3,31 @@
   buildPythonPackage,
   fetchFromGitHub,
   flit-core,
+  filetype,
   mutagen,
   pytestCheckHook,
   pythonOlder,
-  six,
 }:
 
 buildPythonPackage rec {
   pname = "mediafile";
-  version = "0.12.0";
-  format = "pyproject";
+  version = "0.13.0";
+  pyproject = true;
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "beetbox";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-5HHfG1hCIbM/QSXgB61yHNNWJTsuyAh6CQJ7SZhZuvo=";
+    repo = "mediafile";
+    tag = "v${version}";
+    hash = "sha256-Knp91nVPFkE2qYSZoWcOsMBNY+OBfWCPPNn+T1L8v0o=";
   };
 
-  nativeBuildInputs = [ flit-core ];
+  build-system = [ flit-core ];
 
-  propagatedBuildInputs = [
+  dependencies = [
+    filetype
     mutagen
-    six
   ];
 
   nativeCheckInputs = [ pytestCheckHook ];
@@ -37,6 +37,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python interface to the metadata tags for many audio file formats";
     homepage = "https://github.com/beetbox/mediafile";
+    changelog = "https://github.com/beetbox/mediafile/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [ lovesegfault ];
   };

From 9d2159ebe0531cb5f6cb5e21545f8f372ee4b3a1 Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Sun, 23 Mar 2025 16:53:25 +0000
Subject: [PATCH 025/108] apacheKafka: init at 4.0.0

---
 nixos/tests/kafka.nix                 | 3 ++-
 pkgs/servers/apache-kafka/default.nix | 9 ++++++++-
 pkgs/top-level/all-packages.nix       | 5 +++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/nixos/tests/kafka.nix b/nixos/tests/kafka.nix
index 416c0dcb8081..5a1a8c5f8d1a 100644
--- a/nixos/tests/kafka.nix
+++ b/nixos/tests/kafka.nix
@@ -92,7 +92,7 @@ let
       kafka.succeed(
           "echo 'test 1' | "
           + "${kafkaPackage}/bin/kafka-console-producer.sh "
-          + "--broker-list localhost:9092 --topic testtopic"
+          + "--bootstrap-server localhost:9092 --topic testtopic"
       )
       assert "test 1" in kafka.succeed(
           "${kafkaPackage}/bin/kafka-console-consumer.sh "
@@ -106,6 +106,7 @@ in with pkgs; {
   kafka_3_7 = makeKafkaTest "kafka_3_7" { kafkaPackage = apacheKafka_3_7; };
   kafka_3_8 = makeKafkaTest "kafka_3_8" { kafkaPackage = apacheKafka_3_8; };
   kafka_3_9 = makeKafkaTest "kafka_3_9" { kafkaPackage = apacheKafka_3_9; };
+  kafka_4_0 = makeKafkaTest "kafka_4_0" { kafkaPackage = apacheKafka_4_0; mode = "kraft"; };
   kafka = makeKafkaTest "kafka" { kafkaPackage = apacheKafka; };
   kafka_kraft = makeKafkaTest "kafka_kraft" { kafkaPackage = apacheKafka; mode = "kraft"; };
 }
diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix
index 6e31ee06ca0e..59b09c319d38 100644
--- a/pkgs/servers/apache-kafka/default.nix
+++ b/pkgs/servers/apache-kafka/default.nix
@@ -1,7 +1,14 @@
-{ lib, stdenv, fetchurl, jdk17_headless, jdk11_headless, makeWrapper, bash, coreutils, gnugrep, gnused, ps, nixosTests }:
+{ lib, stdenv, fetchurl, jdk17_headless, makeWrapper, bash, coreutils, gnugrep, gnused, ps, nixosTests }:
 
 let
   versionMap = {
+    "4_0" = {
+      kafkaVersion = "4.0.0";
+      scalaVersion = "2.13";
+      sha256 = "sha256-e4Uuk4vAneEM2W7KN1UljH0l+4nb3XYwVxdgfhg14qo=";
+      jre = jdk17_headless;
+      nixosTest = nixosTests.kafka.kafka_4_0;
+    };
     "3_9" = {
       kafkaVersion = "3.9.0";
       scalaVersion = "2.13";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6d00dbd901aa..84716cb276bb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7410,9 +7410,10 @@ with pkgs;
   inherit (callPackages ../servers/apache-kafka { })
     apacheKafka_3_7
     apacheKafka_3_8
-    apacheKafka_3_9;
+    apacheKafka_3_9
+    apacheKafka_4_0;
 
-  apacheKafka = apacheKafka_3_8;
+  apacheKafka = apacheKafka_4_0;
 
   asn2quickder = python3Packages.callPackage ../development/tools/asn2quickder { };
 

From 513e56cc4ac956a101d93a5e348378986eae4cbe Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Sun, 23 Mar 2025 17:04:49 +0000
Subject: [PATCH 026/108] nixos/kafka: Set default test mode to KRaft,
 Zookeeper is deprecated from 4.0

---
 nixos/tests/kafka.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/nixos/tests/kafka.nix b/nixos/tests/kafka.nix
index 5a1a8c5f8d1a..f25d6929302f 100644
--- a/nixos/tests/kafka.nix
+++ b/nixos/tests/kafka.nix
@@ -6,7 +6,7 @@
 with pkgs.lib;
 
 let
-  makeKafkaTest = name: { kafkaPackage, mode ? "zookeeper" }: (import ./make-test-python.nix ({
+  makeKafkaTest = name: { kafkaPackage, mode ? "kraft" }: (import ./make-test-python.nix ({
     inherit name;
     meta = with pkgs.lib.maintainers; {
       maintainers = [ nequissimus ];
@@ -103,10 +103,9 @@ let
   }) { inherit system; });
 
 in with pkgs; {
-  kafka_3_7 = makeKafkaTest "kafka_3_7" { kafkaPackage = apacheKafka_3_7; };
-  kafka_3_8 = makeKafkaTest "kafka_3_8" { kafkaPackage = apacheKafka_3_8; };
-  kafka_3_9 = makeKafkaTest "kafka_3_9" { kafkaPackage = apacheKafka_3_9; };
-  kafka_4_0 = makeKafkaTest "kafka_4_0" { kafkaPackage = apacheKafka_4_0; mode = "kraft"; };
+  kafka_3_7 = makeKafkaTest "kafka_3_7" { kafkaPackage = apacheKafka_3_7; mode = "zookeeper"; };
+  kafka_3_8 = makeKafkaTest "kafka_3_8" { kafkaPackage = apacheKafka_3_8; mode = "zookeeper"; };
+  kafka_3_9 = makeKafkaTest "kafka_3_9" { kafkaPackage = apacheKafka_3_9; mode = "zookeeper"; };
+  kafka_4_0 = makeKafkaTest "kafka_4_0" { kafkaPackage = apacheKafka_4_0; };
   kafka = makeKafkaTest "kafka" { kafkaPackage = apacheKafka; };
-  kafka_kraft = makeKafkaTest "kafka_kraft" { kafkaPackage = apacheKafka; mode = "kraft"; };
 }

From 9141f46cc970d73d0b9d7e4a1b510c2d3d9ee7d1 Mon Sep 17 00:00:00 2001
From: Zev Isert <dev@zevisert.ca>
Date: Fri, 21 Mar 2025 17:20:01 -0700
Subject: [PATCH 027/108] dive: 0.12.0 -> 0.13.0

Also removes unneccessary patches that have been merged upstream
---
 pkgs/by-name/di/dive/package.nix | 28 +++-------------------------
 1 file changed, 3 insertions(+), 25 deletions(-)

diff --git a/pkgs/by-name/di/dive/package.nix b/pkgs/by-name/di/dive/package.nix
index a6b005d2d034..cccb45755f5d 100644
--- a/pkgs/by-name/di/dive/package.nix
+++ b/pkgs/by-name/di/dive/package.nix
@@ -3,25 +3,23 @@
   stdenv,
   buildGoModule,
   fetchFromGitHub,
-  fetchpatch,
   pkg-config,
   btrfs-progs,
   gpgme,
   lvm2,
 }:
-
 buildGoModule rec {
   pname = "dive";
-  version = "0.12.0";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "wagoodman";
     repo = "dive";
     rev = "v${version}";
-    hash = "sha256-CuVRFybsn7PVPgz3fz5ghpjOEOsTYTv6uUAgRgFewFw=";
+    hash = "sha256-kVFXidcvSlYi+aD+3yEPYy1Esm0bl02ioX1DmO0L1Hs=";
   };
 
-  vendorHash = "sha256-uzzawa/Doo6j/Fh9dJMzGKbpp24UTLAo9VGmuQ80IZE=";
+  vendorHash = "sha256-9lNtKpfGDVE3U0ZX0QcaCJrqCxoubvWqR26IvSKkImM=";
 
   nativeBuildInputs = [ pkg-config ];
 
@@ -31,26 +29,6 @@ buildGoModule rec {
     lvm2
   ];
 
-  patches = [
-    # fix scrolling
-    # See https://github.com/wagoodman/dive/pull/447
-    (fetchpatch {
-      name = "fix-scrolling.patch";
-      url = "https://github.com/wagoodman/dive/pull/473/commits/a885fa6e68b3763d52de20603ee1b9cd8949276f.patch";
-      hash = "sha256-6gTWfyvK19xDqc7Ah33ewgz/WQRcQHLYwerrwUtRpJc=";
-    })
-    (fetchpatch {
-      name = "add-scrolling-layers.patch";
-      url = "https://github.com/wagoodman/dive/pull/473/commits/840653158e235bdd59b4c4621cf282ce6499c714.patch";
-      hash = "sha256-dYqg5JpWKOzy3hVjIVCHA2vmKCtCgc8W+oHEzuGpyxc=";
-    })
-    (fetchpatch {
-      name = "fix-render-update.patch";
-      url = "https://github.com/wagoodman/dive/pull/473/commits/36177a9154eebe9e3ae9461a9e6f6b368f7974e1.patch";
-      hash = "sha256-rSeEYxUaYlEZGv+NWYK+nATBYS4P2swqjC3HimHyqNI=";
-    })
-  ];
-
   ldflags = [
     "-s"
     "-w"

From 20bf8862326316def616437fd532833dcb2acbb5 Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Sun, 23 Mar 2025 21:40:09 +0000
Subject: [PATCH 028/108] nixpkgs-track: init at 0.2.0

---
 pkgs/by-name/ni/nixpkgs-track/package.nix | 44 +++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 pkgs/by-name/ni/nixpkgs-track/package.nix

diff --git a/pkgs/by-name/ni/nixpkgs-track/package.nix b/pkgs/by-name/ni/nixpkgs-track/package.nix
new file mode 100644
index 000000000000..4994f776d6c6
--- /dev/null
+++ b/pkgs/by-name/ni/nixpkgs-track/package.nix
@@ -0,0 +1,44 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  openssl,
+  pkg-config,
+  versionCheckHook,
+  nix-update-script,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "nixpkgs-track";
+  version = "0.2.0";
+
+  src = fetchFromGitHub {
+    owner = "uncenter";
+    repo = "nixpkgs-track";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-iJqYn+MttFBmcAI2HKALAAYayFzvdAtkmNwM+IewxRM=";
+  };
+
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-jC3E8BPuzRCI+smuqeWzNDA9MOcK/PDzZZPnvBVqSXI=";
+
+  buildInputs = [ openssl ];
+  nativeBuildInputs = [
+    pkg-config
+    versionCheckHook
+  ];
+
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Track where Nixpkgs pull requests have reached";
+    homepage = "https://github.com/uncenter/nixpkgs-track";
+    license = lib.licenses.mit;
+    mainProgram = "nixpkgs-track";
+    maintainers = with lib.maintainers; [
+      isabelroses
+      uncenter
+    ];
+  };
+})

From ba9e348b39f4e539770595297022b45bf68a578f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 24 Mar 2025 01:15:31 +0000
Subject: [PATCH 029/108] dita-ot: 4.3 -> 4.3.1

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

diff --git a/pkgs/by-name/di/dita-ot/package.nix b/pkgs/by-name/di/dita-ot/package.nix
index 9e73f2364b8e..3568bd8c50fc 100644
--- a/pkgs/by-name/di/dita-ot/package.nix
+++ b/pkgs/by-name/di/dita-ot/package.nix
@@ -9,14 +9,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dita-ot";
-  version = "4.3";
+  version = "4.3.1";
 
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ openjdk17 ];
 
   src = fetchzip {
     url = "https://github.com/dita-ot/dita-ot/releases/download/${finalAttrs.version}/dita-ot-${finalAttrs.version}.zip";
-    hash = "sha256-/qWu9lUfK/3gp/IO4WOO8g8LuZlXErEU5sPt9qZep1I=";
+    hash = "sha256-MwE6HnOrVtoT23wF0Tyje8T52au8kD6waY9tsrLQVck=";
   };
 
   installPhase = ''

From feb4b87024738e96cced7eb6775e2102f4632be2 Mon Sep 17 00:00:00 2001
From: EarthGman <117403037+EarthGman@users.noreply.github.com>
Date: Sun, 23 Mar 2025 20:41:42 -0500
Subject: [PATCH 030/108] maintainers: add EarthGman

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 0daec873adef..eb478d5c330b 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -6677,6 +6677,12 @@
     githubId = 424946;
     name = "James Earl Douglas";
   };
+  EarthGman = {
+    email = "earthgman@protonmail.com";
+    name = "EarthGman";
+    github = "EarthGman";
+    githubId = 117403037;
+  };
   EBADBEEF = {
     name = "EBADBEEF";
     email = "errno@ebadf.com";

From e627058207a24d47b8411cc8a892d6ba4772510b Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Mon, 24 Mar 2025 11:09:01 +0000
Subject: [PATCH 031/108] nixos/release-notes: Added note about Kafka/Zookeeper
 deprecation.

---
 doc/release-notes/rl-2505.section.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md
index e386ead66797..690bc7a68487 100644
--- a/doc/release-notes/rl-2505.section.md
+++ b/doc/release-notes/rl-2505.section.md
@@ -40,6 +40,11 @@
 
 - Default ICU version updated from 74 to 76
 
+- Apache Kafka was updated to `>= 4.0.0`. Please note that this is the first release which operates
+  entirely without Apache ZooKeeper support, and all clusters need to be migrated to KRaft mode. See
+  the [release announcement](https://kafka.apache.org/blog#apache_kafka_400_release_announcement)
+  for more details.
+
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
 
 ### Titanium removed {#sec-nixpkgs-release-25.05-incompatibilities-titanium-removed}

From 157f30a2413737d9957a65808007749f6f18428c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 24 Mar 2025 14:11:21 +0000
Subject: [PATCH 032/108] zapret: 70.3 -> 70.5

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

diff --git a/pkgs/by-name/za/zapret/package.nix b/pkgs/by-name/za/zapret/package.nix
index c5710ab80d99..a9e534fd87f1 100644
--- a/pkgs/by-name/za/zapret/package.nix
+++ b/pkgs/by-name/za/zapret/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zapret";
-  version = "70.3";
+  version = "70.5";
 
   src = fetchFromGitHub {
     owner = "bol-van";
     repo = "zapret";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-sYLZH/j8bHUKfkUAAAuTrCTOXB6Qp9kVj4GjyFv6M+g=";
+    hash = "sha256-El/3qWZCyN5WixDWbtv+W69z0WITGMODX83dwDIT/94=";
   };
 
   buildInputs = [

From 5a9bc6d64311bb93829690b1579a1f16c04dc96c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 24 Mar 2025 16:15:50 +0000
Subject: [PATCH 033/108] sonarlint-ls: 3.17.0.75948 -> 3.18.0.75982

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

diff --git a/pkgs/by-name/so/sonarlint-ls/package.nix b/pkgs/by-name/so/sonarlint-ls/package.nix
index eb3699fa50d6..d3205fbccf88 100644
--- a/pkgs/by-name/so/sonarlint-ls/package.nix
+++ b/pkgs/by-name/so/sonarlint-ls/package.nix
@@ -16,17 +16,17 @@
 
 maven.buildMavenPackage rec {
   pname = "sonarlint-ls";
-  version = "3.17.0.75948";
+  version = "3.18.0.75982";
 
   src = fetchFromGitHub {
     owner = "SonarSource";
     repo = "sonarlint-language-server";
     rev = version;
-    hash = "sha256-9ZZPAkfYnHYaPFGo/WfOhUIZ+Aq7SNsVmyXgDwe68gk=";
+    hash = "sha256-/SpooLAJutBJ/FakSUyXMtPLy3TaPxCU8KEMnnzgdBs=";
   };
 
   mvnJdk = jdk17;
-  mvnHash = "sha256-tsYkp6Zr9gCgb0l6vQViSB7zcbf6JX+JwO4ZYqeG52c=";
+  mvnHash = "sha256-IMM3xXWTnYzD3415tMjuwiQD2NMGM2XkuxdMYpsaqfA=";
 
   # Disables failing tests which either need network access or are flaky.
   mvnParameters = lib.escapeShellArgs [

From 36a6516a864a541a72854491fda0473087a496d6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 25 Mar 2025 12:49:38 +0000
Subject: [PATCH 034/108] armadillo: 14.4.0 -> 14.4.1

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

diff --git a/pkgs/by-name/ar/armadillo/package.nix b/pkgs/by-name/ar/armadillo/package.nix
index 124b54848d6c..c7edb0135324 100644
--- a/pkgs/by-name/ar/armadillo/package.nix
+++ b/pkgs/by-name/ar/armadillo/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "armadillo";
-  version = "14.4.0";
+  version = "14.4.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
-    hash = "sha256-AjJC/VkHHZjHX7AV/TKTySETLcOb9G0iHUsFmq6NefQ=";
+    hash = "sha256-Js4nK/3IJGwnjm+M+lN3eh77FO8ZbogIL+4F2hpGNJE=";
   };
 
   nativeBuildInputs = [ cmake ];

From 296e3817a4c85036d5d0f1943852c7189941bfcf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 25 Mar 2025 16:52:06 +0000
Subject: [PATCH 035/108] got: 0.109 -> 0.110

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

diff --git a/pkgs/by-name/go/got/package.nix b/pkgs/by-name/go/got/package.nix
index 44bf68a4f06e..c856a00b048f 100644
--- a/pkgs/by-name/go/got/package.nix
+++ b/pkgs/by-name/go/got/package.nix
@@ -25,11 +25,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "got";
-  version = "0.109";
+  version = "0.110";
 
   src = fetchurl {
     url = "https://gameoftrees.org/releases/portable/got-portable-${finalAttrs.version}.tar.gz";
-    hash = "sha256-ItLdVOFbxj+g5Vsom01YekPbM2ckFCE8LvcYxTMsaoE=";
+    hash = "sha256-NjXkEgXn+FI2pudv94XT2JlxMc81PIzfb20lwDFmHSk=";
   };
 
   nativeBuildInputs = [

From 40b6b9ac860ae9a3374839d73f665b10a74d220a Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sat, 22 Mar 2025 17:40:16 +0800
Subject: [PATCH 036/108] neohtop: init at 1.1.2

---
 pkgs/by-name/ne/neohtop/package.nix | 69 +++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 pkgs/by-name/ne/neohtop/package.nix

diff --git a/pkgs/by-name/ne/neohtop/package.nix b/pkgs/by-name/ne/neohtop/package.nix
new file mode 100644
index 000000000000..14a83ec87048
--- /dev/null
+++ b/pkgs/by-name/ne/neohtop/package.nix
@@ -0,0 +1,69 @@
+{
+  lib,
+  stdenv,
+  rustPlatform,
+  cargo-tauri,
+  nodejs,
+  npmHooks,
+  fetchNpmDeps,
+  pkg-config,
+  webkitgtk_4_1,
+  fetchFromGitHub,
+  glib,
+  gtk3,
+  libsoup_2_4,
+  openssl,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "neohtop";
+  version = "1.1.2";
+
+  src = fetchFromGitHub {
+    owner = "Abdenasser";
+    repo = "neohtop";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-5hDxMQlDPXf0llu51Hwb/9n0GX0YSvVJUS+RvEiLsnM=";
+  };
+
+  npmDeps = fetchNpmDeps {
+    inherit (finalAttrs) src;
+    hash = "sha256-qhAdKLtTQ2iUFc7UNJNeB1Mzbzg/NrGAWrKQTdGiN4Y=";
+  };
+
+  useFetchCargoVendor = true;
+
+  cargoHash = "sha256-nYBPvfBzRIJdvfuOZnzs+kuSozlkBB/ImqjDYfvNBrA=";
+
+  cargoRoot = "src-tauri";
+
+  buildAndTestSubdir = "src-tauri";
+
+  nativeBuildInputs = [
+    cargo-tauri.hook
+    npmHooks.npmConfigHook
+    pkg-config
+    nodejs
+  ];
+
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
+    glib
+    gtk3
+    openssl
+    libsoup_2_4
+    webkitgtk_4_1
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Blazing-fast system monitoring for your desktop";
+    homepage = "https://github.com/Abdenasser/neohtop";
+    changelog = "https://github.com/Abdenasser/neohtop/releases/tag/v${finalAttrs.version}";
+    mainProgram = "NeoHtop";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    maintainers = with lib.maintainers; [ emaryn ];
+  };
+})

From 8f9ee3c15bde3a73440d3b67cd7d8df1fd50c55c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 26 Mar 2025 10:26:01 +0100
Subject: [PATCH 037/108] python313Packages.pyspx: refactor

---
 pkgs/development/python-modules/pyspx/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pyspx/default.nix b/pkgs/development/python-modules/pyspx/default.nix
index d1b5daba2ac1..06e2b58bd33f 100644
--- a/pkgs/development/python-modules/pyspx/default.nix
+++ b/pkgs/development/python-modules/pyspx/default.nix
@@ -6,7 +6,6 @@
   pytestCheckHook,
   pythonOlder,
   setuptools,
-  wheel,
 }:
 
 buildPythonPackage rec {
@@ -24,10 +23,9 @@ buildPythonPackage rec {
     fetchSubmodules = true;
   };
 
-  nativeBuildInputs = [
+  build-system = [
     cffi
     setuptools
-    wheel
   ];
 
   nativeCheckInputs = [ pytestCheckHook ];

From a3d232142f2c23729704635badc574c595d7073f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 26 Mar 2025 11:25:14 +0000
Subject: [PATCH 038/108] thunderbird-latest-unwrapped: 136.0 -> 136.0.1

---
 .../networking/mailreaders/thunderbird/packages.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
index b3c147621977..366c0b970ae9 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
@@ -85,8 +85,8 @@ rec {
   thunderbird = thunderbird-latest;
 
   thunderbird-latest = common {
-    version = "136.0";
-    sha512 = "37c94258b49a7e87b24b4cffaa6eae81698356ddc3f0f49ea675b885dea2c56a3ca758dac2ddb2720beaf2f34faa15a9ab9b5eda0b352c0c8f14167c01838714";
+    version = "136.0.1";
+    sha512 = "cc217f3e07620442714337ea396a7146d9d80cc973de862990a9fac7c4343e900419b71ff8c6575e563deda6daff90bec5809a9a94376cbf1019c834f4e1b1e7";
 
     updateScript = callPackage ./update.nix {
       attrPath = "thunderbirdPackages.thunderbird-latest";

From fa36b8fdedb16a1e2667723c8185c40ef93605b5 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Mon, 3 Feb 2025 22:17:03 +0100
Subject: [PATCH 039/108] survex: fix and enable strictDeps

---
 pkgs/applications/misc/survex/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/applications/misc/survex/default.nix b/pkgs/applications/misc/survex/default.nix
index a3e42d9121fb..f49e5db55a6a 100644
--- a/pkgs/applications/misc/survex/default.nix
+++ b/pkgs/applications/misc/survex/default.nix
@@ -57,10 +57,16 @@ stdenv.mkDerivation rec {
       libX11
     ];
 
+  strictDeps = true;
+
   postPatch = ''
     patchShebangs .
   '';
 
+  configureFlags = [
+    "WX_CONFIG=${lib.getExe' (lib.getDev wxGTK32) "wx-config"}"
+  ];
+
   enableParallelBuilding = true;
   doCheck = (!stdenv.hostPlatform.isDarwin); # times out
   enableParallelChecking = false;

From 9aff0fa5a39eb7925213bbda1eb1a5a44bc83f44 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 26 Mar 2025 15:20:24 +0000
Subject: [PATCH 040/108] seaview: 5.0.5 -> 5.1

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

diff --git a/pkgs/by-name/se/seaview/package.nix b/pkgs/by-name/se/seaview/package.nix
index 927489cabcdd..0b878abb8d41 100644
--- a/pkgs/by-name/se/seaview/package.nix
+++ b/pkgs/by-name/se/seaview/package.nix
@@ -8,12 +8,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "5.0.5";
+  version = "5.1";
   pname = "seaview";
 
   src = fetchurl {
     url = "ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/archive/seaview_${version}.tar.gz";
-    sha256 = "sha256-zo9emLpHiDv6kekbx55NOibxWN2Zg7XngzGkUqSx+PI=";
+    sha256 = "sha256-tL9YQB4wgUOCyCWxOkw+6oyinDFO1cSh9DRZt47W+Ys=";
   };
 
   buildInputs = [

From a37204be07eb9c37451c883d1cc290535a7b8214 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 26 Mar 2025 17:28:48 +0100
Subject: [PATCH 041/108] strace: 6.13 -> 6.14

ChangeLog: https://github.com/strace/strace/releases/tag/v6.14
---
 pkgs/by-name/st/strace/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/st/strace/package.nix b/pkgs/by-name/st/strace/package.nix
index f692bdd0adef..26e249ac8563 100644
--- a/pkgs/by-name/st/strace/package.nix
+++ b/pkgs/by-name/st/strace/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "strace";
-  version = "6.13";
+  version = "6.14";
 
   src = fetchurl {
     url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz";
-    hash = "sha256-4gna8O4DjKWtzEwnfpJztNUfRqL/htpXXTZ0KsNQihc=";
+    hash = "sha256-JE87XCCjKFTKm3yno+4JHdPUvSCTOhcezujbSGx308k=";
   };
 
   separateDebugInfo = true;

From 240d333419d417f24439ba3534884d1daa5c9b3e Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 26 Mar 2025 17:38:15 +0100
Subject: [PATCH 042/108] strace: split man pages off

strace is on every NixOS system. Some people may want to skip `man`
pages to save a bit of closure size, so it makes sense to also do it on
a package like this.
---
 pkgs/by-name/st/strace/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/st/strace/package.nix b/pkgs/by-name/st/strace/package.nix
index 26e249ac8563..68930c92d64d 100644
--- a/pkgs/by-name/st/strace/package.nix
+++ b/pkgs/by-name/st/strace/package.nix
@@ -20,6 +20,11 @@ stdenv.mkDerivation rec {
 
   separateDebugInfo = true;
 
+  outputs = [
+    "out"
+    "man"
+  ];
+
   depsBuildBuild = [ buildPackages.stdenv.cc ];
   nativeBuildInputs = [ perl ];
 

From e2d38fa0d59f42ee6818c8435d941222c2b64a13 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 26 Mar 2025 17:42:47 +0000
Subject: [PATCH 043/108] soju: 0.8.2 -> 0.9.0

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

diff --git a/pkgs/by-name/so/soju/package.nix b/pkgs/by-name/so/soju/package.nix
index 313c4d04368a..8f8bc8458959 100644
--- a/pkgs/by-name/so/soju/package.nix
+++ b/pkgs/by-name/so/soju/package.nix
@@ -9,17 +9,17 @@
 
 buildGoModule rec {
   pname = "soju";
-  version = "0.8.2";
+  version = "0.9.0";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "emersion";
     repo = "soju";
     rev = "v${version}";
-    hash = "sha256-zJj9y3llJOijmx7+C5NOzEpIG/SEeg+ZhWtLPQ/iabY=";
+    hash = "sha256-qbSTaE0qOeXVcEmOver8Tu+gwV4cP4gNzIxByLKApCU=";
   };
 
-  vendorHash = "sha256-E/9a8GCEb/0Xto6cgH9R4WWdaoo/nwb6kcFdoEeMUps=";
+  vendorHash = "sha256-JhoAtBw4O6lOd27dIXBNvA9EfUH5AD3ZHuGcWgU/Xv0=";
 
   nativeBuildInputs = [
     installShellFiles

From ed93ebbfa6e45b8edc274f3bcb69c968941b27a7 Mon Sep 17 00:00:00 2001
From: 0x4A6F <0x4A6F@users.noreply.github.com>
Date: Wed, 26 Mar 2025 19:56:22 +0100
Subject: [PATCH 044/108] exim: 4.98.1 -> 4.98.2

References:

    https://exim.org/static/doc/security/CVE-2025-30232.txt
    https://www.openwall.com/lists/oss-security/2025/03/26/1
---
 pkgs/by-name/ex/exim/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ex/exim/package.nix b/pkgs/by-name/ex/exim/package.nix
index 8fe6d1ea5425..5bfb1b2b1ae8 100644
--- a/pkgs/by-name/ex/exim/package.nix
+++ b/pkgs/by-name/ex/exim/package.nix
@@ -39,11 +39,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "exim";
-  version = "4.98.1";
+  version = "4.98.2";
 
   src = fetchurl {
     url = "https://ftp.exim.org/pub/exim/exim4/${pname}-${version}.tar.xz";
-    hash = "sha256-2Fi3WtLMa/cckHG6JqVbPqmt0mYHvYMt88tU+CIhws4=";
+    hash = "sha256-iLjopnwdtswLHRSBYao25mL0yi/vJdW282lNSQ5C3K4=";
   };
 
   enableParallelBuilding = true;

From 4a94182437f41bc699ce0aea7ed62c2ee22ad747 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 26 Mar 2025 19:06:50 +0000
Subject: [PATCH 045/108] raspberrypi-eeprom: 2025.02.12-2712 ->
 2025.03.10-2712

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

diff --git a/pkgs/by-name/ra/raspberrypi-eeprom/package.nix b/pkgs/by-name/ra/raspberrypi-eeprom/package.nix
index 4b35c967f715..b5cc06889ed9 100644
--- a/pkgs/by-name/ra/raspberrypi-eeprom/package.nix
+++ b/pkgs/by-name/ra/raspberrypi-eeprom/package.nix
@@ -14,13 +14,13 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "raspberrypi-eeprom";
-  version = "2025.02.12-2712";
+  version = "2025.03.10-2712";
 
   src = fetchFromGitHub {
     owner = "raspberrypi";
     repo = "rpi-eeprom";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-FuOBjS/9gPj775ELE3CKh6wQfBQtnaIJy5I22pAG99M=";
+    hash = "sha256-VfguC6sECfkTPR/BDIYXEzQk7ebYxvDjDZsRmEvQ39o=";
   };
 
   buildInputs = [ python3 ];

From c2eeb9a3dc8a43eee7173b6362ab9ab359bd8c66 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 26 Mar 2025 20:20:00 +0100
Subject: [PATCH 046/108] cnspec: 11.46.2 -> 11.47.1

Diff: https://github.com/mondoohq/cnspec/compare/refs/tags/v11.46.2...v11.47.1

Changelog: https://github.com/mondoohq/cnspec/releases/tag/v11.47.1
---
 pkgs/tools/security/cnspec/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix
index 2dc817dfb9e2..45be5eb931de 100644
--- a/pkgs/tools/security/cnspec/default.nix
+++ b/pkgs/tools/security/cnspec/default.nix
@@ -6,18 +6,18 @@
 
 buildGoModule rec {
   pname = "cnspec";
-  version = "11.46.2";
+  version = "11.47.1";
 
   src = fetchFromGitHub {
     owner = "mondoohq";
     repo = "cnspec";
     tag = "v${version}";
-    hash = "sha256-eeJM4NgvLBXYzJSdt6rN9LwsQKK6drU+l5OqOWUyX8w=";
+    hash = "sha256-y6eycpBrPK1N4lOaaJZFMXpGNFsqt98qTi26Ys01D5k=";
   };
 
   proxyVendor = true;
 
-  vendorHash = "sha256-ybHvPLDet8d1oOWPIPzAhWIzLTFu8lRM94dsrrDZoCs=";
+  vendorHash = "sha256-TjHfPCKIs7k6GkI5c4BMHIw5qVrfDOwx8Z9tJiqUy68=";
 
   subPackages = [ "apps/cnspec" ];
 

From bf201738a7f4fd789e259427756ec38b1c9e4823 Mon Sep 17 00:00:00 2001
From: Malo Bourgon <mbourgon@gmail.com>
Date: Wed, 26 Mar 2025 12:20:50 -0700
Subject: [PATCH 047/108] claude-code: 0.2.53 -> 0.2.54

---
 pkgs/by-name/cl/claude-code/package-lock.json | 8 ++++----
 pkgs/by-name/cl/claude-code/package.nix       | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json
index 1cfca599fc7f..88921827057b 100644
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ b/pkgs/by-name/cl/claude-code/package-lock.json
@@ -5,13 +5,13 @@
   "packages": {
     "": {
       "dependencies": {
-        "@anthropic-ai/claude-code": "^0.2.53"
+        "@anthropic-ai/claude-code": "^0.2.54"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "0.2.53",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-0.2.53.tgz",
-      "integrity": "sha512-DKXGjSsu2+rc1GaAdOjRqD7fMLvyQgwi/sqf6lLHWQAarwYxR/ahbSheu7h1Ub0wm0htnuIqgNnmNZUM43w/3Q==",
+      "version": "0.2.54",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-0.2.54.tgz",
+      "integrity": "sha512-kl/g4oBg+FBQHRQv3INaiDuNWoYIUm4BbIk4qd5YbesFQVMPGtblh0Avst61FUo9ZCm64iBPWupPe5aaiJ6Y9Q==",
       "hasInstallScript": true,
       "license": "SEE LICENSE IN README.md",
       "bin": {
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index 50b2b1fd24ac..e91b133e8f64 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -6,14 +6,14 @@
 
 buildNpmPackage rec {
   pname = "claude-code";
-  version = "0.2.53";
+  version = "0.2.54";
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz";
-    hash = "sha256-oWXtIGJwVe/LwAlIWfpA5Jn9zZWQtjw03DkyQ/Sg08c=";
+    hash = "sha256-zeHaEqcUcxvF0xu2ZViL0m3v8v0UFB/xvBsEWR03F9I=";
   };
 
-  npmDepsHash = "sha256-3igDt1N77LJu5Dq9uK3bd90sfYZkjBOt5ArvoRibFeo=";
+  npmDepsHash = "sha256-e0vVEtJC1QIlGS6XQA0eMLdd7wFYWRuyC0Ynpu/Iw88=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From bee615ca98fe1458da6c44dc7523feeaee1c3d14 Mon Sep 17 00:00:00 2001
From: Patrick Jackson <patrick@jackson.dev>
Date: Wed, 26 Mar 2025 12:23:15 -0700
Subject: [PATCH 048/108] retext: fix case-sensitive substituteInPlace call

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

diff --git a/pkgs/applications/editors/retext/default.nix b/pkgs/applications/editors/retext/default.nix
index 9518a3d94cce..5bd6ace5f54f 100644
--- a/pkgs/applications/editors/retext/default.nix
+++ b/pkgs/applications/editors/retext/default.nix
@@ -84,7 +84,7 @@ python3.pkgs.buildPythonApplication rec {
     cp ${toolbarIcons}/* $out/${python3.pkgs.python.sitePackages}/ReText/icons
 
     substituteInPlace $out/share/applications/me.mitya57.ReText.desktop \
-      --replace-fail "Exec=ReText-${version}.data/scripts/retext %F" "Exec=retext %F" \
+      --replace-fail "Exec=retext-${version}.data/scripts/retext %F" "Exec=retext %F" \
       --replace-fail "Icon=./ReText/icons/retext.svg" "Icon=retext"
   '';
 

From 12c17ff36bf9d2b001501b488e41626a2a884ca2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 26 Mar 2025 20:26:44 +0100
Subject: [PATCH 049/108] python313Packages.mcpadapt: 0.0.15 -> 0.0.16

Diff: https://github.com/grll/mcpadapt/compare/refs/tags/v0.0.15...v0.0.16

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

diff --git a/pkgs/development/python-modules/mcpadapt/default.nix b/pkgs/development/python-modules/mcpadapt/default.nix
index 26de74d821ca..ccca1e0c5be8 100644
--- a/pkgs/development/python-modules/mcpadapt/default.nix
+++ b/pkgs/development/python-modules/mcpadapt/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "mcpadapt";
-  version = "0.0.15";
+  version = "0.0.16";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "grll";
     repo = "mcpadapt";
     tag = "v${version}";
-    hash = "sha256-Cpm6jfdAyhMNc3bnDcF42G24VdStM2OpDTsGHS4IEMM=";
+    hash = "sha256-l5noNvg2vQJa0kOPJG78whrnTKkYy1FUfSb9V+ICpAo=";
   };
 
   build-system = [ hatchling ];

From 6feaf10d4f4cb91ca3f0cfee6ca09b89b31471f8 Mon Sep 17 00:00:00 2001
From: DeftDawg <deftdawg@gmail.com>
Date: Wed, 26 Mar 2025 16:29:35 -0400
Subject: [PATCH 050/108] lmstudio: 0.3.11 -> 0.3.14-3

---
 pkgs/by-name/lm/lmstudio/linux.nix   | 21 +++++++++++++++----
 pkgs/by-name/lm/lmstudio/package.nix | 31 ++++++++++------------------
 2 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/pkgs/by-name/lm/lmstudio/linux.nix b/pkgs/by-name/lm/lmstudio/linux.nix
index 213c18009d82..df9421c581c4 100644
--- a/pkgs/by-name/lm/lmstudio/linux.nix
+++ b/pkgs/by-name/lm/lmstudio/linux.nix
@@ -6,11 +6,12 @@
   hash,
   pname,
   meta,
+  stdenv,
+  lib,
+  patchelf,
 }:
 let
-  src = fetchurl {
-    inherit url hash;
-  };
+  src = fetchurl { inherit url hash; };
 
   appimageContents = appimageTools.extractType2 { inherit pname version src; };
 in
@@ -28,7 +29,19 @@ appimageTools.wrapType2 {
     mkdir -p $out/share/applications
     cp -r ${appimageContents}/usr/share/icons $out/share
     install -m 444 -D ${appimageContents}/lm-studio.desktop -t $out/share/applications
+
+    # Rename the main executable from lmstudio to lm-studio
+    mv $out/bin/lmstudio $out/bin/lm-studio
+
     substituteInPlace $out/share/applications/lm-studio.desktop \
-      --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=lmstudio'
+      --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=lm-studio'
+
+    # lms cli tool
+    install -m 755 ${appimageContents}/resources/app/.webpack/lms $out/bin/
+
+    patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" \
+    --set-rpath "${lib.getLib stdenv.cc.cc}/lib:${lib.getLib stdenv.cc.cc}/lib64:$out/lib:${
+      lib.makeLibraryPath [ (lib.getLib stdenv.cc.cc) ]
+    }" $out/bin/lms
   '';
 }
diff --git a/pkgs/by-name/lm/lmstudio/package.nix b/pkgs/by-name/lm/lmstudio/package.nix
index 31ff8a8ab549..c41d543c446a 100644
--- a/pkgs/by-name/lm/lmstudio/package.nix
+++ b/pkgs/by-name/lm/lmstudio/package.nix
@@ -2,22 +2,19 @@
   lib,
   stdenv,
   callPackage,
-  version ? "0.3.11",
-  rev ? "1",
+  version ? "0.3.14",
+  rev ? "3",
   ...
 }@args:
 let
   pname = "lmstudio";
+  packageVersion = "${version}-${rev}"; # Combine version and rev
   meta = {
     description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)";
     homepage = "https://lmstudio.ai/";
     license = lib.licenses.unfree;
-    mainProgram = "lmstudio";
-    maintainers = with lib.maintainers; [
-      cig0
-      eeedean
-      crertel
-    ];
+    mainProgram = "lm-studio";
+    maintainers = with lib.maintainers; [ crertel ];
     platforms = [
       "x86_64-linux"
       "aarch64-darwin"
@@ -28,25 +25,19 @@ let
 in
 if stdenv.hostPlatform.isDarwin then
   callPackage ./darwin.nix {
-    inherit
-      pname
-      version
-      meta
-      ;
+    inherit pname meta;
+    version = packageVersion;
     url =
       args.url
         or "https://installers.lmstudio.ai/darwin/arm64/${version}-${rev}/LM-Studio-${version}-${rev}-arm64.dmg";
-    hash = args.hash or "sha256-kXH3tAazEtl019IBxuavEI9QUamEH3b6UFYRYAO3Fxs=";
+    hash = args.hash or "sha256-doAhCbWFwDWlBQ+4YfJz6p7I4NZJxIOtdLYTr3mOGds=";
   }
 else
   callPackage ./linux.nix {
-    inherit
-      pname
-      version
-      meta
-      ;
+    inherit pname meta;
+    version = packageVersion;
     url =
       args.url
         or "https://installers.lmstudio.ai/linux/x64/${version}-${rev}/LM-Studio-${version}-${rev}-x64.AppImage";
-    hash = args.hash or "sha256-T8j0l2ZP53Zc0hgb2EyFeR0mH5YrNlz4UfzN0rO7bKU=";
+    hash = args.hash or "sha256-IIJMk0cfLQdrx0nTSbpsbqOvD+f/qrH+rGdYN4mygaw=";
   }

From fddcbd29d7a39b37b938349de20f30a140b992ca Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 26 Mar 2025 23:07:05 +0100
Subject: [PATCH 051/108] python313Packages.tencentcloud-sdk-python: 3.0.1347
 -> 3.0.1348

Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1347...3.0.1348

Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1348/CHANGELOG.md
---
 .../python-modules/tencentcloud-sdk-python/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index 4b2be97b8daf..8f36cdc6d71f 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "tencentcloud-sdk-python";
-  version = "3.0.1347";
+  version = "3.0.1348";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     tag = version;
-    hash = "sha256-0YCO8fYfXfLeCxszJ9RXJHV1wuPFaV18Ty6+j+c1kCw=";
+    hash = "sha256-cKSeey6erm+iXwPwaS/lan+5UDOxMTJVoJErDFCikWI=";
   };
 
   build-system = [ setuptools ];

From 48948ed90ba0033c5cc945b4a38e883554a1bf4a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 26 Mar 2025 22:20:24 +0000
Subject: [PATCH 052/108] retroarch-assets: 1.20.0-unstable-2025-03-09 ->
 1.20.0-unstable-2025-03-21

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

diff --git a/pkgs/by-name/re/retroarch-assets/package.nix b/pkgs/by-name/re/retroarch-assets/package.nix
index 458076efca65..b83e69b63257 100644
--- a/pkgs/by-name/re/retroarch-assets/package.nix
+++ b/pkgs/by-name/re/retroarch-assets/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "retroarch-assets";
-  version = "1.20.0-unstable-2025-03-09";
+  version = "1.20.0-unstable-2025-03-21";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "retroarch-assets";
-    rev = "fb39cdde6dfaea2c98218d28c71b14afc632fa03";
-    hash = "sha256-2ytGtoci0xd10KrYGwMsGbXoT402DiokSVlCek8nhyI=";
+    rev = "818aca56efd784624a241a12936b5c0864e3ddd8";
+    hash = "sha256-14n9oQbvzl66pgWLMYEpAM7uJUH5e8a3xRCy5f1TFIw=";
   };
 
   makeFlags = [

From bd57f94d7a48aa5db8e5cfe5a5a87289a8eaf358 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 26 Mar 2025 22:25:52 +0000
Subject: [PATCH 053/108] libretro.stella: 0-unstable-2025-02-16 ->
 0-unstable-2025-03-17

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

diff --git a/pkgs/applications/emulators/libretro/cores/stella.nix b/pkgs/applications/emulators/libretro/cores/stella.nix
index cef672e0d42c..662ae52655dc 100644
--- a/pkgs/applications/emulators/libretro/cores/stella.nix
+++ b/pkgs/applications/emulators/libretro/cores/stella.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "stella";
-  version = "0-unstable-2025-02-16";
+  version = "0-unstable-2025-03-17";
 
   src = fetchFromGitHub {
     owner = "stella-emu";
     repo = "stella";
-    rev = "dccefede9b9e0c1f08cb645ac4c1b922579b93fa";
-    hash = "sha256-J9/6plYOa44ZeVWilJWSR5ZQF0bzZ8w5v272iIAOMxM=";
+    rev = "aaa6c154750119905190da49569fa9e2de7bb97b";
+    hash = "sha256-QephycS6p6KCAR5ryc8Nhx8jnFGHaY7kObT13RNU42Q=";
   };
 
   makefile = "Makefile";

From be1b27c5024aca36e5062b5311a7c35e6781d9be Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 26 Mar 2025 22:46:53 +0000
Subject: [PATCH 054/108] libretro.ppsspp: 0-unstable-2025-03-15 ->
 0-unstable-2025-03-26

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

diff --git a/pkgs/applications/emulators/libretro/cores/ppsspp.nix b/pkgs/applications/emulators/libretro/cores/ppsspp.nix
index 26e6eae735cb..428e7982f5f8 100644
--- a/pkgs/applications/emulators/libretro/cores/ppsspp.nix
+++ b/pkgs/applications/emulators/libretro/cores/ppsspp.nix
@@ -13,13 +13,13 @@
 }:
 mkLibretroCore {
   core = "ppsspp";
-  version = "0-unstable-2025-03-15";
+  version = "0-unstable-2025-03-26";
 
   src = fetchFromGitHub {
     owner = "hrydgard";
     repo = "ppsspp";
-    rev = "60a2dd12bc6eebb9e7885bf77f91835d6ff07307";
-    hash = "sha256-I9v01nXxaE1JboJ3a4hxIi1Qw78mOaLWdSVikF1vv1I=";
+    rev = "e4a492b6a2d72582e0d32ffd05b7f37d3312657c";
+    hash = "sha256-2WuKxfOmlNcPIbwVjCbGfvWIwd5/WYb7pFGMnzg3fZQ=";
     fetchSubmodules = true;
   };
 

From 6b86a5d6bb31bf16f54373a3ccba2a86751bbedb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 26 Mar 2025 22:57:56 +0000
Subject: [PATCH 055/108] libretro.fbneo: 0-unstable-2025-03-11 ->
 0-unstable-2025-03-26

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

diff --git a/pkgs/applications/emulators/libretro/cores/fbneo.nix b/pkgs/applications/emulators/libretro/cores/fbneo.nix
index 4178fc178a32..cdb81f37a905 100644
--- a/pkgs/applications/emulators/libretro/cores/fbneo.nix
+++ b/pkgs/applications/emulators/libretro/cores/fbneo.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "fbneo";
-  version = "0-unstable-2025-03-11";
+  version = "0-unstable-2025-03-26";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "fbneo";
-    rev = "0bf8e4482caf9c18fcd74b3ddd2d7eaaf32ff8ef";
-    hash = "sha256-vIC1S57z+agpuaY7wb5bVAppsZkxCQGEnQteiHu0Y34=";
+    rev = "ad3b6536f57ec189defabc8aa0fe9d854d167d67";
+    hash = "sha256-Nyzzr6XFQmtRVWxATIIONn3tnwwS6jLbbwHxoYXUDGU=";
   };
 
   makefile = "Makefile";

From 0b0bdc9e6a6f20454df4a1bd164115bc67f285a6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 26 Mar 2025 23:09:09 +0000
Subject: [PATCH 056/108] alistral: 0.5.2 -> 0.5.5

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

diff --git a/pkgs/by-name/al/alistral/package.nix b/pkgs/by-name/al/alistral/package.nix
index 0b88fecf5822..e6501719314c 100644
--- a/pkgs/by-name/al/alistral/package.nix
+++ b/pkgs/by-name/al/alistral/package.nix
@@ -10,13 +10,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "alistral";
-  version = "0.5.2";
+  version = "0.5.5";
 
   src = fetchFromGitHub {
     owner = "RustyNova016";
     repo = "Alistral";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-bt0WCmnk/DAEuQeEvBe5Vdk/AxpfRAafPiEJ7v8HK8Y=";
+    hash = "sha256-DrHoVAIPD/F6pY04QXVilXiwD/nWzeVquuHzRiq2sRY=";
   };
 
   # remove if updating to rust 1.85
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   '';
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-BxJmoJbnGfsA+YCvzUvgnkoHl/ClrwHoE3NjlctjCxA=";
+  cargoHash = "sha256-Jyus5L0z0Z6Qf9vBcO6/h+py0JNKG1FS6qXONUM26BM=";
 
   env.RUSTC_BOOTSTRAP = 1;
 

From 09f36b6d2293030e8f82eff7708acf80f72c53d8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 26 Mar 2025 23:25:49 +0000
Subject: [PATCH 057/108] libretro.flycast: 0-unstable-2025-03-14 ->
 0-unstable-2025-03-22

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

diff --git a/pkgs/applications/emulators/libretro/cores/flycast.nix b/pkgs/applications/emulators/libretro/cores/flycast.nix
index 0f570c206d0e..2cf45fc000e4 100644
--- a/pkgs/applications/emulators/libretro/cores/flycast.nix
+++ b/pkgs/applications/emulators/libretro/cores/flycast.nix
@@ -8,13 +8,13 @@
 }:
 mkLibretroCore {
   core = "flycast";
-  version = "0-unstable-2025-03-14";
+  version = "0-unstable-2025-03-22";
 
   src = fetchFromGitHub {
     owner = "flyinghead";
     repo = "flycast";
-    rev = "44f77408e47d2f2873e1dec4705cd6b6071784fb";
-    hash = "sha256-3UrMup7V6K630p5DvsGweqg9TaRTtL1TU0wC9Xt7hp8=";
+    rev = "305cae496fe009a523e1a43cc6a11141531626ef";
+    hash = "sha256-L91RS+GzNA0IpVh1ANkS7V2wWJqdXyioxJuCP+f5SEA=";
     fetchSubmodules = true;
   };
 

From 68472b90a670e7fc692b053b51a3ac27d73bc632 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 26 Mar 2025 20:03:43 +0100
Subject: [PATCH 058/108] nixVersions.git: drop

this hasn't been updated in a while.
We can bring this back later if someone picks up the task to keep it
up-to-date.
---
 pkgs/by-name/ni/nix-plugin-pijul/package.nix    |  1 -
 pkgs/tools/package-management/nix/default.nix   | 15 ++-------------
 pkgs/tools/package-management/nix/update-all.sh |  6 ------
 pkgs/top-level/release-cross.nix                |  1 -
 4 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/pkgs/by-name/ni/nix-plugin-pijul/package.nix b/pkgs/by-name/ni/nix-plugin-pijul/package.nix
index c39ef2281118..bd83cecddbd1 100644
--- a/pkgs/by-name/ni/nix-plugin-pijul/package.nix
+++ b/pkgs/by-name/ni/nix-plugin-pijul/package.nix
@@ -81,7 +81,6 @@ stdenv.mkDerivation (finalAttrs: {
     {
       stable = localRepoCheck nixVersions.stable;
       latest = localRepoCheck nixVersions.latest;
-      git = localRepoCheck nixVersions.git;
       nix_2_24 = localRepoCheck nixVersions.nix_2_24;
     };
 
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 13448f986c45..62a27705aeda 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -260,18 +260,6 @@ lib.makeExtensible (
       # depend on the components they need in `nixComponents_2_26`.
       nix_2_26 = addTests "nix_2_26" self.nixComponents_2_26.nix-everything;
 
-      git = common rec {
-        version = "2.25.0";
-        suffix = "pre20241101_${lib.substring 0 8 src.rev}";
-        src = fetchFromGitHub {
-          owner = "NixOS";
-          repo = "nix";
-          rev = "2e5759e3778c460efc5f7cfc4cb0b84827b5ffbe";
-          hash = "sha256-E1Sp0JHtbD1CaGO3UbBH6QajCtOGqcrVfPSKL0n63yo=";
-        };
-        self_attribute_name = "git";
-      };
-
       latest = self.nix_2_26;
 
       # The minimum Nix version supported by Nixpkgs
@@ -305,7 +293,8 @@ lib.makeExtensible (
         ) (lib.range 4 23)
       )
       // {
-        unstable = throw "nixVersions.unstable has been removed. For bleeding edge (Nix master, roughly weekly updated) use nixVersions.git, otherwise use nixVersions.latest.";
+        unstable = throw "nixVersions.unstable has been removed. use nixVersions.latest or the nix flake.";
+        git = throw "nixVersions.git has been removed. use nixVersions.latest or the nix flake.";
       }
     )
   )
diff --git a/pkgs/tools/package-management/nix/update-all.sh b/pkgs/tools/package-management/nix/update-all.sh
index 916e8122799f..7b2e647ec232 100755
--- a/pkgs/tools/package-management/nix/update-all.sh
+++ b/pkgs/tools/package-management/nix/update-all.sh
@@ -26,9 +26,3 @@ for name in $nix_versions; do
 
     nix-update --override-filename "$SCRIPT_DIR/default.nix" --version-regex "(2\\.${minor_version}\..+)" --build --commit "nixVersions.$name"
 done
-
-commit_json=$(curl -s https://api.github.com/repos/NixOS/nix/commits/master) # format: 2024-11-01T10:18:53Z
-date_of_commit=$(echo "$commit_json" | jq -r '.commit.author.date')
-suffix="pre$(date -d "$date_of_commit" +%Y%m%d)_"
-sed -i -e "s|\"pre[0-9]\{8\}_|\"$suffix|g" "$SCRIPT_DIR/default.nix"
-nix-update --override-filename "$SCRIPT_DIR/default.nix" --version branch --build --commit "nixVersions.git"
diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index ded7924f146f..ad45dcedb1f2 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -70,7 +70,6 @@ let
     gmp = nativePlatforms;
     libcCross = nativePlatforms;
     nix = nativePlatforms;
-    nixVersions.git = nativePlatforms;
     mesa = nativePlatforms;
     rustc = nativePlatforms;
     cargo = nativePlatforms;

From ead1e597bedf1c8d1fde1003f345578b675dfd19 Mon Sep 17 00:00:00 2001
From: Petr Zahradnik <junior@zahradnik.cz>
Date: Thu, 27 Mar 2025 00:50:05 +0100
Subject: [PATCH 059/108] netkittftp: fix compilation

---
 pkgs/by-name/ne/netkittftp/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/ne/netkittftp/package.nix b/pkgs/by-name/ne/netkittftp/package.nix
index 077438c0e4e7..08b549b319ff 100644
--- a/pkgs/by-name/ne/netkittftp/package.nix
+++ b/pkgs/by-name/ne/netkittftp/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch,
 }:
 
 stdenv.mkDerivation rec {
@@ -17,6 +18,14 @@ stdenv.mkDerivation rec {
     sha256 = "0kfibbjmy85r3k92cdchha78nzb6silkgn1zaq9g8qaf1l0w0hrs";
   };
 
+  patches = [
+    # fix compilation errors, warning and many style issues
+    (fetchpatch {
+      url = "https://sources.debian.org/data/main/n/netkit-tftp/0.17-23/debian/patches/debian_changes_0.17-18.patch";
+      hash = "sha256-kprmSMoNF6E8GGRIPWDLWcqfPRxdUeheeLoFNqI3Uv0=";
+    })
+  ];
+
   preInstall = "
     mkdir -p $out/man/man{1,8} $out/sbin $out/bin
   ";

From e540c3eeb5a9bbb2506daaefb5226365facd9f3d Mon Sep 17 00:00:00 2001
From: Petr Zahradnik <junior@zahradnik.cz>
Date: Thu, 27 Mar 2025 00:50:19 +0100
Subject: [PATCH 060/108] netkittftp: modernize

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

diff --git a/pkgs/by-name/ne/netkittftp/package.nix b/pkgs/by-name/ne/netkittftp/package.nix
index 08b549b319ff..5bbeedc323b5 100644
--- a/pkgs/by-name/ne/netkittftp/package.nix
+++ b/pkgs/by-name/ne/netkittftp/package.nix
@@ -5,17 +5,17 @@
   fetchpatch,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "netkit-tftp";
   version = "0.17";
 
   src = fetchurl {
     urls = [
-      "mirror://ubuntu/pool/universe/n/netkit-tftp/netkit-tftp_${version}.orig.tar.gz"
-      "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-tftp-${version}.tar.gz"
-      "https://ftp.cc.uoc.gr/mirrors/linux/ubuntu/packages/pool/universe/n/netkit-tftp/netkit-tftp_${version}.orig.tar.gz"
+      "mirror://ubuntu/pool/universe/n/netkit-tftp/netkit-tftp_${finalAttrs.version}.orig.tar.gz"
+      "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-tftp-${finalAttrs.version}.tar.gz"
+      "https://ftp.cc.uoc.gr/mirrors/linux/ubuntu/packages/pool/universe/n/netkit-tftp/netkit-tftp_${finalAttrs.version}.orig.tar.gz"
     ];
-    sha256 = "0kfibbjmy85r3k92cdchha78nzb6silkgn1zaq9g8qaf1l0w0hrs";
+    hash = "sha256-OkPAAQ1OYfQSVj/YN2nUZn2LjoKQNSbSHLkgX+Va0U0=";
   };
 
   patches = [
@@ -37,4 +37,4 @@ stdenv.mkDerivation rec {
     maintainers = [ ];
     platforms = with lib.platforms; linux;
   };
-}
+})

From eef8880b4ec114cfa3dd42ede69825f763f89531 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 26 Mar 2025 23:51:11 +0000
Subject: [PATCH 061/108] libretro.dosbox-pure: 0-unstable-2025-03-13 ->
 0-unstable-2025-03-18

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

diff --git a/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix b/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix
index b3220cec2976..a1f582cda4a9 100644
--- a/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix
+++ b/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "dosbox-pure";
-  version = "0-unstable-2025-03-13";
+  version = "0-unstable-2025-03-18";
 
   src = fetchFromGitHub {
     owner = "schellingb";
     repo = "dosbox-pure";
-    rev = "8af2dee6d8efb406067c5120d7fb175eddfefcb9";
-    hash = "sha256-mBSm25ABAvjc0s4YTAViGtzgGSpq0EXYt5q+7agHc6M=";
+    rev = "619c575db6f81d1911e36f1ecd618c9dead86859";
+    hash = "sha256-Pp3OP69KKrznOl1cY5yiKxMJRA7REe4S51zGDHG883c=";
   };
 
   hardeningDisable = [ "format" ];

From cb16b779e38e1a8ced2b9fc84aebddee8e48a3b8 Mon Sep 17 00:00:00 2001
From: Malo Bourgon <mbourgon@gmail.com>
Date: Wed, 26 Mar 2025 16:54:17 -0700
Subject: [PATCH 062/108] claude-code: disable auto-update

---
 pkgs/by-name/cl/claude-code/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index e91b133e8f64..c69a2bf8f4d9 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -23,6 +23,14 @@ buildNpmPackage rec {
 
   AUTHORIZED = "1";
 
+  # `claude-code` tries to auto-update by default, this disables that functionality.
+  # Note that the `DISABLE_AUTOUPDATER` environment variable is not documented, so this trick may
+  # not continue to work.
+  postInstall = ''
+    wrapProgram $out/bin/claude \
+      --set DISABLE_AUTOUPDATER 1
+  '';
+
   passthru.updateScript = ./update.sh;
 
   meta = {

From a0711ea841c1a2ba4d9fc50d1efb3cf4010a5189 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Mar 2025 00:39:08 +0000
Subject: [PATCH 063/108] zabbix-agent2-plugin-postgresql: 7.2.3 -> 7.2.4

---
 pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix b/pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix
index 43addb523a2f..7da304384a5d 100644
--- a/pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix
+++ b/pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix
@@ -6,11 +6,11 @@
 
 buildGoModule rec {
   pname = "zabbix-agent2-plugin-postgresql";
-  version = "7.2.3";
+  version = "7.2.4";
 
   src = fetchurl {
     url = "https://cdn.zabbix.com/zabbix-agent2-plugins/sources/postgresql/zabbix-agent2-plugin-postgresql-${version}.tar.gz";
-    hash = "sha256-TtcEY/X8FXFcI3cghGRnLiCDj0fUwspXf90G/h22M9s=";
+    hash = "sha256-QslDQ45XQ3FjCSRu1cytHVPwJWpIvrxvqC57lCZGMKs=";
   };
 
   vendorHash = null;

From bb2e93f0e60c9b824c46d40220d3570d913c896e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Mar 2025 01:34:38 +0000
Subject: [PATCH 064/108] nuclei: 3.3.10 -> 3.4.0

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

diff --git a/pkgs/by-name/nu/nuclei/package.nix b/pkgs/by-name/nu/nuclei/package.nix
index d6a88fdeb916..42c03a9ccf99 100644
--- a/pkgs/by-name/nu/nuclei/package.nix
+++ b/pkgs/by-name/nu/nuclei/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "nuclei";
-  version = "3.3.10";
+  version = "3.4.0";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "nuclei";
     tag = "v${version}";
-    hash = "sha256-5+alARFuxwJlPYki5TU+4GdaJhBEYXbXH0BrCj2/aic=";
+    hash = "sha256-FseLPykYJrfjCyuS0+yLNcEhzFAaguJjMSdGHIacexo=";
   };
 
-  vendorHash = "sha256-l3733hg11+Qg4h68DnXoD8LyYiB+iFyZyKggpCAsx7Q=";
+  vendorHash = "sha256-tTFEDTUM3ldH3/NtqYx4LyEazp7o5qZ6ionu01Vxwrw=";
 
   proxyVendor = true; # hash mismatch between Linux and Darwin
 

From 491d1a58ad0d5dd7b8e9d807d7e98e4ee4d30040 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Thu, 27 Mar 2025 02:34:48 +0100
Subject: [PATCH 065/108] SDL1: drop

---
 pkgs/by-name/sd/SDL1/find-headers.patch |  26 ----
 pkgs/by-name/sd/SDL1/package.nix        | 156 ------------------------
 pkgs/by-name/sd/SDL1/setup-hook.sh      |  16 ---
 pkgs/top-level/aliases.nix              |   1 +
 4 files changed, 1 insertion(+), 198 deletions(-)
 delete mode 100644 pkgs/by-name/sd/SDL1/find-headers.patch
 delete mode 100644 pkgs/by-name/sd/SDL1/package.nix
 delete mode 100644 pkgs/by-name/sd/SDL1/setup-hook.sh

diff --git a/pkgs/by-name/sd/SDL1/find-headers.patch b/pkgs/by-name/sd/SDL1/find-headers.patch
deleted file mode 100644
index fd498117fd64..000000000000
--- a/pkgs/by-name/sd/SDL1/find-headers.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/sdl-config.in b/sdl-config.in
-index e0fcc0c..bf7928a 100644
---- a/sdl-config.in
-+++ b/sdl-config.in
-@@ -42,14 +42,18 @@ while test $# -gt 0; do
-       echo @SDL_VERSION@
-       ;;
-     --cflags)
--      echo -I@includedir@/SDL @SDL_CFLAGS@
-+      SDL_CFLAGS=""
-+      for i in @includedir@/SDL $SDL_PATH; do
-+        SDL_CFLAGS="$SDL_CFLAGS -I$i"
-+      done
-+      echo $SDL_CFLAGS @SDL_CFLAGS@
-       ;;
- @ENABLE_SHARED_TRUE@    --libs)
--@ENABLE_SHARED_TRUE@      echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
-+@ENABLE_SHARED_TRUE@      echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@ $SDL_LIB_PATH
- @ENABLE_SHARED_TRUE@      ;;
- @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@    --static-libs)
- @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@    --libs|--static-libs)
--@ENABLE_STATIC_TRUE@      echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@
-+@ENABLE_STATIC_TRUE@      echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@ $SDL_LIB_PATH
- @ENABLE_STATIC_TRUE@      ;;
-     *)
-       echo "${usage}" 1>&2
diff --git a/pkgs/by-name/sd/SDL1/package.nix b/pkgs/by-name/sd/SDL1/package.nix
deleted file mode 100644
index bd793b5885bb..000000000000
--- a/pkgs/by-name/sd/SDL1/package.nix
+++ /dev/null
@@ -1,156 +0,0 @@
-{ lib
-, alsa-lib
-, audiofile
-, config
-, darwin
-, fetchpatch
-, fetchurl
-, libGL
-, libGLU
-, libICE
-, libXext
-, libXrandr
-, libcap
-, libiconv
-, libpulseaudio
-, pkg-config
-, stdenv
-# Boolean flags
-, alsaSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid
-, libGLSupported ? lib.meta.availableOn stdenv.hostPlatform libGL
-, openglSupport ? libGLSupported
-, pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid && lib.meta.availableOn stdenv.hostPlatform libpulseaudio
-, x11Support ? !stdenv.hostPlatform.isCygwin && !stdenv.hostPlatform.isAndroid
-}:
-
-# NOTE: When editing this expression see if the same change applies to
-# SDL2 expression too
-
-let
-  inherit (darwin.apple_sdk.frameworks) OpenGL CoreAudio CoreServices AudioUnit Kernel Cocoa GLUT;
-  extraPropagatedBuildInputs = [ ]
-    ++ lib.optionals x11Support [ libXext libICE libXrandr ]
-    ++ lib.optionals (openglSupport && stdenv.hostPlatform.isLinux) [ libGL ]
-    # libGLU doesn’t work with Android's SDL
-    ++ lib.optionals (openglSupport && stdenv.hostPlatform.isLinux && (!stdenv.hostPlatform.isAndroid)) [ libGLU ]
-    ++ lib.optionals (openglSupport && stdenv.hostPlatform.isDarwin) [ OpenGL GLUT ]
-    ++ lib.optional alsaSupport alsa-lib
-    ++ lib.optional pulseaudioSupport libpulseaudio
-    ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa;
-in
-stdenv.mkDerivation (finalAttrs: {
-  pname = "SDL";
-  version = "1.2.15";
-
-  src = fetchurl {
-    url = "https://www.libsdl.org/release/SDL-${finalAttrs.version}.tar.gz";
-    hash = "sha256-1tMWp5Pl40gVXw3ZO5eXmJM/uYqh7evMEIgp1kdKrQA=";
-  };
-
-  outputs = [ "out" "dev" ];
-  outputBin = "dev"; # sdl-config
-
-  nativeBuildInputs = [ pkg-config ]
-    ++ lib.optional stdenv.hostPlatform.isLinux libcap;
-
-  propagatedBuildInputs = [ libiconv ] ++ extraPropagatedBuildInputs;
-
-  buildInputs =
-    [ ]
-    ++ lib.optionals (!stdenv.hostPlatform.isMinGW && alsaSupport) [ audiofile ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ AudioUnit CoreAudio CoreServices Kernel OpenGL ];
-
-  configureFlags = [
-    "--disable-oss"
-    "--disable-video-x11-xme"
-    "--enable-rpath"
-  # Building without this fails on Darwin with
-  #
-  #   ./src/video/x11/SDL_x11sym.h:168:17: error: conflicting types for '_XData32'
-  #   SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return)
-  #
-  # Please try revert the change that introduced this comment when updating SDL.
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-x11-shared"
-    ++ lib.optional (!x11Support) "--without-x"
-    ++ lib.optional alsaSupport "--with-alsa-prefix=${alsa-lib.out}/lib"
-    ++ lib.optional stdenv.hostPlatform.isMusl "CFLAGS=-DICONV_INBUF_NONCONST";
-
-  patches = [
-    ./find-headers.patch
-
-    # Fix window resizing issues, e.g. for xmonad
-    # Ticket: http://bugzilla.libsdl.org/show_bug.cgi?id=1430
-    (fetchpatch {
-      name = "fix_window_resizing.diff";
-      url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=10;filename=fix_window_resizing.diff;att=2;bug=665779";
-      hash = "sha256-hj3ykyOKeDh6uPDlvwNHSowQxmR+mfhvCnHvcdhXZfw=";
-    })
-    # Fix drops of keyboard events for SDL_EnableUNICODE
-    (fetchpatch {
-      url = "https://github.com/libsdl-org/SDL-1.2/commit/0332e2bb18dc68d6892c3b653b2547afe323854b.patch";
-      hash = "sha256-5V6K0oTN56RRi48XLPQsjgLzt0a6GsjajDrda3ZEhTw=";
-    })
-    # Ignore insane joystick axis events
-    (fetchpatch {
-      url = "https://github.com/libsdl-org/SDL-1.2/commit/ab99cc82b0a898ad528d46fa128b649a220a94f4.patch";
-      hash = "sha256-8CvKHvkmidm4tFCWYhxE059hN3gwOKz6nKs5rvQ4ZKw=";
-    })
-    # https://bugzilla.libsdl.org/show_bug.cgi?id=1769
-    (fetchpatch {
-      url = "https://github.com/libsdl-org/SDL-1.2/commit/5d79977ec7a6b58afa6e4817035aaaba186f7e9f.patch";
-      hash = "sha256-t+60bC4gLFbslXm1n9nimiFrho2DnxdWdKr4H9Yp/sw=";
-    })
-    # Workaround X11 bug to allow changing gamma
-    # Ticket: https://bugs.freedesktop.org/show_bug.cgi?id=27222
-    (fetchpatch {
-      name = "SDL_SetGamma.patch";
-      url = "https://src.fedoraproject.org/rpms/SDL/raw/7a07323e5cec08bea6f390526f86a1ce5341596d/f/SDL-1.2.15-x11-Bypass-SetGammaRamp-when-changing-gamma.patch";
-      hash = "sha256-m7ZQ5GnfGlMkKJkrBSB3GrLz8MT6njgI9jROJAbRonQ=";
-    })
-    # Fix a build failure on OS X Mavericks
-    # Ticket: https://bugzilla.libsdl.org/show_bug.cgi?id=2085
-    (fetchpatch {
-      url = "https://github.com/libsdl-org/SDL-1.2/commit/19039324be71738d8990e91b9ba341b2ea068445.patch";
-      hash = "sha256-DCWZo0LzHJoWUr/5vL5pKIEmmz3pvr4TO6Ip8WykfDI=";
-    })
-    (fetchpatch {
-      url = "https://github.com/libsdl-org/SDL-1.2/commit/7933032ad4d57c24f2230db29f67eb7d21bb5654.patch";
-      hash = "sha256-Knq+ceL6y/zKcfJayC2gy+DKnoa8DLslBNl3laMzwa8=";
-    })
-    (fetchpatch {
-      name = "CVE-2022-34568.patch";
-      url = "https://github.com/libsdl-org/SDL-1.2/commit/d7e00208738a0bc6af302723fe64908ac35b777b.patch";
-      hash = "sha256-fuxXsqZW94/C8CKu9LakppCU4zHupj66O2MngQ4BO9o=";
-    })
-  ];
-
-  enableParallelBuilding = true;
-
-  postInstall = ''
-    moveToOutput share/aclocal "$dev"
-  '';
-
-  # See the same place in the expression for SDL2
-  postFixup = let
-    rpath = lib.makeLibraryPath extraPropagatedBuildInputs;
-  in ''
-    for lib in $out/lib/*.so* ; do
-      if [[ -L "$lib" ]]; then
-        patchelf --set-rpath "$(patchelf --print-rpath $lib):${rpath}" "$lib"
-      fi
-    done
-  '';
-
-  setupHook = ./setup-hook.sh;
-
-  passthru = { inherit openglSupport; };
-
-  meta = {
-    homepage = "http://www.libsdl.org/";
-    description = "Cross-platform multimedia library";
-    license = lib.licenses.lgpl21;
-    mainProgram = "sdl-config";
-    maintainers = lib.teams.sdl.members ++ (with lib.maintainers; [ lovek323 ]);
-    platforms = lib.platforms.unix;
-  };
-})
diff --git a/pkgs/by-name/sd/SDL1/setup-hook.sh b/pkgs/by-name/sd/SDL1/setup-hook.sh
deleted file mode 100644
index 54a9b3e8bfab..000000000000
--- a/pkgs/by-name/sd/SDL1/setup-hook.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-addSDLPath () {
-  if [ -e "$1/include/SDL" ]; then
-    export SDL_PATH="${SDL_PATH-}${SDL_PATH:+ }$1/include/SDL"
-    # NB this doesn’t work with split dev packages because different packages
-    # will contain "include/SDL/" and "lib/" directories.
-    #
-    # However the SDL_LIB_PATH is consumed by SDL itself and serves to locate
-    # libraries like SDL_mixer, SDL_image, etc which are not split-package
-    # so the check above will only trigger on them.
-    if [ -e "$1/lib" ]; then
-      export SDL_LIB_PATH="${SDL_LIB_PATH-}${SDL_LIB_PATH:+ }-L$1/lib"
-    fi
-  fi
-}
-
-addEnvHooks "$hostOffset" addSDLPath
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 4062e9fe039e..6ad6b4c2132f 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1393,6 +1393,7 @@ mapAliases {
   ### S ###
 
   SDL_classic = SDL1; # Added 2024-09-03
+  SDL1 = throw "'SDL1' has been removed as development ended long ago with SDL 2.0 replacing it, use SDL_compat instead"; # Added 2025-03-27
   SDL_gpu = throw "'SDL_gpu' has been removed due to lack of upstream maintenance and known users"; # Added 2025-03-15
   s2n = throw "'s2n' has been renamed to/replaced by 's2n-tls'"; # Converted to throw 2024-10-17
   sandboxfs = throw "'sandboxfs' has been removed due to being unmaintained, consider using linux namespaces for sandboxing instead"; # Added 2024-06-06

From 2e4f81754e928ed25032677900f415b93b65045e Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sun, 9 Mar 2025 02:41:17 +0100
Subject: [PATCH 066/108] SDL_image: 1.2.12 -> 1.2.12-unstable-2025-02-13

Diff: https://github.com/libsdl-org/SDL_image/compare/release-1.2.12...74e8d577216e3c3a969e67b68b2e4769fcbf8fdd
---
 .../sd/SDL_image/clang16-webp-errors.patch    | 16 ----------
 pkgs/by-name/sd/SDL_image/package.nix         | 32 ++++++++-----------
 2 files changed, 14 insertions(+), 34 deletions(-)
 delete mode 100644 pkgs/by-name/sd/SDL_image/clang16-webp-errors.patch

diff --git a/pkgs/by-name/sd/SDL_image/clang16-webp-errors.patch b/pkgs/by-name/sd/SDL_image/clang16-webp-errors.patch
deleted file mode 100644
index b696dcc9904c..000000000000
--- a/pkgs/by-name/sd/SDL_image/clang16-webp-errors.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur a/IMG_webp.c b/IMG_webp.c
---- a/IMG_webp.c	2012-01-20 20:51:33.000000000 -0500
-+++ b/IMG_webp.c	2024-07-24 20:48:58.697398200 -0400
-@@ -47,9 +47,9 @@
- static struct {
- 	int loaded;
- 	void *handle;
--	int/*VP8StatuCode*/ (*webp_get_features_internal) (const uint8_t *data, uint32_t data_size, WebPBitstreamFeatures* const features, int decoder_abi_version);
--	uint8_t*	(*webp_decode_rgb_into) (const uint8_t* data, uint32_t data_size, uint8_t* output_buffer, int output_buffer_size, int output_stride);
--	uint8_t*	(*webp_decode_rgba_into) (const uint8_t* data, uint32_t data_size, uint8_t* output_buffer, int output_buffer_size, int output_stride);
-+	VP8StatusCode	(*webp_get_features_internal) (const uint8_t *data, size_t data_size, WebPBitstreamFeatures* const features, int decoder_abi_version);
-+	uint8_t*	(*webp_decode_rgb_into) (const uint8_t* data, size_t data_size, uint8_t* output_buffer, size_t output_buffer_size, int output_stride);
-+	uint8_t*	(*webp_decode_rgba_into) (const uint8_t* data, size_t data_size, uint8_t* output_buffer, size_t output_buffer_size, int output_stride);
- } lib;
- 
- #ifdef LOAD_WEBP_DYNAMIC
diff --git a/pkgs/by-name/sd/SDL_image/package.nix b/pkgs/by-name/sd/SDL_image/package.nix
index 61943b2896be..361d33641b6f 100644
--- a/pkgs/by-name/sd/SDL_image/package.nix
+++ b/pkgs/by-name/sd/SDL_image/package.nix
@@ -1,8 +1,7 @@
 {
   lib,
   SDL,
-  fetchpatch,
-  fetchurl,
+  fetchFromGitHub,
   giflib,
   libXpm,
   libjpeg,
@@ -11,29 +10,20 @@
   libwebp,
   pkg-config,
   stdenv,
+  unstableGitUpdater,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "SDL_image";
-  version = "1.2.12";
+  version = "1.2.12-unstable-2025-02-13";
 
-  src = fetchurl {
-    url = "https://www.libsdl.org/projects/SDL_image/release/SDL_image-${finalAttrs.version}.tar.gz";
-    hash = "sha256-C5ByKYRWEATehIR3RNVmgJ27na9zKp5QO5GhtahOVpk=";
+  src = fetchFromGitHub {
+    owner = "libsdl-org";
+    repo = "SDL_image";
+    rev = "74e8d577216e3c3a969e67b68b2e4769fcbf8fdd";
+    hash = "sha256-WSNH7Pw/tL5rgPQtOjxRGp2UlYSJJmXS2YQS+fAkXSc=";
   };
 
-  patches = [
-    # Fixed security vulnerability in XCF image loader
-    (fetchpatch {
-      name = "CVE-2017-2887";
-      url = "https://github.com/libsdl-org/SDL_image/commit/e7723676825cd2b2ffef3316ec1879d7726618f2.patch";
-      includes = [ "IMG_xcf.c" ];
-      hash = "sha256-Z0nyEtE1LNGsGsN9SFG8ZyPDdunmvg81tUnEkrJQk5w=";
-    })
-    # Fixes incompatible function pointer type errors with clang 16
-    ./clang16-webp-errors.patch
-  ];
-
   configureFlags = [
     # Disable dynamic loading or else dlopen will fail because of no proper
     # rpath
@@ -70,6 +60,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
+  passthru.updateScript = unstableGitUpdater {
+    tagFormat = "release-1.*";
+    tagPrefix = "release-";
+    branch = "SDL-1.2";
+  };
+
   meta = {
     homepage = "http://www.libsdl.org/projects/SDL_image/";
     description = "SDL image library";

From c4fdb21efd847fb4b2e13938329d274d7c12aab4 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sun, 9 Mar 2025 02:42:24 +0100
Subject: [PATCH 067/108] SDL_net: 1.2.8 -> 1.2.8-unstable-2024-04-23

Diff: https://github.com/libsdl-org/SDL_net/compare/release-1.2.8...0043be2e559f8d562d04bf62d6e3f4162ed8edad
---
 pkgs/by-name/sd/SDL_net/package.nix | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/sd/SDL_net/package.nix b/pkgs/by-name/sd/SDL_net/package.nix
index 125f68558f91..49d16a72c5ad 100644
--- a/pkgs/by-name/sd/SDL_net/package.nix
+++ b/pkgs/by-name/sd/SDL_net/package.nix
@@ -1,20 +1,23 @@
 {
   lib,
   SDL,
-  fetchurl,
+  fetchFromGitHub,
   pkg-config,
   stdenv,
+  unstableGitUpdater,
   # Boolean flags
   enableSdltest ? (!stdenv.hostPlatform.isDarwin),
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "SDL_net";
-  version = "1.2.8";
+  version = "1.2.8-unstable-2024-04-23";
 
-  src = fetchurl {
-    url = "http://www.libsdl.org/projects/SDL_net/release/SDL_net-${finalAttrs.version}.tar.gz";
-    hash = "sha256-X0p6i7iE95PCeKw/NxO+QZgMXu3M7P8CYEETR3FPrLQ=";
+  src = fetchFromGitHub {
+    owner = "libsdl-org";
+    repo = "SDL_net";
+    rev = "0043be2e559f8d562d04bf62d6e3f4162ed8edad";
+    hash = "sha256-/W1Mq6hzJNNwpcx+VUT4DRGP3bE06GGMbYDGHBc4XlQ=";
   };
 
   nativeBuildInputs = [
@@ -32,6 +35,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
+  passthru.updateScript = unstableGitUpdater {
+    tagFormat = "release-1.*";
+    tagPrefix = "release-";
+    branch = "SDL-1.2";
+  };
+
   meta = {
     homepage = "https://github.com/libsdl-org/SDL_net";
     description = "SDL networking library";

From 91d1216801c25452878b67827189dec1b160a615 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sun, 9 Mar 2025 02:42:53 +0100
Subject: [PATCH 068/108] SDL_ttf: 2.0.11 -> 2.0.11.1-unstable-2024-04-23

Diff: https://github.com/libsdl-org/SDL_ttf/compare/release-2.0.11...3c4233732b94ce08d5f6a868e597af39e13f8b23
---
 pkgs/by-name/sd/SDL_ttf/package.nix | 32 ++++++++++++++---------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/sd/SDL_ttf/package.nix b/pkgs/by-name/sd/SDL_ttf/package.nix
index 64c2137d25e2..023b34e0953e 100644
--- a/pkgs/by-name/sd/SDL_ttf/package.nix
+++ b/pkgs/by-name/sd/SDL_ttf/package.nix
@@ -1,33 +1,25 @@
 {
   lib,
   SDL,
-  fetchpatch,
-  fetchurl,
+  fetchFromGitHub,
   freetype,
   stdenv,
+  unstableGitUpdater,
   # Boolean flags
   enableSdltest ? (!stdenv.hostPlatform.isDarwin),
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "SDL_ttf";
-  version = "2.0.11";
+  version = "2.0.11.1-unstable-2024-04-23";
 
-  src = fetchurl {
-    url = "https://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-${finalAttrs.version}.tar.gz";
-    hash = "sha256-ckzYlez02jGaPvFkiStyB4vZJjKl2BIREmHN4kjrzbc=";
+  src = fetchFromGitHub {
+    owner = "libsdl-org";
+    repo = "SDL_ttf";
+    rev = "3c4233732b94ce08d5f6a868e597af39e13f8b23";
+    hash = "sha256-FX6Ko4CaOSCSKdpWVsJhTZXlWk1cnjbfVfMDiGG2+TU=";
   };
 
-  patches = [
-    # Bug #830: TTF_RenderGlyph_Shaded is broken
-    (fetchpatch {
-      url = "https://bugzilla-attachments.libsdl.org/attachments/830/renderglyph_shaded.patch.txt";
-      hash = "sha256-TZzlZe7gCRA8wZDHQZsqESAOGbLpJzIoB0HD8L6z3zE=";
-    })
-  ];
-
-  patchFlags = [ "-p0" ];
-
   buildInputs = [
     SDL
     freetype
@@ -35,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   # pass in correct *-config for cross builds
   env.SDL_CONFIG = lib.getExe' (lib.getDev SDL) "sdl-config";
-  env.FREETYPE_CONFIG = lib.getExe' freetype.dev "freetype-config";
+  env.FT2_CONFIG = lib.getExe' freetype.dev "freetype-config";
 
   configureFlags = [
     (lib.enableFeature enableSdltest "sdltest")
@@ -43,6 +35,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
+  passthru.updateScript = unstableGitUpdater {
+    tagFormat = "release-2.0.11";
+    tagPrefix = "release-";
+    branch = "SDL-1.2";
+  };
+
   meta = {
     homepage = "https://github.com/libsdl-org/SDL_ttf";
     description = "SDL TrueType library";

From 3818e5372e6fdc88c23302cd11f35c0fdd1cabd6 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sun, 9 Mar 2025 02:43:24 +0100
Subject: [PATCH 069/108] SDL_mixer: add a passthru.test and some words of
 caution

---
 pkgs/by-name/sd/SDL_mixer/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/sd/SDL_mixer/package.nix b/pkgs/by-name/sd/SDL_mixer/package.nix
index 9a871a71f4ec..34289d127a9b 100644
--- a/pkgs/by-name/sd/SDL_mixer/package.nix
+++ b/pkgs/by-name/sd/SDL_mixer/package.nix
@@ -10,6 +10,8 @@
   pkg-config,
   smpeg,
   stdenv,
+  # passthru.tests
+  onscripter-en,
   # Boolean flags
   enableNativeMidi ? false,
   enableSdltest ? (!stdenv.hostPlatform.isDarwin),
@@ -20,6 +22,9 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "SDL_mixer";
   version = "1.2.12";
 
+  # word of caution: while there is a somewhat maintained SDL-1.2 branch on
+  # https://github.com/libsdl-org/SDL_mixer, it switches from smpeg to mpg123 which
+  # breaks autoconf in a bunch of packages, it's better to cherry-pick patches as needed
   src = fetchurl {
     url = "http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-${finalAttrs.version}.tar.gz";
     hash = "sha256-FkQwgnmpdXmQSeSCavLPx4fK0quxGqFFYuQCUh+GmSo=";
@@ -102,6 +107,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
+  passthru.tests = {
+    inherit onscripter-en;
+  };
+
   meta = {
     description = "SDL multi-channel audio mixer library";
     homepage = "http://www.libsdl.org/projects/SDL_mixer/";

From d665abcac64eec52b423561be846efb242ae88fa Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Thu, 13 Mar 2025 21:10:47 +0100
Subject: [PATCH 070/108] SDL_ttf: unmark insecure

---
 pkgs/by-name/sd/SDL_ttf/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/sd/SDL_ttf/package.nix b/pkgs/by-name/sd/SDL_ttf/package.nix
index 023b34e0953e..dbbb1fff2b71 100644
--- a/pkgs/by-name/sd/SDL_ttf/package.nix
+++ b/pkgs/by-name/sd/SDL_ttf/package.nix
@@ -48,7 +48,8 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = lib.teams.sdl.members ++ (with lib.maintainers; [ ]);
     inherit (SDL.meta) platforms;
     knownVulnerabilities = [
-      "CVE-2022-27470"
+      # CVE applies to SDL2 https://github.com/NixOS/nixpkgs/pull/274836#issuecomment-2708627901
+      # "CVE-2022-27470"
     ];
   };
 })

From 2c77de4416f98f190dc04f92ed34df88f8d5bbf6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Mar 2025 01:46:23 +0000
Subject: [PATCH 071/108] pomerium-cli: 0.23.0 -> 0.29.0

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

diff --git a/pkgs/by-name/po/pomerium-cli/package.nix b/pkgs/by-name/po/pomerium-cli/package.nix
index 990f1bb348e3..7a51ae3e8ad8 100644
--- a/pkgs/by-name/po/pomerium-cli/package.nix
+++ b/pkgs/by-name/po/pomerium-cli/package.nix
@@ -14,16 +14,16 @@ let
 in
 buildGoModule rec {
   pname = "pomerium-cli";
-  version = "0.23.0";
+  version = "0.29.0";
 
   src = fetchFromGitHub {
     owner = "pomerium";
     repo = "cli";
     rev = "v${version}";
-    sha256 = "sha256-2upvdL8kk0Kbll8UbviyzIX2jdK+tqcHvVlkpz5JjrA=";
+    sha256 = "sha256-H5wZaZsMgHPcO1qDoaqp/UP+stU7IG070DNFhxC7Ehw=";
   };
 
-  vendorHash = "sha256-aQo58i+XuCkdjIg/IPf7kNLXXA0NwZbQMhgWyMb45B4=";
+  vendorHash = "sha256-a5eESlDBxYVvfiafdZFIjUqIxB51LZc67fUJek69qwc=";
 
   subPackages = [
     "cmd/pomerium-cli"

From ec5733ecb9dade28f2121898182896448d4d1a0f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Mar 2025 01:55:07 +0000
Subject: [PATCH 072/108] rabbitmqadmin-ng: 0.27.0 -> 0.29.0

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

diff --git a/pkgs/by-name/ra/rabbitmqadmin-ng/package.nix b/pkgs/by-name/ra/rabbitmqadmin-ng/package.nix
index 3f8f064908fc..c68c6ae22128 100644
--- a/pkgs/by-name/ra/rabbitmqadmin-ng/package.nix
+++ b/pkgs/by-name/ra/rabbitmqadmin-ng/package.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rabbitmqadmin-ng";
-  version = "0.27.0";
+  version = "0.29.0";
 
   src = fetchFromGitHub {
     owner = "rabbitmq";
     repo = "rabbitmqadmin-ng";
     tag = "v${version}";
-    hash = "sha256-PSG//vyhNFUVDf9XfIuqm0mGcDo0B02+x0Sesj3ggAA=";
+    hash = "sha256-EWL1MFBBIsjfkx43SFSxsxjM0/XVYS8O3fYkXWkkctc=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-hMFawT1m8VNRWENvJtoi5Ysw7k3iNRB7y5wgNAJCxX8=";
+  cargoHash = "sha256-PShBU5xC9+X1exoIFP64xHWn6oVsID4ZcYMuUq/1vKI=";
 
   buildInputs = [ openssl ];
   nativeBuildInputs = [ pkg-config ];

From c62819e5e581d95fffd56a39b2305571c355f19b Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Mon, 20 Jan 2025 21:21:29 -0600
Subject: [PATCH 073/108] vimPlugins.nvim-dap-view: init at 2025-01-19

---
 pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++
 pkgs/applications/editors/vim/plugins/overrides.nix |  4 ++++
 .../editors/vim/plugins/vim-plugin-names            |  1 +
 3 files changed, 18 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index be6625f1351e..f724bb7b3e93 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -10032,6 +10032,19 @@ final: prev:
     meta.hydraPlatforms = [ ];
   };
 
+  nvim-dap-view = buildVimPlugin {
+    pname = "nvim-dap-view";
+    version = "2025-03-18";
+    src = fetchFromGitHub {
+      owner = "igorlfs";
+      repo = "nvim-dap-view";
+      rev = "8fff34699823c354815891d7081972ef5166a31e";
+      sha256 = "1a2w88g65j04dygf6bkhp6ylj34vhry9h283s1z258ib7741gpip";
+    };
+    meta.homepage = "https://github.com/igorlfs/nvim-dap-view/";
+    meta.hydraPlatforms = [ ];
+  };
+
   nvim-dap-virtual-text = buildVimPlugin {
     pname = "nvim-dap-virtual-text";
     version = "2024-12-25";
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index df5eb664f44d..398cfd71e48f 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -2248,6 +2248,10 @@ in
     doInstallCheck = true;
   };
 
+  nvim-dap-view = super.nvim-dap-view.overrideAttrs {
+    dependencies = [ self.nvim-dap ];
+  };
+
   nvim-dap-virtual-text = super.nvim-dap-virtual-text.overrideAttrs {
     dependencies = [ self.nvim-dap ];
   };
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 2b1bfa41c807..83505b8aaace 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -769,6 +769,7 @@ https://github.com/mfussenegger/nvim-dap-python/,HEAD,
 https://github.com/rinx/nvim-dap-rego/,HEAD,
 https://github.com/jonboh/nvim-dap-rr/,HEAD,
 https://github.com/rcarriga/nvim-dap-ui/,,
+https://github.com/igorlfs/nvim-dap-view/,HEAD,
 https://github.com/theHamsta/nvim-dap-virtual-text/,,
 https://github.com/amrbashir/nvim-docs-view/,HEAD,
 https://github.com/allendang/nvim-expand-expr/,,

From ec529ce5152e039f79bf5f56868b09cd446984dd Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Wed, 26 Mar 2025 21:14:49 -0500
Subject: [PATCH 074/108] vimPlugins: update on 2025-03-27

---
 .../editors/vim/plugins/generated.nix         | 662 +++++++++---------
 .../editors/vim/plugins/overrides.nix         |  20 +-
 2 files changed, 350 insertions(+), 332 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index be6625f1351e..e06c99df38e4 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-20";
+    version = "2025-03-26";
     src = fetchFromGitHub {
       owner = "CopilotC-Nvim";
       repo = "CopilotChat.nvim";
-      rev = "0b0838e31fda8a52e792a5fb6b79ab68e711bc10";
-      sha256 = "0d6j042hallc7g7q278i3adi14ziv6d593avl2ykxd0h9njdca4p";
+      rev = "df550ff3f9f2d028160946d674db08dad432fdd3";
+      sha256 = "1ak9js6xphrwlp6rpkn0p91l5j70r9b81kfvw02mkwkm9r66drgl";
     };
     meta.homepage = "https://github.com/CopilotC-Nvim/CopilotChat.nvim/";
     meta.hydraPlatforms = [ ];
@@ -200,12 +200,12 @@ final: prev:
 
   LeaderF = buildVimPlugin {
     pname = "LeaderF";
-    version = "2025-03-17";
+    version = "2025-03-24";
     src = fetchFromGitHub {
       owner = "Yggdroot";
       repo = "LeaderF";
-      rev = "675cd53462759796e5e410a9f25b9c39c286941c";
-      sha256 = "0g7zx8qgxn7m8ffnm198115v0yyf3ggvh6gbvs16v618na0cqw5a";
+      rev = "570b2f62b1c3d2ace893d203f970c6da3e619c71";
+      sha256 = "0n2ak7pl7xplp9b20yfba2c3mc0cgnx3w2y3hq37i4km84vsbpja";
     };
     meta.homepage = "https://github.com/Yggdroot/LeaderF/";
     meta.hydraPlatforms = [ ];
@@ -369,12 +369,12 @@ final: prev:
 
   SchemaStore-nvim = buildVimPlugin {
     pname = "SchemaStore.nvim";
-    version = "2025-03-20";
+    version = "2025-03-26";
     src = fetchFromGitHub {
       owner = "b0o";
       repo = "SchemaStore.nvim";
-      rev = "39015717d8b25262119df1a8dd4069b17aea8d82";
-      sha256 = "11gyidsfvzpqynlx7r6bbw4qhs6ldjgkj2pj4qg3m833n0da0h3g";
+      rev = "d307d291f38678d064cb987112926df6d9134de3";
+      sha256 = "03blmpkrzgfsv4gpdlmhnan4f4jnxmzmj5gkl3hgqcabfbhdmazp";
     };
     meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
     meta.hydraPlatforms = [ ];
@@ -670,12 +670,12 @@ final: prev:
 
   agitator-nvim = buildVimPlugin {
     pname = "agitator.nvim";
-    version = "2025-02-17";
+    version = "2025-03-23";
     src = fetchFromGitHub {
       owner = "emmanueltouzery";
       repo = "agitator.nvim";
-      rev = "f28f7b4faeddbd95b195569544f3d6920a30d434";
-      sha256 = "160bhk374vqfvidkq78cww65wvfinmd5fvacwb7nhfnal2qrnilk";
+      rev = "36abea264878b57d1cce615df5b74e667fea0818";
+      sha256 = "1v761frhcz6wgrd3l7wqyp65p2bz5apg89cs3sz0wc06dpc9k933";
     };
     meta.homepage = "https://github.com/emmanueltouzery/agitator.nvim/";
     meta.hydraPlatforms = [ ];
@@ -878,12 +878,12 @@ final: prev:
 
   astrocore = buildVimPlugin {
     pname = "astrocore";
-    version = "2025-02-18";
+    version = "2025-03-26";
     src = fetchFromGitHub {
       owner = "AstroNvim";
       repo = "astrocore";
-      rev = "44a3dc0bf1591022b2a6bc89dccdfac1be17bec9";
-      sha256 = "0sn7c91sc9zmrm3lljvj0bnwcjfa47pap9gqmp0vy0i9mwrhigm6";
+      rev = "5d6b00072ef226507d68ef88857aa522b126f7a8";
+      sha256 = "1i36lvcwl0sznf4cpk0w10szbym5mgcxnn1hynymkz5q86rk6a1d";
     };
     meta.homepage = "https://github.com/AstroNvim/astrocore/";
     meta.hydraPlatforms = [ ];
@@ -891,12 +891,12 @@ final: prev:
 
   astrolsp = buildVimPlugin {
     pname = "astrolsp";
-    version = "2025-02-20";
+    version = "2025-03-26";
     src = fetchFromGitHub {
       owner = "AstroNvim";
       repo = "astrolsp";
-      rev = "909fbe64f3f87d089ff3777751261544557117cc";
-      sha256 = "1jqcmailpj7n0nkzd1dw23342gwcf4mxs04kcvbpv06l6gaw74mr";
+      rev = "0ab285f47b9f667402f08eb471e3e98f9a50b5ee";
+      sha256 = "14ajg0kxf0af1s9rasvdd6pldr47zcbm68q08rfkx4h70jzqdgz0";
     };
     meta.homepage = "https://github.com/AstroNvim/astrolsp/";
     meta.hydraPlatforms = [ ];
@@ -917,12 +917,12 @@ final: prev:
 
   astroui = buildVimPlugin {
     pname = "astroui";
-    version = "2025-03-05";
+    version = "2025-03-26";
     src = fetchFromGitHub {
       owner = "AstroNvim";
       repo = "astroui";
-      rev = "eab4c97dbc6961980204e24d79700f7a3097a8d5";
-      sha256 = "08rhdpk84fmna3cx5ci02hqf5vsy78fpw0bkrb0vmzycraf065sl";
+      rev = "7a46b59fc51afb91bcb37f7a2ef3f8811b66bc93";
+      sha256 = "1xxzr8pri876csh0cl464lp5rrsgca8vwh4mjp5c5hl7s8cf03ci";
     };
     meta.homepage = "https://github.com/AstroNvim/astroui/";
     meta.hydraPlatforms = [ ];
@@ -1034,12 +1034,12 @@ final: prev:
 
   asyncrun-vim = buildVimPlugin {
     pname = "asyncrun.vim";
-    version = "2024-11-08";
+    version = "2025-03-24";
     src = fetchFromGitHub {
       owner = "skywind3000";
       repo = "asyncrun.vim";
-      rev = "78dc9277f2b989553861ee7c35b640112d95e1b5";
-      sha256 = "1jkc8r0fcxwrkfrnw80cr65iz67bhzi054klsl0ynnzx28n0hyrk";
+      rev = "e17c49c67d1dd847cd1d7d6077a7168816f546cc";
+      sha256 = "1ky0y5wf5ir0awm6jmnq0d374za4l89jbg4cjzcznv8a798h75bh";
     };
     meta.homepage = "https://github.com/skywind3000/asyncrun.vim/";
     meta.hydraPlatforms = [ ];
@@ -1216,12 +1216,12 @@ final: prev:
 
   aw-watcher-nvim = buildVimPlugin {
     pname = "aw-watcher.nvim";
-    version = "2025-03-06";
+    version = "2025-03-23";
     src = fetchFromGitHub {
       owner = "lowitea";
       repo = "aw-watcher.nvim";
-      rev = "9030f9b851578fce7cec5fa3d7b54556eb7e270f";
-      sha256 = "0nsmfb508x03n0hvlnhcjzgqwwg8rp8wa2a5r7wz4z1hrs03hscx";
+      rev = "be7b03748f59b6602502baf08e7f7736cc7279a5";
+      sha256 = "10gvwc3ccz40w87dvwnks3adzgk196h0s3cwvrdbmad070xnav30";
     };
     meta.homepage = "https://github.com/lowitea/aw-watcher.nvim/";
     meta.hydraPlatforms = [ ];
@@ -1594,12 +1594,12 @@ final: prev:
 
   blink-ripgrep-nvim = buildVimPlugin {
     pname = "blink-ripgrep.nvim";
-    version = "2025-03-16";
+    version = "2025-03-22";
     src = fetchFromGitHub {
       owner = "mikavilpas";
       repo = "blink-ripgrep.nvim";
-      rev = "c80675996d6c7c021a7a13dc2c8c8b9b255efdab";
-      sha256 = "06c680x1ppnpz38kq0w40x732clls6403c5dx659rakksd19mif4";
+      rev = "af61f99945e15b195fbce017230cedb0497ded4d";
+      sha256 = "01n8vyp600smxwyj123f36xbbqgj7v7gvhqp7i0a5494y8vfg212";
     };
     meta.homepage = "https://github.com/mikavilpas/blink-ripgrep.nvim/";
     meta.hydraPlatforms = [ ];
@@ -1711,12 +1711,12 @@ final: prev:
 
   bufexplorer = buildVimPlugin {
     pname = "bufexplorer";
-    version = "2025-03-20";
+    version = "2025-03-26";
     src = fetchFromGitHub {
       owner = "jlanzarotta";
       repo = "bufexplorer";
-      rev = "974252b1a3b4ba008457f178a92e1ff4f38985a6";
-      sha256 = "09hxfbx76fvmbqsi4b2lpjr5vv9mx21qjvnnfi1r2dmdznnbikbd";
+      rev = "7193d1daa317b958fb84f6dc845e31f917ff87b1";
+      sha256 = "13dsfab1jv56l71k0f5d1l01bpjz803rjxnf8f8ir2g15rxyvl4l";
     };
     meta.homepage = "https://github.com/jlanzarotta/bufexplorer/";
     meta.hydraPlatforms = [ ];
@@ -2322,12 +2322,12 @@ final: prev:
 
   cmp-git = buildVimPlugin {
     pname = "cmp-git";
-    version = "2025-01-14";
+    version = "2025-03-25";
     src = fetchFromGitHub {
       owner = "petertriho";
       repo = "cmp-git";
-      rev = "483ffb9a7471409a841df099d7c13556234365a4";
-      sha256 = "0jlz5c5nffri0hvr6iphyy1rmg464br1smcylqv0idvqyp4gy5il";
+      rev = "d9efd00e0b9527ee05031ce7e7e55d6b118f543e";
+      sha256 = "1i9crdbah90f2ijy99ssqs67syhx2xm27cp24nzrawcrrflgv1m4";
     };
     meta.homepage = "https://github.com/petertriho/cmp-git/";
     meta.hydraPlatforms = [ ];
@@ -2816,12 +2816,12 @@ final: prev:
 
   coc-nvim = buildVimPlugin {
     pname = "coc.nvim";
-    version = "2025-03-20";
+    version = "2025-03-21";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc.nvim";
-      rev = "3660d653bf24ed9555fb1ccb59b7504e7f152440";
-      sha256 = "1dv1yh07d9b8f7an005am1s3n915r9xhiyv728nlxxdnsbd8cn48";
+      rev = "da20bea23b6226e5859a06137b841c6853599f22";
+      sha256 = "0gnr6lgpsqxjxy60sx640lpc59mvbvk6f19xwnl8cych0ik6dfrv";
     };
     meta.homepage = "https://github.com/neoclide/coc.nvim/";
     meta.hydraPlatforms = [ ];
@@ -2868,12 +2868,12 @@ final: prev:
 
   codecompanion-nvim = buildVimPlugin {
     pname = "codecompanion.nvim";
-    version = "2025-03-20";
+    version = "2025-03-26";
     src = fetchFromGitHub {
       owner = "olimorris";
       repo = "codecompanion.nvim";
-      rev = "a344661b8c1eaae9a56db5c36e7f5d2101b69128";
-      sha256 = "1gyakqjxxfxd27wc570c3qprinsgb7c9faq5fwx94nzybyi63ik3";
+      rev = "f4eed65f7890023104f7c1979be31baadbfb901f";
+      sha256 = "0snzi9qhjlsr23x7ynh6mw42yzwwb1b787ii5h3a2sh92p3s5gjy";
     };
     meta.homepage = "https://github.com/olimorris/codecompanion.nvim/";
     meta.hydraPlatforms = [ ];
@@ -2946,12 +2946,12 @@ final: prev:
 
   colorful-menu-nvim = buildVimPlugin {
     pname = "colorful-menu.nvim";
-    version = "2025-03-03";
+    version = "2025-03-26";
     src = fetchFromGitHub {
       owner = "xzbdmw";
       repo = "colorful-menu.nvim";
-      rev = "0041037582353a2101f0ba8bd8cae21c064921dc";
-      sha256 = "18ba0h3j4pc4p5w1nyz6kxy80dxwani0i6z948zi138rrnc0d51l";
+      rev = "91621b22c334812e5bbf0c8f82fc03869279acfe";
+      sha256 = "0i1y1kd1bknj9p6n1yhx8wfrxapg7gaii66v2sgdf8jkggcqjzwf";
     };
     meta.homepage = "https://github.com/xzbdmw/colorful-menu.nvim/";
     meta.hydraPlatforms = [ ];
@@ -3168,12 +3168,12 @@ final: prev:
 
   conjure = buildVimPlugin {
     pname = "conjure";
-    version = "2025-03-01";
+    version = "2025-03-23";
     src = fetchFromGitHub {
       owner = "Olical";
       repo = "conjure";
-      rev = "c5f427c33786a024c58d7105e2244f5f14c64fea";
-      sha256 = "0jb28z6daag5j2nxapng5xxmh89wxg9xh6panikmq4ls0k0rdk3r";
+      rev = "980452d93fd6165d3f268f50a181ad7ca4c7b990";
+      sha256 = "0pwl2h19rx3cqkn5l8qdyvia09zkg7fsjafd3py65imji9anqzxi";
     };
     meta.homepage = "https://github.com/Olical/conjure/";
     meta.hydraPlatforms = [ ];
@@ -3220,12 +3220,12 @@ final: prev:
 
   copilot-lua = buildVimPlugin {
     pname = "copilot.lua";
-    version = "2025-02-10";
+    version = "2025-03-27";
     src = fetchFromGitHub {
       owner = "zbirenbaum";
       repo = "copilot.lua";
-      rev = "30321e33b03cb924fdcd6a806a0dc6fa0b0eafb9";
-      sha256 = "0jlwd5x0pdfxa1hg41dfvz9zji0frvlfg86vzak0d3xmn4hr8zgb";
+      rev = "0e3585bb9d482336aeb43811e9d7cd09e33edada";
+      sha256 = "0gc5yvyv20v5iy51kvmc3ws6qswc3v3q3zaw840ag0p2c0q887ij";
     };
     meta.homepage = "https://github.com/zbirenbaum/copilot.lua/";
     meta.hydraPlatforms = [ ];
@@ -3246,12 +3246,12 @@ final: prev:
 
   copilot-vim = buildVimPlugin {
     pname = "copilot.vim";
-    version = "2025-03-06";
+    version = "2025-03-24";
     src = fetchFromGitHub {
       owner = "github";
       repo = "copilot.vim";
-      rev = "5015939f131627a6a332c9e3ecad9a7cb4c2e549";
-      sha256 = "198mymn0ad1kzqzs1rimrhq7z3nrami45fp3yqnwp15am8bxmwi0";
+      rev = "a9228e015528c9307890c48083c925eb98a64a79";
+      sha256 = "0957a7y513n34b2bqysnlpnx3z6rphx8mmrsx3r5219hp19h2pyn";
     };
     meta.homepage = "https://github.com/github/copilot.vim/";
     meta.hydraPlatforms = [ ];
@@ -3311,12 +3311,12 @@ final: prev:
 
   coq_nvim = buildVimPlugin {
     pname = "coq_nvim";
-    version = "2025-03-10";
+    version = "2025-03-24";
     src = fetchFromGitHub {
       owner = "ms-jpq";
       repo = "coq_nvim";
-      rev = "e48a17c63029ef9ac72af80a7a3a56577acffb00";
-      sha256 = "1g1alqkxf1nh794hwx560mfif9g6i9x3pipc948hnwx2rlcywyx1";
+      rev = "d83bc18d044cfcd65e91dc49740a353546bc143b";
+      sha256 = "0nc2qcwh0xz4lwp4q1h7633qpb3v2gpr1kklwsa12w3x6lp3jk8j";
     };
     meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
     meta.hydraPlatforms = [ ];
@@ -3389,12 +3389,12 @@ final: prev:
 
   csharpls-extended-lsp-nvim = buildVimPlugin {
     pname = "csharpls-extended-lsp.nvim";
-    version = "2025-03-12";
+    version = "2025-03-26";
     src = fetchFromGitHub {
       owner = "Decodetalkers";
       repo = "csharpls-extended-lsp.nvim";
-      rev = "991d2c43afd7c7be77edd27a2ae686f9779382da";
-      sha256 = "10jj6x78k34yrarp5ydc7n1ylp2xxgxl7jqh1y4d133mgcygabak";
+      rev = "ed94128fc113d992dc9b78100cb87e41cf4143c0";
+      sha256 = "0b2f2n9cnmw7m5a2wgbn1j0mphqfk3mk4k852qj2bj6izal2ddkh";
     };
     meta.homepage = "https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/";
     meta.hydraPlatforms = [ ];
@@ -3428,12 +3428,12 @@ final: prev:
 
   csvview-nvim = buildVimPlugin {
     pname = "csvview.nvim";
-    version = "2025-03-17";
+    version = "2025-03-25";
     src = fetchFromGitHub {
       owner = "hat0uma";
       repo = "csvview.nvim";
-      rev = "02edaf830c2225ec39b889173f09cbbf89da3b87";
-      sha256 = "1gpw7acb2gp7xbrqkmmxwr8lldzvp4hiaqd0pv80799ny2vqr71j";
+      rev = "7dcb6aa2965a1d5555d4940ed0c9c2f0e173ecdb";
+      sha256 = "1qlw5dlfg93ck398hxv905g3by3avi9fh7v1saxims9j9r7qsm96";
     };
     meta.homepage = "https://github.com/hat0uma/csvview.nvim/";
     meta.hydraPlatforms = [ ];
@@ -3636,12 +3636,12 @@ final: prev:
 
   ddc-source-lsp = buildVimPlugin {
     pname = "ddc-source-lsp";
-    version = "2025-02-03";
+    version = "2025-03-23";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "ddc-source-lsp";
-      rev = "a2715dd309dfefd59e0f4896d512d63aa53300fa";
-      sha256 = "0j1g1086an3rzy59jklmx4gfhxp4kkq0d20kssywgy7csl9dxc44";
+      rev = "5b80eeaa196b67337577bcfbe65e5163667ea97a";
+      sha256 = "1fnzd1s2l86b790kmk6dwx91257jxa3ms6mgbbbijibjivb13zqk";
     };
     meta.homepage = "https://github.com/Shougo/ddc-source-lsp/";
     meta.hydraPlatforms = [ ];
@@ -4288,12 +4288,12 @@ final: prev:
 
   dropbar-nvim = buildVimPlugin {
     pname = "dropbar.nvim";
-    version = "2025-03-20";
+    version = "2025-03-23";
     src = fetchFromGitHub {
       owner = "Bekaboo";
       repo = "dropbar.nvim";
-      rev = "a2f1b275fdf185567ab976d27749d4e8cc21fe4c";
-      sha256 = "02a7wnkvvbivbwrfill3j97mdykb53pahhm7gqsk3lvqlxg1qfga";
+      rev = "873ba43f83398fd0e28880cf98fd89e6ce667c51";
+      sha256 = "0rfh82xyimysali998v91gir0694lp9h03hh9kqvxgn906dgvccd";
     };
     meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/";
     meta.hydraPlatforms = [ ];
@@ -4314,12 +4314,12 @@ final: prev:
 
   easy-dotnet-nvim = buildVimPlugin {
     pname = "easy-dotnet.nvim";
-    version = "2025-03-20";
+    version = "2025-03-25";
     src = fetchFromGitHub {
       owner = "GustavEikaas";
       repo = "easy-dotnet.nvim";
-      rev = "dcf5d4c9a1ee634f76acfd3429b4dc2e9642042b";
-      sha256 = "086khcd38d6ay0n6c1f9bhk9vn585hn7pqwprmy8ibmpynzvf0a8";
+      rev = "6d77deea4905f5fdac5cb1c6e35fb02054b406ae";
+      sha256 = "077wwrqqslspyf21h6ml8wzcwcwgazvg5gpa4dsk938sy6k9nmyy";
     };
     meta.homepage = "https://github.com/GustavEikaas/easy-dotnet.nvim/";
     meta.hydraPlatforms = [ ];
@@ -4706,12 +4706,12 @@ final: prev:
 
   firenvim = buildVimPlugin {
     pname = "firenvim";
-    version = "2025-01-09";
+    version = "2025-03-22";
     src = fetchFromGitHub {
       owner = "glacambre";
       repo = "firenvim";
-      rev = "f8a5fa6f1ed42536490acf0840497c40331c184f";
-      sha256 = "08n53sqgw25m1piwdpyi4g5b30xw5qjprf2fwz73i6zgnyyf83ra";
+      rev = "c4ab7d2aeb145cd93db8660cb134f771722f2b5e";
+      sha256 = "1z48j7m0zpagkb9zvswxpx6a2mh959dzkvcaasz1sadxfinss5bs";
     };
     meta.homepage = "https://github.com/glacambre/firenvim/";
     meta.hydraPlatforms = [ ];
@@ -5046,12 +5046,12 @@ final: prev:
 
   fzf-vim = buildVimPlugin {
     pname = "fzf.vim";
-    version = "2025-03-03";
+    version = "2025-03-21";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "fzf.vim";
-      rev = "245eaf8e50fe440729056ce8d4e7e2bb5b1ff9c9";
-      sha256 = "0any944khix8wnz3h56ar5i3q5r844bcfw4zpi97r520gqcilr4b";
+      rev = "1fff637559f29d5edbdb05e03327954a8cd9e406";
+      sha256 = "13xh17bqnb1k32jm53x9kqc8x6njwcdha9xbwn2zhm0s8dgqikzx";
     };
     meta.homepage = "https://github.com/junegunn/fzf.vim/";
     meta.hydraPlatforms = [ ];
@@ -5150,12 +5150,12 @@ final: prev:
 
   git-blame-nvim = buildVimPlugin {
     pname = "git-blame.nvim";
-    version = "2024-09-24";
+    version = "2025-03-24";
     src = fetchFromGitHub {
       owner = "f-person";
       repo = "git-blame.nvim";
-      rev = "2883a7460f611c2705b23f12d58d398d5ce6ec00";
-      sha256 = "0km0wcwd8jlv5lbvh11kdj58kq55s1x3k917vyi2glhf379fcp4q";
+      rev = "b12da2156ec1c3f53f42c129201ff0bfed69c86e";
+      sha256 = "0mmq0v9dqmrm9r5klbxlvbqby51s1n7np79l3z2dg23v7l9s9ysf";
     };
     meta.homepage = "https://github.com/f-person/git-blame.nvim/";
     meta.hydraPlatforms = [ ];
@@ -5228,12 +5228,12 @@ final: prev:
 
   gitignore-nvim = buildVimPlugin {
     pname = "gitignore.nvim";
-    version = "2024-03-25";
+    version = "2025-03-23";
     src = fetchFromGitHub {
       owner = "wintermute-cell";
       repo = "gitignore.nvim";
-      rev = "2455191ec94da8ed222806a4fe3aa358eac1e558";
-      sha256 = "sha256-p6k0NP3Vne6Kl98YodzSruVmJwxyrXziJj8N7u79o1w=";
+      rev = "47cefc0b6ea412e1e149552b10ebfe9f7f0b8952";
+      sha256 = "0z631qr6vdk4m2vq615qfq0l9c6gkwrpwd4icglhpcnss9vxa52i";
     };
     meta.homepage = "https://github.com/wintermute-cell/gitignore.nvim/";
     meta.hydraPlatforms = [ ];
@@ -5306,12 +5306,12 @@ final: prev:
 
   glow-nvim = buildVimPlugin {
     pname = "glow.nvim";
-    version = "2023-12-23";
+    version = "2025-03-21";
     src = fetchFromGitHub {
       owner = "ellisonleao";
       repo = "glow.nvim";
-      rev = "238070a686c1da3bccccf1079700eb4b5e19aea4";
-      sha256 = "1j63y3hb03n5m4jig8576sxnb3jixxlr66m9xcs8vgfm5h0mrhqs";
+      rev = "5d5954b2f22e109d4a6eba8b2618c5b96e4ee7a2";
+      sha256 = "11rlis4riy1w4clnkiza8x6fs8xjwsrsgfzlz2k8z041ancmrw0a";
     };
     meta.homepage = "https://github.com/ellisonleao/glow.nvim/";
     meta.hydraPlatforms = [ ];
@@ -5319,12 +5319,12 @@ final: prev:
 
   go-nvim = buildVimPlugin {
     pname = "go.nvim";
-    version = "2025-03-18";
+    version = "2025-03-25";
     src = fetchFromGitHub {
       owner = "ray-x";
       repo = "go.nvim";
-      rev = "f058a8c622edf24d27b8ef82fabffdbbc1d55707";
-      sha256 = "1rs9frzbywlq509r33kd9rxgpn6mrdyx4byn1zbcqhj1pdfkq7rv";
+      rev = "0d426e87227dd14584881ecc595c173121456111";
+      sha256 = "0k6ia8nhfs9y904f6bnnxyxnqlij7sk23i6px3d0a87dx5vgd4pz";
     };
     meta.homepage = "https://github.com/ray-x/go.nvim/";
     meta.hydraPlatforms = [ ];
@@ -5449,12 +5449,12 @@ final: prev:
 
   grug-far-nvim = buildVimPlugin {
     pname = "grug-far.nvim";
-    version = "2025-03-19";
+    version = "2025-03-27";
     src = fetchFromGitHub {
       owner = "MagicDuck";
       repo = "grug-far.nvim";
-      rev = "6b1aca6018cb6ce18a46b9e8583074a2f820b51e";
-      sha256 = "156hk1mxq0v2fy2ibw1bg4n6anhg9jxgq0fq7q7kh9rms8xin6ws";
+      rev = "5da116bc99a03e14be3b824e319f4e49c676af78";
+      sha256 = "196l6vy9573fkwld3cl927706a6gfgmc71kn1kx3pmk8l6p8hcya";
     };
     meta.homepage = "https://github.com/MagicDuck/grug-far.nvim/";
     meta.hydraPlatforms = [ ];
@@ -5540,12 +5540,12 @@ final: prev:
 
   gruvbox-nvim = buildVimPlugin {
     pname = "gruvbox.nvim";
-    version = "2025-03-05";
+    version = "2025-03-26";
     src = fetchFromGitHub {
       owner = "ellisonleao";
       repo = "gruvbox.nvim";
-      rev = "15958f5ee43e144856cd2084ce6c571bfdb44504";
-      sha256 = "16nrxcpds3zacqmfw5jsd5d8qqbwllkw9xacjkglcnaynp4qghqq";
+      rev = "c6f42890551b4827253387e93b035568826a9cb7";
+      sha256 = "1ac056i9hs5wbb9qzdijmhjcaz4h67v2c8q0361d17gdm8pdrvnj";
     };
     meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/";
     meta.hydraPlatforms = [ ];
@@ -5579,12 +5579,12 @@ final: prev:
 
   guess-indent-nvim = buildVimPlugin {
     pname = "guess-indent.nvim";
-    version = "2024-07-06";
+    version = "2025-03-25";
     src = fetchFromGitHub {
       owner = "nmac427";
       repo = "guess-indent.nvim";
-      rev = "6cd61f7a600bb756e558627cd2e740302c58e32d";
-      sha256 = "0gb9bgyirlgfbnfdfha7k31gfcyzc4k9a3skvaixdyxn04pgsdcv";
+      rev = "84a4987ff36798c2fc1169cbaff67960aed9776f";
+      sha256 = "0fq6f4k0j10m3ic5a6px4l4q4jqs7xxbh0j72kaqi1np4p069w9k";
     };
     meta.homepage = "https://github.com/nmac427/guess-indent.nvim/";
     meta.hydraPlatforms = [ ];
@@ -5932,7 +5932,7 @@ final: prev:
 
   houdini-nvim = buildVimPlugin {
     pname = "houdini.nvim";
-    version = "2024-08-06";
+    version = "2024-07-05";
     src = fetchFromGitHub {
       owner = "TheBlob42";
       repo = "houdini.nvim";
@@ -5984,12 +5984,12 @@ final: prev:
 
   hydra-nvim = buildVimPlugin {
     pname = "hydra.nvim";
-    version = "2024-12-26";
+    version = "2025-03-26";
     src = fetchFromGitHub {
       owner = "nvimtools";
       repo = "hydra.nvim";
-      rev = "983852960cd4e4e9a1b272df0bd1447495aae755";
-      sha256 = "1igym59zjdgg0kzrbc1xdykw5k9kfqn34p4gz1sgh9fww72j834j";
+      rev = "394744ac7a5e3449044e368006f49e823c2d6908";
+      sha256 = "0j8cz01v30s4z1w9phwyky68gikv2w1j2iwnj4xfbm1hkl3ksj0j";
     };
     meta.homepage = "https://github.com/nvimtools/hydra.nvim/";
     meta.hydraPlatforms = [ ];
@@ -6101,12 +6101,12 @@ final: prev:
 
   inc-rename-nvim = buildVimPlugin {
     pname = "inc-rename.nvim";
-    version = "2025-01-20";
+    version = "2025-03-23";
     src = fetchFromGitHub {
       owner = "smjonas";
       repo = "inc-rename.nvim";
-      rev = "f9b9e5b9a75074810f40881b7e254b5bbeaf122e";
-      sha256 = "0ply4qyly1hsiv75y71i3scnav5z8gxjsh34nspmpk0lcldrhxpd";
+      rev = "87ebe7bee0b83d3b6e4f1494c74abed21b318175";
+      sha256 = "1cra8zz7a1c0w1d7bwvznqlrmjgzc3nap7762qz5mghi3z1yfgak";
     };
     meta.homepage = "https://github.com/smjonas/inc-rename.nvim/";
     meta.hydraPlatforms = [ ];
@@ -6494,12 +6494,12 @@ final: prev:
 
   kitty-scrollback-nvim = buildVimPlugin {
     pname = "kitty-scrollback.nvim";
-    version = "2025-03-20";
+    version = "2025-03-26";
     src = fetchFromGitHub {
       owner = "mikesmithgh";
       repo = "kitty-scrollback.nvim";
-      rev = "9b70b5f73b653745ddca4a8e49b9477fc33b817f";
-      sha256 = "0570ng60dzwdbbq76vpkdrww6jnm15vbcyy79885fvb0sjwcpf1a";
+      rev = "68ef4467bc1c30055bb772fb5e7b94db394f5c62";
+      sha256 = "08lwinzjxirhrg7p1f3wjqiaqyimjr95jyx4i967m7qvqx1l49ax";
     };
     meta.homepage = "https://github.com/mikesmithgh/kitty-scrollback.nvim/";
     meta.hydraPlatforms = [ ];
@@ -6559,12 +6559,12 @@ final: prev:
 
   kulala-nvim = buildVimPlugin {
     pname = "kulala.nvim";
-    version = "2025-03-20";
+    version = "2025-03-25";
     src = fetchFromGitHub {
       owner = "mistweaverco";
       repo = "kulala.nvim";
-      rev = "7defd3663afce220c7de4fe0af6deaece90faef8";
-      sha256 = "0m7c3wq5qf7n9c94lckk0ryf6p65l8j53z2n1lbrlk7mrbhsv99s";
+      rev = "f9daf1df015aac94350b3f20c26ce43a9e0009be";
+      sha256 = "02564h0ly1m93341d3ba81bwviigafjmayyqscfjc31ra6pjvnrz";
     };
     meta.homepage = "https://github.com/mistweaverco/kulala.nvim/";
     meta.hydraPlatforms = [ ];
@@ -6637,12 +6637,12 @@ final: prev:
 
   lazy-lsp-nvim = buildVimPlugin {
     pname = "lazy-lsp.nvim";
-    version = "2025-02-26";
+    version = "2025-03-22";
     src = fetchFromGitHub {
       owner = "dundalek";
       repo = "lazy-lsp.nvim";
-      rev = "9b7c6f4b9e8c42cde90907cf6f54d3b87416a6ea";
-      sha256 = "1gg6c572r9sjm6fll2f2vzxjzmn7hfh96f0qv6vh0ynj5756igc8";
+      rev = "701893d2d60c7eff894324748073f682065999a2";
+      sha256 = "1jd1rn7d0l1qz5djlaqzcggfbza3xpz04zm9dsajcibd61blbn25";
     };
     meta.homepage = "https://github.com/dundalek/lazy-lsp.nvim/";
     meta.hydraPlatforms = [ ];
@@ -6689,12 +6689,12 @@ final: prev:
 
   lean-nvim = buildVimPlugin {
     pname = "lean.nvim";
-    version = "2025-03-19";
+    version = "2025-03-25";
     src = fetchFromGitHub {
       owner = "Julian";
       repo = "lean.nvim";
-      rev = "977c4cc16afe63c56919d296a75ea09e6d7a136c";
-      sha256 = "18vi4sps7l845ldyhvrpdnqrqgjlinvb2fi5zdm43ssas1vxy7g7";
+      rev = "594d051d03eef7ab5e4f91b680e3c87e53936259";
+      sha256 = "1d9vjk4zldq155pcr1s9if9pagw0mpq5sb5nb9pspg9g2j3wjmmd";
     };
     meta.homepage = "https://github.com/Julian/lean.nvim/";
     meta.hydraPlatforms = [ ];
@@ -6793,12 +6793,12 @@ final: prev:
 
   lexima-vim = buildVimPlugin {
     pname = "lexima.vim";
-    version = "2024-12-07";
+    version = "2025-03-26";
     src = fetchFromGitHub {
       owner = "cohama";
       repo = "lexima.vim";
-      rev = "f851b232505766aff7bed7d20100ad31c9c0b33b";
-      sha256 = "0k02zbx157zw6i4x9xnqxm5653165wyyzmbfcl0rd42qlvyz2l1h";
+      rev = "ad09d786d69493a37bd4cd2c383a91b46a42078d";
+      sha256 = "1nkl8llnbk28nl8w63bwayxhapa3a7jjm08mqd8sf6v5i01403yq";
     };
     meta.homepage = "https://github.com/cohama/lexima.vim/";
     meta.hydraPlatforms = [ ];
@@ -6832,12 +6832,12 @@ final: prev:
 
   lh-vim-lib = buildVimPlugin {
     pname = "lh-vim-lib";
-    version = "2025-03-16";
+    version = "2025-03-25";
     src = fetchFromGitHub {
       owner = "LucHermitte";
       repo = "lh-vim-lib";
-      rev = "4e22e197368a2e0d031489cb0f777f7c7a6c1884";
-      sha256 = "1hmdn8ziin659s7pjm4z6nsvszc63iz7gp90a176xs4nsi2va3sx";
+      rev = "3b1b655736ee797b70d06472ae0fe558f4fa8497";
+      sha256 = "05gjj510ly25kkv62mr6xyspmh8dvfqwlvf6pwc6j2073jd05wk7";
     };
     meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/";
     meta.hydraPlatforms = [ ];
@@ -7235,12 +7235,12 @@ final: prev:
 
   lspsaga-nvim = buildVimPlugin {
     pname = "lspsaga.nvim";
-    version = "2025-02-26";
+    version = "2025-03-26";
     src = fetchFromGitHub {
       owner = "nvimdev";
       repo = "lspsaga.nvim";
-      rev = "6063935cf68de9aa6dd79f8e1caf5df0a9385de3";
-      sha256 = "1pqasjg2f2yd3ci8hyxfqqs7xnkmwdc411dlm6qg1agiv1h8v205";
+      rev = "778d56ff9b387dacd14ae648ed5604394b486f51";
+      sha256 = "1rm8ww8krxliwli9m2j6j37xgwgjsrgapvgrcdr6nd4mi6hgmczm";
     };
     meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7300,12 +7300,12 @@ final: prev:
 
   luatab-nvim = buildVimPlugin {
     pname = "luatab.nvim";
-    version = "2024-07-03";
+    version = "2025-03-21";
     src = fetchFromGitHub {
       owner = "alvarosevilla95";
       repo = "luatab.nvim";
-      rev = "7bc6e0f6957fbaa93c98529f2cf28052329002e0";
-      sha256 = "106sl5c38ydjfzaa56cpzkqm0k5fyszxhqvyaax6rpkhv9q7xdds";
+      rev = "7ac54b014b542f02a73b62fcae65db7a2382a378";
+      sha256 = "15kaxhi5r58ibm6y8vwxvrgnz6mz345rfgxal5bxbrsr64gl85ca";
     };
     meta.homepage = "https://github.com/alvarosevilla95/luatab.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7417,12 +7417,12 @@ final: prev:
 
   markview-nvim = buildVimPlugin {
     pname = "markview.nvim";
-    version = "2025-03-18";
+    version = "2025-03-24";
     src = fetchFromGitHub {
       owner = "OXY2DEV";
       repo = "markview.nvim";
-      rev = "7a7d3ed0d276b32e121d791f73d850aae6d61b42";
-      sha256 = "0zn7p5j8c9qp4abj6kywk6j2waf2dg9i397wxrbs8prykq2n12pn";
+      rev = "556cac8bb8eeb461013ebe0d015e2c48d3527c36";
+      sha256 = "029n2zx4ya7iv4qa53q5zg62jx8jzv6mnd3qrlfn3db2akfdlmd3";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/OXY2DEV/markview.nvim/";
@@ -7470,12 +7470,12 @@ final: prev:
 
   mason-nvim-dap-nvim = buildVimPlugin {
     pname = "mason-nvim-dap.nvim";
-    version = "2025-03-17";
+    version = "2025-03-24";
     src = fetchFromGitHub {
       owner = "jay-babu";
       repo = "mason-nvim-dap.nvim";
-      rev = "444aad7977ee713a4049e9d1dd9b377967d67a4c";
-      sha256 = "16yfc27d02vg37ahbx9q8rjgdbqfay7p1935dh5qk7blcs510295";
+      rev = "ea387e0819ab189d536bb4067e4d8ece3801a292";
+      sha256 = "1hhfamkn80can7mvzhr2vw6w0pwlbmxiqmxnlrhqgkb4ff5azwfp";
     };
     meta.homepage = "https://github.com/jay-babu/mason-nvim-dap.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7483,12 +7483,12 @@ final: prev:
 
   mason-tool-installer-nvim = buildVimPlugin {
     pname = "mason-tool-installer.nvim";
-    version = "2025-02-25";
+    version = "2025-03-24";
     src = fetchFromGitHub {
       owner = "WhoIsSethDaniel";
       repo = "mason-tool-installer.nvim";
-      rev = "5639d58a3d11ff7c05c8e31e159bfedae55d7961";
-      sha256 = "049gd6ccijdm1w80r0678h2wv99ij3g3hpyqxlvmrivpd1pg8i99";
+      rev = "98767d37f8e5255a5111fc1e3163232d4dc07bda";
+      sha256 = "0bvjq0ygrgf73xybdkfyv4f48b5r51xla63zfpd05i3fhmclzxd8";
     };
     meta.homepage = "https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7639,12 +7639,12 @@ final: prev:
 
   mini-ai = buildVimPlugin {
     pname = "mini.ai";
-    version = "2025-02-08";
+    version = "2025-03-20";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.ai";
-      rev = "6e01c0e5a15554852546fac9853960780ac52ed4";
-      sha256 = "0138rsb0rh4fjiicm3gjah0b5n1c08lil29c5ssqk3xq1bdr69j9";
+      rev = "978ffc65c6b513fde9ef075326d34d89197f1ea5";
+      sha256 = "1kgar55azqq9g6m9y98kr96cldhzipdfp2cjhszvnzw9ad28p3nb";
     };
     meta.homepage = "https://github.com/echasnovski/mini.ai/";
     meta.hydraPlatforms = [ ];
@@ -7652,12 +7652,12 @@ final: prev:
 
   mini-align = buildVimPlugin {
     pname = "mini.align";
-    version = "2025-01-31";
+    version = "2025-03-20";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.align";
-      rev = "3bdf6f0b91b31db5300a7b04f53f296a7fb150c1";
-      sha256 = "1255r5c9q0nnb7vnhs7xk45vqigmbhbim02ciczv8i80amfh9yw3";
+      rev = "0ce67804b0343409c93eb14275b98d53a7b209cc";
+      sha256 = "1lq5pzi24ahwfp1jipwl7a1mynnz1ja7c70bs2kilafpa314ymnp";
     };
     meta.homepage = "https://github.com/echasnovski/mini.align/";
     meta.hydraPlatforms = [ ];
@@ -7665,12 +7665,12 @@ final: prev:
 
   mini-animate = buildVimPlugin {
     pname = "mini.animate";
-    version = "2025-02-20";
+    version = "2025-03-21";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.animate";
-      rev = "13e170c13030b043aa8ad4311012ec0eaba0d5c7";
-      sha256 = "153hrx7i0kn65lz4yjgkaxkvj0xvqamm3mi6ciq9b0q3c2ngh7rj";
+      rev = "89c921eba5b65834e4e230e5c19e87b8f2c6a969";
+      sha256 = "0yir17bci1772h2d1sp495r1gjzg3h0dnpp8mdpp6jyn5iw4m6lx";
     };
     meta.homepage = "https://github.com/echasnovski/mini.animate/";
     meta.hydraPlatforms = [ ];
@@ -7691,12 +7691,12 @@ final: prev:
 
   mini-basics = buildVimPlugin {
     pname = "mini.basics";
-    version = "2025-02-08";
+    version = "2025-03-24";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.basics";
-      rev = "e8fbcf96e4e8262d452ddc851acea6c50449fa79";
-      sha256 = "0v3j61qik4mv2r246b7q7h4ndg68x373dr5jag3a4hwszgpf7jcl";
+      rev = "c411cee62c9981556ee2df8fb2e76a3cdef124e6";
+      sha256 = "1alqr41iivkldfvpr78zdlwa63kdg6d7r3yndn8d40pd0k67yr5p";
     };
     meta.homepage = "https://github.com/echasnovski/mini.basics/";
     meta.hydraPlatforms = [ ];
@@ -7730,12 +7730,12 @@ final: prev:
 
   mini-clue = buildVimPlugin {
     pname = "mini.clue";
-    version = "2025-03-01";
+    version = "2025-03-22";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.clue";
-      rev = "08901d2223797aa25611c33aaf9d8a1049a653bb";
-      sha256 = "026d647acwxr0wrf43lffmzw4x84jm6v5lipbqqpicqgqs8b4rfv";
+      rev = "8b1947d001419503636398168b8d8413ebd7c14b";
+      sha256 = "1rc9plmqw5nnmd0gdp49r5g10w49j4dvh4lvj2jl87pfxgfmyk6p";
     };
     meta.homepage = "https://github.com/echasnovski/mini.clue/";
     meta.hydraPlatforms = [ ];
@@ -7769,12 +7769,12 @@ final: prev:
 
   mini-completion = buildVimPlugin {
     pname = "mini.completion";
-    version = "2025-03-16";
+    version = "2025-03-22";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.completion";
-      rev = "732b097d395e316ed5d4eeadc19837fbaf59ad7e";
-      sha256 = "07ypcjw4qzqv9jjsn1qv0g1kwgv3x8590v3wkhab54529nb4rxy7";
+      rev = "5603b1ca012777ce8933bda46d62a819c11e5756";
+      sha256 = "13dx7ygkh5dmbnh0470alklgdj98kbaclmj5wv489sjwm43vj9fx";
     };
     meta.homepage = "https://github.com/echasnovski/mini.completion/";
     meta.hydraPlatforms = [ ];
@@ -7821,12 +7821,12 @@ final: prev:
 
   mini-doc = buildVimPlugin {
     pname = "mini.doc";
-    version = "2025-02-18";
+    version = "2025-03-23";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.doc";
-      rev = "466c340917b76d16a79fcbb2545c397fc49b110e";
-      sha256 = "16aglk95hw9wbgz4vzpv3bf3hqzqa2qrrzsxqjva2smg9f59c7rl";
+      rev = "00d626a03e5642c657c58c99d14cc0ea6ed51abd";
+      sha256 = "0n920j25rnb66hk3klrni9ji673800dbxyb8j30vd4dymq5051ym";
     };
     meta.homepage = "https://github.com/echasnovski/mini.doc/";
     meta.hydraPlatforms = [ ];
@@ -7847,12 +7847,12 @@ final: prev:
 
   mini-files = buildVimPlugin {
     pname = "mini.files";
-    version = "2025-03-01";
+    version = "2025-03-25";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.files";
-      rev = "0a396f5ca5516a07959ae2c00667e1a26c20f0ea";
-      sha256 = "1axjd6a6c02jllhi1l8c9xfplipvz4g82hnxjbsgx4kzc9b60zdq";
+      rev = "b6c9cb5f5ebbd9014097cd1296baf74c92b656aa";
+      sha256 = "0pfybraga5mblmlgshnxc8nmqmpxfk8h4zk25dfinypn8jjihcf7";
     };
     meta.homepage = "https://github.com/echasnovski/mini.files/";
     meta.hydraPlatforms = [ ];
@@ -7964,12 +7964,12 @@ final: prev:
 
   mini-map = buildVimPlugin {
     pname = "mini.map";
-    version = "2025-01-31";
+    version = "2025-03-21";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.map";
-      rev = "7f4c785b95ff6d266588fe6e5b6ea696cf654e61";
-      sha256 = "0f8mlszgi1fnmy0npqw27g28h9bgavy7mc97zivgsxgx2whgz6al";
+      rev = "a6b491bd30e3b661b704c65445b00be5b69600f7";
+      sha256 = "0q2sl92za253qf95dyhlcycqsndb7aybngmsf3rbj9n50qb1z1gg";
     };
     meta.homepage = "https://github.com/echasnovski/mini.map/";
     meta.hydraPlatforms = [ ];
@@ -7977,12 +7977,12 @@ final: prev:
 
   mini-misc = buildVimPlugin {
     pname = "mini.misc";
-    version = "2025-03-06";
+    version = "2025-03-22";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.misc";
-      rev = "a477a9d5790f6d899d3055c87f2e771118f91180";
-      sha256 = "1fp60lhv93jiygc0hvchzdzjgs8scczp7kv9cm3kzzimcfa84ky6";
+      rev = "3f0cf62b7e9c545e7e92fe5614f4d6acbe5a8f29";
+      sha256 = "04sw3kxx7qa8i2xvagxls78ih7l6fq9mk42xrqjim225657hva5p";
     };
     meta.homepage = "https://github.com/echasnovski/mini.misc/";
     meta.hydraPlatforms = [ ];
@@ -8003,12 +8003,12 @@ final: prev:
 
   mini-notify = buildVimPlugin {
     pname = "mini.notify";
-    version = "2025-03-02";
+    version = "2025-03-22";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.notify";
-      rev = "e71f08013db6812d9ce95c2624ae405a4267f4f3";
-      sha256 = "0fmy3d62283j2cwlxk97fyylad2zkd5j2r7pg7fb3cq8k1021d0s";
+      rev = "e189f90b114bef9c6fe0418e939207880e5bbaff";
+      sha256 = "0payrhx8m3yisjfzp9bbrlbm1ayqvawglj1zlqjr41h89979jlh9";
     };
     meta.homepage = "https://github.com/echasnovski/mini.notify/";
     meta.hydraPlatforms = [ ];
@@ -8016,12 +8016,12 @@ final: prev:
 
   mini-nvim = buildVimPlugin {
     pname = "mini.nvim";
-    version = "2025-03-16";
+    version = "2025-03-25";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.nvim";
-      rev = "88f18a7d018d8bb4d32f6be4c712134a10e826d3";
-      sha256 = "15sgzl2wr9pqp31qy17w4dzcrcmncavh1i8ihldhsyi4hn08zlrk";
+      rev = "3ad46cdb7a51281e0024416023b56cf5c7909ae7";
+      sha256 = "1gm8s9j26qnxvizpr0rq5sv5nccwbds2srrlkh7cz0ihg8wrpji4";
     };
     meta.homepage = "https://github.com/echasnovski/mini.nvim/";
     meta.hydraPlatforms = [ ];
@@ -8042,12 +8042,12 @@ final: prev:
 
   mini-pairs = buildVimPlugin {
     pname = "mini.pairs";
-    version = "2025-01-31";
+    version = "2025-03-24";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.pairs";
-      rev = "1a3e73649c0eaef2f6c48ce1e761c6f0a7c11918";
-      sha256 = "0d0188v3gw2sdqnfly6i12v9036hdk1sg362lkngjmlpnq3m8574";
+      rev = "b90e36aa5ca5e0d825e77ad67aac22214a4d9096";
+      sha256 = "0h35xn8029d74sdv1fyrycpkl10vv0m01fvx2v955v0jfc9cii1n";
     };
     meta.homepage = "https://github.com/echasnovski/mini.pairs/";
     meta.hydraPlatforms = [ ];
@@ -8055,12 +8055,12 @@ final: prev:
 
   mini-pick = buildVimPlugin {
     pname = "mini.pick";
-    version = "2025-03-01";
+    version = "2025-03-22";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.pick";
-      rev = "12ea14f8e285d1bcc909116685fdbb129a89d546";
-      sha256 = "1ssa7ym6zxhazx551bjsnfdmvm1553kj6amvcczw9jrqbf4ynjqy";
+      rev = "ef479fcfb94b8f5fdbec46d697c18ca113547f3d";
+      sha256 = "1a402rf573jwjl9gqfvpx3x21ix9p5jf4kbncar0my0s5b5j2f6n";
     };
     meta.homepage = "https://github.com/echasnovski/mini.pick/";
     meta.hydraPlatforms = [ ];
@@ -8120,12 +8120,12 @@ final: prev:
 
   mini-statusline = buildVimPlugin {
     pname = "mini.statusline";
-    version = "2025-02-13";
+    version = "2025-03-25";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.statusline";
-      rev = "83209bfbca156f9e4a5ec47a2a8ce1e5ce26311d";
-      sha256 = "1hma81mnylbnx812km7zc0xjxbs3bp2pb3bqzsny9w1llxwv7zrr";
+      rev = "ec3adf7813b7604275dd4a28433e9c9610b70f1b";
+      sha256 = "1ny69yjvldl4jpyjpy8z4w4zz6ir976x63nds8z05zgkq8fa2ajd";
     };
     meta.homepage = "https://github.com/echasnovski/mini.statusline/";
     meta.hydraPlatforms = [ ];
@@ -8133,12 +8133,12 @@ final: prev:
 
   mini-surround = buildVimPlugin {
     pname = "mini.surround";
-    version = "2025-02-10";
+    version = "2025-03-20";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.surround";
-      rev = "f90069c7441a5fb04c3de42eacf93e16b64dd3eb";
-      sha256 = "0bs7y0ai67jlwdz76x6945xvj9f4vqr4qx4vyfg7z7b6k1gzc092";
+      rev = "c92d262deae79545b7674b2069332116461a85f3";
+      sha256 = "0pzcbn030c4yvlncqimcy1qjsa3i9k4ss2rhbjnkb3p59h50s036";
     };
     meta.homepage = "https://github.com/echasnovski/mini.surround/";
     meta.hydraPlatforms = [ ];
@@ -8198,12 +8198,12 @@ final: prev:
 
   minuet-ai-nvim = buildVimPlugin {
     pname = "minuet-ai.nvim";
-    version = "2025-03-20";
+    version = "2025-03-25";
     src = fetchFromGitHub {
       owner = "milanglacier";
       repo = "minuet-ai.nvim";
-      rev = "a9f5269184070434669d8195a78c8f72f8229a2e";
-      sha256 = "1cw43ay6n4hg6mmmfr5v00yncwm0s0w0z1x6kz4k95zw08g650y3";
+      rev = "3053504dc3695ce84cc260ac84c4948960d3ed42";
+      sha256 = "056dynpkx8kd8x4ch3qy89xzzdbasn0kbfl4v7wcy9jhffkiz6qm";
     };
     meta.homepage = "https://github.com/milanglacier/minuet-ai.nvim/";
     meta.hydraPlatforms = [ ];
@@ -8653,12 +8653,12 @@ final: prev:
 
   neo-tree-nvim = buildVimPlugin {
     pname = "neo-tree.nvim";
-    version = "2025-03-18";
+    version = "2025-03-23";
     src = fetchFromGitHub {
       owner = "nvim-neo-tree";
       repo = "neo-tree.nvim";
-      rev = "876c3298a6f822123b9b81b101d5809b1b5aa0c8";
-      sha256 = "0g8hbqki1fjcqv5nzwmrdlsny9q46asvis3yw0zxq6567byyq8r4";
+      rev = "a2f0245a509f1fc70c7af2c3e156305c55fd52cd";
+      sha256 = "0sfr8fsb1d0pnhkq2bxqz3dinhy130sc51fywkkij6awaq486d2b";
     };
     meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/";
     meta.hydraPlatforms = [ ];
@@ -8679,12 +8679,12 @@ final: prev:
 
   neoconf-nvim = buildVimPlugin {
     pname = "neoconf.nvim";
-    version = "2025-03-20";
+    version = "2025-03-27";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "neoconf.nvim";
-      rev = "367600076c04a8f6b8060f61de57299c8ff0a9c3";
-      sha256 = "08c0wchdmr0cg2ix42v7n2kcr6qyn9546x089rp7n83y2ml6p3zv";
+      rev = "d4848c791496eab6989951d46586fabf7a22942c";
+      sha256 = "1fipgrpf2di88zqksa5171bzqwsrmkhrw2b5sw8za4l5m6i8pc9v";
     };
     meta.homepage = "https://github.com/folke/neoconf.nvim/";
     meta.hydraPlatforms = [ ];
@@ -8993,12 +8993,12 @@ final: prev:
 
   neotest-golang = buildVimPlugin {
     pname = "neotest-golang";
-    version = "2025-02-25";
+    version = "2025-03-23";
     src = fetchFromGitHub {
       owner = "fredrikaverpil";
       repo = "neotest-golang";
-      rev = "310a015215fc02ba8b12c3098b75d4805e970b3f";
-      sha256 = "19qq70x2dwaw4sjgr08xz7zzhqsng9nl74jnqyngw1bdrkkkz7ik";
+      rev = "5650ad9d19d05167ae994a9f63f5c34efdafc246";
+      sha256 = "0arc83knnk2n95s6x4zbhdfncify46yp1xajg0r2pciig975z4l7";
     };
     meta.homepage = "https://github.com/fredrikaverpil/neotest-golang/";
     meta.hydraPlatforms = [ ];
@@ -9033,12 +9033,12 @@ final: prev:
 
   neotest-haskell = buildVimPlugin {
     pname = "neotest-haskell";
-    version = "2025-03-17";
+    version = "2025-03-23";
     src = fetchFromGitHub {
       owner = "MrcJkb";
       repo = "neotest-haskell";
-      rev = "ef8cdce17319ea90669066fa7e0f13729e39303c";
-      sha256 = "0jxqakg6dhx49g2fhy5nxk2ap2hgj4kr6y032axw6xkn5kb79a7i";
+      rev = "faa5e6e62482821e61bcbf552f1bef91c35a597d";
+      sha256 = "0njc4x0qk5dm8zyhb65c0mlmibdv5gr9gdwyar8rbv8x54bxi6s5";
     };
     meta.homepage = "https://github.com/MrcJkb/neotest-haskell/";
     meta.hydraPlatforms = [ ];
@@ -9046,12 +9046,12 @@ final: prev:
 
   neotest-java = buildVimPlugin {
     pname = "neotest-java";
-    version = "2025-03-11";
+    version = "2025-03-24";
     src = fetchFromGitHub {
       owner = "rcasia";
       repo = "neotest-java";
-      rev = "1404de796b1afbbc20cf84db991c901270b901c9";
-      sha256 = "0w0m55939wafipi9pqs4k3ya5qi7rfimgknzy0xwac7g48cbhw91";
+      rev = "84474f6d29cbd01efa1ca2abad870f4e73018048";
+      sha256 = "02q62l45grsmwdbk4q04qxxpagbdplh2pl86xn23q6bldaajpsp3";
     };
     meta.homepage = "https://github.com/rcasia/neotest-java/";
     meta.hydraPlatforms = [ ];
@@ -9501,12 +9501,12 @@ final: prev:
 
   nlsp-settings-nvim = buildVimPlugin {
     pname = "nlsp-settings.nvim";
-    version = "2025-03-19";
+    version = "2025-03-26";
     src = fetchFromGitHub {
       owner = "tamago324";
       repo = "nlsp-settings.nvim";
-      rev = "288141e4eec5437fe2f484fce086d84f53ec88a1";
-      sha256 = "0sw7dy0dqkk338n38kr2634qv3pxh619nn70ncsw9k5wnxbw99pr";
+      rev = "4c12781d7008017a9847d9b61fd1873a9e388e03";
+      sha256 = "0a727sxs9i19ffxy1l7n4qkjxzd6wcyddfypg9axzp5s7cmgzfn3";
     };
     meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/";
     meta.hydraPlatforms = [ ];
@@ -10047,12 +10047,12 @@ final: prev:
 
   nvim-docs-view = buildVimPlugin {
     pname = "nvim-docs-view";
-    version = "2024-12-08";
+    version = "2025-03-24";
     src = fetchFromGitHub {
       owner = "amrbashir";
       repo = "nvim-docs-view";
-      rev = "1b97f8f954d74c46061bf289b6cea9232484c12c";
-      sha256 = "1xi0w20fq3yziwdjld1xhkm7dr0ihbbq2hik0qsckd7y73qqg5kg";
+      rev = "f674ba57349849bce894efdd54096483c88e810b";
+      sha256 = "0ifbfhifly5sdsbxv1p71wvl644jz505ln9j1yr6qwvyk6a2krm1";
     };
     meta.homepage = "https://github.com/amrbashir/nvim-docs-view/";
     meta.hydraPlatforms = [ ];
@@ -10112,12 +10112,12 @@ final: prev:
 
   nvim-genghis = buildVimPlugin {
     pname = "nvim-genghis";
-    version = "2025-03-09";
+    version = "2025-03-25";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-genghis";
-      rev = "b7b6a2a265d294852f32519a30287e07e34415ed";
-      sha256 = "05cwc8dzxfi588zanjdwq2qnaw3129h6bddhm2zwr63qvmhi6xvp";
+      rev = "a91692c49fefe13dffaf13d316589f9d76f2b1d2";
+      sha256 = "1nisii2mgfasrblq0ypl28z92zlrnhqri9dshhl1igmsf26dr55d";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-genghis/";
     meta.hydraPlatforms = [ ];
@@ -10151,12 +10151,12 @@ final: prev:
 
   nvim-highlight-colors = buildVimPlugin {
     pname = "nvim-highlight-colors";
-    version = "2025-03-19";
+    version = "2025-03-25";
     src = fetchFromGitHub {
       owner = "brenoprata10";
       repo = "nvim-highlight-colors";
-      rev = "d41a2211b8ba982c74bc190b40ba7686c2e3ffd0";
-      sha256 = "0aw8vjnxydv6as5qv1sjsrj142xc4d7w1szjg6wfk7a37l24rhhm";
+      rev = "7eeaa05eab26fb840c4fe7bca91710bf37cb13ed";
+      sha256 = "0fhiv158ww1kdziknswr3x5gvvnyjsm2qjg1gkkk5cflldfz9cmy";
     };
     meta.homepage = "https://github.com/brenoprata10/nvim-highlight-colors/";
     meta.hydraPlatforms = [ ];
@@ -10346,12 +10346,12 @@ final: prev:
 
   nvim-lilypond-suite = buildVimPlugin {
     pname = "nvim-lilypond-suite";
-    version = "2025-02-09";
+    version = "2025-03-26";
     src = fetchFromGitHub {
       owner = "martineausimon";
       repo = "nvim-lilypond-suite";
-      rev = "ac0d49101de83040d1887babb067eb8c5bc15f55";
-      sha256 = "003r3swx2n7wdk3as4w5cf417vqq4kf0vhfpm2pf064pb8v3r0w8";
+      rev = "b13794ec2e6984ba12a23e1588f69ed36952ee17";
+      sha256 = "1a5bzkfxiq7jcw4zsbb897gdqzv3d3fzw2pnhhnagj745n2cgadx";
     };
     meta.homepage = "https://github.com/martineausimon/nvim-lilypond-suite/";
     meta.hydraPlatforms = [ ];
@@ -10359,12 +10359,12 @@ final: prev:
 
   nvim-lint = buildVimPlugin {
     pname = "nvim-lint";
-    version = "2025-03-17";
+    version = "2025-03-26";
     src = fetchFromGitHub {
       owner = "mfussenegger";
       repo = "nvim-lint";
-      rev = "936197073214c26a347fb933c9459c8766376b23";
-      sha256 = "0wvdyabxqjxm8mx07lw37j99hq4hvxhwiyzjiasi5fgq8xawb2md";
+      rev = "93b8040115c9114dac1047311763bef275e752dc";
+      sha256 = "1115rn9npzj2xdj2zr1ayhfy76281zv0avbiyi5vgnvfg7064jmq";
     };
     meta.homepage = "https://github.com/mfussenegger/nvim-lint/";
     meta.hydraPlatforms = [ ];
@@ -10411,12 +10411,12 @@ final: prev:
 
   nvim-lspconfig = buildVimPlugin {
     pname = "nvim-lspconfig";
-    version = "2025-03-20";
+    version = "2025-03-26";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lspconfig";
-      rev = "699cf2ce74e40e7c5068cf93a6bd6a74b24c5ec3";
-      sha256 = "0jkqc431485rmj21pd2xahrha5dbr802ikfmjbxnax7wnqkaqbp4";
+      rev = "401e50fae626c4707af12114b5ddb7bb9f4236a4";
+      sha256 = "1d8zvgzn91l9cwanbhwnzchhml00wi53qsy228pagisxnhkr7w7v";
     };
     meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
     meta.hydraPlatforms = [ ];
@@ -10476,12 +10476,12 @@ final: prev:
 
   nvim-metals = buildVimPlugin {
     pname = "nvim-metals";
-    version = "2025-03-14";
+    version = "2025-03-20";
     src = fetchFromGitHub {
       owner = "scalameta";
       repo = "nvim-metals";
-      rev = "fe6125f633c1b2f68d468a2041e81e2e5e8933d4";
-      sha256 = "1xpav9ykwk7kz61c6y33kyjxf0nf47risdj0q9gf5rnl88cln4by";
+      rev = "f763b65fd71cb17d544753194fd91090e611c6e0";
+      sha256 = "0ayn8npywhr9j1rlhvq5kij0s3751hh89fd5qqp1iqjqr9mg4ns8";
     };
     meta.homepage = "https://github.com/scalameta/nvim-metals/";
     meta.hydraPlatforms = [ ];
@@ -10697,12 +10697,12 @@ final: prev:
 
   nvim-rip-substitute = buildVimPlugin {
     pname = "nvim-rip-substitute";
-    version = "2025-03-19";
+    version = "2025-03-25";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-rip-substitute";
-      rev = "ddd3562bbd93b02eb43ddfe18af7438abe46dd98";
-      sha256 = "1iwgl28pdipyk4a7hbhsm7wb1a0sglsk7zb5dgc2k2kq526yn7hr";
+      rev = "1b5d78f3d69fcdf8e734114c665994ffe1672fde";
+      sha256 = "1rddfahgyh1n01ba470b82zdk1dk1dhvfx85v6cm441camv5mbz7";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-rip-substitute/";
     meta.hydraPlatforms = [ ];
@@ -10710,12 +10710,12 @@ final: prev:
 
   nvim-scissors = buildVimPlugin {
     pname = "nvim-scissors";
-    version = "2025-03-19";
+    version = "2025-03-25";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-scissors";
-      rev = "445deedd9cc8eb91275ac15e3d6c6df5bc08bff3";
-      sha256 = "1y332f5sd7fjg2kf9v8wx3dgf0c3kjdfx2s2gv90r6a7p7p83idd";
+      rev = "bad61d14ba5e282e6b7b40cf618d879729494036";
+      sha256 = "1k17cy81qnxv3jkkxdfwvsvjr3b482hjxrfcs8n8dgns3j3fhndw";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-scissors/";
     meta.hydraPlatforms = [ ];
@@ -10814,12 +10814,12 @@ final: prev:
 
   nvim-spider = buildVimPlugin {
     pname = "nvim-spider";
-    version = "2025-03-02";
+    version = "2025-03-25";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-spider";
-      rev = "9b9a1cf88a10790de69d3b0562d7d612f23561d5";
-      sha256 = "1pffj9jj44l3kwic3ihkc128i5f5cyyl823ymwbwyrjj8fvh565y";
+      rev = "4bd3221d165da334e57c8e9f38978e0c6f3a1742";
+      sha256 = "17wnp793yiy33zj4xi406b5k78rihpjz5abb2yhhmxriznsr2a2j";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-spider/";
     meta.hydraPlatforms = [ ];
@@ -10827,12 +10827,12 @@ final: prev:
 
   nvim-surround = buildVimPlugin {
     pname = "nvim-surround";
-    version = "2025-03-16";
+    version = "2025-03-22";
     src = fetchFromGitHub {
       owner = "kylechui";
       repo = "nvim-surround";
-      rev = "6c54643ef42016b744888b06d2381abd23f9b7ea";
-      sha256 = "1c5agqfffmjxc73bv8d4hmrnzx62ikqpv7pii19v5alfdcnh5j48";
+      rev = "caf6f633d4d77a29b6e265b560c5a035d171a913";
+      sha256 = "130y0b2f69y5rzm64ss34a9zyqkpkybr2d1s4p0pcvvaq1ngq0r0";
     };
     meta.homepage = "https://github.com/kylechui/nvim-surround/";
     meta.hydraPlatforms = [ ];
@@ -10879,12 +10879,12 @@ final: prev:
 
   nvim-tree-lua = buildVimPlugin {
     pname = "nvim-tree.lua";
-    version = "2025-03-01";
+    version = "2025-03-23";
     src = fetchFromGitHub {
       owner = "nvim-tree";
       repo = "nvim-tree.lua";
-      rev = "c09ff35de503a41fa62465c6b4ae72d96e7a7ce4";
-      sha256 = "0bnc2fc9ipz9yp917l61vvcaqmbdg5fhqxrp7jfjxj5qmvadhai9";
+      rev = "44d9b58f11d5a426c297aafd0be1c9d45617a849";
+      sha256 = "0gya49yydrbq5jylsk4b9c2cpygy0mxhr6kwdsbg0di0i74pkav0";
     };
     meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/";
     meta.hydraPlatforms = [ ];
@@ -10892,12 +10892,12 @@ final: prev:
 
   nvim-treesitter = buildVimPlugin {
     pname = "nvim-treesitter";
-    version = "2025-03-20";
+    version = "2025-03-26";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter";
-      rev = "ff553df2f4c5641be2b282e1a0a072c46cf03591";
-      sha256 = "0xgibfj73j2241mj6vab4sbw5zxxcnfls2lahsadg0r5z7cj01lk";
+      rev = "85168f15808d89b0222313652b9d2777eda3cb08";
+      sha256 = "1mn92s3v0rp5szy9cclnwlvvj61cmib98nwsz5xybw0a3wfmil45";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
     meta.hydraPlatforms = [ ];
@@ -11074,12 +11074,12 @@ final: prev:
 
   nvim-various-textobjs = buildVimPlugin {
     pname = "nvim-various-textobjs";
-    version = "2025-03-18";
+    version = "2025-03-26";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-various-textobjs";
-      rev = "2788ce64fcfaa702ae3340180be592dfcd733c86";
-      sha256 = "12y2j2rzxi5mfyq1qca30dznprr9db4gljmr34xwrz3v3q84dqzd";
+      rev = "cf1a86cf831ac5b45653f47e3c541aaf8f5553fe";
+      sha256 = "0qr6pxlrbi83g3w2xg74mp9vvk8i1dvb6pwv8ncsn44rks8m6jsj";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-various-textobjs/";
     meta.hydraPlatforms = [ ];
@@ -11256,12 +11256,12 @@ final: prev:
 
   octo-nvim = buildVimPlugin {
     pname = "octo.nvim";
-    version = "2025-03-20";
+    version = "2025-03-26";
     src = fetchFromGitHub {
       owner = "pwntester";
       repo = "octo.nvim";
-      rev = "3dfbc7936a9057b8370b903c9e3a115f07dae00d";
-      sha256 = "1m24zzy11526vbydfl00k5z7zhmdlagckkp5lwynicsm4hz0m74m";
+      rev = "1f3c5626427eec7584b42568ee051e21c747eb23";
+      sha256 = "000p5bdagj9wpdccz0p6n7mf2zdy7g3xk8fivjh6gwqmm6y3vq8c";
     };
     meta.homepage = "https://github.com/pwntester/octo.nvim/";
     meta.hydraPlatforms = [ ];
@@ -11399,12 +11399,12 @@ final: prev:
 
   onenord-nvim = buildVimPlugin {
     pname = "onenord.nvim";
-    version = "2025-01-03";
+    version = "2025-03-25";
     src = fetchFromGitHub {
       owner = "rmehri01";
       repo = "onenord.nvim";
-      rev = "af734ccc21847ce56830eed1f593ef320ffa27ff";
-      sha256 = "0qwm5hw9rwazb9ff9p6sc0nlqj934nznwx8fzlxanqx7k5hbpqwy";
+      rev = "babdcc3da92f0c90703bb612a13a58e5f7669287";
+      sha256 = "04pgf4lqm7b81mfw99h0xlhz4s0k9fi4wn2f2jzlwyyc214d2xsc";
     };
     meta.homepage = "https://github.com/rmehri01/onenord.nvim/";
     meta.hydraPlatforms = [ ];
@@ -11477,12 +11477,12 @@ final: prev:
 
   other-nvim = buildVimPlugin {
     pname = "other.nvim";
-    version = "2024-11-30";
+    version = "2025-03-25";
     src = fetchFromGitHub {
       owner = "rgroli";
       repo = "other.nvim";
-      rev = "933aa489ad02f8f973269a565bfea16cc784cbbf";
-      sha256 = "0pp3xcy0aaijk4fjzv67q9yc2phxq764yxprb9s16f35fim7awwq";
+      rev = "20128ea7158dd12df619283a45f336182b369294";
+      sha256 = "165bjqg4yami91mkcpnhskbagk8w3h2qx1hkp6jppn24zfcpam4z";
     };
     meta.homepage = "https://github.com/rgroli/other.nvim/";
     meta.hydraPlatforms = [ ];
@@ -11490,12 +11490,12 @@ final: prev:
 
   otter-nvim = buildVimPlugin {
     pname = "otter.nvim";
-    version = "2025-03-17";
+    version = "2025-03-26";
     src = fetchFromGitHub {
       owner = "jmbuhr";
       repo = "otter.nvim";
-      rev = "16fc46671b5c4e059e9f3a06d593d34d30e571c9";
-      sha256 = "0k4bv870pzx5dlm16fljrmdwnw5ihda04krmcqi9pznp7harvg2g";
+      rev = "c72e597f03ad53479424f52c9df71ddebe34c3d8";
+      sha256 = "1ks44vm0cz52kqhfm8qlvmmda57hj8hr31nhikmx08h8f55g204x";
     };
     meta.homepage = "https://github.com/jmbuhr/otter.nvim/";
     meta.hydraPlatforms = [ ];
@@ -11621,12 +11621,12 @@ final: prev:
 
   papercolor-theme-slim = buildVimPlugin {
     pname = "papercolor-theme-slim";
-    version = "2025-03-09";
+    version = "2025-03-24";
     src = fetchFromGitHub {
       owner = "pappasam";
       repo = "papercolor-theme-slim";
-      rev = "ccfb47869077ef0a7880e6fe73f5dfae44298f68";
-      sha256 = "1yvhrfj2i8b3mrglcqhsk02x4p5bqaqynd84kr9dl0xrzl0bjzcz";
+      rev = "ed3e7dd544d04aff6116cb5eaa94b444162acbeb";
+      sha256 = "1q93nxn0x1wd393fw6djmibl0y60ci2aplx6f9m8y7j7lif24874";
     };
     meta.homepage = "https://github.com/pappasam/papercolor-theme-slim/";
     meta.hydraPlatforms = [ ];
@@ -12078,12 +12078,12 @@ final: prev:
 
   quarto-nvim = buildVimPlugin {
     pname = "quarto-nvim";
-    version = "2025-03-14";
+    version = "2025-03-24";
     src = fetchFromGitHub {
       owner = "quarto-dev";
       repo = "quarto-nvim";
-      rev = "7fd12a6c57d4575cadbf4f97552b616d62ac7e03";
-      sha256 = "0r27n55bngrkcx5p0ang7yw2c0gj821sxgvawxnnp090hlb4pswi";
+      rev = "3c25bf3e9afff07c4396d98f0b2c39bc994037ad";
+      sha256 = "1lms6p9z5k9krz9z8wmd0pz7kpzqx870xq6cpj6rg2dj8ffb956g";
     };
     meta.homepage = "https://github.com/quarto-dev/quarto-nvim/";
     meta.hydraPlatforms = [ ];
@@ -12351,12 +12351,12 @@ final: prev:
 
   render-markdown-nvim = buildVimPlugin {
     pname = "render-markdown.nvim";
-    version = "2025-03-20";
+    version = "2025-03-27";
     src = fetchFromGitHub {
       owner = "MeanderingProgrammer";
       repo = "render-markdown.nvim";
-      rev = "62d6681332365cfddbe916c888752834d9f7ad0c";
-      sha256 = "1vs9y74743dm9025sgzl27arxs50mkihyc2bbmhi7vhggwf4j0hr";
+      rev = "35119c1614ec41f9b02ddd28795673a56b468269";
+      sha256 = "02kfbp2mgp3y717cdb9bl3bb3bb9lval1x202v1z66cywsia9bp4";
     };
     meta.homepage = "https://github.com/MeanderingProgrammer/render-markdown.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12390,12 +12390,12 @@ final: prev:
 
   resession-nvim = buildVimPlugin {
     pname = "resession.nvim";
-    version = "2025-02-12";
+    version = "2025-03-24";
     src = fetchFromGitHub {
       owner = "stevearc";
       repo = "resession.nvim";
-      rev = "cc1cc9a4ed7e6f72057c265ba5cc711ec16c2cff";
-      sha256 = "0j17q8k2hh8qrzd717f9ndm91qlp16bgw88wnjvqzjkah33jks85";
+      rev = "fd08e476c4e2f826905c384a3a301a821758764b";
+      sha256 = "0l6hzzz1n3mlhab97hdy1zy5z3i22v9fk3an5a3wrgjn8sgsm25i";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/stevearc/resession.nvim/";
@@ -12482,12 +12482,12 @@ final: prev:
 
   roslyn-nvim = buildVimPlugin {
     pname = "roslyn.nvim";
-    version = "2025-03-12";
+    version = "2025-03-24";
     src = fetchFromGitHub {
       owner = "seblyng";
       repo = "roslyn.nvim";
-      rev = "0d298e68efa511df18a0bd4fd9a0c9bf70ebdbf2";
-      sha256 = "1j0wc7mh4qqnja07pdz0r9s7zhqw80nnbsiwhrimvicafpbmh0aj";
+      rev = "8c80d1fe4070264f58a366d8ed431544f5f3455a";
+      sha256 = "1m5cagnlgwrfnm6nziny5xaak52wzmf7d9zrdvix7a8pw9jfpan2";
     };
     meta.homepage = "https://github.com/seblyng/roslyn.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12651,12 +12651,12 @@ final: prev:
 
   scrollbar-nvim = buildVimPlugin {
     pname = "scrollbar.nvim";
-    version = "2025-01-22";
+    version = "2025-03-23";
     src = fetchFromGitHub {
       owner = "Xuyuanp";
       repo = "scrollbar.nvim";
-      rev = "3f0d4170db4c4e148c2796f9cdd211970432fec4";
-      sha256 = "08l5b5hb80rr5agjzzh3x0z5i59c0xqnjxgk87sjsary18dbgzn2";
+      rev = "c96fc2fb1a3b5a9e6e82d94014490d5bca9beb9b";
+      sha256 = "1k0kpqhz7il6lxkz9vc999fa2ym2yyp5gmazha4wr5xsyl12jlca";
     };
     meta.homepage = "https://github.com/Xuyuanp/scrollbar.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12834,12 +12834,12 @@ final: prev:
 
   smart-splits-nvim = buildVimPlugin {
     pname = "smart-splits.nvim";
-    version = "2025-03-18";
+    version = "2025-03-21";
     src = fetchFromGitHub {
       owner = "mrjones2014";
       repo = "smart-splits.nvim";
-      rev = "a3ccaa1ea09e21712ded3ffdabdbdc577f784054";
-      sha256 = "03sp4sd2xajnrwsj5nfby6zi8964hbvsp98rvzm5f9gknph79z8f";
+      rev = "096d23df87d5c430e6e96f3e99d67e360fb2097f";
+      sha256 = "12bqnvx1infy4z1ibspcljkdsmrwwlkn6dwhi3scsz1441n425sj";
     };
     meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12886,12 +12886,12 @@ final: prev:
 
   smear-cursor-nvim = buildVimPlugin {
     pname = "smear-cursor.nvim";
-    version = "2025-03-19";
+    version = "2025-03-23";
     src = fetchFromGitHub {
       owner = "sphamba";
       repo = "smear-cursor.nvim";
-      rev = "483ec950ebe77ef92f3e7543945285ffb49093b6";
-      sha256 = "15y8rxwfm3gwdd5p632vdbvb0njfyr70366k9g1z71if787mdzmm";
+      rev = "01570fdc358979678380ff8704184307e87d8a29";
+      sha256 = "0vl7cpfsh06mjcr5ysqmqv9yvixpfrn71qk6h368i9knprsdabs2";
     };
     meta.homepage = "https://github.com/sphamba/smear-cursor.nvim/";
     meta.hydraPlatforms = [ ];
@@ -13134,12 +13134,12 @@ final: prev:
 
   srcery-vim = buildVimPlugin {
     pname = "srcery-vim";
-    version = "2025-03-15";
+    version = "2025-03-25";
     src = fetchFromGitHub {
       owner = "srcery-colors";
       repo = "srcery-vim";
-      rev = "11cf04466429385a63e05ccea1841f82bcfc13e0";
-      sha256 = "1pmwqsykkxzsrj73s9f3nnzx6d3mfzjwcaj6a384bj6n3dz2fhfq";
+      rev = "d8915c0153ed451c975fa20356cb8c254232aa28";
+      sha256 = "119g6jhyiqj65n9cm93pxfydsn913yamx6dk1zf24z0gr7vfpp29";
     };
     meta.homepage = "https://github.com/srcery-colors/srcery-vim/";
     meta.hydraPlatforms = [ ];
@@ -13303,12 +13303,12 @@ final: prev:
 
   substitute-nvim = buildVimPlugin {
     pname = "substitute.nvim";
-    version = "2024-07-06";
+    version = "2025-03-21";
     src = fetchFromGitHub {
       owner = "gbprod";
       repo = "substitute.nvim";
-      rev = "97f49d16f8eea7967d41db4f657dd63af53eeba1";
-      sha256 = "017g2y3hmwa5ar778djr86x9v2nc9lg84njx82rajs6lx28a8m94";
+      rev = "9db749a880e3dd3b0eb57f698aa8f1e1630e1f25";
+      sha256 = "1qvnx3nfxn8l1rljbmby7pdax4gl6kpclvy5q4a7q0vk270acgfv";
     };
     meta.homepage = "https://github.com/gbprod/substitute.nvim/";
     meta.hydraPlatforms = [ ];
@@ -13761,12 +13761,12 @@ final: prev:
 
   telescope-frecency-nvim = buildVimPlugin {
     pname = "telescope-frecency.nvim";
-    version = "2025-03-16";
+    version = "2025-03-21";
     src = fetchFromGitHub {
       owner = "nvim-telescope";
       repo = "telescope-frecency.nvim";
-      rev = "eeda21e429c86bd38ea287700e77f96058331be7";
-      sha256 = "1wm70kvk1as623jdy0pgd2kgw4db0fd66f6k1z3s76mz1y8kdma1";
+      rev = "55ca623ae9e366fabccd5bbe7e612ca0879e98c8";
+      sha256 = "049apxl689zrs8swqzbljw273i70kfli6076j81c19axczgs62z2";
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/";
     meta.hydraPlatforms = [ ];
@@ -14453,12 +14453,12 @@ final: prev:
 
   treewalker-nvim = buildVimPlugin {
     pname = "treewalker.nvim";
-    version = "2025-03-20";
+    version = "2025-03-26";
     src = fetchFromGitHub {
       owner = "aaronik";
       repo = "treewalker.nvim";
-      rev = "b9e6520a08dc8e62891dcb759fce29f988e68da9";
-      sha256 = "0vp7kzf790qsasnrxlhx1qvqhvwski3h889lhbmm1yj8pz71jvzf";
+      rev = "22d0a5f2a2c8030f5544a44a5c5fdcfd9d54c01d";
+      sha256 = "1c381rxhgc0xidpk4rcfk77xwbbd2gas490n5gyp51sq07ir0z1g";
     };
     meta.homepage = "https://github.com/aaronik/treewalker.nvim/";
     meta.hydraPlatforms = [ ];
@@ -14675,12 +14675,12 @@ final: prev:
 
   typst-preview-nvim = buildVimPlugin {
     pname = "typst-preview.nvim";
-    version = "2025-02-28";
+    version = "2025-03-23";
     src = fetchFromGitHub {
       owner = "chomosuke";
       repo = "typst-preview.nvim";
-      rev = "ddcc71126f910ec83037622bc8d506f91a290ade";
-      sha256 = "1iqcbpgk87gcgnqd5dv8n4h4hbildp5hbjhnlwjx5zlzcg5qv2my";
+      rev = "10e6ec6f00365639e383fa8e95a32058dad53b22";
+      sha256 = "1va3yw7iq5170ilfzd0fvpvkbkxn2yqk413j64ymg31aql8amgjc";
     };
     meta.homepage = "https://github.com/chomosuke/typst-preview.nvim/";
     meta.hydraPlatforms = [ ];
@@ -14766,12 +14766,12 @@ final: prev:
 
   unison = buildVimPlugin {
     pname = "unison";
-    version = "2025-03-19";
+    version = "2025-03-24";
     src = fetchFromGitHub {
       owner = "unisonweb";
       repo = "unison";
-      rev = "d67de6f71353df51510a232f55390445d944c3c4";
-      sha256 = "116d3s2pix6vnqi5408xfac3jhrz1z5zmnflxx5gzdmpvik2jmbp";
+      rev = "891dcccc1b761a4bd27c3786977203baddcdcc8f";
+      sha256 = "0qlnvdbvnhx6s8bv2bvzs124z4rvs0p2q4znsyxxm2lqr8p2n0j5";
     };
     meta.homepage = "https://github.com/unisonweb/unison/";
     meta.hydraPlatforms = [ ];
@@ -14883,12 +14883,12 @@ final: prev:
 
   vifm-vim = buildVimPlugin {
     pname = "vifm.vim";
-    version = "2025-03-18";
+    version = "2025-03-23";
     src = fetchFromGitHub {
       owner = "vifm";
       repo = "vifm.vim";
-      rev = "14d81758ff57420a961c7a8d10d7d672d2e00fe4";
-      sha256 = "13iv8hwd9xczdc6qraghq7bf82xkqndzndi8sk00xfiizsc1rbdm";
+      rev = "23358c7f0dda437a3dec3ec902911ee4376c0a56";
+      sha256 = "04jjrrcw1y7wss8xzhh8s33l24d2b1whzf4ijqixpdimw29v73d3";
     };
     meta.homepage = "https://github.com/vifm/vifm.vim/";
     meta.hydraPlatforms = [ ];
@@ -16118,12 +16118,12 @@ final: prev:
 
   vim-dadbod-ui = buildVimPlugin {
     pname = "vim-dadbod-ui";
-    version = "2025-01-29";
+    version = "2025-03-26";
     src = fetchFromGitHub {
       owner = "kristijanhusak";
       repo = "vim-dadbod-ui";
-      rev = "f4d37b7312ae6489e5c04bee654ca521baac188a";
-      sha256 = "13n6jm1ncx9cn0qdr9ck93n92jm36fzvg6miwsppsk5g9icfz147";
+      rev = "685e75b34ee0e12f92ec4507ea8bb7f1aaa936e5";
+      sha256 = "1ir8m3nks2aqh0jkmkyx46qprg7xm0bva72r83hwai79j1q6fk7j";
     };
     meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/";
     meta.hydraPlatforms = [ ];
@@ -16976,12 +16976,12 @@ final: prev:
 
   vim-gruvbox8 = buildVimPlugin {
     pname = "vim-gruvbox8";
-    version = "2025-02-22";
+    version = "2025-03-25";
     src = fetchFromGitHub {
       owner = "lifepillar";
       repo = "vim-gruvbox8";
-      rev = "4b56d56e287b74758edb4504e23be2d4977d0972";
-      sha256 = "1i6s4ql2f16jrkdr2zq2km5yx7basx4gf2jlbr35x42l4nfd7d5c";
+      rev = "f85b7221754cbcf4a9d21eb3a30d3633024be872";
+      sha256 = "1j0ckl8livim2l3ympd3hg3dj7r68faly4kcqzlsr9fsgsnrcv6v";
     };
     meta.homepage = "https://github.com/lifepillar/vim-gruvbox8/";
     meta.hydraPlatforms = [ ];
@@ -17419,12 +17419,12 @@ final: prev:
 
   vim-javascript = buildVimPlugin {
     pname = "vim-javascript";
-    version = "2022-08-15";
+    version = "2025-03-21";
     src = fetchFromGitHub {
       owner = "pangloss";
       repo = "vim-javascript";
-      rev = "c470ce1399a544fe587eab950f571c83cccfbbdc";
-      sha256 = "0h20j09z52gf5f75xcy0d4a0z0a98260s7dw62vwf1m8dk5fixbn";
+      rev = "b26c9edb3563e02f5c0b20580f7cf9743e95b157";
+      sha256 = "0szjcjw9n668zxq6gnvlsd51pbzvag2h5kbif3j0gg6zbycc60mv";
     };
     meta.homepage = "https://github.com/pangloss/vim-javascript/";
     meta.hydraPlatforms = [ ];
@@ -17615,12 +17615,12 @@ final: prev:
 
   vim-just = buildVimPlugin {
     pname = "vim-just";
-    version = "2025-03-09";
+    version = "2025-03-20";
     src = fetchFromGitHub {
       owner = "NoahTheDuke";
       repo = "vim-just";
-      rev = "0eeb7b760ca603be517d4f34a9d1c08c73f93f3f";
-      sha256 = "0yl8rzjynyn46bk7fx4rpczqzhgjyk16lfl3rpkf018rgkvabcwf";
+      rev = "b7f9505f93ede57c4ec011405592280b3f1755ec";
+      sha256 = "105zh0zcdijzqi8prggsgrrm4pzyvjzy0xgs5yn4grc76rxnyn3m";
     };
     meta.homepage = "https://github.com/NoahTheDuke/vim-just/";
     meta.hydraPlatforms = [ ];
@@ -20633,12 +20633,12 @@ final: prev:
 
   vimtex = buildVimPlugin {
     pname = "vimtex";
-    version = "2025-03-19";
+    version = "2025-03-23";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "ae6d6ce6c962ffcabe6d1776341b055a85b18bd6";
-      sha256 = "0j0n9h91v4bsr7yfkj5cnr6xvkifgzk9lpj8ngyq64wvnimysk7p";
+      rev = "bcb14eb6e3739f0c1902115a710292bc37c62d2e";
+      sha256 = "03drrff3r1ch9wll7zdb8sc6jyysd677c65kn4iy841bpqmzg8qx";
     };
     meta.homepage = "https://github.com/lervag/vimtex/";
     meta.hydraPlatforms = [ ];
@@ -20737,12 +20737,12 @@ final: prev:
 
   vscode-nvim = buildVimPlugin {
     pname = "vscode.nvim";
-    version = "2025-03-09";
+    version = "2025-03-26";
     src = fetchFromGitHub {
       owner = "Mofiqul";
       repo = "vscode.nvim";
-      rev = "3faeb317dab9db5d2310b2dc6472632399ead88f";
-      sha256 = "030jm07h8s2mhicfhpai0n92wy7jl9jp50y0ami12q34fclrnp0w";
+      rev = "49d6014ba151fc6cc585b8d5f057ca7839077bf8";
+      sha256 = "1ik0jz4d39jsi117hvcksvzx2b1k3aiqc1x4rgjfd43zg400mi58";
     };
     meta.homepage = "https://github.com/Mofiqul/vscode.nvim/";
     meta.hydraPlatforms = [ ];
@@ -21050,12 +21050,12 @@ final: prev:
 
   yazi-nvim = buildVimPlugin {
     pname = "yazi.nvim";
-    version = "2025-03-20";
+    version = "2025-03-24";
     src = fetchFromGitHub {
       owner = "mikavilpas";
       repo = "yazi.nvim";
-      rev = "a4c14eab6787b13ab14ef1c2fbb44a0383b9c9c2";
-      sha256 = "1485xpw2mg55sy9c2qpjym1f3l8xv4dmw4j7i0cbahlmpk3zgjhz";
+      rev = "9694c227f62dc197b9909cb59b78526775068a22";
+      sha256 = "19zz0i1xp1xlhz8b4ms0bqg5h75rd904hwlj5dlsh2whwd6w9w79";
     };
     meta.homepage = "https://github.com/mikavilpas/yazi.nvim/";
     meta.hydraPlatforms = [ ];
@@ -21193,12 +21193,12 @@ final: prev:
 
   zig-vim = buildVimPlugin {
     pname = "zig.vim";
-    version = "2024-12-28";
+    version = "2025-03-24";
     src = fetchFromGitHub {
       owner = "ziglang";
       repo = "zig.vim";
-      rev = "f023e86b042c0d5bef68b9f0651144a6bf6d642e";
-      sha256 = "102vyrpcdr13ssw6gzzlzmwcwfs64gl3psryadiqh38lpxg99ryv";
+      rev = "a8ecf6ec3175e64811ceb85b33b746637cf95ad6";
+      sha256 = "0ckkila6bgbxnq4k5pmxk2wmcpdsskz2084m38qg8fyhs9mfb41n";
     };
     meta.homepage = "https://github.com/ziglang/zig.vim/";
     meta.hydraPlatforms = [ ];
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index df5eb664f44d..1c4c218ba58d 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -1768,6 +1768,7 @@ in
     checkInputs = [
       # optional cmp integration
       self.nvim-cmp
+      self.lualine-nvim
     ];
     dependencies = with self; [ plenary-nvim ];
     nvimSkipModule = [
@@ -2107,6 +2108,9 @@ in
       plenary-nvim
       nui-nvim
     ];
+    nvimSkipModule = [
+      "neo-tree.types.fixes.compat-0.10"
+    ];
   };
 
   netman-nvim = super.netman-nvim.overrideAttrs {
@@ -2274,7 +2278,12 @@ in
 
   nvim-highlight-colors = super.nvim-highlight-colors.overrideAttrs {
     # Test module
-    nvimSkipModule = [ "nvim-highlight-colors.color.converters_spec" ];
+    nvimSkipModule = [
+      "nvim-highlight-colors.buffer_utils_spec"
+      "nvim-highlight-colors.color.converters_spec"
+      "nvim-highlight-colors.color.patterns_spec"
+      "nvim-highlight-colors.color.utils_spec"
+    ];
   };
 
   nvim-java = super.nvim-java.overrideAttrs {
@@ -2316,6 +2325,15 @@ in
     dependencies = [ self.nvim-java-core ];
   };
 
+  nvim-lilypond-suite = super.nvim-lilypond-suite.overrideAttrs {
+    nvimSkipModule = [
+      # Option not set immediately
+      "nvls.errors.lilypond-book"
+      "nvls.tex"
+      "nvls.texinfo"
+    ];
+  };
+
   nvim-lsp-file-operations = super.nvim-lsp-file-operations.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
   };

From 2f49705481b6a0eccdf269b65b57fb09815b9fa6 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Wed, 26 Mar 2025 21:15:04 -0500
Subject: [PATCH 075/108] vimPlugins.nvim-treesitter: update on 2025-03-27

---
 .../vim/plugins/nvim-treesitter/generated.nix | 124 +++++++++++-------
 1 file changed, 73 insertions(+), 51 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
index 2a87578e8b5a..e949917f6522 100644
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
@@ -27,12 +27,12 @@
   };
   angular = buildGrammar {
     language = "angular";
-    version = "0.0.0+rev=cba2889";
+    version = "0.0.0+rev=be53f25";
     src = fetchFromGitHub {
       owner = "dlvandenberg";
       repo = "tree-sitter-angular";
-      rev = "cba288924f4832abb619c627539f111004ff22e5";
-      hash = "sha256-ZYBmTu6wNDBMBE/nFrNZdNX2o4uG+4wFIA1XBT4rgCA=";
+      rev = "be53f2597dded40c90b5f53ed9f4521422f6b6b3";
+      hash = "sha256-gs28MvuPz9hYUSeyObj1QE7n5CDa1+T1+CsDdE8xZLM=";
     };
     meta.homepage = "https://github.com/dlvandenberg/tree-sitter-angular";
   };
@@ -224,6 +224,17 @@
     };
     meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp";
   };
+  caddy = buildGrammar {
+    language = "caddy";
+    version = "0.0.0+rev=2686186";
+    src = fetchFromGitHub {
+      owner = "opa-oz";
+      repo = "tree-sitter-caddy";
+      rev = "2686186edb61be47960431c93a204fb249681360";
+      hash = "sha256-pKKx2qCqP/8JLhNebTogM24qzxh6bdX5i4mqGzTJKkw=";
+    };
+    meta.homepage = "https://github.com/opa-oz/tree-sitter-caddy";
+  };
   cairo = buildGrammar {
     language = "cairo";
     version = "0.0.0+rev=6238f60";
@@ -923,12 +934,12 @@
   };
   gleam = buildGrammar {
     language = "gleam";
-    version = "0.0.0+rev=e01c884";
+    version = "0.0.0+rev=99ec410";
     src = fetchFromGitHub {
       owner = "gleam-lang";
       repo = "tree-sitter-gleam";
-      rev = "e01c88449b53e2ee5dad222d4020cc7006c5b700";
-      hash = "sha256-clkf5DxLvvDJDcNYQgAPLQYw+hz05UBdOmPK8kjlVDA=";
+      rev = "99ec4101504452c488b7c835fb65cfef75b090b7";
+      hash = "sha256-FEecjw1nYYO8U+qLjOK28qTMCO1pJkwdUDzlDvmle4c=";
     };
     meta.homepage = "https://github.com/gleam-lang/tree-sitter-gleam";
   };
@@ -945,23 +956,23 @@
   };
   glimmer_javascript = buildGrammar {
     language = "glimmer_javascript";
-    version = "0.0.0+rev=4801ac4";
+    version = "0.0.0+rev=babba3f";
     src = fetchFromGitHub {
       owner = "NullVoxPopuli";
       repo = "tree-sitter-glimmer-javascript";
-      rev = "4801ac4d0a611502001035f45d1cba5cb57d272f";
-      hash = "sha256-wK8buxg2Yil6eS4u+m/iursdx9GHcj6CTCRz1nhdCNs=";
+      rev = "babba3fc0c822a633261ce9e96a4d7986050eb0c";
+      hash = "sha256-dz0vDnOrC41URJs7OqgwaKu7MLe6dffTB66Izv25Asw=";
     };
     meta.homepage = "https://github.com/NullVoxPopuli/tree-sitter-glimmer-javascript";
   };
   glimmer_typescript = buildGrammar {
     language = "glimmer_typescript";
-    version = "0.0.0+rev=c011b05";
+    version = "0.0.0+rev=48c6029";
     src = fetchFromGitHub {
       owner = "NullVoxPopuli";
       repo = "tree-sitter-glimmer-typescript";
-      rev = "c011b053626f27a0fe5cc99eeae4185399a572f9";
-      hash = "sha256-vRxR86NmIVv5iO1C5xb/n8k3qaILaUnnWne5Hnszgyk=";
+      rev = "48c60295f1ee34ea4ed6e5177102be6d24bfc9d0";
+      hash = "sha256-lW0R/PMCeM5kuNJE9pyj/Gksi90jHyJ6/D49FTqMCSI=";
     };
     meta.homepage = "https://github.com/NullVoxPopuli/tree-sitter-glimmer-typescript";
   };
@@ -1221,12 +1232,12 @@
   };
   hlsl = buildGrammar {
     language = "hlsl";
-    version = "0.0.0+rev=b309425";
+    version = "0.0.0+rev=bab9111";
     src = fetchFromGitHub {
       owner = "theHamsta";
       repo = "tree-sitter-hlsl";
-      rev = "b309425a7ab4456605cfe78774b80f7e275ca87d";
-      hash = "sha256-o8y2jZUn15kLQ9k1rftxepeyRfx4dP6Vk2Vv4MUxcOQ=";
+      rev = "bab9111922d53d43668fabb61869bec51bbcb915";
+      hash = "sha256-BWjgXtMN6y/0ahD44Cm8a+MxxVMpCNhkf33V/vsCBTU=";
     };
     meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl";
   };
@@ -1406,6 +1417,17 @@
     };
     meta.homepage = "https://github.com/tree-sitter/tree-sitter-java";
   };
+  javadoc = buildGrammar {
+    language = "javadoc";
+    version = "0.0.0+rev=db9589e";
+    src = fetchFromGitHub {
+      owner = "rmuir";
+      repo = "tree-sitter-javadoc";
+      rev = "db9589e9c61cff7d7fcc207744c711b10b60a7a3";
+      hash = "sha256-yW2gtK7rG0bmyJL6emp4YyfKO0UEgOHLFbjAP+rmQZg=";
+    };
+    meta.homepage = "https://github.com/rmuir/tree-sitter-javadoc";
+  };
   javascript = buildGrammar {
     language = "javascript";
     version = "0.0.0+rev=6fbef40";
@@ -1575,12 +1597,12 @@
   };
   koto = buildGrammar {
     language = "koto";
-    version = "0.0.0+rev=329b0e8";
+    version = "0.0.0+rev=6735114";
     src = fetchFromGitHub {
       owner = "koto-lang";
       repo = "tree-sitter-koto";
-      rev = "329b0e84ef6cc6950665de4accd0bdda1601a2f1";
-      hash = "sha256-2TfRbqmUQlRGVRieffKg0fMzKBXzLkiHHHXQ9iZiRcs=";
+      rev = "673511402dfef07b25cfa43991693b8442695fc7";
+      hash = "sha256-PKaG5VKMP+O0QC5Wp2hxA6Q/YEbYzfw2a2L7s37yKuY=";
     };
     meta.homepage = "https://github.com/koto-lang/tree-sitter-koto";
   };
@@ -1597,12 +1619,12 @@
   };
   lalrpop = buildGrammar {
     language = "lalrpop";
-    version = "0.0.0+rev=a7f5ea2";
+    version = "0.0.0+rev=8d38e97";
     src = fetchFromGitHub {
       owner = "traxys";
       repo = "tree-sitter-lalrpop";
-      rev = "a7f5ea297bd621d072ed4cb2cc8ba5ae64ae3c4b";
-      hash = "sha256-R3hGTS8g+QzpsXN+7IpqDR1fi/git8Af/OBo0S0wrW8=";
+      rev = "8d38e9755c05d37df8a24dadb0fc64f6588ac188";
+      hash = "sha256-rqJ0Zr9zxPkqux+DCSaUszqijFpc35fUB6sAPdGdt/0=";
     };
     meta.homepage = "https://github.com/traxys/tree-sitter-lalrpop";
   };
@@ -1686,12 +1708,12 @@
   };
   lua = buildGrammar {
     language = "lua";
-    version = "0.0.0+rev=68d29aa";
+    version = "0.0.0+rev=db16e76";
     src = fetchFromGitHub {
       owner = "MunifTanjim";
       repo = "tree-sitter-lua";
-      rev = "68d29aa745b68ae22cbbdb5dcb68c20232521ff6";
-      hash = "sha256-mE84uI5AKbLvX5CM7NvA59Z8Ux+QFdqVjZf4hi06NAM=";
+      rev = "db16e76558122e834ee214c8dc755b4a3edc82a9";
+      hash = "sha256-uJdXqlDn8F8mjh/NukpkQA6jdd7YjYOBbugzIrBb6GA=";
     };
     meta.homepage = "https://github.com/MunifTanjim/tree-sitter-lua";
   };
@@ -1752,24 +1774,24 @@
   };
   markdown = buildGrammar {
     language = "markdown";
-    version = "0.0.0+rev=192407a";
+    version = "0.0.0+rev=4132852";
     src = fetchFromGitHub {
       owner = "MDeiml";
       repo = "tree-sitter-markdown";
-      rev = "192407ab5a24bfc24f13332979b5e7967518754a";
-      hash = "sha256-R5y1kMVXzzl/pX6FUcLc1n6Z8eG+npMRwdJMoWtHs/U=";
+      rev = "413285231ce8fa8b11e7074bbe265b48aa7277f9";
+      hash = "sha256-Oe2iL5b1Cyv+dK0nQYFNLCCOCe+93nojxt6ukH2lEmU=";
     };
     location = "tree-sitter-markdown";
     meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown";
   };
   markdown_inline = buildGrammar {
     language = "markdown_inline";
-    version = "0.0.0+rev=192407a";
+    version = "0.0.0+rev=4132852";
     src = fetchFromGitHub {
       owner = "MDeiml";
       repo = "tree-sitter-markdown";
-      rev = "192407ab5a24bfc24f13332979b5e7967518754a";
-      hash = "sha256-R5y1kMVXzzl/pX6FUcLc1n6Z8eG+npMRwdJMoWtHs/U=";
+      rev = "413285231ce8fa8b11e7074bbe265b48aa7277f9";
+      hash = "sha256-Oe2iL5b1Cyv+dK0nQYFNLCCOCe+93nojxt6ukH2lEmU=";
     };
     location = "tree-sitter-markdown-inline";
     meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown";
@@ -1820,12 +1842,12 @@
   };
   mlir = buildGrammar {
     language = "mlir";
-    version = "0.0.0+rev=c7c62f3";
+    version = "0.0.0+rev=922cbb9";
     src = fetchFromGitHub {
       owner = "artagnon";
       repo = "tree-sitter-mlir";
-      rev = "c7c62f37a8612a897d25906d93363fec36c1591c";
-      hash = "sha256-SFMJoAjofemUqPy+Spu4mibGXLShXPqDvpl7gJeZQJg=";
+      rev = "922cbb97f3d20044e6b4362b3d7af5e530ed8f34";
+      hash = "sha256-b36hctcSJoWSCZmuQNoNqZWJ3w28ejyEfmFqdmiwuLc=";
     };
     generate = true;
     meta.homepage = "https://github.com/artagnon/tree-sitter-mlir";
@@ -2189,24 +2211,24 @@
   };
   problog = buildGrammar {
     language = "problog";
-    version = "0.0.0+rev=93c69d2";
+    version = "0.0.0+rev=d8d415f";
     src = fetchFromGitHub {
       owner = "foxyseta";
       repo = "tree-sitter-prolog";
-      rev = "93c69d2f84d8a167c0a3f4a8d51ccefe365a4dc8";
-      hash = "sha256-NWB4PvnVE+L1A7QDKcQtc15YIf8Ik7hKIOUW8XT/pFY=";
+      rev = "d8d415f6a1cf80ca138524bcc395810b176d40fa";
+      hash = "sha256-SEqqmkfV/wsr1ObcBN5My29RY9TWfxnQlsnEEIZyR18=";
     };
     location = "grammars/problog";
     meta.homepage = "https://github.com/foxyseta/tree-sitter-prolog";
   };
   prolog = buildGrammar {
     language = "prolog";
-    version = "0.0.0+rev=93c69d2";
+    version = "0.0.0+rev=d8d415f";
     src = fetchFromGitHub {
       owner = "foxyseta";
       repo = "tree-sitter-prolog";
-      rev = "93c69d2f84d8a167c0a3f4a8d51ccefe365a4dc8";
-      hash = "sha256-NWB4PvnVE+L1A7QDKcQtc15YIf8Ik7hKIOUW8XT/pFY=";
+      rev = "d8d415f6a1cf80ca138524bcc395810b176d40fa";
+      hash = "sha256-SEqqmkfV/wsr1ObcBN5My29RY9TWfxnQlsnEEIZyR18=";
     };
     location = "grammars/prolog";
     meta.homepage = "https://github.com/foxyseta/tree-sitter-prolog";
@@ -2533,12 +2555,12 @@
   };
   roc = buildGrammar {
     language = "roc";
-    version = "0.0.0+rev=32e20cb";
+    version = "0.0.0+rev=0b1afe8";
     src = fetchFromGitHub {
       owner = "faldor20";
       repo = "tree-sitter-roc";
-      rev = "32e20cb1133a5a189f986c3b5df47ac730fbee3d";
-      hash = "sha256-kBuVTL2elBM398Il6t8WuzUu4MrL9md+NEtVy7EGkdE=";
+      rev = "0b1afe88161cbd81f5ddea1bb4fa786314ed49a7";
+      hash = "sha256-DO0c6xRpJvj35qifh9/sfj5Op9CPsKA+4X6A7FBTGLI=";
     };
     meta.homepage = "https://github.com/faldor20/tree-sitter-roc";
   };
@@ -2599,12 +2621,12 @@
   };
   scala = buildGrammar {
     language = "scala";
-    version = "0.0.0+rev=041dea1";
+    version = "0.0.0+rev=42a1542";
     src = fetchFromGitHub {
       owner = "tree-sitter";
       repo = "tree-sitter-scala";
-      rev = "041dea1ca8b25f20fa564854922ac6a99c050ec6";
-      hash = "sha256-hK4/FeB11H2x1c2rbYH2IoejgDSyrvlnObgeN3TVASU=";
+      rev = "42a1542248ff611ba2091fe76c6dbf42551ebef8";
+      hash = "sha256-FRX8uaSB408fOWaQSLjOqurVaWQYysoSQCI3vI4d63E=";
     };
     meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala";
   };
@@ -2901,12 +2923,12 @@
   };
   swift = buildGrammar {
     language = "swift";
-    version = "0.0.0+rev=6b1ebb8";
+    version = "0.0.0+rev=aca5a52";
     src = fetchFromGitHub {
       owner = "alex-pinkus";
       repo = "tree-sitter-swift";
-      rev = "6b1ebb86c97fca00835e7fce4a95c5069172145e";
-      hash = "sha256-VR6GmMWueFa/4PXRtnTNWeI0N19vD1qd5XBM+e9HalM=";
+      rev = "aca5a52aa3cab858944d3c02701ccf5b2d8fd0f9";
+      hash = "sha256-F0Fijad6Yry71Xc5b92EiqgtEkvVqRM8WKRt6U07TxY=";
     };
     generate = true;
     meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift";
@@ -3316,12 +3338,12 @@
   };
   vim = buildGrammar {
     language = "vim";
-    version = "0.0.0+rev=f3cd62d";
+    version = "0.0.0+rev=11b688a";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "tree-sitter-vim";
-      rev = "f3cd62d8bd043ef20507e84bb6b4b53731ccf3a7";
-      hash = "sha256-KVaTJKU7r7zk57Fn9zl5s34oq8tsLkSRV3VHM6Q6F+s=";
+      rev = "11b688a1f0e97c0c4e3dbabf4a38016335f4d237";
+      hash = "sha256-UvH/k0gWEhrgxG1HnrdmaLHzygkaKk4hx2gK/6TZYNM=";
     };
     meta.homepage = "https://github.com/neovim/tree-sitter-vim";
   };

From d30cbc2243a51581e6089bc252c079a3970e7d7a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Mar 2025 04:07:44 +0000
Subject: [PATCH 076/108] eww: 0.6.0-unstable-2025-02-16 ->
 0.6.0-unstable-2025-03-25

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

diff --git a/pkgs/by-name/ew/eww/package.nix b/pkgs/by-name/ew/eww/package.nix
index ab2288fc39a7..2d82636a07ce 100644
--- a/pkgs/by-name/ew/eww/package.nix
+++ b/pkgs/by-name/ew/eww/package.nix
@@ -15,13 +15,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "eww";
-  version = "0.6.0-unstable-2025-02-16";
+  version = "0.6.0-unstable-2025-03-25";
 
   src = fetchFromGitHub {
     owner = "elkowar";
     repo = "eww";
-    rev = "5b4cc3e7a8055afb758421f4a114ef4032806e39";
-    hash = "sha256-iA/OTtsymhuCMRDC0IJE7YXuCeFJbkuMwPaj7tAVbQw=";
+    rev = "a9aa0f96892f20e4741e94f4cd46ca31106e492c";
+    hash = "sha256-T9OZ8jke2T73Zeqt8VekH82ar23AV7llA7ta8b7HP2o=";
   };
 
   useFetchCargoVendor = true;

From 34d86191d7e712b679c9677039b205801a7fc0bf Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 27 Mar 2025 15:32:03 +1000
Subject: [PATCH 077/108] nix-eval-jobs: 2.25.0 -> 2.26.0

Diff: https://github.com/nix-community/nix-eval-jobs/compare/v2.25.0...v2.26.0
---
 pkgs/tools/package-management/nix-eval-jobs/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix-eval-jobs/default.nix b/pkgs/tools/package-management/nix-eval-jobs/default.nix
index 3fc90e6fe356..4924db5e6fd6 100644
--- a/pkgs/tools/package-management/nix-eval-jobs/default.nix
+++ b/pkgs/tools/package-management/nix-eval-jobs/default.nix
@@ -13,12 +13,12 @@
 }:
 stdenv.mkDerivation rec {
   pname = "nix-eval-jobs";
-  version = "2.25.0";
+  version = "2.26.0";
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-63i7TgirD3FiJM1z8ZuOOcXWj4ZhgK357NHmf90WNig=";
+    hash = "sha256-Lo4KFBNcY8tmBuCmEr2XV0IUZtxXHmbXPNLkov/QSU0=";
   };
   buildInputs = [
     boost
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5812fa981add..0884dfa7f0b6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17322,7 +17322,7 @@ with pkgs;
     ({ inherit pkgs lib; } // attrs);
 
   nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs {
-    nix = nixVersions.nix_2_25;
+    nix = nixVersions.nix_2_26;
   };
 
   nix-delegate = haskell.lib.compose.justStaticExecutables haskellPackages.nix-delegate;

From 01ce3ebd11aeddb6985275d1d51bf9199b4a1613 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Mar 2025 05:33:49 +0000
Subject: [PATCH 078/108] polarity: latest-unstable-2025-03-14 ->
 latest-unstable-2025-03-26

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

diff --git a/pkgs/by-name/po/polarity/package.nix b/pkgs/by-name/po/polarity/package.nix
index c67e695f6adc..9b32eb7d8ffc 100644
--- a/pkgs/by-name/po/polarity/package.nix
+++ b/pkgs/by-name/po/polarity/package.nix
@@ -7,17 +7,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "polarity";
-  version = "latest-unstable-2025-03-14";
+  version = "latest-unstable-2025-03-26";
 
   src = fetchFromGitHub {
     owner = "polarity-lang";
     repo = "polarity";
-    rev = "ab9fda44fb490da445dcaee7ad9f8bf08b9e9e10";
-    hash = "sha256-ufWHDqvAaQiqwlezm95BCTLMdQEK5NTmMQgeq3oKR1o=";
+    rev = "73c91061930cf10002aae4f2dd7ac301af20dfdc";
+    hash = "sha256-EN4xOBIrIrNBd/YQPc1xRagAvCdvEH83shb2axj9xX0=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-+RqW8ISBKMKIzsJd3PBUPi5OYCADjXctOH+jH19qg9g=";
+  cargoHash = "sha256-wpO7JYLjuEbKc/a4WO4KeUxdDCI1BswvgvSH+sFh1V0=";
 
   passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
 

From 3b27520c95b0d83725d4ed21f54c7bb13df4c5e8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Mar 2025 05:34:52 +0000
Subject: [PATCH 079/108] pkgsite: 0-unstable-2025-03-12 ->
 0-unstable-2025-03-21

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

diff --git a/pkgs/by-name/pk/pkgsite/package.nix b/pkgs/by-name/pk/pkgsite/package.nix
index a7eebe0290f6..c6dcc236ac06 100644
--- a/pkgs/by-name/pk/pkgsite/package.nix
+++ b/pkgs/by-name/pk/pkgsite/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule {
   pname = "pkgsite";
-  version = "0-unstable-2025-03-12";
+  version = "0-unstable-2025-03-21";
 
   src = fetchFromGitHub {
     owner = "golang";
     repo = "pkgsite";
-    rev = "9685cd9cccb49c53773c2b8ab8f2a5e6de3a1c12";
-    hash = "sha256-aTvoi9HFYxDm7Ze+vJfQzMvgcdWUYOEyxrBpzqQdAK0=";
+    rev = "d037ac96d503b32fcdcb5f5efeefef10447c394e";
+    hash = "sha256-/zcnS3qYmiI5kuOZ4jJB7/3C2U9KELYgte7d9OgaLmo=";
   };
 
   vendorHash = "sha256-M4cbpMZ/ujnMUoGp//KpBM2oEl/RCOfI1IcmoGMw+fw=";

From 2db0e733cab034dd4926892663b50a0b36b57aac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Mar 2025 05:39:17 +0000
Subject: [PATCH 080/108] tinty: 0.26.1 -> 0.27.0

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

diff --git a/pkgs/by-name/ti/tinty/package.nix b/pkgs/by-name/ti/tinty/package.nix
index 01932c021c38..4614df10458d 100644
--- a/pkgs/by-name/ti/tinty/package.nix
+++ b/pkgs/by-name/ti/tinty/package.nix
@@ -6,7 +6,7 @@
   nix-update-script,
 }:
 let
-  version = "0.26.1";
+  version = "0.27.0";
 in
 rustPlatform.buildRustPackage {
   pname = "tinty";
@@ -16,11 +16,11 @@ rustPlatform.buildRustPackage {
     owner = "tinted-theming";
     repo = "tinty";
     tag = "v${version}";
-    hash = "sha256-+HTdmAKsm9YXyLktAfjPenbRi1RrrCusc6+ZarCI7Ac=";
+    hash = "sha256-3gJRVKkC3B+DVfVmvlRjBdp6cD5x5wZMX3p4PWVIjno=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-7erxE5sfEMsZiOh/VPfQYsowUub9nefkNaGYjNr0Pyg=";
+  cargoHash = "sha256-CJcPhUxClxk2SQAbAt1hzX7QbAhpXQCEc4xy1ADkAtk=";
 
   # Pretty much all tests require internet access
   doCheck = false;

From d73ff0a790363389175f23b3600a732ecd833bf2 Mon Sep 17 00:00:00 2001
From: daspk04 <dpratyush.k@gmail.com>
Date: Thu, 27 Mar 2025 13:04:46 +0700
Subject: [PATCH 081/108] otb: fix python support

* switch to an older swig version
* add a patch to find ITK missing headers
---
 .../ot/otb/1-otb-swig-include-itk.diff        | 17 +++++++++
 pkgs/by-name/ot/otb/package.nix               | 36 ++++++++++++++++---
 2 files changed, 49 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/by-name/ot/otb/1-otb-swig-include-itk.diff

diff --git a/pkgs/by-name/ot/otb/1-otb-swig-include-itk.diff b/pkgs/by-name/ot/otb/1-otb-swig-include-itk.diff
new file mode 100644
index 000000000000..97e6ef0863a2
--- /dev/null
+++ b/pkgs/by-name/ot/otb/1-otb-swig-include-itk.diff
@@ -0,0 +1,17 @@
+diff --git a/Modules/Core/Wrappers/SWIG/src/python/CMakeLists.txt b/Modules/Core/Wrappers/SWIG/src/python/CMakeLists.txt
+index 1a33064..d791805 100644
+--- a/Modules/Core/Wrappers/SWIG/src/python/CMakeLists.txt
++++ b/Modules/Core/Wrappers/SWIG/src/python/CMakeLists.txt
+@@ -17,6 +17,12 @@
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+ #
++# Add ITK
++find_package(ITK REQUIRED)
++include(${ITK_USE_FILE})
++include_directories(${ITK_INCLUDE_DIRS})
++message(STATUS "ITK FOUND: ${ITK_INCLUDE_DIRS}")
++
+ include_directories( ${Python_INCLUDE_DIRS} )
+ include_directories ( ${CMAKE_CURRENT_SOURCE_DIR})
+ set_source_files_properties ( ../otbApplication.i PROPERTIES CPLUSPLUS ON )
diff --git a/pkgs/by-name/ot/otb/package.nix b/pkgs/by-name/ot/otb/package.nix
index fb9936c05cec..8b66d8e8614e 100644
--- a/pkgs/by-name/ot/otb/package.nix
+++ b/pkgs/by-name/ot/otb/package.nix
@@ -32,7 +32,7 @@
   enableLearning ? true,
   enableMiscellaneous ? true,
   enableOpenMP ? false,
-  enablePython ? false,
+  enablePython ? true,
   extraPythonPackages ? ps: with ps; [ ],
   enableRemote ? true,
   enableShark ? true,
@@ -49,12 +49,24 @@ let
   # ITK configs for OTB requires 5.3.0 and
   # filter out gdcm, libminc from list of ITK deps as it's not needed for OTB
   itkVersion = "5.3.0";
+  itkMajorMinorVersion = lib.versions.majorMinor itkVersion;
   itkDepsToRemove = [
     "gdcm"
     "libminc"
   ];
   itkIsInDepsToRemove = dep: builtins.any (d: d == dep.name) itkDepsToRemove;
 
+  # remove after https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/-/issues/2451
+  otbSwig = swig.overrideAttrs (oldArgs: {
+    version = "4.2.1";
+    src = fetchFromGitHub {
+      owner = "swig";
+      repo = "swig";
+      tag = "v4.2.1";
+      hash = "sha256-VlUsiRZLScmbC7hZDzKqUr9481YXVwo0eXT/jy6Fda8=";
+    };
+  });
+
   # override the ITK version with OTB version
   # https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/-/blob/develop/SuperBuild/CMake/External_itk.cmake?ref_type=heads#L145
   otb-itk = (itk.override { enableRtk = false; }).overrideAttrs (oldArgs: {
@@ -78,6 +90,13 @@ let
       })
     ];
 
+    # fix the CMake config files for ITK which contains double slashes
+    postInstall =
+      (oldArgs.postInstall or "")
+      + ''
+        sed -i 's|''${ITK_INSTALL_PREFIX}//nix/store|/nix/store|g' $out/lib/cmake/ITK-${itkMajorMinorVersion}/ITKConfig.cmake
+      '';
+
     cmakeFlags = oldArgs.cmakeFlags or [ ] ++ [
       (lib.cmakeBool "ITK_USE_SYSTEM_EIGEN" true)
 
@@ -205,12 +224,16 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/-/merge_requests/1056/diffs.patch";
       hash = "sha256-Zj/wkx0vxn5vqj0hszn7NxoYW1yf63G3HPVKbSdZIOY=";
     })
+    ./1-otb-swig-include-itk.diff
   ];
 
+  postPatch = (
+    "substituteInPlace Modules/Core/Wrappers/SWIG/src/python/CMakeLists.txt --replace-fail '''$''{ITK_INCLUDE_DIRS}' ${otb-itk}/include/ITK-${itkMajorMinorVersion}"
+  );
+
   nativeBuildInputs = [
     cmake
     makeWrapper
-    swig
     which
   ];
 
@@ -246,11 +269,16 @@ stdenv.mkDerivation (finalAttrs: {
       otb-itk
       otb-shark
       perl
-      swig
       tinyxml
     ]
     ++ otb-itk.propagatedBuildInputs
-    ++ optionals enablePython ([ python3 ] ++ pythonInputs)
+    ++ optionals enablePython (
+      [
+        python3
+        otbSwig
+      ]
+      ++ pythonInputs
+    )
     ++ optionals enableShark [ otb-shark ];
 
   doInstallCheck = true;

From e64dc7696dda04845583f7fd0150be391696e99d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 24 Mar 2025 21:00:14 +0000
Subject: [PATCH 082/108] gnomeExtensions.unite: 81 -> 82

---
 pkgs/desktops/gnome/extensions/unite/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome/extensions/unite/default.nix b/pkgs/desktops/gnome/extensions/unite/default.nix
index b2c7f73fedbf..41d93826f0d7 100644
--- a/pkgs/desktops/gnome/extensions/unite/default.nix
+++ b/pkgs/desktops/gnome/extensions/unite/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-unite";
-  version = "81";
+  version = "82";
 
   src = fetchFromGitHub {
     owner = "hardpixel";
     repo = "unite-shell";
     rev = "v${version}";
-    hash = "sha256-VGanUhZ1Lh0L7lMThR1PzSoRHU8AOSIIqUOpjNUULk8=";
+    hash = "sha256-Ceo0HQupiihD6GW6/PUbjuArOXtPtAmUPxmNi7DS8E0=";
   };
 
   passthru = {

From 68feba21e95e36628b7ba2e786c60532ce8594c9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 27 Mar 2025 07:11:06 +0100
Subject: [PATCH 083/108] beetsPackages.copyartifacts: add changelog to meta

---
 pkgs/tools/audio/beets/plugins/copyartifacts.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/audio/beets/plugins/copyartifacts.nix b/pkgs/tools/audio/beets/plugins/copyartifacts.nix
index d1a915a70915..e251ec118ce3 100644
--- a/pkgs/tools/audio/beets/plugins/copyartifacts.nix
+++ b/pkgs/tools/audio/beets/plugins/copyartifacts.nix
@@ -12,8 +12,8 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     repo = "beets-copyartifacts";
     owner = "adammillerio";
-    rev = "v${version}";
-    sha256 = "sha256-UTZh7T6Z288PjxFgyFxHnPt0xpAH3cnr8/jIrlJhtyU=";
+    tag = "v${version}";
+    sha = "sha256-UTZh7T6Z288PjxFgyFxHnPt0xpAH3cnr8/jIrlJhtyU=";
   };
 
   postPatch = ''
@@ -39,6 +39,7 @@ python3Packages.buildPythonApplication rec {
   meta = {
     description = "Beets plugin to move non-music files during the import process";
     homepage = "https://github.com/adammillerio/beets-copyartifacts";
+    changelog = "https://github.com/adammillerio/beets-copyartifacts/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     inherit (beets.meta) platforms;
   };

From bf3ba3053be6e02fcdce1efcca4478dc9edda3ea Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 27 Mar 2025 07:15:41 +0100
Subject: [PATCH 084/108] beetsPackages.copyartifacts: refactor

---
 pkgs/tools/audio/beets/plugins/copyartifacts.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/audio/beets/plugins/copyartifacts.nix b/pkgs/tools/audio/beets/plugins/copyartifacts.nix
index e251ec118ce3..46bef54e213e 100644
--- a/pkgs/tools/audio/beets/plugins/copyartifacts.nix
+++ b/pkgs/tools/audio/beets/plugins/copyartifacts.nix
@@ -1,19 +1,21 @@
 {
   lib,
-  fetchFromGitHub,
   beets,
+  fetchFromGitHub,
   python3Packages,
+  writableTmpDirAsHomeHook,
 }:
 
 python3Packages.buildPythonApplication rec {
   pname = "beets-copyartifacts";
   version = "0.1.5";
+  pyproject = true;
 
   src = fetchFromGitHub {
     repo = "beets-copyartifacts";
     owner = "adammillerio";
     tag = "v${version}";
-    sha = "sha256-UTZh7T6Z288PjxFgyFxHnPt0xpAH3cnr8/jIrlJhtyU=";
+    hash = "sha256-UTZh7T6Z288PjxFgyFxHnPt0xpAH3cnr8/jIrlJhtyU=";
   };
 
   postPatch = ''
@@ -26,15 +28,17 @@ python3Packages.buildPythonApplication rec {
     sed -i -e 's/util\.py3_path/os.fsdecode/g' tests/_common.py
   '';
 
-  pytestFlagsArray = [ "-r fEs" ];
+  build-system = with python3Packages; [ setuptools ];
+
+  dependencies = with python3Packages; [ six ];
 
   nativeCheckInputs = [
     python3Packages.pytestCheckHook
     beets
+    writableTmpDirAsHomeHook
   ];
-  preCheck = ''
-    export HOME=$(mktemp -d)
-  '';
+
+  pytestFlagsArray = [ "-r fEs" ];
 
   meta = {
     description = "Beets plugin to move non-music files during the import process";

From a328fc31ba2c3bbf777e40eba10a1d035ca2cff9 Mon Sep 17 00:00:00 2001
From: Kirill Radzikhovskyy <kirillrdy@gmail.com>
Date: Thu, 27 Mar 2025 17:45:38 +1100
Subject: [PATCH 085/108] golangci-lint-langserver: temporarily disable tests

---
 pkgs/by-name/go/golangci-lint-langserver/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/go/golangci-lint-langserver/package.nix b/pkgs/by-name/go/golangci-lint-langserver/package.nix
index 6e9c47172656..b6695d6ae77e 100644
--- a/pkgs/by-name/go/golangci-lint-langserver/package.nix
+++ b/pkgs/by-name/go/golangci-lint-langserver/package.nix
@@ -21,6 +21,9 @@ buildGoModule rec {
 
   subPackages = [ "." ];
 
+  # renable after https://github.com/nametake/golangci-lint-langserver/pull/52
+  doCheck = false;
+
   nativeCheckInputs = [
     golangci-lint
     writableTmpDirAsHomeHook

From e0e4039e481cc625bc2ee31ac3581d7cc8255468 Mon Sep 17 00:00:00 2001
From: Spencer Pogorzelski <34356756+spencerpogo@users.noreply.github.com>
Date: Sat, 30 Nov 2024 00:01:08 -0500
Subject: [PATCH 086/108] python3Packages.binsync: init at 5.2.0

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

diff --git a/pkgs/development/python-modules/binsync/default.nix b/pkgs/development/python-modules/binsync/default.nix
new file mode 100644
index 000000000000..ad2a5795e386
--- /dev/null
+++ b/pkgs/development/python-modules/binsync/default.nix
@@ -0,0 +1,71 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  filelock,
+  gitpython,
+  libbs,
+  prompt-toolkit,
+  pycparser,
+  pytestCheckHook,
+  sortedcontainers,
+  toml,
+  tqdm,
+  pyside6,
+  flake8,
+  pytest,
+  pytest-qt,
+}:
+
+buildPythonPackage rec {
+  pname = "binsync";
+  version = "5.2.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "binsync";
+    repo = "binsync";
+    tag = "v${version}";
+    hash = "sha256-kwwFwCy02nidSQamexyqq3fByjQCJMIrW9jPPTdqL6c=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    filelock
+    gitpython
+    libbs
+    prompt-toolkit
+    pycparser
+    sortedcontainers
+    toml
+    tqdm
+  ];
+
+  optional-dependencies = {
+    ghidra = [ pyside6 ];
+  };
+
+  doCheck = true;
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-qt
+    pyside6
+  ];
+
+  disabledTestPaths = [
+    "tests/test_angr_gui.py" # tries to import angrmanagement
+  ];
+
+  pythonImportsCheck = [ "binsync" ];
+
+  meta = {
+    description = "A reversing plugin for cross-decompiler collaboration, built on git";
+    homepage = "https://github.com/binsync/binsync";
+    changelog = "https://github.com/binsync/binsync/releases/tag/v${version}";
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ scoder12 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 54ce24d46f25..ba4fe4aa1d7f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1789,6 +1789,8 @@ self: super: with self; {
 
   binho-host-adapter = callPackage ../development/python-modules/binho-host-adapter { };
 
+  binsync = callPackage ../development/python-modules/binsync { };
+
   biom-format = callPackage ../development/python-modules/biom-format { };
 
   biopandas = callPackage ../development/python-modules/biopandas { };

From 53b13901c3728f0c386e5a3cc916e5db3c3a4058 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 27 Mar 2025 07:58:23 +0100
Subject: [PATCH 087/108] python313Packages.binsync: 5.2.0 -> 5.3.0

Diff: https://github.com/binsync/binsync/compare/refs/tags/v5.2.0...v5.3.0

Changelog: https://github.com/binsync/binsync/releases/tag/v5.3.0
---
 .../python-modules/binsync/default.nix          | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/binsync/default.nix b/pkgs/development/python-modules/binsync/default.nix
index ad2a5795e386..0a6e052214a7 100644
--- a/pkgs/development/python-modules/binsync/default.nix
+++ b/pkgs/development/python-modules/binsync/default.nix
@@ -2,32 +2,30 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  setuptools,
   filelock,
   gitpython,
   libbs,
   prompt-toolkit,
   pycparser,
+  pyside6,
+  pytest-qt,
   pytestCheckHook,
+  setuptools,
   sortedcontainers,
   toml,
   tqdm,
-  pyside6,
-  flake8,
-  pytest,
-  pytest-qt,
 }:
 
 buildPythonPackage rec {
   pname = "binsync";
-  version = "5.2.0";
+  version = "5.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "binsync";
     repo = "binsync";
     tag = "v${version}";
-    hash = "sha256-kwwFwCy02nidSQamexyqq3fByjQCJMIrW9jPPTdqL6c=";
+    hash = "sha256-f0pPuNTrZ5+iuJgtxLXJF89C9hKXwplhBA/olyhfsQ4=";
   };
 
   build-system = [ setuptools ];
@@ -47,8 +45,6 @@ buildPythonPackage rec {
     ghidra = [ pyside6 ];
   };
 
-  doCheck = true;
-
   nativeCheckInputs = [
     pytestCheckHook
     pytest-qt
@@ -56,7 +52,8 @@ buildPythonPackage rec {
   ];
 
   disabledTestPaths = [
-    "tests/test_angr_gui.py" # tries to import angrmanagement
+    # Test tries to import angrmanagement
+    "tests/test_angr_gui.py"
   ];
 
   pythonImportsCheck = [ "binsync" ];

From 09534278d8aab779c16a87a253b7d28b1467a395 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Mar 2025 07:21:07 +0000
Subject: [PATCH 088/108] snapcraft: 8.7.2 -> 8.7.3

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

diff --git a/pkgs/by-name/sn/snapcraft/package.nix b/pkgs/by-name/sn/snapcraft/package.nix
index bb43fd6b6025..ac4118158968 100644
--- a/pkgs/by-name/sn/snapcraft/package.nix
+++ b/pkgs/by-name/sn/snapcraft/package.nix
@@ -13,7 +13,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "snapcraft";
-  version = "8.7.2";
+  version = "8.7.3";
 
   pyproject = true;
 
@@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec {
     owner = "canonical";
     repo = "snapcraft";
     tag = version;
-    hash = "sha256-RlaAvLU0UE8u6y2xCHLxbOFLQF9jRa+8e2mgrRgTIjw=";
+    hash = "sha256-T39hhosZTttX8jMlF5ul9oBcsh+FKusepj0k2NMZHNU=";
   };
 
   patches = [

From ebee9a439a50bbe2a0a61ef886b25a6c13198332 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Mar 2025 07:25:49 +0000
Subject: [PATCH 089/108] db-rest: 6.0.6 -> 6.1.0

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

diff --git a/pkgs/by-name/db/db-rest/package.nix b/pkgs/by-name/db/db-rest/package.nix
index 320b470a8c17..6aa4e722d169 100644
--- a/pkgs/by-name/db/db-rest/package.nix
+++ b/pkgs/by-name/db/db-rest/package.nix
@@ -8,7 +8,7 @@
 }:
 buildNpmPackage rec {
   pname = "db-rest";
-  version = "6.0.6";
+  version = "6.1.0";
 
   nodejs = nodejs_18;
 
@@ -16,10 +16,10 @@ buildNpmPackage rec {
     owner = "derhuerst";
     repo = "db-rest";
     rev = version;
-    hash = "sha256-Rwy36hi5p/EDLBbfi1M0DEKD+2/eiJsqo0r2Et/3Oa4=";
+    hash = "sha256-1iJ26l6C6GevNkoDVMztPHiH3YsutJa3xWAsfYvgR9U=";
   };
 
-  npmDepsHash = "sha256-Drwmnu23PvrT/cw42hl+mu/S/Dn5nzybWGCDCUF7+R8=";
+  npmDepsHash = "sha256-ELVVsysNjkXuX4i6i5P3irn6twVDu6YiPYqy2hbIlIs=";
 
   preConfigure = ''
     patchShebangs ./build/index.js

From b6d12f5938461576dcd8d0e4dfaceb89df41f86f Mon Sep 17 00:00:00 2001
From: Pierre Roux <pierre.roux@onera.fr>
Date: Sat, 1 Mar 2025 11:15:47 +0100
Subject: [PATCH 090/108] add overrideRocqDerivation

---
 .../science/logic/rocq-core/default.nix       |   2 +-
 pkgs/build-support/coq/extra-lib.nix          | 209 +----------------
 pkgs/build-support/rocq/default.nix           |   2 +-
 pkgs/build-support/rocq/extra-lib-common.nix  | 210 ++++++++++++++++++
 pkgs/build-support/rocq/extra-lib.nix         |  56 +++++
 pkgs/top-level/rocq-packages.nix              |   2 +-
 6 files changed, 271 insertions(+), 210 deletions(-)
 create mode 100644 pkgs/build-support/rocq/extra-lib-common.nix
 create mode 100644 pkgs/build-support/rocq/extra-lib.nix

diff --git a/pkgs/applications/science/logic/rocq-core/default.nix b/pkgs/applications/science/logic/rocq-core/default.nix
index ec6a132f340f..f6e29ea91aff 100644
--- a/pkgs/applications/science/logic/rocq-core/default.nix
+++ b/pkgs/applications/science/logic/rocq-core/default.nix
@@ -12,7 +12,7 @@
 , version, rocq-version ? null
 }@args:
 let
-  lib = import ../../../../build-support/coq/extra-lib.nix { inherit (args) lib; };
+  lib = import ../../../../build-support/rocq/extra-lib.nix { inherit (args) lib; };
 
   release = {
    "9.0.0".sha256 = "sha256-GRwYSvrJGiPD+I82gLOgotb+8Ra5xHZUJGcNwxWqZkU=";
diff --git a/pkgs/build-support/coq/extra-lib.nix b/pkgs/build-support/coq/extra-lib.nix
index c3cb5deda809..6b6d286c9dc9 100644
--- a/pkgs/build-support/coq/extra-lib.nix
+++ b/pkgs/build-support/coq/extra-lib.nix
@@ -1,212 +1,7 @@
 { lib }:
 
-let
-  inherit (lib)
-    all
-    concatStringsSep
-    findFirst
-    flip
-    getAttr
-    head
-    isFunction
-    length
-    recursiveUpdate
-    splitVersion
-    tail
-    take
-    versionAtLeast
-    versionOlder
-    zipListsWith
-    ;
-in
-recursiveUpdate lib (rec {
-
-  versions =
-    let
-      truncate = n: v: concatStringsSep "." (take n (splitVersion v));
-      opTruncate =
-        op: v0: v:
-        let
-          n = length (splitVersion v0);
-        in
-        op (truncate n v) (truncate n v0);
-    in
-    rec {
-
-      /*
-        Get string of the first n parts of a version string.
-
-        Example:
-        - truncate 2 "1.2.3-stuff"
-          => "1.2"
-
-        - truncate 4 "1.2.3-stuff"
-          => "1.2.3.stuff"
-      */
-
-      inherit truncate;
-
-      /*
-        Get string of the first three parts (major, minor and patch)
-        of a version string.
-
-        Example:
-          majorMinorPatch "1.2.3-stuff"
-          => "1.2.3"
-      */
-      majorMinorPatch = truncate 3;
-
-      /*
-        Version comparison predicates,
-          - isGe v0 v <-> v is greater or equal than v0   [*]
-          - isLe v0 v <-> v is lesser  or equal than v0   [*]
-          - isGt v0 v <-> v is strictly greater than v0   [*]
-          - isLt v0 v <-> v is strictly lesser  than v0   [*]
-          - isEq v0 v <-> v is equal to v0                [*]
-          - range low high v <-> v is between low and high [**]
-
-        [*]  truncating v to the same number of digits as v0
-        [**] truncating v to low for the lower bound and high for the upper bound
-
-          Examples:
-          - isGe "8.10" "8.10.1"
-            => true
-          - isLe "8.10" "8.10.1"
-            => true
-          - isGt "8.10" "8.10.1"
-            => false
-          - isGt "8.10.0" "8.10.1"
-            => true
-          - isEq "8.10" "8.10.1"
-            => true
-          - range "8.10" "8.11" "8.11.1"
-            => true
-          - range "8.10" "8.11+" "8.11.0"
-            => false
-          - range "8.10" "8.11+" "8.11+beta1"
-            => false
-      */
-      isGe = opTruncate versionAtLeast;
-      isGt = opTruncate (flip versionOlder);
-      isLe = opTruncate (flip versionAtLeast);
-      isLt = opTruncate versionOlder;
-      isEq = opTruncate pred.equal;
-      range = low: high: pred.inter (versions.isGe low) (versions.isLe high);
-    };
-
-  /*
-    Returns a list of list, splitting it using a predicate.
-     This is analogous to builtins.split sep list,
-     with a predicate as a separator and a list instead of a string.
-
-    Type: splitList :: (a -> bool) -> [a] -> [[a]]
-
-    Example:
-      splitList (x: x == "x") [ "y" "x" "z" "t" ]
-      => [ [ "y" ] "x" [ "z" "t" ] ]
-  */
-  splitList =
-    pred: l: # put in file lists
-    let
-      loop = (
-        vv: v: l:
-        if l == [ ] then
-          vv ++ [ v ]
-        else
-          let
-            hd = head l;
-            tl = tail l;
-          in
-          if pred hd then
-            loop (
-              vv
-              ++ [
-                v
-                hd
-              ]
-            ) [ ] tl
-          else
-            loop vv (v ++ [ hd ]) tl
-      );
-    in
-    loop [ ] [ ] l;
-
-  pred = {
-    # Predicate intersection, union, and complement
-    inter =
-      p: q: x:
-      p x && q x;
-    union =
-      p: q: x:
-      p x || q x;
-    compl = p: x: !p x;
-    true = p: true;
-    false = p: false;
-
-    # predicate "being equal to y"
-    equal = y: x: x == y;
-  };
-
-  /*
-    Emulate a "switch - case" construct,
-    instead of relying on `if then else if ...`
-  */
-  /*
-    Usage:
-    ```nix
-    switch-if [
-      if-clause-1
-      ..
-      if-clause-k
-    ] default-out
-    ```
-    where a if-clause has the form `{ cond = b; out = r; }`
-    the first branch such as `b` is true
-  */
-
-  switch-if = c: d: (findFirst (getAttr "cond") { } c).out or d;
-
-  /*
-    Usage:
-    ```nix
-    switch x [
-      simple-clause-1
-      ..
-      simple-clause-k
-    ] default-out
-    ```
-    where a simple-clause has the form `{ case = p; out = r; }`
-    the first branch such as `p x` is true
-    or
-    ```nix
-    switch [ x1 .. xn ] [
-      complex-clause-1
-      ..
-      complex-clause-k
-    ] default-out
-    ```
-    where a complex-clause is either a simple-clause
-    or has the form { cases = [ p1 .. pn ]; out = r; }
-    in which case the first branch such as all `pi x` are true
-
-    if the variables p are not functions,
-    they are converted to a equal p
-    if out is missing the default-out is taken
-  */
-
-  switch =
-    var: clauses: default:
-    with pred;
-    let
-      compare = f: if isFunction f then f else equal f;
-      combine =
-        cl: var:
-        if cl ? case then compare cl.case var else all (equal true) (zipListsWith compare cl.cases var);
-    in
-    switch-if (map (cl: {
-      cond = combine cl var;
-      inherit (cl) out;
-    }) clauses) default;
+lib.recursiveUpdate lib (
+  import ../rocq/extra-lib-common.nix { inherit lib; } // {
 
   /*
     Override arguments to mkCoqDerivation for a Coq library.
diff --git a/pkgs/build-support/rocq/default.nix b/pkgs/build-support/rocq/default.nix
index 367b4b8666b8..83399ac62049 100644
--- a/pkgs/build-support/rocq/default.nix
+++ b/pkgs/build-support/rocq/default.nix
@@ -9,7 +9,7 @@
 }@args:
 
 let
-  lib = import ../coq/extra-lib.nix {
+  lib = import ./extra-lib.nix {
     inherit (args) lib;
   };
 
diff --git a/pkgs/build-support/rocq/extra-lib-common.nix b/pkgs/build-support/rocq/extra-lib-common.nix
new file mode 100644
index 000000000000..db361d265880
--- /dev/null
+++ b/pkgs/build-support/rocq/extra-lib-common.nix
@@ -0,0 +1,210 @@
+{ lib }:
+
+let
+  inherit (lib)
+    all
+    concatStringsSep
+    findFirst
+    flip
+    getAttr
+    head
+    isFunction
+    length
+    recursiveUpdate
+    splitVersion
+    tail
+    take
+    versionAtLeast
+    versionOlder
+    zipListsWith
+    ;
+in
+rec {
+
+  versions =
+    let
+      truncate = n: v: concatStringsSep "." (take n (splitVersion v));
+      opTruncate =
+        op: v0: v:
+        let
+          n = length (splitVersion v0);
+        in
+        op (truncate n v) (truncate n v0);
+    in
+    rec {
+
+      /*
+        Get string of the first n parts of a version string.
+
+        Example:
+        - truncate 2 "1.2.3-stuff"
+          => "1.2"
+
+        - truncate 4 "1.2.3-stuff"
+          => "1.2.3.stuff"
+      */
+
+      inherit truncate;
+
+      /*
+        Get string of the first three parts (major, minor and patch)
+        of a version string.
+
+        Example:
+          majorMinorPatch "1.2.3-stuff"
+          => "1.2.3"
+      */
+      majorMinorPatch = truncate 3;
+
+      /*
+        Version comparison predicates,
+          - isGe v0 v <-> v is greater or equal than v0   [*]
+          - isLe v0 v <-> v is lesser  or equal than v0   [*]
+          - isGt v0 v <-> v is strictly greater than v0   [*]
+          - isLt v0 v <-> v is strictly lesser  than v0   [*]
+          - isEq v0 v <-> v is equal to v0                [*]
+          - range low high v <-> v is between low and high [**]
+
+        [*]  truncating v to the same number of digits as v0
+        [**] truncating v to low for the lower bound and high for the upper bound
+
+          Examples:
+          - isGe "8.10" "8.10.1"
+            => true
+          - isLe "8.10" "8.10.1"
+            => true
+          - isGt "8.10" "8.10.1"
+            => false
+          - isGt "8.10.0" "8.10.1"
+            => true
+          - isEq "8.10" "8.10.1"
+            => true
+          - range "8.10" "8.11" "8.11.1"
+            => true
+          - range "8.10" "8.11+" "8.11.0"
+            => false
+          - range "8.10" "8.11+" "8.11+beta1"
+            => false
+      */
+      isGe = opTruncate versionAtLeast;
+      isGt = opTruncate (flip versionOlder);
+      isLe = opTruncate (flip versionAtLeast);
+      isLt = opTruncate versionOlder;
+      isEq = opTruncate pred.equal;
+      range = low: high: pred.inter (versions.isGe low) (versions.isLe high);
+    };
+
+  /*
+    Returns a list of list, splitting it using a predicate.
+     This is analogous to builtins.split sep list,
+     with a predicate as a separator and a list instead of a string.
+
+    Type: splitList :: (a -> bool) -> [a] -> [[a]]
+
+    Example:
+      splitList (x: x == "x") [ "y" "x" "z" "t" ]
+      => [ [ "y" ] "x" [ "z" "t" ] ]
+  */
+  splitList =
+    pred: l: # put in file lists
+    let
+      loop = (
+        vv: v: l:
+        if l == [ ] then
+          vv ++ [ v ]
+        else
+          let
+            hd = head l;
+            tl = tail l;
+          in
+          if pred hd then
+            loop (
+              vv
+              ++ [
+                v
+                hd
+              ]
+            ) [ ] tl
+          else
+            loop vv (v ++ [ hd ]) tl
+      );
+    in
+    loop [ ] [ ] l;
+
+  pred = {
+    # Predicate intersection, union, and complement
+    inter =
+      p: q: x:
+      p x && q x;
+    union =
+      p: q: x:
+      p x || q x;
+    compl = p: x: !p x;
+    true = p: true;
+    false = p: false;
+
+    # predicate "being equal to y"
+    equal = y: x: x == y;
+  };
+
+  /*
+    Emulate a "switch - case" construct,
+    instead of relying on `if then else if ...`
+  */
+  /*
+    Usage:
+    ```nix
+    switch-if [
+      if-clause-1
+      ..
+      if-clause-k
+    ] default-out
+    ```
+    where a if-clause has the form `{ cond = b; out = r; }`
+    the first branch such as `b` is true
+  */
+
+  switch-if = c: d: (findFirst (getAttr "cond") { } c).out or d;
+
+  /*
+    Usage:
+    ```nix
+    switch x [
+      simple-clause-1
+      ..
+      simple-clause-k
+    ] default-out
+    ```
+    where a simple-clause has the form `{ case = p; out = r; }`
+    the first branch such as `p x` is true
+    or
+    ```nix
+    switch [ x1 .. xn ] [
+      complex-clause-1
+      ..
+      complex-clause-k
+    ] default-out
+    ```
+    where a complex-clause is either a simple-clause
+    or has the form { cases = [ p1 .. pn ]; out = r; }
+    in which case the first branch such as all `pi x` are true
+
+    if the variables p are not functions,
+    they are converted to a equal p
+    if out is missing the default-out is taken
+  */
+
+  switch =
+    var: clauses: default:
+    with pred;
+    let
+      compare = f: if isFunction f then f else equal f;
+      combine =
+        cl: var:
+        if cl ? case then compare cl.case var else all (equal true) (zipListsWith compare cl.cases var);
+    in
+    switch-if (map (cl: {
+      cond = combine cl var;
+      inherit (cl) out;
+    }) clauses) default;
+}
diff --git a/pkgs/build-support/rocq/extra-lib.nix b/pkgs/build-support/rocq/extra-lib.nix
new file mode 100644
index 000000000000..1f5d96794963
--- /dev/null
+++ b/pkgs/build-support/rocq/extra-lib.nix
@@ -0,0 +1,56 @@
+{ lib }:
+
+lib.recursiveUpdate lib (
+  import ./extra-lib-common.nix { inherit lib; } // {
+
+  /*
+    Override arguments to mkRocqDerivation for a Rocq library.
+
+    This function allows you to easily override arguments to mkRocqDerivation,
+    even when they are not exposed by the Rocq library directly.
+
+    Type: overrideRocqDerivation :: AttrSet -> RocqLibraryDerivation -> RocqLibraryDerivation
+
+    Example:
+
+    ```nix
+    rocqPackages.lib.overrideRocqDerivation
+      {
+        defaultVersion = "9999";
+        release."9999".hash = "sha256-fDoP11rtrIM7+OLdMisv2EF7n/IbGuwFxHiPtg3qCNM=";
+      }
+      rocqPackages.QuickChick;
+    ```
+
+    This example overrides the `defaultVersion` and `release` arguments that
+    are passed to `mkRocqDerivation` in the QuickChick derivation.
+
+    Note that there is a difference between using `.override` on a Rocq
+    library vs this `overrideRocqDerivation` function. `.override` allows you
+    to modify arguments to the derivation itself, for instance by passing
+    different versions of dependencies:
+
+    ```nix
+    rocqPackages.QuickChick.override { ssreflect = my-cool-ssreflect; }
+    ```
+
+    whereas `overrideRocqDerivation` allows you to override arguments to the
+    call to `mkRocqDerivation` in the Rocq library.
+
+    Note that all Rocq libraries in Nixpkgs have a `version` argument for
+    easily using a different version.  So if all you want to do is use a
+    different version, and the derivation for the Rocq library already has
+    support for the version you want, you likely only need to update the
+    `version` argument on the library derivation.  This is done with
+    `.override`:
+
+    ```nix
+    rocqPackages.QuickChick.override { version = "1.4.0"; }
+    ```
+  */
+  overrideRocqDerivation =
+    f: drv:
+    (drv.override (args: {
+      mkRocqDerivation = drv_: (args.mkRocqDerivation drv_).override f;
+    }));
+})
diff --git a/pkgs/top-level/rocq-packages.nix b/pkgs/top-level/rocq-packages.nix
index 1253ebd1f4f8..6c741553b99c 100644
--- a/pkgs/top-level/rocq-packages.nix
+++ b/pkgs/top-level/rocq-packages.nix
@@ -2,7 +2,7 @@
 , callPackage, newScope, recurseIntoAttrs, ocamlPackages_4_14
 , fetchpatch, makeWrapper,
 }@args:
-let lib = import ../build-support/coq/extra-lib.nix {inherit (args) lib;}; in
+let lib = import ../build-support/rocq/extra-lib.nix {inherit (args) lib;}; in
 let
   mkRocqPackages' = self: rocq-core:
     let callPackage = self.callPackage; in {

From 8b4c587edf8db9fc5cc2ed672630fe66e1397f83 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Mar 2025 07:48:29 +0000
Subject: [PATCH 091/108] osqp-eigen: 0.9.0 -> 0.10.0

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

diff --git a/pkgs/by-name/os/osqp-eigen/package.nix b/pkgs/by-name/os/osqp-eigen/package.nix
index fdcc3dfceb96..bd2ef7bb4924 100644
--- a/pkgs/by-name/os/osqp-eigen/package.nix
+++ b/pkgs/by-name/os/osqp-eigen/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "osqp-eigen";
-  version = "0.9.0";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "robotology";
     repo = "osqp-eigen";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-cXH27UC7hw3iswuf7xSf5pHX1fDyHzFxnCzUpW00SLE=";
+    hash = "sha256-vmHGOG+duR8R5KSC0yaXkjB5KaotTjuXbXneKv9MO3c=";
   };
 
   cmakeFlags = [

From a46206abeffb012390bd458866c3fd8d863632b8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Mar 2025 08:23:36 +0000
Subject: [PATCH 092/108] woodpecker-plugin-git: 2.6.2 -> 2.6.3

---
 pkgs/by-name/wo/woodpecker-plugin-git/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/wo/woodpecker-plugin-git/package.nix b/pkgs/by-name/wo/woodpecker-plugin-git/package.nix
index 9fde5ba1dfd8..01b04bac2f36 100644
--- a/pkgs/by-name/wo/woodpecker-plugin-git/package.nix
+++ b/pkgs/by-name/wo/woodpecker-plugin-git/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "woodpecker-plugin-git";
-  version = "2.6.2";
+  version = "2.6.3";
 
   src = fetchFromGitHub {
     owner = "woodpecker-ci";
     repo = "plugin-git";
     tag = version;
-    hash = "sha256-5YyYCdZpRlchLH4qX9golv8DmlMghosWi5WXP9WxMXU=";
+    hash = "sha256-8CioqP0+L4DMF3S7QOGAmq3Uj0WAi0W7jhw0HNWVPwQ=";
   };
 
-  vendorHash = "sha256-XOriHt+qyOcuGZzMtGAZuztxLod92JzjKWWjNq5Giro=";
+  vendorHash = "sha256-X9cpR45fB4HqTn3TiehAw6J7G2lXAQ3OfxRh5N+ceFc=";
 
   env.CGO_ENABLED = "0";
 

From af05cb1ed4d21ae4989f76cc3e93d3e66862c34f Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 27 Mar 2025 10:15:52 +0100
Subject: [PATCH 093/108] tacent: fix tag

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

diff --git a/pkgs/by-name/ta/tacent/package.nix b/pkgs/by-name/ta/tacent/package.nix
index a55a4e950426..602e62e1f6fc 100644
--- a/pkgs/by-name/ta/tacent/package.nix
+++ b/pkgs/by-name/ta/tacent/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "bluescan";
     repo = "tacent";
-    tag = finalAttrs.version;
+    tag = "v${finalAttrs.version}";
     hash = "sha256-z8VuJS8OaVw5CeO/udvBEmcURKIy1oWVYUv6Ai8lTI8=";
   };
 

From e30d3148b9f865490d4e946396663c953a2a4e4f Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 27 Mar 2025 10:22:56 +0100
Subject: [PATCH 094/108] python312Packages.pytest-postrgesql: fix on darwin
 sandbox

---
 .../python-modules/pytest-postgresql/default.nix    | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-postgresql/default.nix b/pkgs/development/python-modules/pytest-postgresql/default.nix
index 8aaab0f13a69..c989f2748348 100644
--- a/pkgs/development/python-modules/pytest-postgresql/default.nix
+++ b/pkgs/development/python-modules/pytest-postgresql/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
   pytestCheckHook,
   pytest-cov-stub,
   setuptools,
@@ -18,8 +17,6 @@ buildPythonPackage rec {
   version = "6.0.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "ClearcodeHQ";
     repo = "pytest-postgresql";
@@ -35,7 +32,7 @@ buildPythonPackage rec {
 
   buildInputs = [ pytest ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     mirakuru
     port-for
     psycopg
@@ -65,11 +62,13 @@ buildPythonPackage rec {
     "pytest_postgresql.executor"
   ];
 
-  meta = with lib; {
+  __darwinAllowLocalNetworking = true;
+
+  meta = {
     homepage = "https://pypi.python.org/pypi/pytest-postgresql";
     description = "Pytest plugin that enables you to test code on a temporary PostgreSQL database";
     changelog = "https://github.com/ClearcodeHQ/pytest-postgresql/blob/v${version}/CHANGES.rst";
-    license = licenses.lgpl3Plus;
-    maintainers = with maintainers; [ bcdarwin ];
+    license = lib.licenses.lgpl3Plus;
+    maintainers = with lib.maintainers; [ bcdarwin ];
   };
 }

From b3640db3ea4b92930d1e87fa81f338448fe2ca2d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Mar 2025 09:30:37 +0000
Subject: [PATCH 095/108] python312Packages.reflex-chakra: 0.6.3 -> 0.7.0

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

diff --git a/pkgs/development/python-modules/reflex-chakra/default.nix b/pkgs/development/python-modules/reflex-chakra/default.nix
index c720d2bdc455..e197395d1d2a 100644
--- a/pkgs/development/python-modules/reflex-chakra/default.nix
+++ b/pkgs/development/python-modules/reflex-chakra/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "reflex-chakra";
-  version = "0.6.3";
+  version = "0.7.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "reflex-dev";
     repo = "reflex-chakra";
     tag = "v${version}";
-    hash = "sha256-Smkpcy6jPYTUWskZwWKkL9V545Ji/riQ8RFjJXm44qM=";
+    hash = "sha256-foIXPLWcxNf33y39BgiRpvwRnZOTcfAjhCvC4TD8ZMs=";
   };
 
   pythonRemoveDeps = [
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Chakra Implementation in Reflex";
     homepage = "https://github.com/reflex-dev/reflex-chakra";
-    changelog = "https://github.com/reflex-dev/reflex-chakra/releases/tag/v${version}";
+    changelog = "https://github.com/reflex-dev/reflex-chakra/releases/tag/${src.tag}";
     license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
   };

From 240064db50b9ff76957db83a827620a93be6e788 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Mar 2025 09:32:26 +0000
Subject: [PATCH 096/108] python312Packages.google-cloud-pubsub: 2.28.0 ->
 2.29.0

---
 .../python-modules/google-cloud-pubsub/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix
index 02f51c149be1..9c46626f6869 100644
--- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix
+++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-pubsub";
-  version = "2.28.0";
+  version = "2.29.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_pubsub";
     inherit version;
-    hash = "sha256-kE6JS04VEhUhB3rIXJqo9Oe4UXvF+0Cd2yqsjfGgKzw=";
+    hash = "sha256-uCD41BDJath7jaecaWuXnhoYKhcNDAYCYm9bnYy/Ie4=";
   };
 
   build-system = [ setuptools ];

From 388815b181e297e1ad42d4c302e7808460b4305e Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Thu, 27 Mar 2025 10:10:45 +0100
Subject: [PATCH 097/108] freerdp: drop freerdp 2.x, move to by-name

The freerdp package name previuously pointed to the unmaintained freerdp version 2.x.
Version 2.x is no longer used in nixpkgs.
It was never clear `freerdp` would be pinned to 2.x versions indefinitely.

This removes the pin on the freerdp package and moves the package to by-name pattern.
---
 .../networking/remote/freerdp/default.nix     | 243 ------------------
 .../3.nix => by-name/fr/freerdp/package.nix}  |   0
 pkgs/top-level/all-packages.nix               |  13 +-
 3 files changed, 1 insertion(+), 255 deletions(-)
 delete mode 100644 pkgs/applications/networking/remote/freerdp/default.nix
 rename pkgs/{applications/networking/remote/freerdp/3.nix => by-name/fr/freerdp/package.nix} (100%)

diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix
deleted file mode 100644
index 923aeea8db2f..000000000000
--- a/pkgs/applications/networking/remote/freerdp/default.nix
+++ /dev/null
@@ -1,243 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  cmake,
-  docbook-xsl-nons,
-  libxslt,
-  pkg-config,
-  alsa-lib,
-  faac,
-  faad2,
-  fetchpatch,
-  ffmpeg,
-  glib,
-  openh264,
-  openssl,
-  pcre2,
-  zlib,
-  libX11,
-  libXcursor,
-  libXdamage,
-  libXdmcp,
-  libXext,
-  libXi,
-  libXinerama,
-  libXrandr,
-  libXrender,
-  libXtst,
-  libXv,
-  libxkbcommon,
-  libxkbfile,
-  wayland,
-  wayland-scanner,
-  gstreamer,
-  gst-plugins-base,
-  gst-plugins-good,
-  libunwind,
-  orc,
-  cairo,
-  libusb1,
-  libpulseaudio,
-  cups,
-  pcsclite,
-  systemd,
-  libjpeg_turbo,
-  buildServer ? true,
-  nocaps ? false,
-  AudioToolbox,
-  AVFoundation,
-  Carbon,
-  Cocoa,
-  CoreMedia,
-  withUnfree ? false,
-
-  # tries to compile and run generate_argument_docbook.c
-  withManPages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
-
-  buildPackages,
-}:
-
-let
-  cmFlag = flag: if flag then "ON" else "OFF";
-  disabledTests =
-    [
-      # this one is probably due to our sandbox
-      {
-        dir = "libfreerdp/crypto/test";
-        file = "Test_x509_cert_info.c";
-      }
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      {
-        dir = "winpr/libwinpr/sysinfo/test";
-        file = "TestGetComputerName.c";
-      }
-    ];
-
-  inherit (lib) optionals;
-
-in
-stdenv.mkDerivation rec {
-  pname = "freerdp";
-  version = "2.11.7";
-
-  src = fetchFromGitHub {
-    owner = "FreeRDP";
-    repo = "FreeRDP";
-    rev = version;
-    hash = "sha256-w+xyMNFmKylSheK0yAGl8J6MXly/HUjjAfR9Qq3s/kA=";
-  };
-
-  patches = [
-    # GCC 14 compatibility
-    (fetchpatch {
-      url = "https://github.com/FreeRDP/FreeRDP/commit/5b14b7cbdd36414f1838047f21502654bd32ebb1.patch";
-      hash = "sha256-EWLfmjGJGWA/sY2E2DnFKhPbzhOVbXZPCrV8i1XuSeY=";
-    })
-    (fetchpatch {
-      url = "https://github.com/FreeRDP/FreeRDP/commit/efa899d3deb8595a29fabb2a2251722f9d7e0d7f.patch";
-      hash = "sha256-hjqNexYq+3iO2L2L9wT2tWbHz0BEtl/y7jgQT4kpNIM=";
-    })
-    (fetchpatch {
-      url = "https://github.com/FreeRDP/FreeRDP/commit/0c20fac8f1deeeca3df93a6619542e5d9176f0f0.patch";
-      hash = "sha256-cEzNPteucoI5KoGEM3C6mg2kW9uWImPebZEV6nssexY=";
-    })
-  ];
-
-  postPatch =
-    ''
-      export HOME=$TMP
-
-      # skip NIB file generation on darwin
-      sed -z 's/NIB file generation.*//' -i client/Mac{,/cli}/CMakeLists.txt
-
-      # failing test(s)
-      ${lib.concatMapStringsSep "\n" (e: ''
-        substituteInPlace ${e.dir}/CMakeLists.txt \
-          --replace ${e.file} ""
-        rm ${e.dir}/${e.file}
-      '') disabledTests}
-
-      substituteInPlace "libfreerdp/freerdp.pc.in" \
-        --replace "Requires:" "Requires: @WINPR_PKG_CONFIG_FILENAME@"
-    ''
-    + lib.optionalString (pcsclite != null) ''
-      substituteInPlace "winpr/libwinpr/smartcard/smartcard_pcsc.c" \
-        --replace "libpcsclite.so" "${lib.getLib pcsclite}/lib/libpcsclite.so"
-    ''
-    + lib.optionalString nocaps ''
-      substituteInPlace "libfreerdp/locale/keyboard_xkbfile.c" \
-        --replace "RDP_SCANCODE_CAPSLOCK" "RDP_SCANCODE_LCONTROL"
-    '';
-
-  buildInputs =
-    [
-      cairo
-      cups
-      faad2
-      ffmpeg
-      glib
-      gst-plugins-base
-      gst-plugins-good
-      gstreamer
-      libX11
-      libXcursor
-      libXdamage
-      libXdmcp
-      libXext
-      libXi
-      libXinerama
-      libXrandr
-      libXrender
-      libXtst
-      libXv
-      libjpeg_turbo
-      libpulseaudio
-      libunwind
-      libusb1
-      libxkbcommon
-      libxkbfile
-      openh264
-      openssl
-      orc
-      pcre2
-      pcsclite
-      zlib
-    ]
-    ++ optionals stdenv.hostPlatform.isLinux [
-      alsa-lib
-      systemd
-      wayland
-    ]
-    ++ optionals stdenv.hostPlatform.isDarwin [
-      AudioToolbox
-      AVFoundation
-      Carbon
-      Cocoa
-      CoreMedia
-    ]
-    ++ optionals withUnfree [
-      faac
-    ];
-
-  nativeBuildInputs = [
-    cmake
-    libxslt
-    docbook-xsl-nons
-    pkg-config
-    wayland-scanner
-  ];
-
-  doCheck = true;
-
-  # https://github.com/FreeRDP/FreeRDP/issues/8526#issuecomment-1357134746
-  cmakeFlags =
-    [
-      "-Wno-dev"
-      "-DCMAKE_INSTALL_LIBDIR=lib"
-      "-DDOCBOOKXSL_DIR=${docbook-xsl-nons}/xml/xsl/docbook"
-    ]
-    ++ lib.mapAttrsToList (k: v: "-D${k}=${cmFlag v}") {
-      BUILD_TESTING = false; # false is recommended by upstream
-      WITH_CAIRO = (cairo != null);
-      WITH_CUPS = (cups != null);
-      WITH_FAAC = (withUnfree && faac != null);
-      WITH_FAAD2 = (faad2 != null);
-      WITH_JPEG = (libjpeg_turbo != null);
-      WITH_OPENH264 = (openh264 != null);
-      WITH_OSS = false;
-      WITH_MANPAGES = withManPages;
-      WITH_PCSC = (pcsclite != null);
-      WITH_PULSE = (libpulseaudio != null);
-      WITH_SERVER = buildServer;
-      WITH_VAAPI = false; # false is recommended by upstream
-      WITH_X11 = true;
-    };
-
-  env.NIX_CFLAGS_COMPILE = toString (
-    lib.optionals stdenv.hostPlatform.isDarwin [
-      "-include AudioToolbox/AudioToolbox.h"
-    ]
-    ++ lib.optionals stdenv.cc.isClang [
-      "-Wno-error=incompatible-function-pointer-types"
-    ]
-  );
-
-  NIX_LDFLAGS = lib.optionals stdenv.hostPlatform.isDarwin [
-    "-framework AudioToolbox"
-  ];
-
-  meta = with lib; {
-    description = "Remote Desktop Protocol Client";
-    longDescription = ''
-      FreeRDP is a client-side implementation of the Remote Desktop Protocol (RDP)
-      following the Microsoft Open Specifications.
-    '';
-    homepage = "https://www.freerdp.com/";
-    changelog = "https://github.com/FreeRDP/FreeRDP/releases/tag/${src.rev}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ peterhoeg ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/applications/networking/remote/freerdp/3.nix b/pkgs/by-name/fr/freerdp/package.nix
similarity index 100%
rename from pkgs/applications/networking/remote/freerdp/3.nix
rename to pkgs/by-name/fr/freerdp/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 761a6cb61201..75b3d05b98e2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13179,18 +13179,7 @@ with pkgs;
 
   inherit (xorg) xlsfonts;
 
-  inherit
-    ({
-      freerdp = callPackage ../applications/networking/remote/freerdp {
-        inherit (darwin.apple_sdk.frameworks) AudioToolbox AVFoundation Carbon Cocoa CoreMedia;
-        inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good;
-      };
-      freerdp3 = callPackage ../applications/networking/remote/freerdp/3.nix {};
-    })
-    freerdp
-    freerdp3
-    ;
-
+  freerdp3 = freerdp;
   freerdpUnstable = freerdp;
 
   gimp = callPackage ../applications/graphics/gimp {

From c892f85e78098d835a52bb219bd22993241bc503 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Tue, 25 Mar 2025 12:48:55 +0100
Subject: [PATCH 098/108] treewide: switch to unpinned freerdp

---
 pkgs/applications/networking/remote/remmina/default.nix | 4 ++--
 pkgs/by-name/gn/gnome-remote-desktop/package.nix        | 6 +++---
 pkgs/by-name/gt/gtk-frdp/package.nix                    | 4 ++--
 pkgs/by-name/we/weston/package.nix                      | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix
index 42f36c1f7257..9020ea614166 100644
--- a/pkgs/applications/networking/remote/remmina/default.nix
+++ b/pkgs/applications/networking/remote/remmina/default.nix
@@ -15,7 +15,7 @@
   libxkbfile,
   libX11,
   python3,
-  freerdp3,
+  freerdp,
   libssh,
   libgcrypt,
   gnutls,
@@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
       gettext
       libxkbfile
       libX11
-      freerdp3
+      freerdp
       libssh
       libgcrypt
       gnutls
diff --git a/pkgs/by-name/gn/gnome-remote-desktop/package.nix b/pkgs/by-name/gn/gnome-remote-desktop/package.nix
index bcf3d0929c2e..f4f8091d28e5 100644
--- a/pkgs/by-name/gn/gnome-remote-desktop/package.nix
+++ b/pkgs/by-name/gn/gnome-remote-desktop/package.nix
@@ -21,7 +21,7 @@
   libopus,
   libxkbcommon,
   gdk-pixbuf,
-  freerdp3,
+  freerdp,
   fdk_aac,
   tpm2-tss,
   fuse3,
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     cairo
-    freerdp3
+    freerdp
     fdk_aac
     tpm2-tss
     fuse3
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
     "-Dsystemd_tmpfiles_dir=${placeholder "out"}/lib/tmpfiles.d"
     "-Dtests=false" # Too deep of a rabbit hole.
     # TODO: investigate who should be fixed here.
-    "-Dc_args=-I${freerdp3}/include/winpr3"
+    "-Dc_args=-I${freerdp}/include/winpr3"
   ];
 
   passthru = {
diff --git a/pkgs/by-name/gt/gtk-frdp/package.nix b/pkgs/by-name/gt/gtk-frdp/package.nix
index fdd63978bf43..d45904eb477d 100644
--- a/pkgs/by-name/gt/gtk-frdp/package.nix
+++ b/pkgs/by-name/gt/gtk-frdp/package.nix
@@ -9,7 +9,7 @@
   gobject-introspection,
   glib,
   gtk3,
-  freerdp3,
+  freerdp,
   fuse3,
   unstableGitUpdater,
 }:
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
   buildInputs = [
     glib
     gtk3
-    freerdp3
+    freerdp
     fuse3
   ];
 
diff --git a/pkgs/by-name/we/weston/package.nix b/pkgs/by-name/we/weston/package.nix
index 16fe178ac36f..8c31cb0b22a0 100644
--- a/pkgs/by-name/we/weston/package.nix
+++ b/pkgs/by-name/we/weston/package.nix
@@ -31,7 +31,7 @@
   pipewireSupport ? true,
   pipewire,
   rdpSupport ? true,
-  freerdp3,
+  freerdp,
   remotingSupport ? true,
   gst_all_1,
   vaapiSupport ? true,
@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
     ++ lib.optional lcmsSupport lcms2
     ++ lib.optional pangoSupport pango
     ++ lib.optional pipewireSupport pipewire
-    ++ lib.optional rdpSupport freerdp3
+    ++ lib.optional rdpSupport freerdp
     ++ lib.optionals remotingSupport [
       gst_all_1.gstreamer
       gst_all_1.gst-plugins-base

From dff5452805e81382647bae45c41767f1b6b7b1f9 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Thu, 27 Mar 2025 10:15:32 +0100
Subject: [PATCH 099/108] freerdp: deprecate aliases

---
 pkgs/top-level/aliases.nix      | 2 ++
 pkgs/top-level/all-packages.nix | 3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6ad6b4c2132f..d4d5f3efa7c7 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -508,6 +508,8 @@ mapAliases {
   fractal-next = fractal; # added 2023-11-25
   framework-system-tools = framework-tool; # added 2023-12-09
   francis = kdePackages.francis; # added 2024-07-13
+  freerdp3 = freerdp; # added 2025-03-25
+  freerdpUnstable = freerdp; # added 2025-03-25
   frostwire = throw "frostwire was removed, as it was broken due to reproducibility issues, use `frostwire-bin` package instead."; # added 2024-05-17
   ftjam = throw "ftjam was removed, as it hasn't been updated since 2007 and fails to build"; # added 2025-01-02
   fuse2fs = if stdenv.hostPlatform.isLinux then e2fsprogs.fuse2fs else null; # Added 2022-03-27 preserve, reason: convenience, arch has a package named fuse2fs too.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 75b3d05b98e2..fe790da3b7bb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13179,9 +13179,6 @@ with pkgs;
 
   inherit (xorg) xlsfonts;
 
-  freerdp3 = freerdp;
-  freerdpUnstable = freerdp;
-
   gimp = callPackage ../applications/graphics/gimp {
     autoreconfHook = buildPackages.autoreconfHook269;
     lcms = lcms2;

From ee0fc3559eef448209dc7de4ec7344f7524bf98e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 25 Mar 2025 11:25:40 +0100
Subject: [PATCH 100/108] libblake3: use older tbb

This crashes on macOS.
For consistency, use the same version on all platforms.

-------------------------------------
Translated Report (Full Report Below)
-------------------------------------

Process:               nix [69105]
Path:                  /Users/USER/*/nix
Identifier:            nix
Version:               ???
Code Type:             ARM-64 (Native)
Parent Process:        Exited process [69036]
Responsible:           ghostty [609]
User ID:               501

Date/Time:             2025-03-24 10:28:36.3531 +0100
OS Version:            macOS 15.1.1 (24B91)
Report Version:        12
Anonymous UUID:        43196E0E-30B7-6E8A-68F3-0C573FEA61E3

Sleep/Wake UUID:       C4FFF3A0-095A-4AE0-935B-60B5E7DE7522

Time Awake Since Boot: 130000 seconds
Time Since Wake:       78381 seconds

System Integrity Protection: enabled

Crashed Thread:        0  Dispatch queue: com.apple.main-thread

Exception Type:        EXC_BAD_ACCESS (SIGSEGV)
Exception Codes:       KERN_INVALID_ADDRESS at 0x000000010d7d3ff4
Exception Codes:       0x0000000000000001, 0x000000010d7d3ff4

Termination Reason:    Namespace SIGNAL, Code 11 Segmentation fault: 11
Terminating Process:   exc handler [69105]

VM Region Info: 0x10d7d3ff4 is not in any region.  Bytes after previous region: 49141  Bytes before following region: 196620
      REGION TYPE                    START - END         [ VSIZE] PRT/MAX SHRMOD  REGION DETAIL
      __LINKEDIT                  10d7c0000-10d7c8000    [   32K] r--/rwx SM=COW  /Volumes/VOLUME/*/liblowdown.1.dylib
--->  GAP OF 0x3c000 BYTES
      VM_ALLOCATE                 10d804000-10d854000    [  320K] rw-/rwx SM=PRV

Thread 0 Crashed::  Dispatch queue: com.apple.main-thread
0   ???                           	       0x10d7d3ff4 ???
1   libtbb.12.14.dylib            	       0x106abd4f8 tbb::detail::r1::__TBB_InitOnce::~__TBB_InitOnce() + 60
2   libsystem_c.dylib             	       0x1939f2998 __cxa_finalize_ranges + 476
3   libsystem_c.dylib             	       0x1939f275c exit + 44
4   libdyld.dylib                 	       0x193b5a94c dyld4::LibSystemHelpers::exit(int) const + 20
5   dyld                          	       0x1937b42c8 start + 2924

Thread 1:
0   libsystem_pthread.dylib       	       0x193b320e8 start_wqthread + 0

Thread 2:
0   libsystem_pthread.dylib       	       0x193b320e8 start_wqthread + 0

Thread 3:
0   libsystem_kernel.dylib        	       0x193b01840 __sigwait + 8
1   libsystem_pthread.dylib       	       0x193b37a9c sigwait + 40
2   libnixutil.dylib              	       0x106fae034 nix::signalHandlerThread(unsigned int) + 36 (signals.cc:62)
3   libnixutil.dylib              	       0x106fb0730 decltype(std::declval<void (*)(unsigned int)>()(std::declval<unsigned int>())) std::__1::__invoke[abi:fe190107]<void (*)(unsigned int), unsigned int>(void (*&&)(unsigned int), unsigned int&&) + 40 (invoke.h:149)
4   libnixutil.dylib              	       0x106fb06f4 void std::__1::__thread_execute[abi:fe190107]<std::__1::unique_ptr<std::__1::__thread_struct, std::__1::default_delete<std::__1::__thread_struct>>, void (*)(unsigned int), unsigned int, 2ul>(std::__1::tuple<std::__1::unique_ptr<std::__1::__thread_struct, std::__1::default_delete<std::__1::__thread_struct>>, void (*)(unsigned int), unsigned int>&, std::__1::__tuple_indices<2ul>) + 48 (thread.h:192)
5   libnixutil.dylib              	       0x106fb0340 void* std::__1::__thread_proxy[abi:fe190107]<std::__1::tuple<std::__1::unique_ptr<std::__1::__thread_struct, std::__1::default_delete<std::__1::__thread_struct>>, void (*)(unsigned int), unsigned int>>(void*) + 100 (thread.h:201)
6   libsystem_pthread.dylib       	       0x193b372e4 _pthread_start + 136
7   libsystem_pthread.dylib       	       0x193b320fc thread_start + 8

Thread 0 crashed with ARM Thread State (64-bit):
    x0: 0x000000010dc8bf80   x1: 0x000000010d7d3ff4   x2: 0x0000000000000103   x3: 0x00000001f9b12978
    x4: 0x0000000000000000   x5: 0x0000000000000000   x6: 0x0000000000000000   x7: 0x0000000000000000
    x8: 0x0000000000000000   x9: 0x0000000000000000  x10: 0x000000016b68dc40  x11: 0x000000016b68ded0
   x12: 0x0000000000000000  x13: 0x0000000000018000  x14: 0x0000000000004af0  x15: 0x00000001111477df
   x16: 0x0000000193b693b4  x17: 0x0000000200eaa590  x18: 0x0000000000000000  x19: 0x0000000106af0838
   x20: 0x0000000106af0388  x21: 0x0000000000000002  x22: 0x0000000106158030  x23: 0x0000000000000000
   x24: 0x0000000000000008  x25: 0x00000001f8c54000  x26: 0x0000000000000004  x27: 0x0000000000000003
   x28: 0x0000000000000003   fp: 0x000000016b68f7a0   lr: 0x0000000106abc110
    sp: 0x000000016b68f790   pc: 0x000000010d7d3ff4 cpsr: 0x60001000
   far: 0x000000010d7d3ff4  esr: 0x82000007 (Instruction Abort) Translation fault
---
 pkgs/by-name/li/libblake3/package.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libblake3/package.nix b/pkgs/by-name/li/libblake3/package.nix
index 68fa286d164a..89352b9c769b 100644
--- a/pkgs/by-name/li/libblake3/package.nix
+++ b/pkgs/by-name/li/libblake3/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   cmake,
   fetchFromGitHub,
-  tbb_2022_0,
+  tbb_2021_11,
   useTBB ? true,
 }:
 
@@ -22,7 +22,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ cmake ];
 
-  buildInputs = lib.optionals useTBB [ tbb_2022_0 ];
+  buildInputs = lib.optionals useTBB [
+    # 2022.0 crashes on macOS at the moment
+    tbb_2021_11
+  ];
 
   cmakeFlags = [
     (lib.cmakeBool "BLAKE3_USE_TBB" useTBB)

From 4d47b3a8561c1ec9eb7aea9110483d221afbeca1 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Thu, 27 Mar 2025 12:02:27 +0100
Subject: [PATCH 101/108] krdp: backport freerdp3 support to fix build

---
 pkgs/kde/plasma/krdp/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/kde/plasma/krdp/default.nix b/pkgs/kde/plasma/krdp/default.nix
index 0ba2cd1c2df6..2fa1c15f53fe 100644
--- a/pkgs/kde/plasma/krdp/default.nix
+++ b/pkgs/kde/plasma/krdp/default.nix
@@ -6,6 +6,7 @@
   pkg-config,
   qtwayland,
   freerdp,
+  fetchpatch,
   wayland,
   wayland-protocols,
 }:
@@ -16,6 +17,11 @@ mkKdeDerivation {
     (replaceVars ./hardcode-openssl-path.patch {
       openssl = lib.getExe openssl;
     })
+    (fetchpatch {
+      # support for freerdp3, can be dropped with krdp 6.4
+      url = "https://invent.kde.org/plasma/krdp/-/merge_requests/69.patch";
+      hash = "sha256-5x9JUbFTw/POxBW8G/BOlo/wtcUjPU9J1V/wba1EI/o=";
+    })
   ];
 
   extraNativeBuildInputs = [ pkg-config ];

From 4dc6984b698d634d878bac53ba42f408fb240bfd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 17 Mar 2025 12:44:05 +0000
Subject: [PATCH 102/108] nuclear: 0.6.42 -> 0.6.43

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

diff --git a/pkgs/by-name/nu/nuclear/package.nix b/pkgs/by-name/nu/nuclear/package.nix
index dddac219c269..ad1b1ba9b0c5 100644
--- a/pkgs/by-name/nu/nuclear/package.nix
+++ b/pkgs/by-name/nu/nuclear/package.nix
@@ -5,7 +5,7 @@
 }:
 let
   pname = "nuclear";
-  version = "0.6.42";
+  version = "0.6.43";
 
   src = fetchurl {
     # Nuclear currently only publishes AppImage releases for x86_64, which is hardcoded in
@@ -13,7 +13,7 @@ let
     # provide more arches, we should use stdenv.hostPlatform to determine the arch and choose
     # source URL accordingly.
     url = "https://github.com/nukeop/nuclear/releases/download/v${version}/${pname}-v${version}-x86_64.AppImage";
-    hash = "sha256-95Q8TEn2gvJu75vgDdzSYH/1ci3BlidQ5nKA53fas6U=";
+    hash = "sha256-kruQ9h/0dYWIsjX8P2Em7v5weGd4B5hZbu/VldeAGRU=";
   };
 
   appimageContents = appimageTools.extract { inherit pname version src; };

From e5fc692ea19ee52c6b817224f1f39506a43c6927 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Thu, 27 Mar 2025 03:52:40 +0800
Subject: [PATCH 103/108] yay: init at 12.4.2

---
 pkgs/by-name/ya/yay/package.nix | 73 +++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 pkgs/by-name/ya/yay/package.nix

diff --git a/pkgs/by-name/ya/yay/package.nix b/pkgs/by-name/ya/yay/package.nix
new file mode 100644
index 000000000000..27e454f6bc6d
--- /dev/null
+++ b/pkgs/by-name/ya/yay/package.nix
@@ -0,0 +1,73 @@
+{
+  lib,
+  stdenv,
+  buildGoModule,
+  fetchFromGitHub,
+  pacman,
+  libarchive,
+  installShellFiles,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "yay";
+  version = "12.4.2";
+
+  src = fetchFromGitHub {
+    owner = "Jguer";
+    repo = "yay";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-QLkqpeHVdR9dxhSGl2wQ7WL1mX6JJm3z6pLeI37z3oM=";
+  };
+
+  vendorHash = "sha256-BKxhRa2y/liBDtMLg0Rlf/ysjQOgIaFjXbPWYBw53Po=";
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  buildInputs = [
+    pacman
+    libarchive
+  ];
+
+  env.CGO_ENABLED = 1;
+
+  checkFlags =
+    let
+      skippedTests = [
+        # need fhs
+        "TestAlpmExecutor"
+        "TestBuildRuntime"
+        "TestPacmanConf"
+        # need su/sudo/doas
+        "TestNewConfig"
+        "TestNewConfigAURDEST"
+        "TestNewConfigAURDESTTildeExpansion"
+        "TestConfiguration_setPrivilegeElevator"
+        "TestConfiguration_setPrivilegeElevator_su"
+        "TestConfiguration_setPrivilegeElevator_no_path"
+        "TestConfiguration_setPrivilegeElevator_doas"
+        "TestConfiguration_setPrivilegeElevator_pacman_auth_doas"
+        "TestConfiguration_setPrivilegeElevator_custom_script"
+        "TestConfiguration_setPrivilegeElevator_pacman_auth_sudo"
+      ];
+    in
+    [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
+
+  postInstall =
+    ''
+      installManPage doc/yay.8
+    ''
+    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+      installShellCompletion --name yay.bash --bash completions/bash
+      installShellCompletion --name yay.fish --fish completions/fish
+      installShellCompletion --name _yay --zsh completions/zsh
+    '';
+
+  meta = {
+    description = "AUR Helper written in Go";
+    homepage = "https://github.com/Jguer/yay";
+    mainProgram = "yay";
+    platforms = lib.platforms.linux;
+    license = with lib.licenses; [ gpl3Plus ];
+    maintainers = with lib.maintainers; [ emaryn ];
+  };
+})

From acdcd27da6376f5db109612429aeba0d17757a92 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 16 Mar 2025 23:06:16 +0000
Subject: [PATCH 104/108] rocketchat-desktop: 4.1.2 -> 4.2.0

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

diff --git a/pkgs/by-name/ro/rocketchat-desktop/package.nix b/pkgs/by-name/ro/rocketchat-desktop/package.nix
index 0f764f66518c..081215e4dc39 100644
--- a/pkgs/by-name/ro/rocketchat-desktop/package.nix
+++ b/pkgs/by-name/ro/rocketchat-desktop/package.nix
@@ -10,11 +10,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "rocketchat-desktop";
-  version = "4.1.2";
+  version = "4.2.0";
 
   src = fetchurl {
     url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat-${version}-linux-amd64.deb";
-    hash = "sha256-lcMxBEcZkJARFd+ZQTAdLQLVy4/SIi4ps8N798PomyM=";
+    hash = "sha256-6eoZbjmwzvXz7u+zkyrvzebens8GF9jGQA40cKxX26M=";
   };
 
   nativeBuildInputs = [

From c1b451eabc00cdcb55b953b70fe1770f3deea228 Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Sun, 16 Mar 2025 19:43:41 +0200
Subject: [PATCH 105/108] koboldcpp: 1.85 -> 1.86.2

Changelog: https://github.com/LostRuins/koboldcpp/releases/tag/v1.86.2
---
 pkgs/by-name/ko/koboldcpp/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix
index 6cfe8bc0b4c2..c79ae4a3475e 100644
--- a/pkgs/by-name/ko/koboldcpp/package.nix
+++ b/pkgs/by-name/ko/koboldcpp/package.nix
@@ -40,13 +40,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "koboldcpp";
-  version = "1.85";
+  version = "1.86.2";
 
   src = fetchFromGitHub {
     owner = "LostRuins";
     repo = "koboldcpp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ahmZmCnIjbFDVkAX0JtEJerhb9qzEhh+X/dxrB72HjI=";
+    hash = "sha256-zB/X4tfygpf3ZrQ9FtQCd3sxN11Ewlxz1+YCiw7iUZU=";
   };
 
   enableParallelBuilding = true;

From 42d70d393c4122c857a5eadad5cc773f869b4f5b Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Thu, 27 Mar 2025 12:23:57 +0100
Subject: [PATCH 106/108] krdc: temporarily disable rdp support

---
 pkgs/kde/gear/krdc/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/kde/gear/krdc/default.nix b/pkgs/kde/gear/krdc/default.nix
index 301b214f280d..ca6864e87903 100644
--- a/pkgs/kde/gear/krdc/default.nix
+++ b/pkgs/kde/gear/krdc/default.nix
@@ -1,4 +1,5 @@
 {
+  lib,
   mkKdeDerivation,
   pkg-config,
   shared-mime-info,
@@ -10,6 +11,13 @@
 mkKdeDerivation {
   pname = "krdc";
 
+  # freerdp3 is not yet supported by 24.12 version of krdc
+  # can be dropped with 25.04 kdePackages release, as that will default to freerdp3
+  # backporting freerdp3 support is non-trivial
+  cmakeFlags = [
+    (lib.cmakeBool "WITH_RDP" false)
+  ];
+
   extraNativeBuildInputs = [
     pkg-config
     shared-mime-info

From 37f622fbb7a94bc482666c36df44ad13e5347498 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Wed, 26 Mar 2025 19:43:01 -0400
Subject: [PATCH 107/108] telegram-desktop: 5.12.3 -> 5.13.0

Diff: https://github.com/telegramdesktop/tdesktop/compare/v5.12.3...v5.13.0

Changelog: https://github.com/telegramdesktop/tdesktop/releases/tag/v5.13.0
---
 .../telegram/telegram-desktop/unwrapped.nix                   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix
index 0fecbe861422..f48ad7e674a9 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix
@@ -46,14 +46,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "telegram-desktop-unwrapped";
-  version = "5.12.3";
+  version = "5.13.0";
 
   src = fetchFromGitHub {
     owner = "telegramdesktop";
     repo = "tdesktop";
     rev = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-foXIxFAE2a9AsHbqJKnqswW5EYSYu54DATKp//ixcVU=";
+    hash = "sha256-xepBk0sQkiiqoDGaynmKFqjNm4VHcclKrr7mYdLkExs=";
   };
 
   postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''

From 393056823fb256cd49c62cf3a071c401df43e608 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Wed, 26 Mar 2025 22:50:19 -0400
Subject: [PATCH 108/108] telegram-desktop: 5.13.0 -> 5.13.1

Diff: https://github.com/telegramdesktop/tdesktop/compare/v5.13.0...v5.13.1

Changelog: https://github.com/telegramdesktop/tdesktop/releases/tag/v5.13.1
---
 .../telegram/telegram-desktop/unwrapped.nix                   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix
index f48ad7e674a9..b4ab76aebe29 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix
@@ -46,14 +46,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "telegram-desktop-unwrapped";
-  version = "5.13.0";
+  version = "5.13.1";
 
   src = fetchFromGitHub {
     owner = "telegramdesktop";
     repo = "tdesktop";
     rev = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-xepBk0sQkiiqoDGaynmKFqjNm4VHcclKrr7mYdLkExs=";
+    hash = "sha256-E9d5jWw4HeCO4sqDB0tXXgxM91kg1Gixi9B0xZQYe14=";
   };
 
   postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''