From da3e442de894c53ad34fc1f15674d7201196a669 Mon Sep 17 00:00:00 2001
From: Axel Karjalainen <axel@axka.fi>
Date: Mon, 24 Mar 2025 16:53:01 +0200
Subject: [PATCH 001/103] jnitrace: init at 3.3.1

---
 pkgs/by-name/jn/jnitrace/package.nix | 30 ++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 pkgs/by-name/jn/jnitrace/package.nix

diff --git a/pkgs/by-name/jn/jnitrace/package.nix b/pkgs/by-name/jn/jnitrace/package.nix
new file mode 100644
index 000000000000..52d31747dbf3
--- /dev/null
+++ b/pkgs/by-name/jn/jnitrace/package.nix
@@ -0,0 +1,30 @@
+{
+  lib,
+  fetchPypi,
+  python3Packages,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "jnitrace";
+  version = "3.3.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-b8azmlYbNEFSUN3MjqpUqNlBTKT0JTLpCVBkk9Rx7+0=";
+  };
+
+  dependencies = with python3Packages; [
+    frida-python
+    colorama
+    hexdump
+    setuptools
+  ];
+
+  meta = {
+    description = "Frida based tool that traces usage of the JNI API in Android apps";
+    homepage = "https://github.com/chame1eon/jnitrace";
+    maintainers = [ lib.maintainers.axka ];
+    license = lib.licenses.mit;
+    mainProgram = "jnitrace";
+  };
+}

From b541d837f44a42a1408c97ba08c5564bba541a84 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Fri, 9 May 2025 08:34:23 +0800
Subject: [PATCH 002/103] mint: 0.23.2 -> 0.24.1

Diff: https://github.com/mint-lang/mint/compare/0.23.2...0.24.1
---
 pkgs/by-name/mi/mint/package.nix | 6 +++---
 pkgs/by-name/mi/mint/shards.nix  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/mi/mint/package.nix b/pkgs/by-name/mi/mint/package.nix
index 17b994f0b53e..b6b98791ac96 100644
--- a/pkgs/by-name/mi/mint/package.nix
+++ b/pkgs/by-name/mi/mint/package.nix
@@ -8,13 +8,13 @@
 
 crystal.buildCrystalPackage rec {
   pname = "mint";
-  version = "0.23.2";
+  version = "0.24.1";
 
   src = fetchFromGitHub {
     owner = "mint-lang";
     repo = "mint";
-    rev = version;
-    hash = "sha256-cPx0/BrD2w7LlH5xO9hKlHndNmVm8jpN7cti5/eZ1m4=";
+    tag = version;
+    hash = "sha256-gMR/FUp/pOC0TQy6ENH3pIxK43hrHEciT17aGqXVKc8=";
   };
 
   format = "shards";
diff --git a/pkgs/by-name/mi/mint/shards.nix b/pkgs/by-name/mi/mint/shards.nix
index 2579fbe3b23f..53ceabfa26dd 100644
--- a/pkgs/by-name/mi/mint/shards.nix
+++ b/pkgs/by-name/mi/mint/shards.nix
@@ -16,8 +16,8 @@
   };
   baked_file_system = {
     url = "https://github.com/schovi/baked_file_system.git";
-    rev = "v0.10.0";
-    sha256 = "10f25sby8ipps5c2jj4j2q30kscgv4g1s5nhdddmldhg9isj0jli";
+    rev = "ea0b659f43d7ce00bde66e8a87eeb4d5a112621b";
+    sha256 = "0zxwmznmh8aazjhlf9j5nxqnij74hb2j4kad48p706bzv3m5bymg";
   };
   dotenv = {
     url = "https://github.com/gdotdesign/cr-dotenv.git";

From 84124e008ccb71c55235f38f8849d86cc12c4db0 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Fri, 9 May 2025 11:03:33 +0800
Subject: [PATCH 003/103] ms-sys: 2.6.0 -> 2.7.0

---
 .../manpages-without-build-timestamps.patch    | 12 ------------
 pkgs/by-name/ms/ms-sys/package.nix             | 18 ++++++++----------
 2 files changed, 8 insertions(+), 22 deletions(-)
 delete mode 100644 pkgs/by-name/ms/ms-sys/manpages-without-build-timestamps.patch

diff --git a/pkgs/by-name/ms/ms-sys/manpages-without-build-timestamps.patch b/pkgs/by-name/ms/ms-sys/manpages-without-build-timestamps.patch
deleted file mode 100644
index 7b031cb34f1a..000000000000
--- a/pkgs/by-name/ms/ms-sys/manpages-without-build-timestamps.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u ms-sys-2.6.0/Makefile ms-sys-2.6.0-fixed/Makefile
---- ms-sys-2.6.0/Makefile	2015-09-27 20:39:45.000000000 +0200
-+++ ms-sys-2.6.0-fixed/Makefile2020-01-06 16:43:55.181477511 +0100
-@@ -121,7 +121,7 @@
-
- $(DESTDIR)$(MANDIR)/%: $(MAN)/$(dir $(*D))/$(*F)
- 	install -D -m 644 $(MAN)/$(dir $(*D))$(*F) $@
--	gzip -f $@
-+	gzip -n -f $@
-
- #$(DESTDIR)$(MANDIR)/%: $(MAN)/$(*F)
- #	echo t: $<
diff --git a/pkgs/by-name/ms/ms-sys/package.nix b/pkgs/by-name/ms/ms-sys/package.nix
index 482f7602a40d..3efa81608c2d 100644
--- a/pkgs/by-name/ms/ms-sys/package.nix
+++ b/pkgs/by-name/ms/ms-sys/package.nix
@@ -5,16 +5,14 @@
   gettext,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "ms-sys";
-  version = "2.6.0";
+  version = "2.7.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/ms-sys/ms-sys-${version}.tar.gz";
-    sha256 = "06xqpm2s9cg8fj7a1822wmh3p4arii0sifssazg1gr6i7xg7kbjz";
+    url = "mirror://sourceforge/ms-sys/ms-sys-${finalAttrs.version}.tar.gz";
+    hash = "sha256-a4Rs9BwX/nhGfLbNzqQapWvzwhHIKLfFaehJYszQ9RQ=";
   };
-  # TODO: Remove with next release, see https://sourceforge.net/p/ms-sys/patches/8/
-  patches = [ ./manpages-without-build-timestamps.patch ];
 
   nativeBuildInputs = [ gettext ];
 
@@ -22,11 +20,11 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "PREFIX=$(out)" ];
 
-  meta = with lib; {
+  meta = {
     description = "Program for writing Microsoft-compatible boot records";
     homepage = "https://ms-sys.sourceforge.net/";
-    license = licenses.gpl2Plus;
-    platforms = with platforms; linux;
+    license = lib.licenses.gpl2Plus;
+    platforms = with lib.platforms; linux;
     mainProgram = "ms-sys";
   };
-}
+})

From e7ddf711a7d5fc62219cb6e5abbd8fb66f31dc50 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sun, 11 May 2025 15:23:22 +0800
Subject: [PATCH 004/103] libndctl: 79 -> 81

Diff: https://github.com/pmem/ndctl/compare/v79...v81
---
 pkgs/by-name/li/libndctl/package.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/li/libndctl/package.nix b/pkgs/by-name/li/libndctl/package.nix
index 61d0704897b9..4551b80eaa4f 100644
--- a/pkgs/by-name/li/libndctl/package.nix
+++ b/pkgs/by-name/li/libndctl/package.nix
@@ -12,17 +12,19 @@
   kmod,
   udev,
   util-linux,
+  libtracefs,
+  libtraceevent,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libndctl";
-  version = "79";
+  version = "81";
 
   src = fetchFromGitHub {
     owner = "pmem";
     repo = "ndctl";
-    rev = "v${version}";
-    sha256 = "sha256-gG1Rz5AtDLzikGFr8A3l25ypd+VoLw2oWjszy9ogDLk=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-geOfaI5XehucLanNS8KTIyOAXOS5YSjs61hfrWbmqSs=";
   };
 
   patches = lib.optionals (!stdenv.hostPlatform.isGnu) [
@@ -52,12 +54,13 @@ stdenv.mkDerivation rec {
     kmod
     udev
     util-linux
+    libtracefs
+    libtraceevent
   ];
 
   mesonFlags = [
     (lib.mesonOption "rootprefix" "${placeholder "out"}")
     (lib.mesonOption "sysconfdir" "${placeholder "out"}/etc/ndctl.conf.d")
-    (lib.mesonEnable "libtracefs" false)
     # Use asciidoctor due to xmlto errors
     (lib.mesonEnable "asciidoctor" true)
     (lib.mesonEnable "systemd" false)
@@ -70,7 +73,7 @@ stdenv.mkDerivation rec {
     substituteInPlace git-version --replace-fail /bin/bash ${stdenv.shell}
     substituteInPlace git-version-gen --replace-fail /bin/sh ${stdenv.shell}
 
-    echo "m4_define([GIT_VERSION], [${version}])" > version.m4;
+    echo "m4_define([GIT_VERSION], [${finalAttrs.version}])" > version.m4;
   '';
 
   meta = {
@@ -80,4 +83,4 @@ stdenv.mkDerivation rec {
     maintainers = with lib.maintainers; [ thoughtpolice ];
     platforms = lib.platforms.linux;
   };
-}
+})

From 5f478b3a2bf44e0a77b318a31c8f2cbfe46365b5 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Mon, 12 May 2025 12:35:30 +0800
Subject: [PATCH 005/103] netexec: 1.3.0 -> 1.4.0

Diff: https://github.com/Pennyw0rth/NetExec/compare/refs/tags/v1.3.0...refs/tags/v1.4.0

Changelog: https://github.com/Pennyw0rth/NetExec/releases/tag/v1.4.0
---
 pkgs/by-name/ne/netexec/package.nix | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/ne/netexec/package.nix b/pkgs/by-name/ne/netexec/package.nix
index 0b7913cd8657..747103618c22 100644
--- a/pkgs/by-name/ne/netexec/package.nix
+++ b/pkgs/by-name/ne/netexec/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchFromGitHub,
   python3,
+  writableTmpDirAsHomeHook,
 }:
 let
   python = python3.override {
@@ -27,14 +28,14 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "netexec";
-  version = "1.3.0";
+  version = "1.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Pennyw0rth";
     repo = "NetExec";
     tag = "v${version}";
-    hash = "sha256-Pub7PAw6CTN4c/PHTPE9KcnDR2a6hSza1ODp3EWMOH0=";
+    hash = "sha256-1yNnnPntJ5aceX3Z8yYAMLv5bSFfCFVp0pgxAySlVfE=";
   };
 
   pythonRelaxDeps = true;
@@ -46,8 +47,9 @@ python.pkgs.buildPythonApplication rec {
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace-fail '{ git = "https://github.com/fortra/impacket.git" }' '"*"' \
-      --replace-fail '{ git = "https://github.com/Pennyw0rth/NfsClient" }' '"*"'
+      --replace-fail " @ git+https://github.com/fortra/impacket.git" "" \
+      --replace-fail " @ git+https://github.com/wbond/oscrypto" "" \
+      --replace-fail " @ git+https://github.com/Pennyw0rth/NfsClient" ""
   '';
 
   build-system = with python.pkgs; [
@@ -56,6 +58,7 @@ python.pkgs.buildPythonApplication rec {
   ];
 
   dependencies = with python.pkgs; [
+    jwt
     aardwolf
     aioconsole
     aiosqlite
@@ -89,15 +92,11 @@ python.pkgs.buildPythonApplication rec {
     xmltodict
   ];
 
-  nativeCheckInputs = with python.pkgs; [ pytestCheckHook ];
+  nativeCheckInputs = with python.pkgs; [ pytestCheckHook ] ++ [ writableTmpDirAsHomeHook ];
 
   # Tests no longer works out-of-box with 1.3.0
   doCheck = false;
 
-  preCheck = ''
-    export HOME=$(mktemp -d)
-  '';
-
   meta = {
     description = "Network service exploitation tool (maintained fork of CrackMapExec)";
     homepage = "https://github.com/Pennyw0rth/NetExec";

From 7cfb663639a1dbfd07c9dfd6cc7fdc6df7012d90 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Mon, 12 May 2025 14:23:45 +0800
Subject: [PATCH 006/103] netlogo: 6.1.1 -> 6.4.0

---
 pkgs/by-name/ne/netlogo/package.nix | 83 +++++++++++++++--------------
 1 file changed, 43 insertions(+), 40 deletions(-)

diff --git a/pkgs/by-name/ne/netlogo/package.nix b/pkgs/by-name/ne/netlogo/package.nix
index f7375bc7c78d..168ad2a917af 100644
--- a/pkgs/by-name/ne/netlogo/package.nix
+++ b/pkgs/by-name/ne/netlogo/package.nix
@@ -1,57 +1,60 @@
 {
-  jre,
   lib,
   stdenv,
   fetchurl,
-  makeWrapper,
+  jre,
+  makeBinaryWrapper,
+  copyDesktopItems,
   makeDesktopItem,
 }:
 
 let
-
-  desktopItem = makeDesktopItem rec {
-    name = "netlogo";
-    exec = name;
-    icon = name;
-    comment = "A multi-agent programmable modeling environment";
-    desktopName = "NetLogo";
-    categories = [ "Science" ];
-  };
-
-in
-
-stdenv.mkDerivation rec {
-  pname = "netlogo";
-  version = "6.1.1";
-
-  src = fetchurl {
-    url = "https://ccl.northwestern.edu/netlogo/${version}/NetLogo-${version}-64.tgz";
-    sha256 = "1j08df68pgggxqkmpzd369w4h97q0pivmmljdb48hjghx7hacblp";
-  };
-
-  src1 = fetchurl {
+  desktopicon = fetchurl {
     name = "netlogo.png";
     url = "https://netlogoweb.org/assets/images/desktopicon.png";
-    sha256 = "1i43lhr31lzva8d2r0dxpcgr58x496gb5vmb0h2da137ayvifar8";
+    hash = "sha256-KCsXt1dnBNUEBKvusp5JpKOSH7u9gSwaUvvTMDKkg8Q=";
+  };
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "netlogo";
+  version = "6.4.0";
+
+  src = fetchurl {
+    url = "https://ccl.northwestern.edu/netlogo/${finalAttrs.version}/NetLogo-${finalAttrs.version}-64.tgz";
+    hash = "sha256-hkciO0KC4L4+YtycRSB/gkELpj3SiSsIrylAy6pq0d4=";
   };
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [
+    makeBinaryWrapper
+    copyDesktopItems
+  ];
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "netlogo";
+      exec = "netlogo";
+      icon = "netlogo";
+      comment = "A multi-agent programmable modeling environment";
+      desktopName = "NetLogo";
+      categories = [ "Science" ];
+    })
+  ];
 
   installPhase = ''
-    mkdir -pv $out/share/netlogo $out/share/icons/hicolor/256x256/apps $out/share/applications $out/share/doc
-    cp -rv app $out/share/netlogo
-    cp -v readme.md $out/share/doc/
+    runHook preInstall
 
+    mkdir -p $out/opt
+    cp -r lib/app $out/opt/netlogo
     # launcher with `cd` is required b/c otherwise the model library isn't usable
-    makeWrapper "${jre}/bin/java" "$out/bin/netlogo" \
-      --chdir "$out/share/netlogo/app" \
-      --add-flags "-jar netlogo-${version}.jar"
+    makeWrapper ${jre}/bin/java $out/bin/netlogo \
+      --chdir $out/opt/netlogo \
+      --add-flags "-jar netlogo-${finalAttrs.version}.jar"
+    install -Dm644 ${desktopicon} $out/share/pixmaps/netlogo.png
 
-    cp $src1 $out/share/icons/hicolor/256x256/apps/netlogo.png
-    cp ${desktopItem}/share/applications/* $out/share/applications
+    runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Multi-agent programmable modeling environment";
     mainProgram = "netlogo";
     longDescription = ''
@@ -59,9 +62,9 @@ stdenv.mkDerivation rec {
       many tens of thousands of students, teachers and researchers worldwide.
     '';
     homepage = "https://ccl.northwestern.edu/netlogo/index.shtml";
-    sourceProvenance = with sourceTypes; [ binaryBytecode ];
-    license = licenses.gpl2;
-    maintainers = [ maintainers.dpaetzel ];
-    platforms = platforms.linux;
+    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+    license = lib.licenses.gpl2;
+    maintainers = [ lib.maintainers.dpaetzel ];
+    platforms = lib.platforms.linux;
   };
-}
+})

From 506a3ffeedf7907b8e7c4b7d9c98614878aadd58 Mon Sep 17 00:00:00 2001
From: kpbaks <kristoffer.pbs@tuta.io>
Date: Wed, 7 May 2025 20:30:33 +0200
Subject: [PATCH 007/103] oci2git: init at 0.1.4

Update pkgs/by-name/oc/oci2git/package.nix

Co-authored-by: awwpotato <awwpotato@voidq.com>
---
 pkgs/by-name/oc/oci2git/package.nix | 46 +++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 pkgs/by-name/oc/oci2git/package.nix

diff --git a/pkgs/by-name/oc/oci2git/package.nix b/pkgs/by-name/oc/oci2git/package.nix
new file mode 100644
index 000000000000..98591d2d1292
--- /dev/null
+++ b/pkgs/by-name/oc/oci2git/package.nix
@@ -0,0 +1,46 @@
+{
+  fetchFromGitHub,
+  lib,
+  nix-update-script,
+  openssl,
+  pkg-config,
+  rustPlatform,
+  versionCheckHook,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "oci2git";
+  version = "0.1.4";
+
+  src = fetchFromGitHub {
+    owner = "Virviil";
+    repo = "oci2git";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-vz4OqRg7CYliAswQWtzEWUb7Z10fwxDhYrvQ3q4ZtPA=";
+  };
+
+  cargoHash = "sha256-Aj93f+L4h1FxHpWehD11sTPXTFsg2B9rJ96mSJ/VVQ4=";
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    openssl
+  ];
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Introspecting Docker images as easy as using Git";
+    homepage = "https://github.com/Virviil/oci2git";
+    changelog = "https://github.com/Virviil/oci2git/releases/tag/v${finalAttrs.version}";
+    license = [ lib.licenses.mit ];
+    maintainers = [ lib.maintainers.kpbaks ];
+    mainProgram = "oci2git";
+    platforms = lib.platforms.all;
+  };
+})

From 2143771374d7906552b48cd22d3261c7f8f459c8 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Wed, 14 May 2025 23:05:53 +0200
Subject: [PATCH 008/103] lomiri.lomiri-filemanager-app: 1.1.3 -> 1.1.4

---
 .../applications/lomiri-filemanager-app/default.nix       | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/lomiri/applications/lomiri-filemanager-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-filemanager-app/default.nix
index 31c006767689..cb7b7ca5e07e 100644
--- a/pkgs/desktops/lomiri/applications/lomiri-filemanager-app/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri-filemanager-app/default.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-filemanager-app";
-  version = "1.1.3";
+  version = "1.1.4";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/apps/lomiri-filemanager-app";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-qOzQba1NJBH1hE3XYQQowfkggLlaZl6Vz8uVW7dCzWI=";
+    hash = "sha256-2NDz9XcUMEYHOLaomTVImjuQHLzZ/pat/Fe9uWe29as=";
   };
 
   postPatch = ''
@@ -81,7 +81,9 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "File Manager application for Ubuntu Touch devices";
     homepage = "https://gitlab.com/ubports/development/apps/lomiri-filemanager-app";
-    changelog = "https://gitlab.com/ubports/development/apps/lomiri-filemanager-app/-/blob/v${finalAttrs.version}/ChangeLog";
+    changelog = "https://gitlab.com/ubports/development/apps/lomiri-filemanager-app/-/blob/${
+      if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev
+    }/ChangeLog";
     license = lib.licenses.gpl3Only;
     mainProgram = "lomiri-filemanager-app";
     teams = [ lib.teams.lomiri ];

From 66301f51a371c9d7af9dc27688ff374ca9526195 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Wed, 14 May 2025 23:38:38 +0200
Subject: [PATCH 009/103] nixosTests.lomiri-filemanager-app: Fix OCR

---
 nixos/tests/lomiri-filemanager-app.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/lomiri-filemanager-app.nix b/nixos/tests/lomiri-filemanager-app.nix
index efde3a01c114..ef0556875e38 100644
--- a/nixos/tests/lomiri-filemanager-app.nix
+++ b/nixos/tests/lomiri-filemanager-app.nix
@@ -34,14 +34,22 @@
     machine.wait_for_x()
 
     with subtest("lomiri filemanager launches"):
-        machine.execute("lomiri-filemanager-app >&2 &")
+        machine.succeed("lomiri-filemanager-app >&2 &")
+        machine.wait_for_console_text("QFSFileEngine::open: No file name specified")
+        machine.sleep(10)
+        machine.send_key("alt-f10")
+        machine.sleep(5)
         machine.wait_for_text(r"(filemanager.ubports|alice|items|directories|files|folder)")
         machine.screenshot("lomiri-filemanager_open")
 
     machine.succeed("pkill -f lomiri-filemanager-app")
 
     with subtest("lomiri filemanager localisation works"):
-        machine.execute("env LANG=de_DE.UTF-8 lomiri-filemanager-app >&2 &")
+        machine.succeed("env LANG=de_DE.UTF-8 lomiri-filemanager-app >&2 &")
+        machine.wait_for_console_text("QFSFileEngine::open: No file name specified")
+        machine.sleep(10)
+        machine.send_key("alt-f10")
+        machine.sleep(5)
         machine.wait_for_text(r"(Elemente|Verzeichnisse|Dateien|Ordner)")
         machine.screenshot("lomiri-filemanager_localised")
   '';

From 4ff9a06625459158727004b9eb1d4e3bb72bdfb6 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Fri, 16 May 2025 08:48:45 +0800
Subject: [PATCH 010/103] navicat-premium: 17.2.2 -> 17.2.3

---
 pkgs/by-name/na/navicat-premium/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/na/navicat-premium/package.nix b/pkgs/by-name/na/navicat-premium/package.nix
index f4e715411b76..74eba0859009 100644
--- a/pkgs/by-name/na/navicat-premium/package.nix
+++ b/pkgs/by-name/na/navicat-premium/package.nix
@@ -1,22 +1,22 @@
 {
-  fetchurl,
-  appimageTools,
   lib,
   stdenv,
+  fetchurl,
+  appimageTools,
 }:
 let
   pname = "navicat-premium";
-  version = "17.2.2";
+  version = "17.2.3";
 
   src =
     {
       x86_64-linux = fetchurl {
-        url = "https://web.archive.org/web/20250409204831/https://dn.navicat.com/download/navicat17-premium-en-x86_64.AppImage";
-        hash = "sha256-btSHD4hDqaqtdiwgd6jJraUqTcS4lGabPD/Q+UJS6KM=";
+        url = "https://web.archive.org/web/20250516003452/https://dn.navicat.com/download/navicat17-premium-en-x86_64.AppImage";
+        hash = "sha256-QGz+0D0rNkuzkLxLO/tFlif4X4Zuzpb+btkqKNOBi7c=";
       };
       aarch64-linux = fetchurl {
-        url = "https://web.archive.org/web/20250409211232/https://dn.navicat.com/download/navicat17-premium-en-aarch64.AppImage";
-        hash = "sha256-D7dVxcHdrlc2Exa+gR8MkY8Tk9+afZXTRTvNzGWGOco=";
+        url = "https://web.archive.org/web/20250516004158/https://dn.navicat.com/download/navicat17-premium-en-aarch64.AppImage";
+        hash = "sha256-hxaqK9dPm/0mL3+LoQFeVSe14AD+tfYSNvEC9JsUvRE=";
       };
     }
     .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

From eea6cf304007fa52212d9bac99228ba853dddc7b Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sat, 17 May 2025 19:23:40 +0000
Subject: [PATCH 011/103] proxypin: 1.1.8 -> 1.1.9

---
 pkgs/by-name/pr/proxypin/package.nix       |   4 +-
 pkgs/by-name/pr/proxypin/pubspec.lock.json | 108 ++++++++++++++++++---
 2 files changed, 96 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/pr/proxypin/package.nix b/pkgs/by-name/pr/proxypin/package.nix
index 9477c9d7c671..3318ff99ea94 100644
--- a/pkgs/by-name/pr/proxypin/package.nix
+++ b/pkgs/by-name/pr/proxypin/package.nix
@@ -7,13 +7,13 @@
 
 flutter329.buildFlutterApplication rec {
   pname = "proxypin";
-  version = "1.1.8";
+  version = "1.1.9";
 
   src = fetchFromGitHub {
     owner = "wanghongenpin";
     repo = "proxypin";
     tag = "v${version}";
-    hash = "sha256-SLAm/Ab6/LgDFV/bUdBOTdNBFFh4+F+OrYFxjv5X3wo=";
+    hash = "sha256-yYZUXgWM7e1+TUvOid1X3WXlAGbUzDHrMXptPXKhuA8=";
   };
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;
diff --git a/pkgs/by-name/pr/proxypin/pubspec.lock.json b/pkgs/by-name/pr/proxypin/pubspec.lock.json
index 61fe885f77e7..93f5bb12823d 100644
--- a/pkgs/by-name/pr/proxypin/pubspec.lock.json
+++ b/pkgs/by-name/pr/proxypin/pubspec.lock.json
@@ -145,11 +145,11 @@
       "dependency": "direct main",
       "description": {
         "name": "device_info_plus",
-        "sha256": "306b78788d1bb569edb7c55d622953c2414ca12445b41c9117963e03afc5c513",
+        "sha256": "0c6396126421b590089447154c5f98a5de423b70cfb15b1578fd018843ee6f53",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "11.3.3"
+      "version": "11.4.0"
     },
     "device_info_plus_platform_interface": {
       "dependency": "transitive",
@@ -205,11 +205,11 @@
       "dependency": "direct main",
       "description": {
         "name": "file_picker",
-        "sha256": "8986dec4581b4bcd4b6df5d75a2ea0bede3db802f500635d05fa8be298f9467f",
+        "sha256": "77f8e81d22d2a07d0dee2c62e1dda71dc1da73bf43bb2d45af09727406167964",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.1.2"
+      "version": "10.1.9"
     },
     "fixnum": {
       "dependency": "transitive",
@@ -350,11 +350,11 @@
       "dependency": "transitive",
       "description": {
         "name": "http",
-        "sha256": "fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f",
+        "sha256": "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.0"
+      "version": "1.4.0"
     },
     "http_parser": {
       "dependency": "transitive",
@@ -600,21 +600,21 @@
       "dependency": "direct main",
       "description": {
         "name": "permission_handler",
-        "sha256": "59adad729136f01ea9e35a48f5d1395e25cba6cea552249ddbe9cf950f5d7849",
+        "sha256": "2d070d8684b68efb580a5997eb62f675e8a885ef0be6e754fb9ef489c177470f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "11.4.0"
+      "version": "12.0.0+1"
     },
     "permission_handler_android": {
       "dependency": "transitive",
       "description": {
         "name": "permission_handler_android",
-        "sha256": "d3971dcdd76182a0c198c096b5db2f0884b0d4196723d21a866fc4cdea057ebc",
+        "sha256": "1e3bc410ca1bf84662104b100eb126e066cb55791b7451307f9708d4007350e6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "12.1.0"
+      "version": "13.0.1"
     },
     "permission_handler_apple": {
       "dependency": "transitive",
@@ -1046,11 +1046,11 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_web",
-        "sha256": "3ba963161bd0fe395917ba881d320b9c4f6dd3c4a233da62ab18a5025c85f1e9",
+        "sha256": "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.0"
+      "version": "2.4.1"
     },
     "url_launcher_windows": {
       "dependency": "transitive",
@@ -1116,11 +1116,11 @@
       "dependency": "transitive",
       "description": {
         "name": "win32",
-        "sha256": "dc6ecaa00a7c708e5b4d10ee7bec8c270e9276dfcab1783f57e9962d7884305f",
+        "sha256": "329edf97fdd893e0f1e3b9e88d6a0e627128cc17cc316a8d67fda8f1451178ba",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.12.0"
+      "version": "5.13.0"
     },
     "win32_registry": {
       "dependency": "transitive",
@@ -1171,6 +1171,86 @@
       },
       "source": "hosted",
       "version": "1.1.0"
+    },
+    "zstandard": {
+      "dependency": "direct main",
+      "description": {
+        "name": "zstandard",
+        "sha256": "f1635a33fedc97ea4140fb7f41ae0f591f23c171079ed1054a2a99423bbb21cd",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.3.27"
+    },
+    "zstandard_android": {
+      "dependency": "transitive",
+      "description": {
+        "name": "zstandard_android",
+        "sha256": "e345f280c23fa6d679797a7c5ad93862f02109ee3039b27262a82af574abae23",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.3.27"
+    },
+    "zstandard_ios": {
+      "dependency": "transitive",
+      "description": {
+        "name": "zstandard_ios",
+        "sha256": "824319352d9a88259e43a8e344b9ef4db54cf09cd6053792563a8ad9257e38f9",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.3.27"
+    },
+    "zstandard_linux": {
+      "dependency": "transitive",
+      "description": {
+        "name": "zstandard_linux",
+        "sha256": "65bf0d25e7e930866615b9a22c16ad36603b6800f8030fcd5538b2f1ce8c6ac0",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.3.27"
+    },
+    "zstandard_macos": {
+      "dependency": "transitive",
+      "description": {
+        "name": "zstandard_macos",
+        "sha256": "876a9eaacbf4a94392e8514b56305c1b6bea042dd17891e7527a7c859a3ab984",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.3.27"
+    },
+    "zstandard_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "zstandard_platform_interface",
+        "sha256": "0b82c4a43552eccc92033a6504ab2ac442d9456f20132b08296bafd41a807e2f",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.3.27"
+    },
+    "zstandard_web": {
+      "dependency": "transitive",
+      "description": {
+        "name": "zstandard_web",
+        "sha256": "a72a265fd5f1092ff916e49fa7669c306dbaf161454780d446f88e626d55804c",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.3.27"
+    },
+    "zstandard_windows": {
+      "dependency": "transitive",
+      "description": {
+        "name": "zstandard_windows",
+        "sha256": "2095eae95f774973088fcbddc094a4ed11d2cac6d731911c987a0c06e743dddd",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.3.27"
     }
   },
   "sdks": {

From d46587da8efacee34bd1cc51fcb8f532e502879d Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Mon, 19 May 2025 08:36:50 +0200
Subject: [PATCH 012/103] azure-mgmt-core: 1.4.0 -> 1.5.0

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 .../python-modules/azure-mgmt-core/default.nix           | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-core/default.nix b/pkgs/development/python-modules/azure-mgmt-core/default.nix
index 62b1b1cc2863..d69683337d22 100644
--- a/pkgs/development/python-modules/azure-mgmt-core/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-core/default.nix
@@ -7,14 +7,15 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.4.0";
+  version = "1.5.0";
   format = "setuptools";
   pname = "azure-mgmt-core";
 
   src = fetchPypi {
-    inherit pname version;
-    extension = "zip";
-    hash = "sha256-0ZUgg0AJT5jlpmYbeBzeb2oFHnnOMXyqvY/5cDCps64=";
+    pname = "azure_mgmt_core";
+    inherit version;
+    extension = "tar.gz";
+    hash = "sha256-OArj36Njn0pcJGp9t+0tCDdOiCMP0No+uJn3wR5cRBo=";
   };
 
   propagatedBuildInputs = [

From 49e27791e685489e2142b78b763a2979ff17b540 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Mon, 19 May 2025 08:37:29 +0200
Subject: [PATCH 013/103] azure-mgmt-containerregistry: 12.0.0 -> 14.0.0

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 .../python-modules/azure-mgmt-containerregistry/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix b/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix
index 9935c3e0cc99..22550fed130b 100644
--- a/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-containerregistry";
-  version = "12.0.0";
+  version = "14.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "azure_mgmt_containerregistry";
     inherit version;
-    hash = "sha256-8Z+PqniB3q8rUBXA6wUKkuI4DNnRje4zzbXyfUSgbAM=";
+    hash = "sha256-c4PxxVR7z/525BHt2CUNVcNM3fXvaATVh1wWPMpmxLU=";
   };
 
   build-system = [ setuptools ];

From 11bae019cc6ca40e7e112846b87a97dc173959cb Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Mon, 19 May 2025 08:37:55 +0200
Subject: [PATCH 014/103] azure-cli: 2.72.0 -> 2.73.0

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 pkgs/by-name/az/azure-cli/package.nix         |  4 ++--
 pkgs/by-name/az/azure-cli/python-packages.nix | 10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/package.nix b/pkgs/by-name/az/azure-cli/package.nix
index 62bdf047b188..1cc1ffc07535 100644
--- a/pkgs/by-name/az/azure-cli/package.nix
+++ b/pkgs/by-name/az/azure-cli/package.nix
@@ -26,14 +26,14 @@
 }:
 
 let
-  version = "2.72.0";
+  version = "2.73.0";
 
   src = fetchFromGitHub {
     name = "azure-cli-${version}-src";
     owner = "Azure";
     repo = "azure-cli";
     tag = "azure-cli-${version}";
-    hash = "sha256-LuQhGrAYVgv+OH214A4xz4LV+xwIshNAH8nAlQL4mDc=";
+    hash = "sha256-MLmTV/tg5fM3XFEMtBLPdvsiUS5Gj8CH/zvdehDoka0=";
   };
 
   # put packages that needs to be overridden in the py package scope
diff --git a/pkgs/by-name/az/azure-cli/python-packages.nix b/pkgs/by-name/az/azure-cli/python-packages.nix
index b5233892d1c1..f7c64cc4b907 100644
--- a/pkgs/by-name/az/azure-cli/python-packages.nix
+++ b/pkgs/by-name/az/azure-cli/python-packages.nix
@@ -169,6 +169,16 @@ let
         overrideAzureMgmtPackage super.azure-mgmt-media "9.0.0" "zip"
           "sha256-TI7l8sSQ2QUgPqiE3Cu/F67Wna+KHbQS3fuIjOb95ZM=";
 
+      # ModuleNotFoundError: No module named 'azure.mgmt.monitor.operations'
+      azure-mgmt-monitor = super.azure-mgmt-monitor.overridePythonAttrs (attrs: rec {
+        version = "7.0.0b1";
+        src = fetchPypi {
+          pname = "azure_mgmt_monitor"; # Different from src.pname in the original package.
+          inherit version;
+          hash = "sha256-WR4YZMw4njklpARkujsRnd6nwTZ8M5vXFcy9AfL9oj4=";
+        };
+      });
+
       # AttributeError: module 'azure.mgmt.rdbms.postgresql_flexibleservers.operations' has no attribute 'BackupsOperations'
       azure-mgmt-rdbms =
         overrideAzureMgmtPackage super.azure-mgmt-rdbms "10.2.0b17" "tar.gz"

From 064d8e2ced796e053208c1d35ab9dce8f041dde0 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Mon, 19 May 2025 08:38:47 +0200
Subject: [PATCH 015/103] azure-cli-extensions.zones: init at 1.0.0b1

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index b2f4a25b6d29..77e93f3d1873 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -1111,5 +1111,12 @@
     "url": "https://azcliprod.blob.core.windows.net/cli-extensions/workloads-1.1.0-py3-none-any.whl",
     "hash": "sha256-hpNEiU4IBe5krQcXEX0oIArfVCXB7Lv6O1sbkrdSAok=",
     "description": "Microsoft Azure Command-Line Tools Workloads Extension"
+  },
+  "zones": {
+    "pname": "zones",
+    "version": "1.0.0b1",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/zones-1.0.0b1-py3-none-any.whl",
+    "hash": "sha256-/CPMEVqdxeyzt2l3K8+eqv5Hs+EWjXJeKdWtD4xxGG0=",
+    "description": "Microsoft Azure Command-Line Tools Zones Extension"
   }
 }

From 9e3b23d391859dce2c8740931d08a2391419acd5 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Mon, 19 May 2025 08:38:49 +0200
Subject: [PATCH 016/103] azure-cli-extensions.devcenter: 6.2.3 -> 7.0.0

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index 77e93f3d1873..28b21307552c 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -344,9 +344,9 @@
   },
   "devcenter": {
     "pname": "devcenter",
-    "version": "6.2.3",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/devcenter-6.2.3-py3-none-any.whl",
-    "hash": "sha256-w0IE25YKaUtrtHzExBn2lEQC8UnXOZkbPMh2czkhAfw=",
+    "version": "7.0.0",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/devcenter-7.0.0-py3-none-any.whl",
+    "hash": "sha256-UQgGkRRJ3WGPKT3agMb533CKD/A1dq/66Z/4K13VuK0=",
     "description": "Microsoft Azure Command-Line Tools DevCenter Extension"
   },
   "diskpool": {

From 2bc8d420e89774b7481a72de44ee911e1b8c4d43 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Mon, 19 May 2025 08:38:51 +0200
Subject: [PATCH 017/103] azure-cli-extensions.datamigration: 1.0.0b4 ->
 1.0.0b5

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index 28b21307552c..1eb55d41bac0 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -302,9 +302,9 @@
   },
   "datamigration": {
     "pname": "datamigration",
-    "version": "1.0.0b4",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/datamigration-1.0.0b4-py3-none-any.whl",
-    "hash": "sha256-Oumfyx7js8B8NAgSvhM/ED+ltxjrCyicx14D7/Uy+GM=",
+    "version": "1.0.0b5",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/datamigration-1.0.0b5-py3-none-any.whl",
+    "hash": "sha256-0ZcMgeoUIB5M+e3qrdnkerWj5jiRd3SDfyQJKip+SBI=",
     "description": "Microsoft Azure Command-Line Tools DataMigrationManagementClient Extension"
   },
   "dataprotection": {

From fd77d2986eaad1da8cb3bf49dffcb015c4447720 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Mon, 19 May 2025 08:38:53 +0200
Subject: [PATCH 018/103] azure-cli-extensions.k8s-runtime: 1.0.4 -> 2.0.0

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index 1eb55d41bac0..9bbb801304b4 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -596,9 +596,9 @@
   },
   "k8s-runtime": {
     "pname": "k8s-runtime",
-    "version": "1.0.4",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/k8s_runtime-1.0.4-py3-none-any.whl",
-    "hash": "sha256-ruLTAI2BjXg0IUnm8dLHkiq7vkPzI9UebNWMc7HGezo=",
+    "version": "2.0.0",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/k8s_runtime-2.0.0-py3-none-any.whl",
+    "hash": "sha256-SSW6qtKarGtCPsi88PWG4IWX5YzTQ9WoyNqiKbx8mok=",
     "description": "Microsoft Azure Command-Line Tools K8sRuntime Extension"
   },
   "kusto": {

From ffbdca4fa4cd6406946e35727db4f11c12ab3069 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Mon, 19 May 2025 08:38:55 +0200
Subject: [PATCH 019/103] azure-cli-extensions.nsp: 1.0.0b3 -> 1.0.0

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index 9bbb801304b4..f248e0be9fa2 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -771,9 +771,9 @@
   },
   "nsp": {
     "pname": "nsp",
-    "version": "1.0.0b3",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/nsp-1.0.0b3-py3-none-any.whl",
-    "hash": "sha256-Nsxf4BMEWkvx5od7YsLwQLZdULc5glwtcDC7qClx5T8=",
+    "version": "1.0.0",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/nsp-1.0.0-py3-none-any.whl",
+    "hash": "sha256-nlRya9v8U6q/sjGV5XNgsSLDBeVPPSF/to4KIvvckvE=",
     "description": "Microsoft Azure Command-Line Tools Nsp Extension"
   },
   "offazure": {

From 0d74bf610d5f8c8fc301a562d28be866e654f63e Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 19 May 2025 08:38:01 +0200
Subject: [PATCH 020/103] =?UTF-8?q?ocamlPackages.lwt=5Fppx:=202.1.0=20?=
 =?UTF-8?q?=E2=86=92=205.9.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/ocaml-modules/lwt/ppx.nix | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/pkgs/development/ocaml-modules/lwt/ppx.nix b/pkgs/development/ocaml-modules/lwt/ppx.nix
index be2e32220c8b..fd7fbf0cc6bf 100644
--- a/pkgs/development/ocaml-modules/lwt/ppx.nix
+++ b/pkgs/development/ocaml-modules/lwt/ppx.nix
@@ -7,24 +7,7 @@
 
 buildDunePackage {
   pname = "lwt_ppx";
-  version = "2.1.0";
-  duneVersion = "3";
-
-  minimalOCamlVersion = "4.04";
-
-  # `lwt_ppx` has a different release cycle than Lwt, but it's included in
-  # one of its release bundles.
-  # Because there could exist an Lwt release _without_ a `lwt_ppx` release,
-  # this `src` field doesn't inherit from the Lwt derivation.
-  #
-  # This is particularly useful for overriding Lwt without breaking `lwt_ppx`,
-  # as new Lwt releases may contain broken `lwt_ppx` code.
-  src = fetchFromGitHub {
-    owner = "ocsigen";
-    repo = "lwt";
-    rev = "5.6.0";
-    hash = "sha256-DLQupCkZ14kOuSQatbb7j07I+jvvDCKpdlaR3rijT4s=";
-  };
+  inherit (lwt) version src;
 
   propagatedBuildInputs = [
     lwt

From 4f71badf1abe577615209e945929c8adfb73e813 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Mon, 19 May 2025 08:38:57 +0200
Subject: [PATCH 021/103] azure-cli-extensions.mixed-reality: 0.0.5 -> 1.0.0b1

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index f248e0be9fa2..2c282f8133a1 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -687,9 +687,9 @@
   },
   "mixed-reality": {
     "pname": "mixed-reality",
-    "version": "0.0.5",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/mixed_reality-0.0.5-py2.py3-none-any.whl",
-    "hash": "sha256-AmqvWPmtAtdIN9IaH1wSImSlmBTgt8OVwm5f3BKTGH4=",
+    "version": "1.0.0b1",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/mixed_reality-1.0.0b1-py2.py3-none-any.whl",
+    "hash": "sha256-o8Grh7xfaLhlvW+T1WLkDR6kvcSFqs/gkAZz3j+rmGk=",
     "description": "Mixed Reality Azure CLI Extension"
   },
   "mobile-network": {

From 21a971457c9dce03cf983a6f21ee51b07188894a Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Mon, 19 May 2025 08:38:59 +0200
Subject: [PATCH 022/103] azure-cli-extensions.neon: 1.0.0b2 -> 1.0.0b3

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index 2c282f8133a1..78791352a0b8 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -722,9 +722,9 @@
   },
   "neon": {
     "pname": "neon",
-    "version": "1.0.0b2",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/neon-1.0.0b2-py3-none-any.whl",
-    "hash": "sha256-EUIO1Xjt9RaJ4RFq9YQTO2a1ZqydVs8b5PqyW0ef7AY=",
+    "version": "1.0.0b3",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/neon-1.0.0b3-py3-none-any.whl",
+    "hash": "sha256-tvnHv5o0GxltVyZNQmraPsJBMXE+/XAIaJcMAVKTUBo=",
     "description": "Microsoft Azure Command-Line Tools Neon Extension"
   },
   "network-analytics": {

From ffb1ba7e9bd4365e608a0a8d31e5d159d7af82ff Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Mon, 19 May 2025 08:39:01 +0200
Subject: [PATCH 023/103] azure-cli-extensions.portal: 1.0.0b1 -> 1.0.0b2

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index 78791352a0b8..fadecd4948de 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -827,9 +827,9 @@
   },
   "portal": {
     "pname": "portal",
-    "version": "1.0.0b1",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/portal-1.0.0b1-py3-none-any.whl",
-    "hash": "sha256-0/pZ1Wo3IUB3hSNxdo6MhVsgf5sdEfO+Tp/dsOGseWk=",
+    "version": "1.0.0b2",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/portal-1.0.0b2-py3-none-any.whl",
+    "hash": "sha256-JXUW9FWgF+UVqvFDXC0qGPTCjuIDevimJ1AW+5FANdY=",
     "description": "Microsoft Azure Command-Line Tools Portal Extension"
   },
   "powerbidedicated": {

From 0a893dfaa913ffdc1b122a2012bc84d10ec7db5d Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Mon, 19 May 2025 08:39:03 +0200
Subject: [PATCH 024/103] azure-cli-extensions.aks-preview: 14.0.0b7 ->
 17.0.0b4

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index fadecd4948de..a63d5d7575b9 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -50,9 +50,9 @@
   },
   "aks-preview": {
     "pname": "aks-preview",
-    "version": "14.0.0b7",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-14.0.0b7-py2.py3-none-any.whl",
-    "hash": "sha256-c3nxx7SMqE9Ng431jQ8c8zxojyT0g4Cddt3iy6npyF4=",
+    "version": "17.0.0b4",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-17.0.0b4-py2.py3-none-any.whl",
+    "hash": "sha256-KZ4j1OvY/ziVZnv1nAnowWD+ujYrOYMxfOmH6krHDjI=",
     "description": "Provides a preview for upcoming AKS features"
   },
   "akshybrid": {

From 98083bdd099f488bc3aae1e76b40c1a2d573ab6b Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Mon, 19 May 2025 08:39:05 +0200
Subject: [PATCH 025/103] azure-cli-extensions.stack-hci-vm: 1.8.2 -> 1.9.1

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index a63d5d7575b9..1efbd6c658a9 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -967,9 +967,9 @@
   },
   "stack-hci-vm": {
     "pname": "stack-hci-vm",
-    "version": "1.8.2",
-    "url": "https://hciarcvmsstorage.z13.web.core.windows.net/cli-extensions/stack_hci_vm-1.8.2-py3-none-any.whl",
-    "hash": "sha256-SmSb7R1LxmEY8/BSA//KB7crWv8JRdVE8xVAGE52ptc=",
+    "version": "1.9.1",
+    "url": "https://hciarcvmsstorage.z13.web.core.windows.net/cli-extensions/stack_hci_vm-1.9.1-py3-none-any.whl",
+    "hash": "sha256-BZSQ1tVLSkQE+jQPpZWIHEoM/86RPKT5kAlmKmNa0qY=",
     "description": "Microsoft Azure Command-Line Tools Stack-HCi-VM Extension"
   },
   "standbypool": {

From fb8c4a8169c009ed599e85af78fa0208be19c3fa Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Mon, 19 May 2025 16:34:39 +0800
Subject: [PATCH 026/103] intiface-central: 2.6.5 -> 2.6.7

---
 pkgs/by-name/in/intiface-central/package.nix  |  12 +-
 .../in/intiface-central/pubspec.lock.json     | 428 +++++++++---------
 pkgs/by-name/in/intiface-central/update.sh    |  20 +
 3 files changed, 233 insertions(+), 227 deletions(-)
 create mode 100755 pkgs/by-name/in/intiface-central/update.sh

diff --git a/pkgs/by-name/in/intiface-central/package.nix b/pkgs/by-name/in/intiface-central/package.nix
index 26ae0d211eba..9a81496f7953 100644
--- a/pkgs/by-name/in/intiface-central/package.nix
+++ b/pkgs/by-name/in/intiface-central/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   fetchFromGitHub,
-  flutter327,
+  flutter329,
   corrosion,
   rustPlatform,
   cargo,
@@ -11,15 +11,15 @@
   makeDesktopItem,
 }:
 
-flutter327.buildFlutterApplication rec {
+flutter329.buildFlutterApplication rec {
   pname = "intiface-central";
-  version = "2.6.5";
+  version = "2.6.7";
 
   src = fetchFromGitHub {
     owner = "intiface";
     repo = "intiface-central";
     tag = "v${version}";
-    hash = "sha256-goN0750EvGw5G8cb4jy6wWnjlLwlwMeTz4GQEilbwpY=";
+    hash = "sha256-ePk0I6Uf2/eaBKSZumv/kF9MJOB+MWQ4/FnQ19lE3ZQ=";
   };
 
   patches = [
@@ -32,7 +32,7 @@ flutter327.buildFlutterApplication rec {
     name = "${pname}-${version}-cargo-deps";
     inherit src;
     sourceRoot = "${src.name}/intiface-engine-flutter-bridge";
-    hash = "sha256-z9i0xT0e8G9spOmXpI2yFee/y3ZEh69YqL+7zRWszzA=";
+    hash = "sha256-EC0pdTG+BsVFbxixCeOIXCsMHi4pF3tug+YNVzaMn/A=";
   };
 
   cargoRoot = "intiface-engine-flutter-bridge";
@@ -69,6 +69,8 @@ flutter327.buildFlutterApplication rec {
     })
   ];
 
+  passthru.updateScript = ./update.sh;
+
   meta = {
     mainProgram = "intiface_central";
     description = "Intiface Central (Buttplug Frontend) Application for Desktop";
diff --git a/pkgs/by-name/in/intiface-central/pubspec.lock.json b/pkgs/by-name/in/intiface-central/pubspec.lock.json
index 8c97f04835e0..61df5b91b15f 100644
--- a/pkgs/by-name/in/intiface-central/pubspec.lock.json
+++ b/pkgs/by-name/in/intiface-central/pubspec.lock.json
@@ -4,27 +4,21 @@
       "dependency": "transitive",
       "description": {
         "name": "_fe_analyzer_shared",
-        "sha256": "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab",
+        "sha256": "e55636ed79578b9abca5fecf9437947798f5ef7456308b5cb85720b793eac92f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "76.0.0"
-    },
-    "_macros": {
-      "dependency": "transitive",
-      "description": "dart",
-      "source": "sdk",
-      "version": "0.3.3"
+      "version": "82.0.0"
     },
     "analyzer": {
       "dependency": "transitive",
       "description": {
         "name": "analyzer",
-        "sha256": "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e",
+        "sha256": "f4c21c94eb4623b183c1014a470196b3910701bea9b926e6c91270d756e6fc60",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.11.0"
+      "version": "7.4.1"
     },
     "archive": {
       "dependency": "transitive",
@@ -40,41 +34,41 @@
       "dependency": "transitive",
       "description": {
         "name": "args",
-        "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a",
+        "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.0"
+      "version": "2.7.0"
     },
     "async": {
       "dependency": "transitive",
       "description": {
         "name": "async",
-        "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c",
+        "sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.11.0"
+      "version": "2.12.0"
     },
     "bloc": {
       "dependency": "direct main",
       "description": {
         "name": "bloc",
-        "sha256": "106842ad6569f0b60297619e9e0b1885c2fb9bf84812935490e6c5275777804e",
+        "sha256": "52c10575f4445c61dd9e0cafcc6356fdd827c4c64dd7945ef3c4105f6b6ac189",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.1.4"
+      "version": "9.0.0"
     },
     "boolean_selector": {
       "dependency": "transitive",
       "description": {
         "name": "boolean_selector",
-        "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66",
+        "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.1"
+      "version": "2.1.2"
     },
     "buffer": {
       "dependency": "transitive",
@@ -90,11 +84,11 @@
       "dependency": "transitive",
       "description": {
         "name": "build",
-        "sha256": "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0",
+        "sha256": "cef23f1eda9b57566c81e2133d196f8e3df48f244b317368d65c5943d91148f0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.1"
+      "version": "2.4.2"
     },
     "build_cli_annotations": {
       "dependency": "transitive",
@@ -110,51 +104,51 @@
       "dependency": "transitive",
       "description": {
         "name": "build_config",
-        "sha256": "bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1",
+        "sha256": "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.1"
+      "version": "1.1.2"
     },
     "build_daemon": {
       "dependency": "transitive",
       "description": {
         "name": "build_daemon",
-        "sha256": "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9",
+        "sha256": "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.0.2"
+      "version": "4.0.4"
     },
     "build_resolvers": {
       "dependency": "transitive",
       "description": {
         "name": "build_resolvers",
-        "sha256": "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a",
+        "sha256": "b9e4fda21d846e192628e7a4f6deda6888c36b5b69ba02ff291a01fd529140f0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.2"
+      "version": "2.4.4"
     },
     "build_runner": {
       "dependency": "direct dev",
       "description": {
         "name": "build_runner",
-        "sha256": "dd09dd4e2b078992f42aac7f1a622f01882a8492fef08486b27ddde929c19f04",
+        "sha256": "74691599a5bc750dc96a6b4bfd48f7d9d66453eab04c7f4063134800d6a5c573",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.12"
+      "version": "2.4.14"
     },
     "build_runner_core": {
       "dependency": "transitive",
       "description": {
         "name": "build_runner_core",
-        "sha256": "f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0",
+        "sha256": "22e3aa1c80e0ada3722fe5b63fd43d9c8990759d0a2cf489c8c5d7b2bdebc021",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.3.2"
+      "version": "8.0.0"
     },
     "built_collection": {
       "dependency": "transitive",
@@ -170,11 +164,11 @@
       "dependency": "transitive",
       "description": {
         "name": "built_value",
-        "sha256": "c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb",
+        "sha256": "ea90e81dc4a25a043d9bee692d20ed6d1c4a1662a28c03a96417446c093ed6b4",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.9.2"
+      "version": "8.9.5"
     },
     "buttplug": {
       "dependency": "direct main",
@@ -190,11 +184,11 @@
       "dependency": "transitive",
       "description": {
         "name": "characters",
-        "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605",
+        "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.0"
+      "version": "1.4.0"
     },
     "checked_yaml": {
       "dependency": "transitive",
@@ -210,41 +204,41 @@
       "dependency": "transitive",
       "description": {
         "name": "cli_util",
-        "sha256": "c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19",
+        "sha256": "ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.4.1"
+      "version": "0.4.2"
     },
     "clock": {
       "dependency": "transitive",
       "description": {
         "name": "clock",
-        "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf",
+        "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.1"
+      "version": "1.1.2"
     },
     "code_builder": {
       "dependency": "transitive",
       "description": {
         "name": "code_builder",
-        "sha256": "f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37",
+        "sha256": "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.10.0"
+      "version": "4.10.1"
     },
     "collection": {
       "dependency": "transitive",
       "description": {
         "name": "collection",
-        "sha256": "a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf",
+        "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.19.0"
+      "version": "1.19.1"
     },
     "console": {
       "dependency": "transitive",
@@ -260,21 +254,21 @@
       "dependency": "transitive",
       "description": {
         "name": "convert",
-        "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592",
+        "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.1"
+      "version": "3.1.2"
     },
     "crypto": {
       "dependency": "transitive",
       "description": {
         "name": "crypto",
-        "sha256": "ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab",
+        "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.3"
+      "version": "3.0.6"
     },
     "cupertino_icons": {
       "dependency": "direct main",
@@ -290,21 +284,21 @@
       "dependency": "transitive",
       "description": {
         "name": "dart_style",
-        "sha256": "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9",
+        "sha256": "27eb0ae77836989a3bc541ce55595e8ceee0992807f14511552a898ddd0d88ac",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.6"
+      "version": "3.0.1"
     },
     "dbus": {
       "dependency": "transitive",
       "description": {
         "name": "dbus",
-        "sha256": "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac",
+        "sha256": "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.10"
+      "version": "0.7.11"
     },
     "device_info_plus": {
       "dependency": "direct main",
@@ -320,11 +314,11 @@
       "dependency": "transitive",
       "description": {
         "name": "device_info_plus_platform_interface",
-        "sha256": "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba",
+        "sha256": "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.0.1"
+      "version": "7.0.2"
     },
     "discord_rich_presence": {
       "dependency": "direct main",
@@ -350,31 +344,31 @@
       "dependency": "direct main",
       "description": {
         "name": "equatable",
-        "sha256": "c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2",
+        "sha256": "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.5"
+      "version": "2.0.7"
     },
     "fake_async": {
       "dependency": "transitive",
       "description": {
         "name": "fake_async",
-        "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78",
+        "sha256": "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.1"
+      "version": "1.3.2"
     },
     "ffi": {
       "dependency": "direct main",
       "description": {
         "name": "ffi",
-        "sha256": "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21",
+        "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.2"
+      "version": "2.1.4"
     },
     "ffigen": {
       "dependency": "direct dev",
@@ -390,21 +384,21 @@
       "dependency": "transitive",
       "description": {
         "name": "file",
-        "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c",
+        "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.0.0"
+      "version": "7.0.1"
     },
     "fixnum": {
       "dependency": "transitive",
       "description": {
         "name": "fixnum",
-        "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1",
+        "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.0"
+      "version": "1.1.1"
     },
     "flutter": {
       "dependency": "direct main",
@@ -416,11 +410,11 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_bloc",
-        "sha256": "b594505eac31a0518bdcb4b5b79573b8d9117b193cc80cc12e17d639b10aa27a",
+        "sha256": "1046d719fbdf230330d3443187cc33cc11963d15c9089f6cc56faa42a4c5f0cc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.1.6"
+      "version": "9.1.0"
     },
     "flutter_foreground_task": {
       "dependency": "direct main",
@@ -456,11 +450,11 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_local_notifications",
-        "sha256": "c500d5d9e7e553f06b61877ca6b9c8b92c570a4c8db371038702e8ce57f8a50f",
+        "sha256": "674173fd3c9eda9d4c8528da2ce0ea69f161577495a9cc835a2a4ecd7eadeb35",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "17.2.2"
+      "version": "17.2.4"
     },
     "flutter_local_notifications_linux": {
       "dependency": "transitive",
@@ -486,11 +480,11 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_loggy",
-        "sha256": "c758629403e19115af198993ff7bd3af2c5a337de16ee23acda2e6f29df1db48",
+        "sha256": "f7640f2d06e64a6141b2210e18cac3146f30bcb4b92349da53f969f59b78c04b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.3"
+      "version": "2.0.3+1"
     },
     "flutter_markdown": {
       "dependency": "direct main",
@@ -568,21 +562,21 @@
       "dependency": "direct main",
       "description": {
         "name": "github",
-        "sha256": "57f6ad78591f9638e903409977443093f862d25062a6b582a3c89e4ae44e4814",
+        "sha256": "c88cd9f11e131a05b1910e1c742c80e6dc7708701884d1fcf28147fc95933aa8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.24.0"
+      "version": "9.25.0"
     },
     "glob": {
       "dependency": "transitive",
       "description": {
         "name": "glob",
-        "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63",
+        "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.2"
+      "version": "2.1.3"
     },
     "graphs": {
       "dependency": "transitive",
@@ -598,41 +592,41 @@
       "dependency": "transitive",
       "description": {
         "name": "http",
-        "sha256": "a2bbf9d017fcced29139daa8ed2bba4ece450ab222871df93ca9eec6f80c34ba",
+        "sha256": "fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.0"
+      "version": "1.3.0"
     },
     "http_multi_server": {
       "dependency": "transitive",
       "description": {
         "name": "http_multi_server",
-        "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b",
+        "sha256": "aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.2.1"
+      "version": "3.2.2"
     },
     "http_parser": {
       "dependency": "transitive",
       "description": {
         "name": "http_parser",
-        "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b",
+        "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.0.2"
+      "version": "4.1.2"
     },
     "image": {
       "dependency": "transitive",
       "description": {
         "name": "image",
-        "sha256": "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8",
+        "sha256": "f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.2.0"
+      "version": "4.3.0"
     },
     "intl": {
       "dependency": "direct main",
@@ -648,11 +642,11 @@
       "dependency": "transitive",
       "description": {
         "name": "io",
-        "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e",
+        "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.4"
+      "version": "1.0.5"
     },
     "js": {
       "dependency": "transitive",
@@ -678,31 +672,31 @@
       "dependency": "direct dev",
       "description": {
         "name": "json_serializable",
-        "sha256": "ea1432d167339ea9b5bb153f0571d0039607a873d6e04e0117af043f14a1fd4b",
+        "sha256": "c50ef5fc083d5b5e12eef489503ba3bf5ccc899e487d691584699b4bdefeea8c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.8.0"
+      "version": "6.9.5"
     },
     "leak_tracker": {
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker",
-        "sha256": "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06",
+        "sha256": "c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.0.7"
+      "version": "10.0.8"
     },
     "leak_tracker_flutter_testing": {
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker_flutter_testing",
-        "sha256": "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379",
+        "sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.8"
+      "version": "3.0.9"
     },
     "leak_tracker_testing": {
       "dependency": "transitive",
@@ -728,11 +722,11 @@
       "dependency": "transitive",
       "description": {
         "name": "logging",
-        "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340",
+        "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.0"
+      "version": "1.3.0"
     },
     "loggy": {
       "dependency": "direct main",
@@ -744,35 +738,25 @@
       "source": "hosted",
       "version": "2.0.3"
     },
-    "macros": {
-      "dependency": "transitive",
-      "description": {
-        "name": "macros",
-        "sha256": "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.3-main.0"
-    },
     "markdown": {
       "dependency": "direct main",
       "description": {
         "name": "markdown",
-        "sha256": "ef2a1298144e3f985cc736b22e0ccdaf188b5b3970648f2d9dc13efd1d9df051",
+        "sha256": "935e23e1ff3bc02d390bad4d4be001208ee92cc217cb5b5a6c19bc14aaa318c1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.2.2"
+      "version": "7.3.0"
     },
     "matcher": {
       "dependency": "transitive",
       "description": {
         "name": "matcher",
-        "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb",
+        "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.12.16+1"
+      "version": "0.12.17"
     },
     "material_color_utilities": {
       "dependency": "transitive",
@@ -788,41 +772,41 @@
       "dependency": "transitive",
       "description": {
         "name": "meta",
-        "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7",
+        "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.15.0"
+      "version": "1.16.0"
     },
     "mime": {
       "dependency": "transitive",
       "description": {
         "name": "mime",
-        "sha256": "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2",
+        "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.5"
+      "version": "2.0.0"
     },
     "msix": {
       "dependency": "direct dev",
       "description": {
         "name": "msix",
-        "sha256": "519b183d15dc9f9c594f247e2d2339d855cf0eaacc30e19b128e14f3ecc62047",
+        "sha256": "c50d6bd1aafe0d071a3c1e5a5ccb056404502935cb0a549e3178c4aae16caf33",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.16.7"
+      "version": "3.16.8"
     },
     "multicast_dns": {
       "dependency": "direct main",
       "description": {
         "name": "multicast_dns",
-        "sha256": "982c4cc4cda5f98dd477bddfd623e8e4bd1014e7dbf9e7b05052e14a5b550b99",
+        "sha256": "de72ada5c3db6fdd6ad4ae99452fe05fb403c4bb37c67ceb255ddd37d2b5b1eb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.3.2+7"
+      "version": "0.3.3"
     },
     "nested": {
       "dependency": "transitive",
@@ -868,71 +852,71 @@
       "dependency": "transitive",
       "description": {
         "name": "package_config",
-        "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd",
+        "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.0"
+      "version": "2.2.0"
     },
     "package_info_plus": {
       "dependency": "direct main",
       "description": {
         "name": "package_info_plus",
-        "sha256": "88bc797f44a94814f2213db1c9bd5badebafdfb8290ca9f78d4b9ee2a3db4d79",
+        "sha256": "7976bfe4c583170d6cdc7077e3237560b364149fcd268b5f53d95a991963b191",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.0.1"
+      "version": "8.3.0"
     },
     "package_info_plus_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "package_info_plus_platform_interface",
-        "sha256": "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6",
+        "sha256": "6c935fb612dff8e3cc9632c2b301720c77450a126114126ffaafe28d2e87956c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.1"
+      "version": "3.2.0"
     },
     "path": {
       "dependency": "direct main",
       "description": {
         "name": "path",
-        "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af",
+        "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.9.0"
+      "version": "1.9.1"
     },
     "path_provider": {
       "dependency": "direct main",
       "description": {
         "name": "path_provider",
-        "sha256": "fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378",
+        "sha256": "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.4"
+      "version": "2.1.5"
     },
     "path_provider_android": {
       "dependency": "transitive",
       "description": {
         "name": "path_provider_android",
-        "sha256": "490539678396d4c3c0b06efdaab75ae60675c3e0c66f72bc04c2e2c1e0e2abeb",
+        "sha256": "d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.9"
+      "version": "2.2.17"
     },
     "path_provider_foundation": {
       "dependency": "transitive",
       "description": {
         "name": "path_provider_foundation",
-        "sha256": "f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16",
+        "sha256": "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.0"
+      "version": "2.4.1"
     },
     "path_provider_linux": {
       "dependency": "transitive",
@@ -968,61 +952,61 @@
       "dependency": "direct main",
       "description": {
         "name": "percent_indicator",
-        "sha256": "c37099ad833a883c9d71782321cb65c3a848c21b6939b6185f0ff6640d05814c",
+        "sha256": "157d29133bbc6ecb11f923d36e7960a96a3f28837549a20b65e5135729f0f9fd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.2.3"
+      "version": "4.2.5"
     },
     "permission_handler": {
       "dependency": "direct main",
       "description": {
         "name": "permission_handler",
-        "sha256": "18bf33f7fefbd812f37e72091a15575e72d5318854877e0e4035a24ac1113ecb",
+        "sha256": "59adad729136f01ea9e35a48f5d1395e25cba6cea552249ddbe9cf950f5d7849",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "11.3.1"
+      "version": "11.4.0"
     },
     "permission_handler_android": {
       "dependency": "transitive",
       "description": {
         "name": "permission_handler_android",
-        "sha256": "eaf2a1ec4472775451e88ca6a7b86559ef2f1d1ed903942ed135e38ea0097dca",
+        "sha256": "d3971dcdd76182a0c198c096b5db2f0884b0d4196723d21a866fc4cdea057ebc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "12.0.8"
+      "version": "12.1.0"
     },
     "permission_handler_apple": {
       "dependency": "transitive",
       "description": {
         "name": "permission_handler_apple",
-        "sha256": "e6f6d73b12438ef13e648c4ae56bd106ec60d17e90a59c4545db6781229082a0",
+        "sha256": "f000131e755c54cf4d84a5d8bd6e4149e262cc31c5a8b1d698de1ac85fa41023",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.4.5"
+      "version": "9.4.7"
     },
     "permission_handler_html": {
       "dependency": "transitive",
       "description": {
         "name": "permission_handler_html",
-        "sha256": "54bf176b90f6eddd4ece307e2c06cf977fb3973719c35a93b85cc7093eb6070d",
+        "sha256": "38f000e83355abb3392140f6bc3030660cfaef189e1f87824facb76300b4ff24",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.1.1"
+      "version": "0.1.3+5"
     },
     "permission_handler_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "permission_handler_platform_interface",
-        "sha256": "fe0ffe274d665be8e34f9c59705441a7d248edebbe5d9e3ec2665f88b79358ea",
+        "sha256": "eb99b295153abce5d683cac8c02e22faab63e50679b937fa1bf67d58bb282878",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.2.2"
+      "version": "4.3.0"
     },
     "permission_handler_windows": {
       "dependency": "transitive",
@@ -1038,21 +1022,21 @@
       "dependency": "transitive",
       "description": {
         "name": "petitparser",
-        "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27",
+        "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.0.2"
+      "version": "6.1.0"
     },
     "platform": {
       "dependency": "transitive",
       "description": {
         "name": "platform",
-        "sha256": "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65",
+        "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.5"
+      "version": "3.1.6"
     },
     "plugin_platform_interface": {
       "dependency": "direct main",
@@ -1078,51 +1062,51 @@
       "dependency": "transitive",
       "description": {
         "name": "provider",
-        "sha256": "c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c",
+        "sha256": "489024f942069c2920c844ee18bb3d467c69e48955a4f32d1677f71be103e310",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.1.2"
+      "version": "6.1.4"
     },
     "pub_semver": {
       "dependency": "transitive",
       "description": {
         "name": "pub_semver",
-        "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c",
+        "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.4"
+      "version": "2.2.0"
     },
     "pubspec_parse": {
       "dependency": "transitive",
       "description": {
         "name": "pubspec_parse",
-        "sha256": "c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8",
+        "sha256": "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.0"
+      "version": "1.5.0"
     },
     "puppeteer": {
       "dependency": "transitive",
       "description": {
         "name": "puppeteer",
-        "sha256": "de3f921154e5d336b14cdc05b674ac3db5701a5338f3cb0042868a5146f16e67",
+        "sha256": "7a990c68d33882b642214c351f66492d9a738afa4226a098ab70642357337fa2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.12.0"
+      "version": "3.16.0"
     },
     "quiver": {
       "dependency": "transitive",
       "description": {
         "name": "quiver",
-        "sha256": "b1c1ac5ce6688d77f65f3375a9abb9319b3cb32486bdc7a1e0fdf004d7ba4e47",
+        "sha256": "ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.2.1"
+      "version": "3.2.2"
     },
     "rxdart": {
       "dependency": "direct main",
@@ -1148,21 +1132,21 @@
       "dependency": "direct main",
       "description": {
         "name": "sentry",
-        "sha256": "57514bc72d441ffdc463f498d6886aa586a2494fa467a1eb9d649c28010d7ee3",
+        "sha256": "599701ca0693a74da361bc780b0752e1abc98226cf5095f6b069648116c896bb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.20.2"
+      "version": "8.14.2"
     },
     "sentry_flutter": {
       "dependency": "direct main",
       "description": {
         "name": "sentry_flutter",
-        "sha256": "9723d58470ca43a360681ddd26abb71ca7b815f706bc8d3747afd054cf639ded",
+        "sha256": "5ba2cf40646a77d113b37a07bd69f61bb3ec8a73cbabe5537b05a7c89d2656f8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.20.2"
+      "version": "8.14.2"
     },
     "settings_ui": {
       "dependency": "direct main",
@@ -1178,31 +1162,31 @@
       "dependency": "direct main",
       "description": {
         "name": "shared_preferences",
-        "sha256": "d3bbe5553a986e83980916ded2f0b435ef2e1893dfaa29d5a7a790d0eca12180",
+        "sha256": "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.3"
+      "version": "2.5.3"
     },
     "shared_preferences_android": {
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_android",
-        "sha256": "a7e8467e9181cef109f601e3f65765685786c1a738a83d7fbbde377589c0d974",
+        "sha256": "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.1"
+      "version": "2.4.10"
     },
     "shared_preferences_foundation": {
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_foundation",
-        "sha256": "776786cff96324851b656777648f36ac772d88bc4c669acff97b7fce5de3c849",
+        "sha256": "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.1"
+      "version": "2.5.4"
     },
     "shared_preferences_linux": {
       "dependency": "transitive",
@@ -1228,11 +1212,11 @@
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_web",
-        "sha256": "7b15ffb9387ea3e237bb7a66b8a23d2147663d391cafc5c8f37b2e7b4bde5d21",
+        "sha256": "c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.2"
+      "version": "2.4.3"
     },
     "shared_preferences_windows": {
       "dependency": "transitive",
@@ -1248,21 +1232,21 @@
       "dependency": "transitive",
       "description": {
         "name": "shelf",
-        "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4",
+        "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.4.1"
+      "version": "1.4.2"
     },
     "shelf_static": {
       "dependency": "transitive",
       "description": {
         "name": "shelf_static",
-        "sha256": "a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e",
+        "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.2"
+      "version": "1.1.3"
     },
     "shelf_web_socket": {
       "dependency": "transitive",
@@ -1284,31 +1268,31 @@
       "dependency": "transitive",
       "description": {
         "name": "source_gen",
-        "sha256": "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832",
+        "sha256": "35c8150ece9e8c8d263337a265153c3329667640850b9304861faea59fc98f6b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.5.0"
+      "version": "2.0.0"
     },
     "source_helper": {
       "dependency": "transitive",
       "description": {
         "name": "source_helper",
-        "sha256": "6adebc0006c37dd63fe05bca0a929b99f06402fc95aa35bf36d67f5c06de01fd",
+        "sha256": "86d247119aedce8e63f4751bd9626fc9613255935558447569ad42f9f5b48b3c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.4"
+      "version": "1.3.5"
     },
     "source_span": {
       "dependency": "transitive",
       "description": {
         "name": "source_span",
-        "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c",
+        "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.10.0"
+      "version": "1.10.1"
     },
     "sprintf": {
       "dependency": "transitive",
@@ -1324,61 +1308,61 @@
       "dependency": "transitive",
       "description": {
         "name": "stack_trace",
-        "sha256": "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377",
+        "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.12.0"
+      "version": "1.12.1"
     },
     "stream_channel": {
       "dependency": "transitive",
       "description": {
         "name": "stream_channel",
-        "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7",
+        "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.2"
+      "version": "2.1.4"
     },
     "stream_transform": {
       "dependency": "transitive",
       "description": {
         "name": "stream_transform",
-        "sha256": "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f",
+        "sha256": "ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.0"
+      "version": "2.1.1"
     },
     "string_scanner": {
       "dependency": "transitive",
       "description": {
         "name": "string_scanner",
-        "sha256": "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3",
+        "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.0"
+      "version": "1.4.1"
     },
     "term_glyph": {
       "dependency": "transitive",
       "description": {
         "name": "term_glyph",
-        "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84",
+        "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.1"
+      "version": "1.2.2"
     },
     "test_api": {
       "dependency": "transitive",
       "description": {
         "name": "test_api",
-        "sha256": "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c",
+        "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.3"
+      "version": "0.7.4"
     },
     "timezone": {
       "dependency": "transitive",
@@ -1394,11 +1378,11 @@
       "dependency": "transitive",
       "description": {
         "name": "timing",
-        "sha256": "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32",
+        "sha256": "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.1"
+      "version": "1.0.2"
     },
     "tuple": {
       "dependency": "direct main",
@@ -1424,51 +1408,51 @@
       "dependency": "direct main",
       "description": {
         "name": "url_launcher",
-        "sha256": "b1c9e98774adf8820c96fbc7ae3601231d324a7d5ebd8babe27b6dfac91357ba",
+        "sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.2.1"
+      "version": "6.3.1"
     },
     "url_launcher_android": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_android",
-        "sha256": "31222ffb0063171b526d3e569079cf1f8b294075ba323443fdc690842bfd4def",
+        "sha256": "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.2.0"
+      "version": "6.3.16"
     },
     "url_launcher_ios": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_ios",
-        "sha256": "bba3373219b7abb6b5e0d071b0fe66dfbe005d07517a68e38d4fc3638f35c6d3",
+        "sha256": "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.2.1"
+      "version": "6.3.3"
     },
     "url_launcher_linux": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_linux",
-        "sha256": "9f2d390e096fdbe1e6e6256f97851e51afc2d9c423d3432f1d6a02a8a9a8b9fd",
+        "sha256": "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.0"
+      "version": "3.2.1"
     },
     "url_launcher_macos": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_macos",
-        "sha256": "b7244901ea3cf489c5335bdacda07264a6e960b1c1b1a9f91e4bc371d9e68234",
+        "sha256": "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.0"
+      "version": "3.2.2"
     },
     "url_launcher_platform_interface": {
       "dependency": "transitive",
@@ -1484,21 +1468,21 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_web",
-        "sha256": "fff0932192afeedf63cdd50ecbb1bc825d31aed259f02bb8dba0f3b729a5e88b",
+        "sha256": "3ba963161bd0fe395917ba881d320b9c4f6dd3c4a233da62ab18a5025c85f1e9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.3"
+      "version": "2.4.0"
     },
     "url_launcher_windows": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_windows",
-        "sha256": "49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185",
+        "sha256": "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.2"
+      "version": "3.1.4"
     },
     "uuid": {
       "dependency": "transitive",
@@ -1534,61 +1518,61 @@
       "dependency": "transitive",
       "description": {
         "name": "vm_service",
-        "sha256": "f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b",
+        "sha256": "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "14.3.0"
+      "version": "14.3.1"
     },
     "watcher": {
       "dependency": "transitive",
       "description": {
         "name": "watcher",
-        "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8",
+        "sha256": "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.0"
+      "version": "1.1.1"
     },
     "web": {
       "dependency": "transitive",
       "description": {
         "name": "web",
-        "sha256": "4188706108906f002b3a293509234588823c8c979dc83304e229ff400c996b05",
+        "sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.4.2"
+      "version": "0.5.1"
     },
     "web_socket_channel": {
       "dependency": "direct main",
       "description": {
         "name": "web_socket_channel",
-        "sha256": "d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b",
+        "sha256": "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.0"
+      "version": "2.4.5"
     },
     "win32": {
       "dependency": "transitive",
       "description": {
         "name": "win32",
-        "sha256": "68d1e89a91ed61ad9c370f9f8b6effed9ae5e0ede22a270bdfa6daf79fc2290a",
+        "sha256": "dc6ecaa00a7c708e5b4d10ee7bec8c270e9276dfcab1783f57e9962d7884305f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.5.4"
+      "version": "5.12.0"
     },
     "win32_registry": {
       "dependency": "transitive",
       "description": {
         "name": "win32_registry",
-        "sha256": "723b7f851e5724c55409bb3d5a32b203b3afe8587eaf5dafb93a5fed8ecda0d6",
+        "sha256": "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.4"
+      "version": "1.1.5"
     },
     "window_manager": {
       "dependency": "direct main",
@@ -1604,11 +1588,11 @@
       "dependency": "transitive",
       "description": {
         "name": "xdg_directories",
-        "sha256": "faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d",
+        "sha256": "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.4"
+      "version": "1.1.0"
     },
     "xml": {
       "dependency": "transitive",
@@ -1624,25 +1608,25 @@
       "dependency": "transitive",
       "description": {
         "name": "yaml",
-        "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5",
+        "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.2"
+      "version": "3.1.3"
     },
     "yaml_edit": {
       "dependency": "transitive",
       "description": {
         "name": "yaml_edit",
-        "sha256": "e9c1a3543d2da0db3e90270dbb1e4eebc985ee5e3ffe468d83224472b2194a5f",
+        "sha256": "fb38626579fb345ad00e674e2af3a5c9b0cc4b9bfb8fd7f7ff322c7c9e62aef5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.1"
+      "version": "2.2.2"
     }
   },
   "sdks": {
-    "dart": ">=3.5.3 <4.0.0",
-    "flutter": ">=3.22.0"
+    "dart": ">=3.7.0 <4.0.0",
+    "flutter": ">=3.27.0"
   }
 }
diff --git a/pkgs/by-name/in/intiface-central/update.sh b/pkgs/by-name/in/intiface-central/update.sh
new file mode 100755
index 000000000000..5907e0ae5628
--- /dev/null
+++ b/pkgs/by-name/in/intiface-central/update.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -I nixpkgs=./. -i bash -p curl gnused jq yq nix bash coreutils nix-update
+
+set -eou pipefail
+
+ROOT="$(dirname "$(readlink -f "$0")")"
+
+latestTag=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/intiface/intiface-central/releases/latest | jq --raw-output .tag_name)
+latestVersion=$(echo "$latestTag" | sed 's/^v//')
+
+currentVersion=$(nix-instantiate --eval -E "with import ./. {}; intiface-central.version or (lib.getVersion intiface-central)" | tr -d '"')
+
+if [[ "$currentVersion" == "$latestVersion" ]]; then
+    echo "package is up-to-date: $currentVersion"
+    exit 0
+fi
+
+nix-update intiface-central --version $latestVersion
+
+curl https://raw.githubusercontent.com/intiface/intiface-central/${latestTag}/pubspec.lock | yq . >$ROOT/pubspec.lock.json

From 98a66261fe3523e0c2dd1f8cc03bf5304976ebf0 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Mon, 19 May 2025 16:35:01 +0800
Subject: [PATCH 027/103] dart.sentry_flutter: init

---
 .../dart/package-source-builders/default.nix  |  1 +
 .../sentry_flutter/default.nix                | 33 +++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/compilers/dart/package-source-builders/sentry_flutter/default.nix

diff --git a/pkgs/development/compilers/dart/package-source-builders/default.nix b/pkgs/development/compilers/dart/package-source-builders/default.nix
index 5197224788ef..687ce7d90b31 100644
--- a/pkgs/development/compilers/dart/package-source-builders/default.nix
+++ b/pkgs/development/compilers/dart/package-source-builders/default.nix
@@ -16,6 +16,7 @@
   pdfrx = callPackage ./pdfrx { };
   printing = callPackage ./printing { };
   rhttp = callPackage ./rhttp { };
+  sentry_flutter = callPackage ./sentry_flutter { };
   sqlcipher_flutter_libs = callPackage ./sqlcipher_flutter_libs { };
   sqlite3 = callPackage ./sqlite3 { };
   sqlite3_flutter_libs = callPackage ./sqlite3_flutter_libs { };
diff --git a/pkgs/development/compilers/dart/package-source-builders/sentry_flutter/default.nix b/pkgs/development/compilers/dart/package-source-builders/sentry_flutter/default.nix
new file mode 100644
index 000000000000..dec8882e59d0
--- /dev/null
+++ b/pkgs/development/compilers/dart/package-source-builders/sentry_flutter/default.nix
@@ -0,0 +1,33 @@
+{
+  stdenv,
+  fetchFromGitHub,
+}:
+
+{ version, src, ... }:
+
+let
+  sentry-native = fetchFromGitHub {
+    owner = "getsentry";
+    repo = "sentry-native";
+    tag = "0.8.4";
+    hash = "sha256-0NLxu+aelp36m3ocPhyYz3LDeq310fkyu8WSpZML3Pc=";
+  };
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "sentry_flutter";
+  inherit version src;
+  inherit (src) passthru;
+
+  postPatch = ''
+    sed -i "s|GIT_REPOSITORY.*|SOURCE_DIR "${sentry-native}"|" sentry-native/sentry-native.cmake
+    sed -i '/GIT_TAG/d' sentry-native/sentry-native.cmake
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    cp -r . $out
+
+    runHook postInstall
+  '';
+})

From 0625ffaf9dce0baa02339bbdb4e3543ae8833dd6 Mon Sep 17 00:00:00 2001
From: DPDmancul <davide.peressoni@tuta.io>
Date: Sat, 17 May 2025 23:06:52 +0200
Subject: [PATCH 028/103] karlyriceditor: init at 3.3

---
 pkgs/by-name/ka/karlyriceditor/package.nix | 55 ++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 pkgs/by-name/ka/karlyriceditor/package.nix

diff --git a/pkgs/by-name/ka/karlyriceditor/package.nix b/pkgs/by-name/ka/karlyriceditor/package.nix
new file mode 100644
index 000000000000..399af098af05
--- /dev/null
+++ b/pkgs/by-name/ka/karlyriceditor/package.nix
@@ -0,0 +1,55 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  qt6,
+  ffmpeg_4,
+  pkg-config,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "karlyriceditor";
+  version = "3.3";
+
+  src = fetchFromGitHub {
+    owner = "gyunaev";
+    repo = "karlyriceditor";
+    rev = finalAttrs.version;
+    hash = "sha256-i4uZtHxnreow7a5ZX6WCXMUSwgkUJS/1oDCJOgfFjHw=";
+  };
+
+  nativeBuildInputs = [
+    qt6.wrapQtAppsHook
+    qt6.qmake
+    pkg-config
+  ];
+
+  buildInputs = [
+    ffmpeg_4
+    qt6.qtmultimedia
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 bin/karlyriceditor $out/bin/karlyriceditor
+    install -Dm644 packages/karlyriceditor.desktop $out/share/applications/karlyriceditor.desktop
+    install -Dm644 packages/karlyriceditor.png $out/share/pixmaps/karlyriceditor.png
+
+    substituteInPlace $out/share/applications/karlyriceditor.desktop \
+      --replace-fail 'Icon=/usr/share/pixmaps/karlyriceditor.png' 'Icon=karlyriceditor'
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Edit and synchronize lyrics with karaoke songs in various formats";
+    homepage = "https://github.com/gyunaev/karlyriceditor";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [
+      DPDmancul
+    ];
+    mainProgram = "karlyricseditor";
+    platforms = lib.platforms.linux;
+  };
+})

From 6ecb6317c6986f367b1629f20438e9c9b81ea046 Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Tue, 20 May 2025 12:44:57 +0200
Subject: [PATCH 029/103] gnucap: 20240130-dev -> 20240220

Also: use `fetchFromSavannah`, install manpages, add passthru test,
upgrade verilog plugin
---
 pkgs/by-name/gn/gnucap/modelgen-verilog.nix | 25 ++++++++----
 pkgs/by-name/gn/gnucap/package.nix          | 44 +++++++++++++++------
 2 files changed, 48 insertions(+), 21 deletions(-)

diff --git a/pkgs/by-name/gn/gnucap/modelgen-verilog.nix b/pkgs/by-name/gn/gnucap/modelgen-verilog.nix
index 6a29673563d2..9d6da894018f 100644
--- a/pkgs/by-name/gn/gnucap/modelgen-verilog.nix
+++ b/pkgs/by-name/gn/gnucap/modelgen-verilog.nix
@@ -1,19 +1,24 @@
 {
+  fetchFromSavannah,
+  gnucap,
+  installShellFiles,
   lib,
   stdenv,
-  fetchurl,
-  gnucap,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "gnucap-modelgen-verilog";
-  version = "20240130-dev";
+  version = "20240220";
 
-  src = fetchurl {
-    url = "https://git.savannah.gnu.org/cgit/gnucap/gnucap-modelgen-verilog.git/snapshot/${pname}-${version}.tar.gz";
-    hash = "sha256-7w0eWUJKVRYFicQgDvKrJTkZ6fzgwxvcCKj78KrHj8E=";
+  src = fetchFromSavannah {
+    repo = "gnucap/gnucap-modelgen-verilog";
+    rev = finalAttrs.version;
+    hash = "sha256-hDH+aUuCjr5JK2UOy1diNXJaqt6Lrw4GgiiZmQ/SaQs=";
   };
 
+  nativeBuildInputs = [
+    installShellFiles
+  ];
   propagatedBuildInputs = [ gnucap ];
 
   doCheck = true;
@@ -26,6 +31,10 @@ stdenv.mkDerivation rec {
     export GNUCAP_PKGLIBDIR=$out/lib/gnucap
   '';
 
+  postInstall = ''
+    installManPage man/*.*
+  '';
+
   meta = with lib; {
     description = "gnucap modelgen to preprocess, parse and dump vams files";
     homepage = "http://www.gnucap.org/";
@@ -35,4 +44,4 @@ stdenv.mkDerivation rec {
     platforms = platforms.all;
     maintainers = [ maintainers.raboof ];
   };
-}
+})
diff --git a/pkgs/by-name/gn/gnucap/package.nix b/pkgs/by-name/gn/gnucap/package.nix
index 56a4a67ca7e6..201e6e133796 100644
--- a/pkgs/by-name/gn/gnucap/package.nix
+++ b/pkgs/by-name/gn/gnucap/package.nix
@@ -1,16 +1,19 @@
 {
-  lib,
-  stdenv,
-  fetchurl,
-  readline,
-  termcap,
-  gnucap,
   callPackage,
+  fetchFromSavannah,
+  gnucap,
+  gnucap-full,
+  installShellFiles,
+  lib,
+  readline,
+  runCommand,
+  stdenv,
+  termcap,
   writeScript,
 }:
 
 let
-  version = "20240130-dev";
+  version = "20240220";
   meta = with lib; {
     description = "Gnu Circuit Analysis Package";
     longDescription = ''
@@ -18,23 +21,27 @@ let
       It performs nonlinear dc and transient analyses, fourier analysis, and ac analysis.
     '';
     homepage = "http://www.gnucap.org/";
-    changelog = "https://git.savannah.gnu.org/cgit/gnucap.git/plain/NEWS?h=v${version}";
-    license = licenses.gpl3Plus;
+    changelog = "https://git.savannah.gnu.org/gitweb/?p=gnucap.git;a=blob;f=NEWS";
+    license = licenses.gpl3Only;
     platforms = platforms.all;
     broken = stdenv.hostPlatform.isDarwin; # Relies on LD_LIBRARY_PATH
     maintainers = [ maintainers.raboof ];
     mainProgram = "gnucap";
   };
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "gnucap";
   inherit version;
 
-  src = fetchurl {
-    url = "https://git.savannah.gnu.org/cgit/gnucap.git/snapshot/gnucap-${version}.tar.gz";
-    hash = "sha256-MUCtGw3BxGWgXgUwzklq5T1y9kjBTnFBa0/GK0hhl0E=";
+  src = fetchFromSavannah {
+    repo = "gnucap";
+    rev = version;
+    hash = "sha256-aZMiNKwI6eQZAxlF/+GoJhKczohgGwZ0/Wgpv3+AhYY=";
   };
 
+  nativeBuildInputs = [
+    installShellFiles
+  ];
   buildInputs = [
     readline
     termcap
@@ -42,6 +49,17 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  postInstall = ''
+    installManPage man/*
+  '';
+
+  passthru.tests = {
+    verilog = runCommand "gnucap-verilog-test" { } ''
+      echo "attach mgsim" | ${gnucap-full}/bin/gnucap -a msgsim > $out
+      cat $out | grep "verilog: already installed"
+    '';
+  };
+
   inherit meta;
 }
 // {

From 5852629c268b15781059329ea3753901e29c30b2 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 20 May 2025 16:08:14 +0000
Subject: [PATCH 030/103] cherry-studio: 1.3.4 -> 1.3.8

---
 .../ch/cherry-studio/missing-hashes.json      | 48 ++++++++++---------
 pkgs/by-name/ch/cherry-studio/package.nix     |  6 +--
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/pkgs/by-name/ch/cherry-studio/missing-hashes.json b/pkgs/by-name/ch/cherry-studio/missing-hashes.json
index 1240077e0388..be79bf6b583c 100644
--- a/pkgs/by-name/ch/cherry-studio/missing-hashes.json
+++ b/pkgs/by-name/ch/cherry-studio/missing-hashes.json
@@ -1,52 +1,54 @@
 {
-  "@esbuild/aix-ppc64@npm:0.21.5": "1f48fea96ab4fbc2921756361bc8a0c4d0690f14dc2298a357aa3d436bcd1cd646d490e5d71c4e0fb46b9e04401bc93153d6886456dd0665b6758be643c95a16",
   "@esbuild/aix-ppc64@npm:0.25.2": "e25252d47d27d5e15a09ba7e7e906fe35d90a363e1eec7bc1e054c066bea6f89364139385008f78e8b4523ebaecb1f7a678213c8fcc2cd0309d539bbc455fd05",
-  "@esbuild/android-arm64@npm:0.21.5": "7a4831b0886c165ed671f0094dcd491235fe503364a261379c84e2225a3c3230a06bce1d3a02316fa8a040b0ffede56c617746dc3b5550549ae3fb07095bb20d",
+  "@esbuild/aix-ppc64@npm:0.25.3": "5e3ec55997c8d3c9c0fa565cbd04f1566795fe47626d63f6a593a39190402869a2561c772d1db5621719fa9db174f4cbc201032447b97a1cc28e69a9426a893e",
   "@esbuild/android-arm64@npm:0.25.2": "b387ab30ec70902c81ca1231a7838ccc993ad8dff9561a5ec7d7d4e5f03426153d42e496985a02539bce55f6d1048156f36e24a29f61fa5fd8e0587f62696703",
-  "@esbuild/android-arm@npm:0.21.5": "9fa871018a9f2198f40fde2c672fcb1b9d3ab5ee602644ea4cf68c548ee2c0b6c60ad851ce85219f84886fd29757d8c49bac28ea48a2a16708a088e32dfe673a",
+  "@esbuild/android-arm64@npm:0.25.3": "d840843df6b82cc918abea3e706235ae256caa7b6feaf4b78f47d97cfc476ffc905d5e4263f066ae96dcc997bdc4e33458ed3436d6a38d147cd401071dc92d10",
   "@esbuild/android-arm@npm:0.25.2": "8e7efb22407ad9a985ff5a09dc0d2b895126c6ccca470db671ca0a3e3026f79666af20ce5d296311f5d056e95ca71e743feeae526f94dcaacb5a6969f9963283",
-  "@esbuild/android-x64@npm:0.21.5": "24e477ccdaf1437cabe8710bc052a13b975a53617094a225e39823a1c562a71ef975d860ab895c129a813302495d85387143e27068e62fc897a2ac0335e4a2f6",
+  "@esbuild/android-arm@npm:0.25.3": "185f4827b86ebc797ec74a98a75256a401eda92af862d217c10268816e8c4feeb49d82e965916dd2df238d7f3eda98325085e8d36cccf63c6cb2d3a11b3c6ee0",
   "@esbuild/android-x64@npm:0.25.2": "66256eee6168c2f903c45c82863f1377f525dc7de0fc902fca412a44d0abbb8a25761fb9e10c8663b25b0f816d86b7e353d2b77ab39eae95234333f9d233ddc4",
-  "@esbuild/darwin-arm64@npm:0.21.5": "67b0e4ebc870d0babb6721328f02b0e75eca5ee8f176220fa194ac5897ce76a27aa4f6d724389a74e1517670f70e766fe03c30875fdebeee5b1f7b22e99c5a1f",
+  "@esbuild/android-x64@npm:0.25.3": "0328941aaedafe3e0164a93a0e57178ca5fbe5a336709bd24270329a504bdb76bfc4b7a63e07c2f6fdea1fbd4b25d53320ca5665351d477e8e77b2fd071732ee",
   "@esbuild/darwin-arm64@npm:0.25.2": "36a568a779000133d077e2272181232f52939c3e0b0b986ad3f3fd6ab29628c148e88cd857f6de41a16e22e6a252bb16680f91c00c7d813690fa9bc060f58386",
-  "@esbuild/darwin-x64@npm:0.21.5": "a4b6df47edf4b1e91eeca9d7af18f538e25615e00763709a4cc24a8918e7ac93b9bfc2ef9f44086f16257d05ad99e23c1213a7a1397475d1a78f0a1e773af89a",
+  "@esbuild/darwin-arm64@npm:0.25.3": "c10ed8ec813cad217666f556481baa0c4286f2a0567ca662fbf3088cb960421729eaf6b5a8504b9c956a1497f88141549af5f7c0f907a27a2c546e75fb4c678e",
   "@esbuild/darwin-x64@npm:0.25.2": "b761a20f8db7bf0499f6cba51c72104e733d9186d6f34a7f5e4590c02ecc2f9b84cd02c4e7bd3dade4156b7f92015cdbddc516dd1e4859233e3155cb0fecda58",
-  "@esbuild/freebsd-arm64@npm:0.21.5": "a4cf357807f2ea445b5191b8e5488070b567e2b534dba24ce6f8f1a332598ee0b9ffa41b3b0e55cd0cf57e2b56f0f1d84413faba182b81cb43bf19edf58a7654",
+  "@esbuild/darwin-x64@npm:0.25.3": "9828c988e7a54e63c7afca426348bd09d5c70b4ec799908ec5310347a14c94900f58e14f2b2eeea87d68b382078977bd5d5629546b307e8ac093168a7c72712d",
   "@esbuild/freebsd-arm64@npm:0.25.2": "8f869d6200dba388ac4c008c7a5b6522f44797370a12f94fd19e37b6cd76bdbdf48d0fa893b5ce200a538a151281e9f71e985f82ec8b8c96f16075e45266c718",
-  "@esbuild/freebsd-x64@npm:0.21.5": "8957c1345196e5dabd7d9f290b5292161f5d9955f269051fa7873118cfb5a20c31d70771ea3560b513f879d0948ba32fba915fb1b387571c4fbbb1fbeaf2dd87",
+  "@esbuild/freebsd-arm64@npm:0.25.3": "4b20547db6bc1dea0e14f4bb96fb474d6e80e8d01c4fdc141d77a1693be06aee5ea3d4968f80276f87037086822c336defa358cb315bd671a7af9c672a081811",
   "@esbuild/freebsd-x64@npm:0.25.2": "6cdfb6c6d6f6ead324a9ee75ab1068305672207cf1d3189bcf5599ec158e0eb07d74ff63597e389777163b4399da1cc6164b918a7ea9e798e7fd45eee6aad9bb",
-  "@esbuild/linux-arm64@npm:0.21.5": "1b95b17ed94eb977e38ea9130e677551b7cf0ccccdb3f23a9f8b59b5d67400817c2a417e4f043295bd3f67796853da2a1b1a8ca201ffe745efb40a144dfdc99c",
+  "@esbuild/freebsd-x64@npm:0.25.3": "083edc9e2de8f3dc407b52836b49ebea29d0d543786c706b744c77646f5fde53327b786d156b79b859fb61eaac191733d275a183807c8599d51cd4416d00f5d6",
   "@esbuild/linux-arm64@npm:0.25.2": "a0d51ec6e91e97461916eb6c25b12a8ea6b58ec2f3d91199c0c3f02ec569e98ff1389700250d4664d8394d3d5b5a051d695b34bfe77ab4a12985dfc18f315b73",
-  "@esbuild/linux-arm@npm:0.21.5": "6bfcd098ada5e6117d028777e5cc58456c2f570157fa0a0dce30c9d05b8389b86f74bf6b862534bf6994d342946c98b6774e1820880fd289765864b668e94c17",
+  "@esbuild/linux-arm64@npm:0.25.3": "bad206365faf883e5f7615daef3d65b7a82d6c9e401fd67353352c532a42310dcf6491dbf0e094c8007fb6d73e45183bb63cc10585cfaadc1386fbf78c529dc1",
   "@esbuild/linux-arm@npm:0.25.2": "5a4cf4045a2a5949dc8875dbad9a82fde7333d3f59b66d8cb614b34b76a7fb715a8d74e41f0788104bcef0436108ca548d71a543f582073e0458e20370dbb802",
-  "@esbuild/linux-ia32@npm:0.21.5": "73c249c9918f0c9a9268ffe14fe745f5e7564b309dcea213da08a5e4367ffdfc8df4b004c70f80269dce0f653a3280cfdd8bf9a7a616b5b60649e4faea6e69b5",
+  "@esbuild/linux-arm@npm:0.25.3": "4659e20bf62737bb6ba5e54f36f87260e8092f6c55aed6a73457cb002f7af990bb205ca48d0c19078540a210b65a1db1a1cecd7a4ed06f4fe4eb1c0d27c30bd0",
   "@esbuild/linux-ia32@npm:0.25.2": "535c1755ed95a47b05b865361d2efbef3490f05815743c0d2372f55a2e14f0cc1d5ed6e5dd6f91c7aea871ea2f64cea021eea6e714027148489c54edc6e2b19f",
-  "@esbuild/linux-loong64@npm:0.21.5": "60977efe24b3b6e1461d49da07dd57c1234992b9d2e6ac7d0dedfee538321d42be25e496ffb193121d3a6c6ca6ea6722b880e95695824dcc6643a3d9426b2296",
+  "@esbuild/linux-ia32@npm:0.25.3": "96cf22e5979c95aff499cf0ebd576e21964d9a7412bf5cd4eb1ab71cb555aef2b4d5d3e8aae34ab80354125f1ec571f0ddb3f728f9e19cebbeceff75bb9d0686",
   "@esbuild/linux-loong64@npm:0.25.2": "8ff82f5cdd7a9490dfb3be64c990841d2a8e1a0ce83d76fa8d5e9b0ba7aa91ca725f338ff43b4d69a18744905f1730adf87a7f8359ae839030663e0bbe2807e2",
-  "@esbuild/linux-mips64el@npm:0.21.5": "20fb6c8f6e58f66cd4351034858b2ad85bda4144576b180979305cfabed43780a71934e9f176e476c719f14e37253b231a43d46638ad232989d5f4dd72ec6b75",
+  "@esbuild/linux-loong64@npm:0.25.3": "9d12d8deaf0bdd5d64c062c65eb0e3ea24ab98b1e6ec34b2b14bb3902e5e3504442c3273f6dc05228f6104650ddaf0d37ba86033f19e7b065766c3d528c0f6a3",
   "@esbuild/linux-mips64el@npm:0.25.2": "382520bf655329d04f65e041f9bf774d11a2232bdf5125934732db915c179b1172ec3429722d9f02f46ee5bad7b70372872bfd003d7c1cc5ec95b7ca6ec8a983",
-  "@esbuild/linux-ppc64@npm:0.21.5": "69f2ef1d127f48bc14cec479ae1a96dbf5fea651e0a3f148486f73495d2acb91acdaa164cd80648844916f05e7f9f9665a1864dd394e7f9acf96bea70937e6b5",
+  "@esbuild/linux-mips64el@npm:0.25.3": "f117b06fe2d39b08571fd84ed191801cc9501342a514d5d83494219ad14bee9713b6332d0836f192c224b1f9a01405f3d6e2d22952e399bababd527bfeac9c0f",
   "@esbuild/linux-ppc64@npm:0.25.2": "c5736195867e9c441cabd0a2cbaa62f91c4e4963ed7490018d09a932d549e1d281411ddf9dbd4a4b68f0c0298c1321ba15fd4e493cdc3dea3e14b7a6207b12f8",
-  "@esbuild/linux-riscv64@npm:0.21.5": "60c749d87c0f67cc67c5cc0d82aa597b7a807bc52510a16960337433bdbc8fa9f3c46eba98080106c0971e404e2250ca11c441bb4ae5b7a7d78b4095e3a70363",
+  "@esbuild/linux-ppc64@npm:0.25.3": "ef777920724eecd3bb20f9718901498001ed8b28ced1a6c9a8e947c5ae412d31856761556b9d89bdae1cd9af3ff53f9c83756fac3b4e99b53ebdce44c5ff0cdd",
   "@esbuild/linux-riscv64@npm:0.25.2": "c72879775daded232fb2e36a6fe26058ec1ccd1f5dd6a76b4e8da700c6dd20cb15b684bce34569cadd41f25a0a53bd2037994279856bb3148f8c16055adcaf68",
-  "@esbuild/linux-s390x@npm:0.21.5": "a14ff0484b962b374fd1e4662a53f8dd8999ba39fcf891f15631dfb2802c8d18893d6e366c42d28d55885e5804b7d6252c0e3cee038c241285c9b537ef12b4ae",
+  "@esbuild/linux-riscv64@npm:0.25.3": "87d71b5c361f7d95c173f8c1051e8dce165ff3d6100ef0e5cbd090f8249c58d7f5a38e93774d081afe4fecf3a6e725102dbf9ffa51e5b4960ccd1b072cf86e10",
   "@esbuild/linux-s390x@npm:0.25.2": "d8810561312c4c7705f3c580ef8cd38e2768feb19ebf2899595a227f59dfb6ca35182f8ad7ca65d503cc5d9c688fe742002243387aa09b98b8c32aabc522ac4e",
-  "@esbuild/linux-x64@npm:0.21.5": "9e5663fcace9c8456e9934a9ed6e7428db4080024eef3bfeaf82d476120bd881382c958be2785463d6b44467b3d3f870d6cce09a9cb37bcef19afeb97814d674",
+  "@esbuild/linux-s390x@npm:0.25.3": "9972d82725c5818fca8ef1625c3f55a8033c2d678c809a01580780fd5171025e4f90b60fdfe6ff925a1738bb6cff85dea104fdce57badf0a270ed1d290345e23",
   "@esbuild/linux-x64@npm:0.25.2": "32c8a5f7d0640655ebf60f379ee2b037fe83f3f0edad911a9098505e6ac589c5f2873ff441017183626a19d334e3bb59f58411f2d5474eb7222917575593abea",
+  "@esbuild/linux-x64@npm:0.25.3": "434e21ed68e25e2043295fca9c382461bf50f031c45480a1482f297412f95ebfb183339001444e5d1e6b14358571c395f17ddb8bb9bbd22aefe82740463bc18c",
   "@esbuild/netbsd-arm64@npm:0.25.2": "0b7f77ec46163feac839b17b94e7db87edf61441bd9a67115722bf72781021c8220576a2e2c70bbca45b89a1e69a6b132f5489b59e84241b197272c1ee080304",
-  "@esbuild/netbsd-x64@npm:0.21.5": "3cb6115c4557d653c7ad6d2be5b4ed7a688b14d85b7b7108a1a57dda0b2cca3f8ed13560fa6639da8788f860b75eb714a17cfb7ba8f967e93bdf40c9b3a1cde1",
+  "@esbuild/netbsd-arm64@npm:0.25.3": "4dbc6ef9a5ddcf44f2df0fe39c662189eb4cea38fe5778ecc81cc29af68fba2ac077c5b308ad84b8263bb6bea9f03732507b79966d051d860a2344b8fe8ddc4d",
   "@esbuild/netbsd-x64@npm:0.25.2": "6d6686f5d2eb79b042bd4f38dc95e73a8e290a057be1b6afc42867830c9cf2313600b4fd53287f2f418c9f454bf5df02154b16dcfbfc33a6eb2ce9722a4eecc1",
+  "@esbuild/netbsd-x64@npm:0.25.3": "d42fca551f67c20b18d11cae67fed9675b90293c901b3b152d6e0c1153db1443f7b8a4f7786797b1946d19881db64b50f32e883d756ce3fdf8b844a1c71611f3",
   "@esbuild/openbsd-arm64@npm:0.25.2": "8a08c16440c6389623bbacb717412635aff61a1552c917e707d71da1dc92c618eea9a9aa1606a4a4f322216f100ede658523baec2e82b1f11b4efd523d491173",
-  "@esbuild/openbsd-x64@npm:0.21.5": "1caf0b502d6e2612ffd3e62589de2b9cd48cd742818746011d437e2d5787df4984f7c17b7a536aa20f12d04e519c859d755a7b57e6db0ed277054bd9c1036e85",
+  "@esbuild/openbsd-arm64@npm:0.25.3": "3aee3b70a7f41ce2355d93bd955718683861ffe9e6b5550c37caa28b8b16e6414222c806f413c37eb553c3990a22b8fdb88721c619f553d809db92cd070ed383",
   "@esbuild/openbsd-x64@npm:0.25.2": "43baf3248bb460e169cb1b5f26f5eb720088fa0d467c77f4f72c6cfa8e6d7b7794c52ed5e4a9a2113db53313c5fec86e352c94939abf601ab22d5e6e9addc4e5",
-  "@esbuild/sunos-x64@npm:0.21.5": "676da7301c7c600bb7de2523ecf5d877128da3c125fd8136533f5be38ca15d9f800b2fbbd396ca37d44c5daa51b8124d8a4728bb18245cd2becb3191b897c45a",
+  "@esbuild/openbsd-x64@npm:0.25.3": "d158b78f95feb68c6217f114a3178058aa93933e83897546ffecb6b9ab8e0fe5fed69940651b6c42c1ac9064a42a29fa1c2da316dc64ab146107c2c2599e68c6",
   "@esbuild/sunos-x64@npm:0.25.2": "0babbb99d3bc3ed818b2b01fbf65ebbf5930defb850e5a5a94a3ba5fc7bc2463d561c07af0d3ac6d6d0197c86682750ceb47abf7d293dd3222b1bd33da9f8aa5",
-  "@esbuild/win32-arm64@npm:0.21.5": "9b2ab87429efd3c2697dc5c7948ea57b57757b6e4709469e773b73cd5fe4b7fda5912073f4c3bdf9d0346b8f3ae443367a63bcd51de24fb81b9f592712eb3366",
+  "@esbuild/sunos-x64@npm:0.25.3": "8b6bd4c43c023d0dcb9966349ec1f2ccdfb6163aea2c1c06060806795ed1fb083e22cb9e80e7853ba8c62a74d1bafa36dabab70881e7d6782c2dfb237f93bcc0",
   "@esbuild/win32-arm64@npm:0.25.2": "205aab6fc7b0ca7ee992cd24d73550110c1f79dc2ca724384bb52aa95111248df022375cd648314bd7eeb42083d576c55572f3d39d4ddcd82fc7372f1e7688b0",
-  "@esbuild/win32-ia32@npm:0.21.5": "c1fe3276507d82202c464cd4809e67e6f151e29ed9de05c32d086dfe30207db15e646911ebc7f50df659891bfee292a25062792c589c2ff769be238c6b5fb8be",
+  "@esbuild/win32-arm64@npm:0.25.3": "c49c827b8cae7eb2a4a6b38a1321c0c1bca1693826c7268d3c3b9361df360b897f583e91b9acff3eeb0c9f477d39c00a2d89c71436b64091442e74011a41f2ed",
   "@esbuild/win32-ia32@npm:0.25.2": "aa38c0e082e3111e84929a64638cce1c3e1114218726e41c99bf239f2c05be94fb6fe1083366aa342bbd8e75fd449a6a3bcae9b6b3b84066a3a3882dcbaa0090",
-  "@esbuild/win32-x64@npm:0.21.5": "5d7b28baa9c22684d35ec0515f6d36f8f583f26733c8e84c7f78edf17b8a7d133819267486f2fd66f20ca3a810896f11c3c81106d745040c2f07ade314846bf1",
+  "@esbuild/win32-ia32@npm:0.25.3": "84acc7f9d65de4875bfe09976620e94327bef444b1b8a795d98173ca777a2070b775763bd927ee475503455b2c1109bf5c911fdfe7c73de7d32124ccf3858afd",
   "@esbuild/win32-x64@npm:0.25.2": "2f2d147c610a3c3ab0f0f97132e4421464d3d38b835d989e8c324b7397e2592cd05485ec1998ae352f06d3191dd1d71c24f94f63f7c70cd8ea8a4c85441502a9",
+  "@esbuild/win32-x64@npm:0.25.3": "2b88dffa4814240cf7d88a6dee449361ae411a0d9cc6ebc327de59f4f6662a65fb2ef62fa38258bae422933d97a416db50ec4f04875ddf61d15f47bc0ec1ab22",
   "@libsql/darwin-arm64@npm:0.4.7": "161ac6b537e39e33c65a7f06c16152ccd5077129b8321b5d0082e008054c47dbc32563d39a47e223d09994457211582ff3760ffa5523f2dd3cfac1dd726a577a",
   "@libsql/darwin-x64@npm:0.4.7": "45c85d00566507f19474f9ae4b6453fa8fff10994147751df2dd2177edf9961520af54156d2d41b23cdfaaf2b219ea4ebd4b44a868e890088fc2283c1224752b",
   "@libsql/linux-arm64-gnu@npm:0.4.7": "c4126b0d717b45a8d1d66797bd7447fdaf53631277dac0250e0aa0267e279493b114b3823407e49da0e2928d6595d3a28370acb99c43424e8bc7e11434cae5f8",
diff --git a/pkgs/by-name/ch/cherry-studio/package.nix b/pkgs/by-name/ch/cherry-studio/package.nix
index 19510bf703bf..e3887ee2dc96 100644
--- a/pkgs/by-name/ch/cherry-studio/package.nix
+++ b/pkgs/by-name/ch/cherry-studio/package.nix
@@ -18,13 +18,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "cherry-studio";
-  version = "1.3.4";
+  version = "1.3.8";
 
   src = fetchFromGitHub {
     owner = "CherryHQ";
     repo = "cherry-studio";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xCS8ZomIAVEnQ2SJRay/ii7xhPMO+ctc8C14Xrje8kI=";
+    hash = "sha256-1It3vUC3SsXjhsvWwOGyUgbkxXAsOp2lsmO53Ad48ZU=";
   };
 
   postPatch = ''
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   offlineCache = yarn-berry.fetchYarnBerryDeps {
     inherit (finalAttrs) src missingHashes;
-    hash = "sha256-cStjxlmOnoDfrt6z5jvpkHfIKyfZ9UFWbbZjnJLiTu4=";
+    hash = "sha256-F1HAVG6ZEVb8yYKDXV4MEoBrbG2gXcv/VcCQbDFAnnE=";
   };
 
   nativeBuildInputs = [

From 97cea36f8b8c3c97c79af1cf7b856507b63ddc7e Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Wed, 21 May 2025 04:01:47 +0800
Subject: [PATCH 031/103] osinfo-db-tools: 1.11.0 -> 1.12.0

Changelog: https://gitlab.com/libosinfo/osinfo-db-tools/-/blob/v1.12.0/NEWS
---
 pkgs/by-name/os/osinfo-db-tools/package.nix | 33 +++++++--------------
 1 file changed, 10 insertions(+), 23 deletions(-)

diff --git a/pkgs/by-name/os/osinfo-db-tools/package.nix b/pkgs/by-name/os/osinfo-db-tools/package.nix
index e89c7416888e..faf2aff4cdca 100644
--- a/pkgs/by-name/os/osinfo-db-tools/package.nix
+++ b/pkgs/by-name/os/osinfo-db-tools/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchurl,
-  fetchpatch,
   pkg-config,
   meson,
   ninja,
@@ -19,27 +18,15 @@
   libsoup_3,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "osinfo-db-tools";
-  version = "1.11.0";
+  version = "1.12.0";
 
   src = fetchurl {
-    url = "https://releases.pagure.org/libosinfo/osinfo-db-tools-${version}.tar.xz";
-    sha256 = "sha256-i6bTG7XvBwVuOIeeBwZxr7z+wOtBqH+ZUEULu4MbCh0=";
+    url = "https://releases.pagure.org/libosinfo/osinfo-db-tools-${finalAttrs.version}.tar.xz";
+    hash = "sha256-8zFfZ10Ydw8l3qjtBLILj8gO+wD2DDfuXoFfnDd25/M=";
   };
 
-  patches = [
-    # Fix build with libxml 2.12
-    (fetchpatch {
-      url = "https://gitlab.com/libosinfo/osinfo-db-tools/-/commit/019487cbc79925e49988789bf533c78dab7e1842.patch";
-      hash = "sha256-skuspjHDRilwym+hFInrSvIZ+rrzBOoI7WeFj2SrGkc=";
-    })
-    (fetchpatch {
-      url = "https://gitlab.com/libosinfo/osinfo-db-tools/-/commit/34378a4ac257f2f5fcf364786d1634a8c36b304f.patch";
-      hash = "sha256-I9vRRbnotqRi8+7q1eZLJwQLaT9J4G3h+3rKxlaCME4=";
-    })
-  ];
-
   nativeBuildInputs = [
     meson
     ninja
@@ -60,12 +47,12 @@ stdenv.mkDerivation rec {
     libsoup_3
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tools for managing the osinfo database";
     homepage = "https://libosinfo.org/";
-    changelog = "https://gitlab.com/libosinfo/osinfo-db-tools/-/blob/v${version}/NEWS";
-    license = licenses.lgpl2Plus;
-    platforms = platforms.unix;
-    maintainers = [ maintainers.bjornfor ];
+    changelog = "https://gitlab.com/libosinfo/osinfo-db-tools/-/blob/v${finalAttrs.version}/NEWS";
+    license = lib.licenses.lgpl2Plus;
+    platforms = lib.platforms.unix;
+    maintainers = [ lib.maintainers.bjornfor ];
   };
-}
+})

From 7140a4123c691dc6d66eaa756cb45c9e2fe7d851 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Wed, 21 May 2025 04:43:14 +0800
Subject: [PATCH 032/103] pandoc-plantuml-filter: 0.1.2 -> 0.1.5

---
 .../misc/pandoc-plantuml-filter/default.nix   | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/misc/pandoc-plantuml-filter/default.nix b/pkgs/tools/misc/pandoc-plantuml-filter/default.nix
index d90cb0e52f97..e484a68d852f 100644
--- a/pkgs/tools/misc/pandoc-plantuml-filter/default.nix
+++ b/pkgs/tools/misc/pandoc-plantuml-filter/default.nix
@@ -1,28 +1,34 @@
 {
+  lib,
   buildPythonApplication,
   fetchPypi,
+  setuptools,
+  setuptools-scm,
   pandocfilters,
-  lib,
 }:
 
 buildPythonApplication rec {
   pname = "pandoc-plantuml-filter";
-  version = "0.1.2";
+  version = "0.1.5";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "08673mfwxsw6s52mgglbdz7ybb68svqyr3s9w97d7rifbwvvc9ia";
+    hash = "sha256-9qXeIZuCu44m9EoPCPL7MgEboEwN91OylLfbkwhkZYQ=";
   };
 
-  propagatedBuildInputs = [
-    pandocfilters
+  build-system = [
+    setuptools
+    setuptools-scm
   ];
 
-  meta = with lib; {
+  dependencies = [ pandocfilters ];
+
+  meta = {
     homepage = "https://github.com/timofurrer/pandoc-plantuml-filter";
     description = "Pandoc filter which converts PlantUML code blocks to PlantUML images";
-    license = licenses.mit;
-    maintainers = with maintainers; [ cmcdragonkai ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ cmcdragonkai ];
     mainProgram = "pandoc-plantuml";
   };
 }

From 749a83e7fef603816396523b1cf89ad1bd98aa4c Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Wed, 21 May 2025 07:26:18 +0800
Subject: [PATCH 033/103] pdfstudio2024: 2024.0.0 -> 2024.0.1

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

diff --git a/pkgs/applications/misc/pdfstudio/default.nix b/pkgs/applications/misc/pdfstudio/default.nix
index 03305f685fa0..1efa2836d6af 100644
--- a/pkgs/applications/misc/pdfstudio/default.nix
+++ b/pkgs/applications/misc/pdfstudio/default.nix
@@ -110,10 +110,10 @@ in
       program
       year
       ;
-    version = "${year}.0.0";
+    version = "${year}.0.1";
     src = fetchurl {
       url = "https://download.qoppa.com/pdfstudio/v${year}/PDFStudio_v${dot2dash version}_linux64.deb";
-      hash = "sha256-9TMSKtBE0+T7wRnBgtUjRr/JUmCaYdyD/7y0ML37wCM=";
+      hash = "sha256-dptpkWPlocp4U9QSp+AJTOSVWA3RRs8GrFfXhCYzOJc=";
     };
     extraBuildInputs = [
       (lib.getLib stdenv.cc.cc) # for libstdc++.so.6 and libgomp.so.1

From 7cb6c936965b955d80313484448d1ff8cb02fd9f Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Wed, 21 May 2025 09:24:42 +0800
Subject: [PATCH 034/103] pdfium-binaries: refactor

---
 pkgs/by-name/pd/pdfium-binaries/package.nix | 53 +++++++++++++--------
 pkgs/by-name/pd/pdfium-binaries/update.sh   | 31 +++++++-----
 pkgs/top-level/all-packages.nix             |  2 +
 3 files changed, 54 insertions(+), 32 deletions(-)

diff --git a/pkgs/by-name/pd/pdfium-binaries/package.nix b/pkgs/by-name/pd/pdfium-binaries/package.nix
index 626c2e13cda8..3ee8b3072c4f 100644
--- a/pkgs/by-name/pd/pdfium-binaries/package.nix
+++ b/pkgs/by-name/pd/pdfium-binaries/package.nix
@@ -1,44 +1,52 @@
 {
   lib,
-  fetchzip,
   stdenv,
+  fetchzip,
   python3Packages,
+  withV8 ? false,
 }:
-let
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "pdfium-binaries";
   # also update rev of headers in python3Packages.pypdfium2
   version = "7087";
+
   src =
     let
-      inherit (stdenv.hostPlatform) system;
-      selectSystem = attrs: attrs.${system};
-      suffix = selectSystem {
+      selectSystem =
+        attrs:
+        attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
+      system = selectSystem {
         x86_64-linux = "linux-x64";
         aarch64-linux = "linux-arm64";
         x86_64-darwin = "mac-x64";
         aarch64-darwin = "mac-arm64";
       };
-      hash = selectSystem {
-        x86_64-linux = "sha256-zn7QlTvChQa2mQCe5K+zEGVUtuD+l/jEtlKticrrSKg=";
-        aarch64-linux = "sha256-080X72NNfKaanHeVtmxE/4uNV6Ue4f/1Mri/p3nOT8c=";
-        x86_64-darwin = "sha256-XMStU0MN9ieCrLQnQL4/jKrNWxgQl9OtZHg9EmemPhU=";
-        aarch64-darwin = "sha256-Q8R/p1hX6+JeVTFc6w7MC9GPNGqxlu6m+iawRIMndic=";
-      };
     in
     fetchzip {
-      url = "https://github.com/bblanchon/pdfium-binaries/releases/download/chromium%2F${version}/pdfium-${suffix}.tgz";
-      inherit hash;
+      url = "https://github.com/bblanchon/pdfium-binaries/releases/download/chromium%2F${finalAttrs.version}/pdfium${lib.optionalString withV8 "-v8"}-${system}.tgz";
+      hash =
+        if withV8 then
+          selectSystem {
+            x86_64-linux = "sha256-nKHXcBTEp165g18HLzaNGfKt8MtTYpKBGNgwIpSO0u4=";
+            aarch64-linux = "sha256-wip/ry42aDbyGiwYSUX8koxDuf88BLGZAmMZE0s+fL0=";
+            x86_64-darwin = "sha256-7pUMfNFgGqQ8Dnox57sHfrKKke+i8CGEma4tePJaTDA=";
+            aarch64-darwin = "sha256-o59kmTNC4nSCFLfww3E+4iIYs2kQ30yyFaX9f2Za7os=";
+          }
+        else
+          selectSystem {
+            x86_64-linux = "sha256-zn7QlTvChQa2mQCe5K+zEGVUtuD+l/jEtlKticrrSKg=";
+            aarch64-linux = "sha256-080X72NNfKaanHeVtmxE/4uNV6Ue4f/1Mri/p3nOT8c=";
+            x86_64-darwin = "sha256-XMStU0MN9ieCrLQnQL4/jKrNWxgQl9OtZHg9EmemPhU=";
+            aarch64-darwin = "sha256-Q8R/p1hX6+JeVTFc6w7MC9GPNGqxlu6m+iawRIMndic=";
+          };
       stripRoot = false;
     };
-in
-stdenv.mkDerivation {
-  pname = "pdfium-binaries";
-  inherit version src;
 
   installPhase = ''
     runHook preInstall
 
-    mkdir $out
-    cp -r ./ $out/
+    cp -r . $out
 
     runHook postInstall
   '';
@@ -53,7 +61,10 @@ stdenv.mkDerivation {
   meta = {
     description = "Binary distribution of PDFium";
     homepage = "https://github.com/bblanchon/pdfium-binaries";
-    license = with lib.licenses; [ asl20 ];
+    license = with lib.licenses; [
+      asl20
+      mit
+    ];
     sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
     maintainers = with lib.maintainers; [ ];
     platforms = [
@@ -63,4 +74,4 @@ stdenv.mkDerivation {
       "x86_64-darwin"
     ];
   };
-}
+})
diff --git a/pkgs/by-name/pd/pdfium-binaries/update.sh b/pkgs/by-name/pd/pdfium-binaries/update.sh
index 1682c8f38ee5..8cc3aecd7933 100755
--- a/pkgs/by-name/pd/pdfium-binaries/update.sh
+++ b/pkgs/by-name/pd/pdfium-binaries/update.sh
@@ -1,10 +1,10 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i bash -p bash nixVersions.latest curl coreutils jq common-updater-scripts
+#!nix-shell -i bash -p bash nix curl coreutils jq common-updater-scripts
 
 set -eou pipefail
 
 latestVersion=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/bblanchon/pdfium-binaries/releases/latest | jq -r '.tag_name | ltrimstr("chromium/")')
-currentVersion=$(nix-instantiate --eval -E "with import ./. {}; pdfium-binaries.version" | tr -d '"')
+currentVersion=$(nix-instantiate --eval -E "with import ./. {}; pdfium-binaries.version or (lib.getVersion pdfium-binaries)" | tr -d '"')
 
 echo "latest  version: $latestVersion"
 echo "current version: $currentVersion"
@@ -14,13 +14,22 @@ if [[ "$latestVersion" == "$currentVersion" ]]; then
     exit 0
 fi
 
-for i in \
-    "x86_64-linux linux-x64" \
-    "aarch64-linux linux-arm64" \
-    "x86_64-darwin mac-x64" \
-    "aarch64-darwin mac-arm64"; do
-    set -- $i
-    prefetch=$(nix-prefetch-url --unpack "https://github.com/bblanchon/pdfium-binaries/releases/download/chromium%2F$latestVersion/pdfium-$2.tgz")
-    hash=$(nix hash convert --hash-algo sha256 --to sri $prefetch)
-    update-source-version pdfium-binaries $latestVersion $hash --system=$1 --ignore-same-version
+update-source-version pdfium-binaries $latestVersion || true
+
+for system in \
+    x86_64-linux \
+    aarch64-linux \
+    x86_64-darwin \
+    aarch64-darwin; do
+    hash=$(nix hash convert --to sri --hash-algo sha256 $(nix-prefetch-url --unpack $(nix-instantiate --eval -E "with import ./. {}; pdfium-binaries.src.url" --system "$system" | tr -d '"')))
+    update-source-version pdfium-binaries $latestVersion $hash --system=$system --ignore-same-version
+done
+
+for system in \
+    x86_64-linux \
+    aarch64-linux \
+    x86_64-darwin \
+    aarch64-darwin; do
+    hash=$(nix hash convert --to sri --hash-algo sha256 $(nix-prefetch-url --unpack $(nix-instantiate --eval -E "with import ./. {}; pdfium-binaries-v8.src.url" --system "$system" | tr -d '"')))
+    update-source-version pdfium-binaries-v8 $latestVersion $hash --system=$system --ignore-same-version
 done
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 198ea1b474a6..9f477061f7b7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4145,6 +4145,8 @@ with pkgs;
 
   pdfminer = with python3Packages; toPythonApplication pdfminer-six;
 
+  pdfium-binaries-v8 = pdfium-binaries.override { withV8 = true; };
+
   pgsync = callPackage ../development/tools/database/pgsync { };
 
   pdsh = callPackage ../tools/networking/pdsh {

From 804b71a29efcf4bab8ffa90446c7789abfbdb109 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 21 May 2025 03:50:46 +0000
Subject: [PATCH 035/103] vscode-extensions.github.vscode-pull-request-github:
 0.108.0 -> 0.110.0

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 6039303c58b9..d5172a21e8d0 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2117,8 +2117,8 @@ let
         mktplcRef = {
           publisher = "github";
           name = "vscode-pull-request-github";
-          version = "0.108.0";
-          hash = "sha256-GNNPc8nzNIrPOn+4ujKvhKodeHt9r1QlV8+EgqIz54I=";
+          version = "0.110.0";
+          hash = "sha256-roD6ugBm04L2IOKIQiAWULhhq4wo1O9VMYiYtdwCrCc=";
         };
         meta = {
           license = lib.licenses.mit;

From d068ba3d163bb52c46a25104677baf88b8da7f99 Mon Sep 17 00:00:00 2001
From: Nathan Mills <38995150+Quipyowert2@users.noreply.github.com>
Date: Thu, 8 May 2025 05:34:02 +0000
Subject: [PATCH 036/103] python3Packages.lizard: 1.17.10 -> 1.17.30

assertRegexpMatches was renamed to assertRegex in Python 3.2.
TestCSVOutput and TestHTMLOutput were failing because of this.

https://github.com/terryyin/lizard/releases/tag/1.17.30
---
 pkgs/development/python-modules/lizard/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/lizard/default.nix b/pkgs/development/python-modules/lizard/default.nix
index df6ab5c4b7b3..57f52013eb09 100644
--- a/pkgs/development/python-modules/lizard/default.nix
+++ b/pkgs/development/python-modules/lizard/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "lizard";
-  version = "1.17.10";
+  version = "1.17.30";
   format = "setuptools";
   disabled = pythonOlder "3.7";
 
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "terryyin";
     repo = "lizard";
     rev = version;
-    hash = "sha256-4jq6gXpI1hFtX7ka2c/qQ+S6vZCThKOGhQwJ2FOYItY=";
+    hash = "sha256-yXiRbC85IeeNR8rWSqLTQD9qy2CzAhlDD7YeTm5Vj9c=";
   };
 
   propagatedBuildInputs = [ jinja2 ];

From 395b6df1b90714f976dc3ad53b6fad906a1421e4 Mon Sep 17 00:00:00 2001
From: Nathan Mills <38995150+Quipyowert2@users.noreply.github.com>
Date: Thu, 8 May 2025 05:54:44 +0000
Subject: [PATCH 037/103] python3Packages.lizard: Add missing dependencies

test_gitignore_filter was failing because get_all_source_files was failing to import pathspec, causing the mock .gitignore file to be ignored.
---
 pkgs/development/python-modules/lizard/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/lizard/default.nix b/pkgs/development/python-modules/lizard/default.nix
index 57f52013eb09..c22effdc56ea 100644
--- a/pkgs/development/python-modules/lizard/default.nix
+++ b/pkgs/development/python-modules/lizard/default.nix
@@ -6,6 +6,8 @@
   pytestCheckHook,
   mock,
   jinja2,
+  pygments, # for Erlang support
+  pathspec, # for .gitignore support
 }:
 
 buildPythonPackage rec {
@@ -21,7 +23,11 @@ buildPythonPackage rec {
     hash = "sha256-yXiRbC85IeeNR8rWSqLTQD9qy2CzAhlDD7YeTm5Vj9c=";
   };
 
-  propagatedBuildInputs = [ jinja2 ];
+  propagatedBuildInputs = [
+    jinja2
+    pygments
+    pathspec
+  ];
 
   nativeCheckInputs = [
     pytestCheckHook

From 3220bea642efdf4ae402d25ac31ffbc580b63039 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 21 May 2025 08:45:11 +0000
Subject: [PATCH 038/103] otpclient: 4.0.2 -> 4.1.1

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

diff --git a/pkgs/by-name/ot/otpclient/package.nix b/pkgs/by-name/ot/otpclient/package.nix
index 0a09503a7d37..663366299cef 100644
--- a/pkgs/by-name/ot/otpclient/package.nix
+++ b/pkgs/by-name/ot/otpclient/package.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation rec {
   pname = "otpclient";
-  version = "4.0.2";
+  version = "4.1.1";
 
   src = fetchFromGitHub {
     owner = "paolostivanin";
     repo = "otpclient";
     tag = "v${version}";
-    hash = "sha256-lSGXxwtys3V8dDTAW7l7+9VlF9tZQnWqNaV8neBvMRg=";
+    hash = "sha256-yve6DMtMqPTkyI01lRvJy0rObEt9KMrekjPegjT5blk=";
   };
 
   nativeBuildInputs = [

From 1c35b30210a7b4be4ace553ea45321cfcfbc307b Mon Sep 17 00:00:00 2001
From: Bloxx12 <charlie@charlieroot.dev>
Date: Wed, 21 May 2025 16:24:47 +0200
Subject: [PATCH 039/103] dix: init at 1.0.0

---
 pkgs/by-name/di/dix/package.nix | 37 +++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 pkgs/by-name/di/dix/package.nix

diff --git a/pkgs/by-name/di/dix/package.nix b/pkgs/by-name/di/dix/package.nix
new file mode 100644
index 000000000000..05bf4c748aed
--- /dev/null
+++ b/pkgs/by-name/di/dix/package.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  nix-update-script,
+  versionCheckHook,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "dix";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "bloxx12";
+    repo = "dix";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-hsTw0MyxYD4UtUEeXgNRjmp1yla9Renl6xD19XQ5/LY=";
+  };
+
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-9uGtkWBShoge5tyeIdgJhthaBDF2nzCUbeY8HcaLWYc=";
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    homepage = "https://github.com/bloxx12/dix";
+    description = "Blazingly fast tool to diff Nix related things";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [
+      bloxx12
+      NotAShelf
+    ];
+    mainProgram = "dix";
+  };
+})

From 2f08a0cd4ff4b84815f71f82971ab6fee8e1b0cb Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 21 May 2025 19:47:01 +0200
Subject: [PATCH 040/103] python312Packages.mcp: 1.6.0 -> 1.9.0

Diff: https://github.com/modelcontextprotocol/python-sdk/compare/refs/tags/v1.6.0...refs/tags/v1.9.0

Changelog: https://github.com/modelcontextprotocol/python-sdk/releases/tag/v1.9.0
---
 .../python-modules/mcp/default.nix            | 43 +++++++++++++------
 1 file changed, 29 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/mcp/default.nix b/pkgs/development/python-modules/mcp/default.nix
index e0f9c268ac28..e68a6ef12382 100644
--- a/pkgs/development/python-modules/mcp/default.nix
+++ b/pkgs/development/python-modules/mcp/default.nix
@@ -1,44 +1,54 @@
 {
-  anyio,
+  lib,
   buildPythonPackage,
-  coreutils,
   fetchFromGitHub,
+
+  # build-system
   hatchling,
+
+  # dependencies
+  anyio,
   httpx,
   httpx-sse,
-  lib,
   pydantic,
   pydantic-settings,
+  python-multipart,
+  sse-starlette,
+  starlette,
+  uvicorn,
+
+  # optional-dependencies
+  # cli
+  python-dotenv,
+  typer,
+  # rich
+  rich,
+  # ws
+  websockets,
+
+  # tests
   pytest-asyncio,
   pytest-examples,
   pytestCheckHook,
-  python-dotenv,
-  rich,
-  sse-starlette,
-  starlette,
-  typer,
-  uvicorn,
-  websockets,
+  requests,
 }:
 
 buildPythonPackage rec {
   pname = "mcp";
-  version = "1.6.0";
+  version = "1.9.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "modelcontextprotocol";
     repo = "python-sdk";
     tag = "v${version}";
-    hash = "sha256-APm3x4tcDbp8D2ygW43wFyP0llJ6fXZiINHRYShp9ZY=";
+    hash = "sha256-UH91o2ElS0XLjH67R9QaJ/7AeX6oVkqqOc3588D4s0g=";
   };
 
   postPatch = ''
     substituteInPlace pyproject.toml \
       --replace-fail ', "uv-dynamic-versioning"' "" \
       --replace-fail 'dynamic = ["version"]' 'version = "${version}"'
-    substituteInPlace tests/client/test_stdio.py \
-      --replace '/usr/bin/tee' '${lib.getExe' coreutils "tee"}'
   '';
 
   build-system = [ hatchling ];
@@ -53,6 +63,7 @@ buildPythonPackage rec {
     httpx-sse
     pydantic
     pydantic-settings
+    python-multipart
     sse-starlette
     starlette
     uvicorn
@@ -77,6 +88,7 @@ buildPythonPackage rec {
     pytest-asyncio
     pytest-examples
     pytestCheckHook
+    requests
   ] ++ lib.flatten (lib.attrValues optional-dependencies);
 
   pytestFlagsArray = [
@@ -89,6 +101,9 @@ buildPythonPackage rec {
     "test_command_execution"
     # performance-dependent test
     "test_messages_are_executed_concurrently"
+
+    # ExceptionGroup: unhandled errors in a TaskGroup (1 sub-exception)
+    "test_client_session_version_negotiation_failure"
   ];
 
   __darwinAllowLocalNetworking = true;

From 8816e907c65cdefe7ac4db7bf69d9b3c54589977 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 21 May 2025 19:44:46 +0200
Subject: [PATCH 041/103] python312Packages.fastapi-mcp: init at 0.3.4

---
 .../python-modules/fastapi-mcp/default.nix    | 74 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 76 insertions(+)
 create mode 100644 pkgs/development/python-modules/fastapi-mcp/default.nix

diff --git a/pkgs/development/python-modules/fastapi-mcp/default.nix b/pkgs/development/python-modules/fastapi-mcp/default.nix
new file mode 100644
index 000000000000..60ec0fa3f8ec
--- /dev/null
+++ b/pkgs/development/python-modules/fastapi-mcp/default.nix
@@ -0,0 +1,74 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  hatchling,
+  tomli,
+
+  # dependencies
+  fastapi,
+  httpx,
+  mcp,
+  pydantic,
+  pydantic-settings,
+  requests,
+  rich,
+  typer,
+  uvicorn,
+
+  # tests
+  coverage,
+  pytest-asyncio,
+  pytest-cov-stub,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "fastapi-mcp";
+  version = "0.3.4";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "tadata-org";
+    repo = "fastapi_mcp";
+    tag = "v${version}";
+    hash = "sha256-t6p/jXQjbhUmIlwoqszRj3GGSrLS0Gcoh1BtizNaw8o=";
+  };
+
+  build-system = [
+    hatchling
+    tomli
+  ];
+
+  dependencies = [
+    fastapi
+    httpx
+    mcp
+    pydantic
+    pydantic-settings
+    requests
+    rich
+    tomli
+    typer
+    uvicorn
+  ];
+
+  pythonImportsCheck = [ "fastapi_mcp" ];
+
+  nativeCheckInputs = [
+    coverage
+    pytest-asyncio
+    pytest-cov-stub
+    pytestCheckHook
+  ];
+
+  meta = {
+    description = "Expose your FastAPI endpoints as Model Context Protocol (MCP) tools, with Auth";
+    homepage = "https://github.com/tadata-org/fastapi_mcp";
+    changelog = "https://github.com/tadata-org/fastapi_mcp/blob/v${version}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 91f1fb0c6de2..85461c1feb53 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4803,6 +4803,8 @@ self: super: with self; {
 
   fastapi-mail = callPackage ../development/python-modules/fastapi-mail { };
 
+  fastapi-mcp = callPackage ../development/python-modules/fastapi-mcp { };
+
   fastapi-sso = callPackage ../development/python-modules/fastapi-sso { };
 
   fastavro = callPackage ../development/python-modules/fastavro { };

From aca503c55dd5f476e9bd674103b13084599d9cc9 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Thu, 22 May 2025 03:49:34 +0800
Subject: [PATCH 042/103] picat: 3.6#8 -> 3.8#7

---
 pkgs/by-name/pi/picat/package.nix | 43 ++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/pi/picat/package.nix b/pkgs/by-name/pi/picat/package.nix
index 7aeeb75be2e7..839161187d46 100644
--- a/pkgs/by-name/pi/picat/package.nix
+++ b/pkgs/by-name/pi/picat/package.nix
@@ -5,8 +5,18 @@
   zlib,
 }:
 
-let
-  ARCH =
+stdenv.mkDerivation {
+  pname = "picat";
+  version = "3.8#7";
+
+  src = fetchurl {
+    url = "https://picat-lang.org/download/picat387_src.tar.gz";
+    hash = "sha256-H+aFmagdb7jU4LZCYrNPa4ZWVB1ziiJHrUe4b1ImWks=";
+  };
+
+  buildInputs = [ zlib ];
+
+  env.ARCH =
     {
       x86_64-linux = "linux64";
       aarch64-linux = "linux64";
@@ -15,39 +25,36 @@ let
       aarch64-darwin = "mac64";
     }
     ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
-in
-stdenv.mkDerivation {
-  pname = "picat";
-  version = "3.6#8";
-
-  src = fetchurl {
-    url = "http://picat-lang.org/download/picat368_src.tar.gz";
-    hash = "sha256-eJxF5atvJq3fhFltcQCGTP/sgUmfsfCohUgm3x2U1n0=";
-  };
-
-  buildInputs = [ zlib ];
-
-  inherit ARCH;
 
   hardeningDisable = [ "format" ];
+
   enableParallelBuilding = true;
 
   buildPhase = ''
+    runHook preBuild
+
     cd emu
     make -j $NIX_BUILD_CORES -f Makefile.$ARCH
+
+    runHook postBuild
   '';
+
   installPhase = ''
+    runHook preInstall
+
     mkdir -p $out/bin $out/share
     cp picat $out/bin/
     cp -r ../doc $out/share/doc
     cp -r ../exs $out/share/examples
+
+    runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Logic-based programming language";
     mainProgram = "picat";
     homepage = "http://picat-lang.org/";
-    license = licenses.mpl20;
+    license = lib.licenses.mpl20;
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
@@ -55,7 +62,7 @@ stdenv.mkDerivation {
       "x86_64-darwin"
       "aarch64-darwin"
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       earldouglas
       thoughtpolice
     ];

From c8d0558860e4d84a7b30d25e561e5607271e88fc Mon Sep 17 00:00:00 2001
From: Willi Carlsen <carlsenwilli@gmail.com>
Date: Wed, 21 May 2025 22:28:36 +0200
Subject: [PATCH 043/103] maintainers: add wcarlsen

Signed-off-by: Willi Carlsen <carlsenwilli@gmail.com>
---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 2bdd25f9a199..a5a22a22af4e 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -26287,6 +26287,12 @@
     github = "waynr";
     githubId = 1441126;
   };
+  wcarlsen = {
+    name = "Willi Carlsen";
+    email = "carlsenwilli@gmail.com";
+    github = "wcarlsen";
+    githubId = 17003032;
+  };
   wchresta = {
     email = "wchresta.nix@chrummibei.ch";
     github = "wchresta";

From 9829c006cc92d46ad5f18665770866df0f4c19e1 Mon Sep 17 00:00:00 2001
From: Willi Carlsen <carlsenwilli@gmail.com>
Date: Wed, 21 May 2025 22:30:36 +0200
Subject: [PATCH 044/103] grafanactl: init at 0.0.6

Signed-off-by: Willi Carlsen <carlsenwilli@gmail.com>
---
 pkgs/by-name/gr/grafanactl/package.nix | 52 ++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 pkgs/by-name/gr/grafanactl/package.nix

diff --git a/pkgs/by-name/gr/grafanactl/package.nix b/pkgs/by-name/gr/grafanactl/package.nix
new file mode 100644
index 000000000000..b9ffc1d88c9a
--- /dev/null
+++ b/pkgs/by-name/gr/grafanactl/package.nix
@@ -0,0 +1,52 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "grafanactl";
+  version = "0.0.6";
+
+  src = fetchFromGitHub {
+    owner = "grafana";
+    repo = "grafanactl";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-XpXfoD2Ln3YgMl02mEqoP8BIdT9gz45hMclii28D5xQ=";
+  };
+
+  vendorHash = "sha256-00FLRrQknuRPwmbkIazpCxRb34IY/OCxi/zgbuzBtWw=";
+
+  ldflags = [
+    "-X main.version=v${finalAttrs.version}"
+    "-X main.commit=unknown"
+    "-X main.date=unknown"
+  ];
+
+  subPackage = [ "cmd/grafanactl" ];
+
+  postInstall = ''
+    rm $out/bin/cmd-reference
+    rm $out/bin/config-reference
+    rm $out/bin/env-vars-reference
+  '';
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "--version";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Tool designed to simplify interaction with Grafana instances";
+    homepage = "https://github.com/grafana/grafanactl";
+    changelog = "https://github.com/grafana/grafanactl/tags/v${finalAttrs.version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ wcarlsen ];
+    mainProgram = "grafanactl";
+  };
+})

From 5ce8ed644c81b2b6a8fd93715eeaee33158d86ed Mon Sep 17 00:00:00 2001
From: p0lyw0lf <p0lyw0lf@protonmail.com>
Date: Wed, 21 May 2025 21:38:34 -0400
Subject: [PATCH 045/103] python313Packages.tracerite: add missing dep

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

diff --git a/pkgs/development/python-modules/tracerite/default.nix b/pkgs/development/python-modules/tracerite/default.nix
index 4f1a67923279..f728f1d62192 100644
--- a/pkgs/development/python-modules/tracerite/default.nix
+++ b/pkgs/development/python-modules/tracerite/default.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   setuptools-scm,
   html5tagger,
+  setuptools,
   python,
   pythonOlder,
 }:
@@ -24,7 +25,10 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ setuptools-scm ];
 
-  propagatedBuildInputs = [ html5tagger ];
+  propagatedBuildInputs = [
+    html5tagger
+    setuptools
+  ];
 
   postInstall = ''
     cp tracerite/style.css $out/${python.sitePackages}/tracerite

From 5fe8749c5151e62f67fbc2f45a9702a6d282d96d Mon Sep 17 00:00:00 2001
From: PolyWolf <31190026+p0lyw0lf@users.noreply.github.com>
Date: Wed, 21 May 2025 21:52:31 -0400
Subject: [PATCH 046/103] Apply suggestions from code review

Co-authored-by: Aleksana <alexander.huang.y@gmail.com>
---
 pkgs/development/python-modules/tracerite/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tracerite/default.nix b/pkgs/development/python-modules/tracerite/default.nix
index f728f1d62192..1a590780cdfc 100644
--- a/pkgs/development/python-modules/tracerite/default.nix
+++ b/pkgs/development/python-modules/tracerite/default.nix
@@ -23,9 +23,9 @@ buildPythonPackage rec {
     hash = "sha256-rI1MNdYl/P64tUHyB3qV9gfLbGbCVOXnEFoqFTkaqgg=";
   };
 
-  nativeBuildInputs = [ setuptools-scm ];
+  build-system = [ setuptools-scm ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     html5tagger
     setuptools
   ];

From b42d12d7fba5abf69c019560aa0e4f770eeba583 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Thu, 22 May 2025 12:34:11 +0800
Subject: [PATCH 047/103] sing-box: avoid with lib;

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

diff --git a/pkgs/by-name/si/sing-box/package.nix b/pkgs/by-name/si/sing-box/package.nix
index e708f141f705..10b38701bc98 100644
--- a/pkgs/by-name/si/sing-box/package.nix
+++ b/pkgs/by-name/si/sing-box/package.nix
@@ -66,11 +66,11 @@ buildGoModule rec {
     tests = { inherit (nixosTests) sing-box; };
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://sing-box.sagernet.org";
     description = "Universal proxy platform";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ nickcao ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ nickcao ];
     mainProgram = "sing-box";
   };
 }

From 7ea800b921c5fd45fdb2d86599176851e886ff44 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Thu, 22 May 2025 12:40:03 +0800
Subject: [PATCH 048/103] sing-box: use finalAttrs

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

diff --git a/pkgs/by-name/si/sing-box/package.nix b/pkgs/by-name/si/sing-box/package.nix
index 10b38701bc98..ccc9dec43c6b 100644
--- a/pkgs/by-name/si/sing-box/package.nix
+++ b/pkgs/by-name/si/sing-box/package.nix
@@ -10,14 +10,14 @@
   nixosTests,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "sing-box";
   version = "1.11.11";
 
   src = fetchFromGitHub {
     owner = "SagerNet";
-    repo = pname;
-    rev = "v${version}";
+    repo = "sing-box";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-hdYYjKBXnTqScYTUCfMmXozDD8GtIorLXnsU2Fmwg/c=";
   };
 
@@ -42,7 +42,7 @@ buildGoModule rec {
   nativeBuildInputs = [ installShellFiles ];
 
   ldflags = [
-    "-X=github.com/sagernet/sing-box/constant.Version=${version}"
+    "-X=github.com/sagernet/sing-box/constant.Version=${finalAttrs.version}"
   ];
 
   postInstall =
@@ -73,4 +73,4 @@ buildGoModule rec {
     maintainers = with lib.maintainers; [ nickcao ];
     mainProgram = "sing-box";
   };
-}
+})

From a3d80d590e87227e28ac7516b6fbe38506bc8c42 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Thu, 22 May 2025 12:43:47 +0800
Subject: [PATCH 049/103] sing-box: add prince213 to maintainers

---
 pkgs/by-name/si/sing-box/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/si/sing-box/package.nix b/pkgs/by-name/si/sing-box/package.nix
index ccc9dec43c6b..b1fd01cce72d 100644
--- a/pkgs/by-name/si/sing-box/package.nix
+++ b/pkgs/by-name/si/sing-box/package.nix
@@ -70,7 +70,10 @@ buildGoModule (finalAttrs: {
     homepage = "https://sing-box.sagernet.org";
     description = "Universal proxy platform";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ nickcao ];
+    maintainers = with lib.maintainers; [
+      nickcao
+      prince213
+    ];
     mainProgram = "sing-box";
   };
 })

From 422a85d518ffaa33a56f42b66e36d9ed203edb90 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 22 May 2025 05:15:31 +0000
Subject: [PATCH 050/103] files-cli: 2.14.8 -> 2.15.7

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

diff --git a/pkgs/by-name/fi/files-cli/package.nix b/pkgs/by-name/fi/files-cli/package.nix
index cabeeb09702e..4383603f89e9 100644
--- a/pkgs/by-name/fi/files-cli/package.nix
+++ b/pkgs/by-name/fi/files-cli/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "files-cli";
-  version = "2.14.8";
+  version = "2.15.7";
 
   src = fetchFromGitHub {
     repo = "files-cli";
     owner = "files-com";
     rev = "v${version}";
-    hash = "sha256-qiqxvRy0jHhxnCky+XizHaFGdJnsk5qdUjgaY2lVfko=";
+    hash = "sha256-lG4nmP5Ar+9KEjbDhE4epv+/8mrhhxpSWETZ56/gGzU=";
   };
 
-  vendorHash = "sha256-58XHEcBZZR/nEu+6LX/ItB2JlI00Uz+htVluavFtNm0=";
+  vendorHash = "sha256-Zs7Sd/xndXeEDNye0DqmeKsmtwLMonNMEwmsA/ymeOs=";
 
   ldflags = [
     "-s"

From 2634ef71a80f41ff04234be5d5cd0af677c05262 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Thu, 22 May 2025 12:53:05 +0800
Subject: [PATCH 051/103] sing-box: install shell completions directly

---
 pkgs/by-name/si/sing-box/package.nix | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/si/sing-box/package.nix b/pkgs/by-name/si/sing-box/package.nix
index b1fd01cce72d..867dc573e195 100644
--- a/pkgs/by-name/si/sing-box/package.nix
+++ b/pkgs/by-name/si/sing-box/package.nix
@@ -1,10 +1,8 @@
 {
   lib,
-  stdenv,
   buildGoModule,
   fetchFromGitHub,
   installShellFiles,
-  buildPackages,
   coreutils,
   nix-update-script,
   nixosTests,
@@ -45,21 +43,14 @@ buildGoModule (finalAttrs: {
     "-X=github.com/sagernet/sing-box/constant.Version=${finalAttrs.version}"
   ];
 
-  postInstall =
-    let
-      emulator = stdenv.hostPlatform.emulator buildPackages;
-    in
-    ''
-      installShellCompletion --cmd sing-box \
-        --bash <(${emulator} $out/bin/sing-box completion bash) \
-        --fish <(${emulator} $out/bin/sing-box completion fish) \
-        --zsh  <(${emulator} $out/bin/sing-box completion zsh )
+  postInstall = ''
+    installShellCompletion release/completions/sing-box.{bash,fish,zsh}
 
-      substituteInPlace release/config/sing-box{,@}.service \
-        --replace-fail "/usr/bin/sing-box" "$out/bin/sing-box" \
-        --replace-fail "/bin/kill" "${coreutils}/bin/kill"
-      install -Dm444 -t "$out/lib/systemd/system/" release/config/sing-box{,@}.service
-    '';
+    substituteInPlace release/config/sing-box{,@}.service \
+      --replace-fail "/usr/bin/sing-box" "$out/bin/sing-box" \
+      --replace-fail "/bin/kill" "${coreutils}/bin/kill"
+    install -Dm444 -t "$out/lib/systemd/system/" release/config/sing-box{,@}.service
+  '';
 
   passthru = {
     updateScript = nix-update-script { };

From 8d24e36a2fd9e6b177c8b3c24605d0f6334e2f66 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Thu, 22 May 2025 14:12:48 +0800
Subject: [PATCH 052/103] stockpile: init at 0.5.0

---
 pkgs/by-name/st/stockpile/package.nix | 54 +++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 pkgs/by-name/st/stockpile/package.nix

diff --git a/pkgs/by-name/st/stockpile/package.nix b/pkgs/by-name/st/stockpile/package.nix
new file mode 100644
index 000000000000..9310ee53f519
--- /dev/null
+++ b/pkgs/by-name/st/stockpile/package.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitea,
+  meson,
+  ninja,
+  pkg-config,
+  vala,
+  wrapGAppsHook4,
+  blueprint-compiler,
+  desktop-file-utils,
+  appstream-glib,
+  libadwaita,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "stockpile";
+  version = "0.5.0";
+
+  src = fetchFromGitea {
+    domain = "codeberg.org";
+    owner = "turtle";
+    repo = "stockpile";
+    tag = finalAttrs.version;
+    hash = "sha256-e8mBZyZFGtiDGsAb4kyNOzLNA9GIE6X8buRJj6DCbxM=";
+  };
+
+  postPatch = ''
+    substituteInPlace meson.build \
+      --replace-fail "run_command('git', 'rev-parse', '--short', 'HEAD').stdout().strip()" "'${finalAttrs.version}'"
+  '';
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    desktop-file-utils
+    appstream-glib
+    blueprint-compiler
+    vala
+    wrapGAppsHook4
+  ];
+
+  buildInputs = [ libadwaita ];
+
+  meta = {
+    description = "Keep count of restockable items";
+    homepage = "https://codeberg.org/turtle/stockpile";
+    mainProgram = "stockpile";
+    license = lib.licenses.agpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ emaryn ];
+  };
+})

From 3533884ef2239c5cbd640824dc198e2da4ae813d Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Wed, 21 May 2025 21:39:21 +0200
Subject: [PATCH 053/103] rustup: disable parallel testing

Caused issues in:
- download::tests::reqwest::socks_proxy_request
- download::tests::curl::callback_gets_all_data_as_if_the_download_happened_all_at_once
- download::tests::reqwest::callback_gets_all_data_as_if_the_download_happened_all_at_once
---
 pkgs/development/tools/rust/rustup/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix
index f683e5021415..911a956b9c44 100644
--- a/pkgs/development/tools/rust/rustup/default.nix
+++ b/pkgs/development/tools/rust/rustup/default.nix
@@ -79,6 +79,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
   # Random tests fail nondeterministically on macOS.
   # TODO: Investigate this.
   doCheck = !stdenv.hostPlatform.isDarwin;
+  # Random failures when running tests in parallel.
+  preCheck = ''
+    export NIX_BUILD_CORES=1
+  '';
 
   # skip failing tests
   checkFlags = [

From 90d573e717dacdfaa0d392571cacd56495c571a4 Mon Sep 17 00:00:00 2001
From: Matt Field <matt@mild.systems>
Date: Mon, 12 May 2025 16:33:43 +0100
Subject: [PATCH 054/103] fluxcd-operator: 0.19.0 -> 0.20.0

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

diff --git a/pkgs/by-name/fl/fluxcd-operator/package.nix b/pkgs/by-name/fl/fluxcd-operator/package.nix
index dac5909a448f..4462ceebfc25 100644
--- a/pkgs/by-name/fl/fluxcd-operator/package.nix
+++ b/pkgs/by-name/fl/fluxcd-operator/package.nix
@@ -1,24 +1,24 @@
 {
   lib,
-  buildGo124Module,
+  buildGoModule,
   fetchFromGitHub,
   installShellFiles,
   versionCheckHook,
   nix-update-script,
   stdenv,
 }:
-buildGo124Module (finalAttrs: {
+buildGoModule (finalAttrs: {
   pname = "fluxcd-operator";
-  version = "0.19.0";
+  version = "0.20.0";
 
   src = fetchFromGitHub {
     owner = "controlplaneio-fluxcd";
     repo = "fluxcd-operator";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2AkO8nie2ep3ASy0hkM9JEryv0ekyRNPkCoZ3WgBQwU=";
+    hash = "sha256-GGHufHUqTylgynK19aaj4KAawlzzuz3iSEHa+vVVPMM=";
   };
 
-  vendorHash = "sha256-sQhp89AzICeu3oRVh3ys93PyeU5A24T36QwQsHxMSaY=";
+  vendorHash = "sha256-5uT/pcfXrinyJ1hXmQ+vmWNuyO33c6d5PAjm6kwOZmY=";
 
   ldflags = [
     "-s"

From 6298c6279a90a025712ea8fce57471ac9604fe12 Mon Sep 17 00:00:00 2001
From: thtrf <r3769.tv@gmail.com>
Date: Thu, 22 May 2025 13:10:25 +0200
Subject: [PATCH 055/103] spedread: init at 2.4.7-fixed

---
 pkgs/by-name/sp/spedread/package.nix | 67 ++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 pkgs/by-name/sp/spedread/package.nix

diff --git a/pkgs/by-name/sp/spedread/package.nix b/pkgs/by-name/sp/spedread/package.nix
new file mode 100644
index 000000000000..050a2461e252
--- /dev/null
+++ b/pkgs/by-name/sp/spedread/package.nix
@@ -0,0 +1,67 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  meson,
+  ninja,
+  pkg-config,
+  vala,
+  glib,
+  gtk4,
+  libadwaita,
+  wrapGAppsHook4,
+  appstream-glib,
+  desktop-file-utils,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "spedread";
+  version = "2.4.7-fixed";
+
+  src = fetchFromGitHub {
+    owner = "Darazaki";
+    repo = "Spedread";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-wbSayADL2J+GEJWreiyTWtgXjdXC1bloRq1iHRS0VFc=";
+  };
+
+  postPatch = ''
+    substituteInPlace meson.build \
+      --replace-fail "meson.add_install_script('build-aux/meson/postinstall.py')" ""
+  '';
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    vala
+    pkg-config
+    wrapGAppsHook4
+    appstream-glib
+    desktop-file-utils
+  ];
+
+  buildInputs = [
+    glib
+    gtk4
+    libadwaita
+  ];
+
+  postInstall = ''
+    gtk4-update-icon-cache -qtf "$out/share/icons/hicolor"
+    update-desktop-database -q "$out/share/applications"
+    glib-compile-schemas "$out/share/glib-2.0/schemas"
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Rapid word display tool for improved reading focus and reduced eye movement";
+    homepage = "https://github.com/Darazaki/Spedread";
+    changelog = "https://github.com/Darazaki/Spedread/releases/tag/${finalAttrs.version}";
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ thtrf ];
+    platforms = lib.platforms.linux;
+    mainProgram = "spedread";
+  };
+})

From 13f89696ea547abb0557e296eaf2951c93b0b76f Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Thu, 22 May 2025 13:25:54 +0200
Subject: [PATCH 056/103] notion: 4.0.3 -> 4.0.4

removes the need for patches
---
 pkgs/by-name/no/notion/package.nix | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/no/notion/package.nix b/pkgs/by-name/no/notion/package.nix
index da7a28082e51..7d52d18312b3 100644
--- a/pkgs/by-name/no/notion/package.nix
+++ b/pkgs/by-name/no/notion/package.nix
@@ -21,25 +21,15 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "notion";
-  version = "4.0.3";
+  version = "4.0.4";
 
   src = fetchFromGitHub {
     owner = "raboof";
     repo = "notion";
     tag = finalAttrs.version;
-    hash = "sha256-Ll4thDS8fHxkm2IuGjePPVPyPPrz7yDzpKVloFuk/yE=";
+    hash = "sha256-L7WL8zn1Qkf5sqrhqZJqFe4B1l9ULXI3pt3Jpc87huk=";
   };
 
-  postPatch = ''
-    # Fix build failure due missing headers
-    sed -i '1i#define _POSIX_C_SOURCE 200809L' mod_notionflux/notionflux/notionflux.c
-    sed -i '2i#include <stdio.h>' mod_notionflux/notionflux/notionflux.c
-    sed -i '3i#include <string.h>' mod_notionflux/notionflux/notionflux.c
-
-    # error: 'PATH_MAX' undeclared
-    sed 1i'#include <linux/limits.h>' -i mod_notionflux/notionflux/notionflux.c
-  '';
-
   nativeBuildInputs = [
     gettext
     groff

From c34062115198293ff358d58a47d45cd81944640a Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 22 May 2025 00:17:21 +0200
Subject: [PATCH 057/103] python312Packages.gliner: init at 0.2.20

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

diff --git a/pkgs/development/python-modules/gliner/default.nix b/pkgs/development/python-modules/gliner/default.nix
new file mode 100644
index 000000000000..77583b257065
--- /dev/null
+++ b/pkgs/development/python-modules/gliner/default.nix
@@ -0,0 +1,60 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  huggingface-hub,
+  onnxruntime,
+  sentencepiece,
+  torch,
+  tqdm,
+  transformers,
+}:
+
+buildPythonPackage rec {
+  pname = "gliner";
+  version = "0.2.20";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "urchade";
+    repo = "GLiNER";
+    tag = "v${version}";
+    hash = "sha256-aWBDnaiq9Z30YT4sszEVk1WAyU4aH8SFD6ESOBkT2ds=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    huggingface-hub
+    onnxruntime
+    sentencepiece
+    torch
+    tqdm
+    transformers
+  ];
+
+  pythonImportsCheck = [ "gliner" ];
+
+  # All tests require internet
+  doCheck = false;
+
+  meta = {
+    description = "Generalist and Lightweight Model for Named Entity Recognition";
+    homepage = "https://github.com/urchade/GLiNER";
+    changelog = "https://github.com/urchade/GLiNER/releases/tag/v${version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+    badPlatforms = [
+      # terminate called after throwing an instance of 'onnxruntime::OnnxRuntimeException'
+      # Attempt to use DefaultLogger but none has been registered.
+      "aarch64-linux"
+    ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 85461c1feb53..b75310f7202b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5688,6 +5688,8 @@ self: super: with self; {
 
   glfw = callPackage ../development/python-modules/glfw { };
 
+  gliner = callPackage ../development/python-modules/gliner { };
+
   glob2 = callPackage ../development/python-modules/glob2 { };
 
   globus-sdk = callPackage ../development/python-modules/globus-sdk { };

From f4603dcf7eed4b17dd2f9687d06d9d181ff0ccd9 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 22 May 2025 00:29:39 +0200
Subject: [PATCH 058/103] python312Packages.staticvectors: init at 0.2.0

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

diff --git a/pkgs/development/python-modules/staticvectors/default.nix b/pkgs/development/python-modules/staticvectors/default.nix
new file mode 100644
index 000000000000..793f80902a8c
--- /dev/null
+++ b/pkgs/development/python-modules/staticvectors/default.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  huggingface-hub,
+  numpy,
+  safetensors,
+  tqdm,
+}:
+
+buildPythonPackage rec {
+  pname = "staticvectors";
+  version = "0.2.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "neuml";
+    repo = "staticvectors";
+    tag = "v${version}";
+    hash = "sha256-p3m22qLxQYma0WtkTE/GzHXkxNHjatqLOdeHh4vtyVc=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    huggingface-hub
+    numpy
+    safetensors
+    tqdm
+  ];
+
+  pythonImportsCheck = [ "staticvectors" ];
+
+  # no tests
+  doCheck = false;
+
+  meta = {
+    description = "Work with static vector models";
+    homepage = "https://github.com/neuml/staticvectors";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b75310f7202b..79506c4f0975 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16728,6 +16728,8 @@ self: super: with self; {
 
   staticmap = callPackage ../development/python-modules/staticmap { };
 
+  staticvectors = callPackage ../development/python-modules/staticvectors { };
+
   statistics = callPackage ../development/python-modules/statistics { };
 
   statmake = callPackage ../development/python-modules/statmake { };

From 46381e0f8e24d547d395c9f570144ab3f03890c7 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 21 May 2025 19:22:30 +0200
Subject: [PATCH 059/103] python312Packages.txtai: 8.2.0 -> 8.5.0

Diff: https://github.com/neuml/txtai/compare/refs/tags/v8.2.0...refs/tags/v8.5.0

Changelog: https://github.com/neuml/txtai/releases/tag/v8.5.0
---
 .../python-modules/txtai/default.nix          | 45 ++++++++++++++-----
 1 file changed, 33 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/txtai/default.nix b/pkgs/development/python-modules/txtai/default.nix
index 4292552242b1..4e3d4788a6c4 100644
--- a/pkgs/development/python-modules/txtai/default.nix
+++ b/pkgs/development/python-modules/txtai/default.nix
@@ -16,6 +16,9 @@
   regex,
 
   # optional-dependencies
+  # agent
+  mcpadapt,
+  smolagents,
   # ann
   annoy,
   hnswlib,
@@ -25,11 +28,14 @@
   # api
   aiohttp,
   fastapi,
+  fastapi-mcp,
+  httpx,
   pillow,
   python-multipart,
   uvicorn,
   # cloud
   # apache-libcloud, (unpackaged)
+  fasteners,
   # console
   rich,
   # database
@@ -38,7 +44,6 @@
   # grand-cypher (unpackaged)
   # grand-graph (unpackaged)
   networkx,
-  python-louvain,
   # model
   onnx,
   onnxruntime,
@@ -61,8 +66,9 @@
   litellm,
   # llama-cpp-python, (unpackaged)
   # pipeline-text
-  fasttext,
+  gliner,
   sentencepiece,
+  staticvectors,
   # pipeline-train
   accelerate,
   bitsandbytes,
@@ -70,6 +76,7 @@
   peft,
   skl2onnx,
   # vectors
+  fasttext,
   # pymagnitude-lite, (unpackaged)
   scikit-learn,
   sentence-transformers,
@@ -82,12 +89,15 @@
   xmltodict,
 
   # tests
-  httpx,
   msgpack,
   pytestCheckHook,
 }:
 let
-  version = "8.2.0";
+  version = "8.5.0";
+  agent = [
+    mcpadapt
+    smolagents
+  ];
   ann = [
     annoy
     hnswlib
@@ -98,11 +108,16 @@ let
   api = [
     aiohttp
     fastapi
+    fastapi-mcp
+    httpx
     pillow
     python-multipart
     uvicorn
   ];
-  # cloud = [ apache-libcloud ];
+  cloud = [
+    # apache-libcloud
+    fasteners
+  ];
   console = [ rich ];
   database = [
     duckdb
@@ -113,7 +128,6 @@ let
     # grand-cypher
     # grand-graph
     networkx
-    python-louvain
     sqlalchemy
   ];
   model = [
@@ -145,8 +159,9 @@ let
     # llama-cpp-python
   ];
   pipeline-text = [
-    fasttext
+    gliner
     sentencepiece
+    staticvectors
   ];
   pipeline-train = [
     accelerate
@@ -186,7 +201,8 @@ let
   ];
   similarity = ann ++ vectors;
   all =
-    api
+    agent
+    ++ api
     ++ ann
     ++ console
     ++ database
@@ -199,8 +215,10 @@ let
 
   optional-dependencies = {
     inherit
+      agent
       ann
       api
+      cloud
       console
       database
       graph
@@ -222,7 +240,7 @@ let
     owner = "neuml";
     repo = "txtai";
     tag = "v${version}";
-    hash = "sha256-fMzCYw9eqlpGI5FKoyYyxT17EhUFmFP9lrCn/LFC6ks=";
+    hash = "sha256-kYjlA7pJ+xCC+tu0aaxziKaPo3hph5Ld8P/lVrip/eM=";
   };
 in
 buildPythonPackage {
@@ -264,8 +282,10 @@ buildPythonPackage {
       msgpack
       pytestCheckHook
       python-multipart
+      timm
       sqlalchemy
     ]
+    ++ optional-dependencies.agent
     ++ optional-dependencies.ann
     ++ optional-dependencies.api
     ++ optional-dependencies.similarity;
@@ -280,9 +300,9 @@ buildPythonPackage {
     "--deselect=test/python/testconsole.py"
     "--deselect=test/python/testembeddings.py"
     "--deselect=test/python/testgraph.py"
-    "--deselect=test/python/testapi/testembeddings.py"
-    "--deselect=test/python/testapi/testpipelines.py"
-    "--deselect=test/python/testapi/testworkflow.py"
+    "--deselect=test/python/testapi/testapiembeddings.py"
+    "--deselect=test/python/testapi/testapipipelines.py"
+    "--deselect=test/python/testapi/testapiworkflow.py"
     "--deselect=test/python/testdatabase/testclient.py"
     "--deselect=test/python/testdatabase/testduckdb.py"
     "--deselect=test/python/testdatabase/testencoder.py"
@@ -295,6 +315,7 @@ buildPythonPackage {
     "testInvalidZip"
     # Downloads from Huggingface
     "testPipeline"
+    "testVectors"
     # Not finding sqlite-vec despite being supplied
     "testSQLite"
     "testSQLiteCustom"

From bb60182678c48fec74e70352b083879453ec3e83 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 22 May 2025 01:14:02 +0200
Subject: [PATCH 060/103] python312Packages.fastmcp: init at 2.4.0

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

diff --git a/pkgs/development/python-modules/fastmcp/default.nix b/pkgs/development/python-modules/fastmcp/default.nix
new file mode 100644
index 000000000000..d378c0fc9142
--- /dev/null
+++ b/pkgs/development/python-modules/fastmcp/default.nix
@@ -0,0 +1,73 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  hatchling,
+
+  # dependencies
+  exceptiongroup,
+  httpx,
+  mcp,
+  openapi-pydantic,
+  python-dotenv,
+  rich,
+  typer,
+  websockets,
+
+  # tests
+  dirty-equals,
+  fastapi,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "fastmcp";
+  version = "2.4.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "jlowin";
+    repo = "fastmcp";
+    tag = "v${version}";
+    hash = "sha256-F4lgMm/84svLZo6SZ7AubsC73s4tffqjJcd9gvA7hGA=";
+  };
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail ', "uv-dynamic-versioning>=0.7.0"' "" \
+      --replace-fail 'dynamic = ["version"]' 'version = "${version}"'
+  '';
+
+  build-system = [
+    hatchling
+  ];
+
+  dependencies = [
+    exceptiongroup
+    httpx
+    mcp
+    openapi-pydantic
+    python-dotenv
+    rich
+    typer
+    websockets
+  ];
+
+  pythonImportsCheck = [ "fastmcp" ];
+
+  nativeCheckInputs = [
+    dirty-equals
+    fastapi
+    pytestCheckHook
+  ];
+
+  meta = {
+    description = "The fast, Pythonic way to build MCP servers and clients";
+    changelog = "https://github.com/jlowin/fastmcp/releases/tag/v${version}";
+    homepage = "https://github.com/jlowin/fastmcp";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 79506c4f0975..7d0f4ede1d2a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4841,6 +4841,8 @@ self: super: with self; {
 
   fastjsonschema = callPackage ../development/python-modules/fastjsonschema { };
 
+  fastmcp = callPackage ../development/python-modules/fastmcp { };
+
   fastmri = callPackage ../development/python-modules/fastmri { };
 
   fastnlo-toolkit = toPythonModule (

From 480cd683636fadd26af97523f54e1ac3d74a0c3b Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 22 May 2025 01:11:19 +0200
Subject: [PATCH 061/103] oterm: 0.11.1 -> 0.12.1

Diff: https://github.com/ggozad/oterm/compare/refs/tags/0.11.1...refs/tags/0.12.1

Changelog: https://github.com/ggozad/oterm/releases/tag/0.12.1
---
 pkgs/by-name/ot/oterm/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ot/oterm/package.nix b/pkgs/by-name/ot/oterm/package.nix
index b6dd44bef0fd..a6edcabadeca 100644
--- a/pkgs/by-name/ot/oterm/package.nix
+++ b/pkgs/by-name/ot/oterm/package.nix
@@ -9,14 +9,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "oterm";
-  version = "0.11.1";
+  version = "0.12.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ggozad";
     repo = "oterm";
     tag = version;
-    hash = "sha256-b/+siNzmM6RUJ3jv/2dNJJFueejChKde0D5r8J0lTqM=";
+    hash = "sha256-6y73Lh3cV/fnvpZWzfyD4CletC4UV2zl+I7l88BYPIk=";
   };
 
   pythonRelaxDeps = [
@@ -37,8 +37,8 @@ python3Packages.buildPythonApplication rec {
     aiohttp
     aiosql
     aiosqlite
+    fastmcp
     httpx
-    jinja2
     mcp
     ollama
     packaging

From c598c6d5762b5c10ef0dd098d7a9feac52f3494a Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Wed, 21 May 2025 18:09:11 +0200
Subject: [PATCH 062/103] json-schema-catalog-rs: init at 0.1.1

---
 .../js/json-schema-catalog-rs/package.nix     | 42 +++++++++++++++
 .../js/json-schema-catalog-rs/test-run.nix    | 54 +++++++++++++++++++
 2 files changed, 96 insertions(+)
 create mode 100644 pkgs/by-name/js/json-schema-catalog-rs/package.nix
 create mode 100644 pkgs/by-name/js/json-schema-catalog-rs/test-run.nix

diff --git a/pkgs/by-name/js/json-schema-catalog-rs/package.nix b/pkgs/by-name/js/json-schema-catalog-rs/package.nix
new file mode 100644
index 000000000000..5fd10d430fab
--- /dev/null
+++ b/pkgs/by-name/js/json-schema-catalog-rs/package.nix
@@ -0,0 +1,42 @@
+{
+  callPackage,
+  fetchFromGitHub,
+  lib,
+  nix-update-script,
+  rustPlatform,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "json-schema-catalog-rs";
+  version = "0.1.1";
+
+  src = fetchFromGitHub {
+    owner = "roberth";
+    repo = "json-schema-catalog-rs";
+    tag = finalAttrs.version;
+    hash = "sha256-BbEPpolv2aoKFlfZ6A+CmUlr5sySGIqRlv3rLgf1VkA=";
+  };
+
+  cargoHash = "sha256-YI2LN2DBzC1B5wCZOrGAZi/hkKHoAm6xLkdJ+8DDFo8=";
+
+  passthru = {
+    tests = {
+      run = callPackage ./test-run.nix { json-schema-catalog-rs = finalAttrs.finalPackage; };
+    };
+
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "CLI for working with JSON Schema Catalogs";
+    longDescription = ''
+      A JSON Schema Catalog file provides a mapping from schema URIs to schema locations.
+      By constructing and using a catalog, you can avoid the need to download and parse schemas from the internet.
+      This is particularly useful when working with large schemas or when you need to work, test or build offline.
+    '';
+    homepage = "https://github.com/roberth/json-schema-catalog-rs";
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.roberth ];
+    mainProgram = "json-schema-catalog";
+  };
+})
diff --git a/pkgs/by-name/js/json-schema-catalog-rs/test-run.nix b/pkgs/by-name/js/json-schema-catalog-rs/test-run.nix
new file mode 100644
index 000000000000..0b2cce62e208
--- /dev/null
+++ b/pkgs/by-name/js/json-schema-catalog-rs/test-run.nix
@@ -0,0 +1,54 @@
+{
+  json-schema-catalog-rs,
+  runCommand,
+}:
+let
+
+  sample = builtins.toFile "example-schema.json" (
+    builtins.toJSON {
+      "$schema" = "http://json-schema.org/draft-07/schema#";
+      "$id" = "https://example.com/example-2.9.json";
+      "title" = "Example Schema";
+    }
+  );
+
+in
+runCommand "json-schema-catalog-rs-test-run"
+  {
+    nativeBuildInputs = [
+      json-schema-catalog-rs
+    ];
+    inherit sample;
+    expectedOutput = ''
+      {
+        "groups": [
+          {
+            "baseLocation": "/nix/store",
+            "name": "Example Schema",
+            "schemas": [
+              {
+                "id": "https://example.com/example-2.9.json",
+                "location": "${baseNameOf sample}"
+              }
+            ]
+          }
+        ],
+        "name": "Catalog"
+      }
+    '';
+    passAsFile = [
+      "expectedOutput"
+    ];
+  }
+  ''
+    set -u
+
+    # Test version
+    json-schema-catalog --version | grep ${json-schema-catalog-rs.version}
+
+    # Test a simple command
+    json-schema-catalog new "$sample" > out.json
+    diff -U3 "$expectedOutputPath" out.json
+
+    touch $out
+  ''

From 35cfb482381fd4d296dd111899e080835eefad02 Mon Sep 17 00:00:00 2001
From: TheTaoOfSu <TheTaoOfSu@protonmail.com>
Date: Thu, 22 May 2025 14:23:16 +0200
Subject: [PATCH 063/103] deutex: init at 5.2.3

---
 pkgs/by-name/de/deutex/package.nix | 42 ++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 pkgs/by-name/de/deutex/package.nix

diff --git a/pkgs/by-name/de/deutex/package.nix b/pkgs/by-name/de/deutex/package.nix
new file mode 100644
index 000000000000..339d1ec1eaaa
--- /dev/null
+++ b/pkgs/by-name/de/deutex/package.nix
@@ -0,0 +1,42 @@
+{
+  stdenv,
+  lib,
+  autoreconfHook,
+  fetchFromGitHub,
+  pkg-config,
+  libpng,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "deutex";
+  version = "5.2.3";
+
+  src = fetchFromGitHub {
+    owner = "Doom-Utils";
+    repo = "deutex";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-wDAlwOtupkYv6y4fQPwL/PVOhh7wqORnjxV22kmON+U=";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ];
+
+  buildInput = [
+    libpng
+  ];
+
+  meta = {
+    description = "Command-line tool to create and modify WAD files for games built on the original Doom engine";
+    homepage = "https://github.com/Doom-Utils/deutex";
+    license = with lib.licenses; [
+      gpl2Plus
+      hpnd
+      lgpl21Plus
+    ];
+    maintainers = with lib.maintainers; [ thetaoofsu ];
+    mainProgram = "deutex";
+    platforms = lib.platforms.unix;
+  };
+})

From 72a8e2a6224cd5ce2d79591f946bc799b034fe24 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 22 May 2025 16:12:21 +0000
Subject: [PATCH 064/103] ansi: 0.2.0 -> 0.2.2

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

diff --git a/pkgs/by-name/an/ansi/package.nix b/pkgs/by-name/an/ansi/package.nix
index 2afd42a5fe1c..02a0f466391e 100644
--- a/pkgs/by-name/an/ansi/package.nix
+++ b/pkgs/by-name/an/ansi/package.nix
@@ -6,15 +6,15 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ansi-escape-sequences-cli";
-  version = "0.2.0";
+  version = "0.2.2";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-15C389g4PrI8Qg25B1LxFgb7gkABw0q0O5RDg3YTv3w=";
+    hash = "sha256-55CdEw1bVgabWRbZIRe9jytwDf70Y92nITwDRQaTXaQ=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-u7BfevNT3f7YVFke9BzHK/LHHYJZlGTYyg0dENc1pVs=";
+  cargoHash = "sha256-g+FP98lcC3EeQtcGO0kE+g6Z9tUgrlieTlVJYKs/ig4=";
 
   meta = {
     description = "Quickly get ANSI escape sequences";

From 6745f4538085eb8b3735a18415d809cc3b1ed2df Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 22 May 2025 16:46:37 +0000
Subject: [PATCH 065/103] librenms: 25.4.0 -> 25.5.0

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

diff --git a/pkgs/by-name/li/librenms/package.nix b/pkgs/by-name/li/librenms/package.nix
index becb2c17bf2e..5d7ea073b901 100644
--- a/pkgs/by-name/li/librenms/package.nix
+++ b/pkgs/by-name/li/librenms/package.nix
@@ -27,16 +27,16 @@ let
 in
 phpPackage.buildComposerProject2 rec {
   pname = "librenms";
-  version = "25.4.0";
+  version = "25.5.0";
 
   src = fetchFromGitHub {
     owner = "librenms";
     repo = pname;
     tag = version;
-    sha256 = "sha256-t+RupwKnUtQd3A0VzWhCXNzc+TnVnDMaMJ6Jcgp+Sfg=";
+    sha256 = "sha256-I1bHEFWGgwHq1U8Ipbm9tu7t6ikfMG+EIPjCsLAP/tk=";
   };
 
-  vendorHash = "sha256-t/3wBSXJJHqbGR1iKF4zC2Ia99gXNlanabR/iPPlHqw=";
+  vendorHash = "sha256-bt7DXkQ3Jgab4L9fB8qInbHvlRxFfkzP+F8DVQ9qWJ4=";
 
   php = phpPackage;
 

From 858d5255ee764ba7bca527f42ec6775fdebeabc0 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Fri, 23 May 2025 02:01:13 +0800
Subject: [PATCH 066/103] aurea: init at 1.6.1

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

diff --git a/pkgs/by-name/au/aurea/package.nix b/pkgs/by-name/au/aurea/package.nix
new file mode 100644
index 000000000000..e901b4d1c466
--- /dev/null
+++ b/pkgs/by-name/au/aurea/package.nix
@@ -0,0 +1,69 @@
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+  meson,
+  ninja,
+  blueprint-compiler,
+  desktop-file-utils,
+  pkg-config,
+  wrapGAppsHook4,
+  libsoup_3,
+  glib-networking,
+  libadwaita,
+  nix-update-script,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "aurea";
+  version = "1.6.1";
+  pyproject = false; # uses meson
+
+  src = fetchFromGitHub {
+    owner = "CleoMenezesJr";
+    repo = "Aurea";
+    tag = version;
+    hash = "sha256-XoLqtuh4ZIeKo8xb1ccaK+9K3uGuQfZt9Fb6NeUDCjE=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    blueprint-compiler
+    pkg-config
+    wrapGAppsHook4
+    desktop-file-utils
+  ];
+
+  buildInputs = [
+    libadwaita
+    libsoup_3
+    glib-networking
+  ];
+
+  dependencies = with python3Packages; [
+    pygobject3
+    pillow
+  ];
+
+  strictDeps = true;
+
+  dontWrapGApps = true;
+
+  makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ];
+
+  postInstallCheck = ''
+    mesonCheckPhase
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Flatpak metainfo banner previewer";
+    homepage = "https://github.com/CleoMenezesJr/Aurea";
+    mainProgram = "aurea";
+    platforms = lib.platforms.linux;
+    license = with lib.licenses; [ gpl3Plus ];
+    maintainers = with lib.maintainers; [ emaryn ];
+  };
+}

From 72eaf394d30c57cf685f528abe9b6c5c2432284d Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethancedwards8@users.noreply.github.com>
Date: Thu, 22 May 2025 23:48:38 +0200
Subject: [PATCH 067/103] json-schema-catalog-rs: add versionCheckHook

---
 pkgs/by-name/js/json-schema-catalog-rs/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/js/json-schema-catalog-rs/package.nix b/pkgs/by-name/js/json-schema-catalog-rs/package.nix
index 5fd10d430fab..00c40f562221 100644
--- a/pkgs/by-name/js/json-schema-catalog-rs/package.nix
+++ b/pkgs/by-name/js/json-schema-catalog-rs/package.nix
@@ -4,6 +4,7 @@
   lib,
   nix-update-script,
   rustPlatform,
+  versionCheckHook,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -19,6 +20,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoHash = "sha256-YI2LN2DBzC1B5wCZOrGAZi/hkKHoAm6xLkdJ+8DDFo8=";
 
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgram = "${placeholder "out"}/bin/json-schema-catalog";
+  versionCheckProgramArg = "--version";
+
   passthru = {
     tests = {
       run = callPackage ./test-run.nix { json-schema-catalog-rs = finalAttrs.finalPackage; };

From ae45b31e06134f7f579c41910c430c454df07b56 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Fri, 16 May 2025 18:43:16 -0700
Subject: [PATCH 068/103] python3Packages.labelbox: build missing lbox-clients
 dependency

---
 .../python-modules/labelbox/default.nix       | 34 ++++++++++++++-----
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix
index 212811a02151..25fe94199e94 100644
--- a/pkgs/development/python-modules/labelbox/default.nix
+++ b/pkgs/development/python-modules/labelbox/default.nix
@@ -20,7 +20,6 @@
   pytest-xdist,
   pytestCheckHook,
   python-dateutil,
-  pythonOlder,
   requests,
   shapely,
   strenum,
@@ -29,13 +28,10 @@
   typing-extensions,
 }:
 
-buildPythonPackage rec {
-  pname = "labelbox";
+let
   version = "6.6.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "Labelbox";
     repo = "labelbox-python";
@@ -43,6 +39,27 @@ buildPythonPackage rec {
     hash = "sha256-aMJJZ9ONnjFK/J4pyLTFQox/cC8ij85IYNlJTFrfV2I=";
   };
 
+  lbox-clients = buildPythonPackage {
+    inherit src version pyproject;
+
+    pname = "lbox-clients";
+
+    sourceRoot = "${src.name}/libs/lbox-clients";
+
+    build-system = [ hatchling ];
+
+    dependencies = [
+      google-api-core
+      requests
+    ];
+
+  };
+in
+buildPythonPackage rec {
+  inherit src version pyproject;
+
+  pname = "labelbox";
+
   sourceRoot = "${src.name}/libs/labelbox";
 
   pythonRelaxDeps = [
@@ -54,6 +71,7 @@ buildPythonPackage rec {
 
   dependencies = [
     google-api-core
+    lbox-clients
     pydantic
     python-dateutil
     requests
@@ -97,11 +115,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "labelbox" ];
 
-  meta = with lib; {
+  meta = {
     description = "Platform API for LabelBox";
     homepage = "https://github.com/Labelbox/labelbox-python";
     changelog = "https://github.com/Labelbox/labelbox-python/releases/tag/v.${src.tag}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ rakesh4g ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ rakesh4g ];
   };
 }

From 7b2772c14dbb2296a081e2195fcf7a8d1ac89abd Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Fri, 16 May 2025 19:18:30 -0700
Subject: [PATCH 069/103] python3Packages.labelbox: 6.6.0 -> 6.10.0

Changelogs:
* https://github.com/Labelbox/labelbox-python/releases/tag/v.6.10.0
* https://github.com/Labelbox/labelbox-python/releases/tag/v.6.9.0
* https://github.com/Labelbox/labelbox-python/releases/tag/v.6.8.0
* https://github.com/Labelbox/labelbox-python/releases/tag/v.6.8.0

diff: https://github.com/Labelbox/labelbox-python/compare/v.6.6.0...v.6.10.0
---
 .../python-modules/labelbox/default.nix       | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix
index 25fe94199e94..0c0737abdead 100644
--- a/pkgs/development/python-modules/labelbox/default.nix
+++ b/pkgs/development/python-modules/labelbox/default.nix
@@ -29,14 +29,14 @@
 }:
 
 let
-  version = "6.6.0";
+  version = "6.10.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Labelbox";
     repo = "labelbox-python";
     tag = "v.${version}";
-    hash = "sha256-aMJJZ9ONnjFK/J4pyLTFQox/cC8ij85IYNlJTFrfV2I=";
+    hash = "sha256-EstHsY9yFeUhQAx3pgvKk/o3EMkr3JeHDDg/p6meDIE=";
   };
 
   lbox-clients = buildPythonPackage {
@@ -48,11 +48,23 @@ let
 
     build-system = [ hatchling ];
 
+    postPatch = ''
+      substituteInPlace pyproject.toml \
+        --replace "--durations=20 --cov=lbox.example" "--durations=20"
+    '';
+
     dependencies = [
       google-api-core
       requests
     ];
 
+    nativeCheckInputs = [
+      pytestCheckHook
+    ];
+
+    doCheck = true;
+
+    __darwinAllowLocalNetworking = true;
   };
 in
 buildPythonPackage rec {
@@ -113,6 +125,10 @@ buildPythonPackage rec {
     "tests/unit/test_label_data_type.py"
   ];
 
+  doCheck = true;
+
+  __darwinAllowLocalNetworking = true;
+
   pythonImportsCheck = [ "labelbox" ];
 
   meta = {

From 9e02e9fb40ef0c044563dc7cce977b3ceb8cdea9 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 22 May 2025 13:20:47 +0200
Subject: [PATCH 070/103] python312Packages.jax[lib]: 0.6.0 -> 0.6.1

Diff:
https://github.com/google/jax/compare/refs/tags/jax-v0.6.0...jax-v0.6.1

Changelog:
https://github.com/jax-ml/jax/blob/main/CHANGELOG.md#jax-061-may-21-2025
---
 .../jax-cuda12-pjrt/default.nix               |  4 +--
 .../jax-cuda12-plugin/default.nix             | 16 ++++++------
 .../python-modules/jax/default.nix            |  4 +--
 .../development/python-modules/jaxlib/bin.nix | 26 +++++++++----------
 4 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix b/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix
index 5ab1564d9049..b5780c9e6fe1 100644
--- a/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix
+++ b/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix
@@ -51,8 +51,8 @@ buildPythonPackage rec {
       .${stdenv.hostPlatform.system};
     hash =
       {
-        x86_64-linux = "sha256-aDcb2cE1JEuJZjA5viCCVWmKdb7JhU1BnqPD+VfKRkY= ";
-        aarch64-linux = "sha256-m/67BqOWFMtomfdzDqhWHxEVasgcuz7GiEpir7OxX/M=";
+        x86_64-linux = "sha256-TJfRClqawJ+gAVaMrDtxUBTo27ws2GdjdT9Y5acwwzM=";
+        aarch64-linux = "sha256-lnB2z7by4zlZ5zdmY1maoMEcwO3o8vUaIG2godQixrs=";
       }
       .${stdenv.hostPlatform.system};
   };
diff --git a/pkgs/development/python-modules/jax-cuda12-plugin/default.nix b/pkgs/development/python-modules/jax-cuda12-plugin/default.nix
index c7d55d07d594..4c9dbcee35fe 100644
--- a/pkgs/development/python-modules/jax-cuda12-plugin/default.nix
+++ b/pkgs/development/python-modules/jax-cuda12-plugin/default.nix
@@ -40,42 +40,42 @@ let
     "3.10-x86_64-linux" = getSrcFromPypi {
       platform = "manylinux2014_x86_64";
       dist = "cp310";
-      hash = "sha256-pwDhcYI84lUQIALkDJR4j6ho8hYle30/BWjQn+dcEHs=";
+      hash = "sha256-t3gE4OTZI605kJCV/3wbcj6sbz7l+f/LgFl7qGe1crg=";
     };
     "3.10-aarch64-linux" = getSrcFromPypi {
       platform = "manylinux2014_aarch64";
       dist = "cp310";
-      hash = "sha256-UwrYUcpGKZHOgtsmrUfwKwjOvkg8nI0MADfp4np7Up8=";
+      hash = "sha256-2p99ySQ+wo4DwOOjmFK0JG+pz8Pc1R5Chtggl/XGlcA=";
     };
     "3.11-x86_64-linux" = getSrcFromPypi {
       platform = "manylinux2014_x86_64";
       dist = "cp311";
-      hash = "sha256-DZ7O3mbEAlhwKkImHoaM21ahA1UafDyISzX1Mcms1I4=";
+      hash = "sha256-H7+NS0JFVEOgia/RqI+xBqUboQdfxohLM53JZXHFthc=";
     };
     "3.11-aarch64-linux" = getSrcFromPypi {
       platform = "manylinux2014_aarch64";
       dist = "cp311";
-      hash = "sha256-fNG0iKVKMInolYjMr2dwiZUsglKefQQD4LBQGZ5SVBg=";
+      hash = "sha256-QlzPE8vdRnixEJ+EOYgVelnk9Nm8KYIFrLFt8EijHDg=";
     };
     "3.12-x86_64-linux" = getSrcFromPypi {
       platform = "manylinux2014_x86_64";
       dist = "cp312";
-      hash = "sha256-5w608IRpbD474StekJ7xIFyfVu/j3OzyYhvZtatZVNU=";
+      hash = "sha256-GIXxW+OPrszPvySxhP/cHQ02Nxfq3SU01XWcDT0K9SM=";
     };
     "3.12-aarch64-linux" = getSrcFromPypi {
       platform = "manylinux2014_aarch64";
       dist = "cp312";
-      hash = "sha256-oqOvX5iIDYb40kartGpVLlou9J12e/xKdMjDV3UgB8Y=";
+      hash = "sha256-u2SgyAH5OnGKZU38aXQvL9YKJgdDEiBOvfT+QD2eK8Q=";
     };
     "3.13-x86_64-linux" = getSrcFromPypi {
       platform = "manylinux2014_x86_64";
       dist = "cp313";
-      hash = "sha256-6W891KlCUWroeMn2l+au/teOFI8JAYynPuKLI0JqfYo=";
+      hash = "sha256-KjV43At9RMwbAjOw/nrXZCZTgQldfqxkxWvQGzS+dvI=";
     };
     "3.13-aarch64-linux" = getSrcFromPypi {
       platform = "manylinux2014_aarch64";
       dist = "cp313";
-      hash = "sha256-o0LyznxLH1nUA/Zlo1qGuGUCU7sl3jRkf7IlxFzrCgQ=";
+      hash = "sha256-uL/3pfx6QWcX4dWdqXKKH3qtB6i2WvoPhpYtQ+0OZU8=";
     };
   };
 in
diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix
index b8168916df8d..58787193c502 100644
--- a/pkgs/development/python-modules/jax/default.nix
+++ b/pkgs/development/python-modules/jax/default.nix
@@ -40,7 +40,7 @@ let
 in
 buildPythonPackage rec {
   pname = "jax";
-  version = "0.6.0";
+  version = "0.6.1";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -48,7 +48,7 @@ buildPythonPackage rec {
     repo = "jax";
     # google/jax contains tags for jax and jaxlib. Only use jax tags!
     tag = "jax-v${version}";
-    hash = "sha256-leadxLK21JF/cF/hMveUPgrwyumjR+zMm9Wsn7bWNLQ=";
+    hash = "sha256-Am+ksPC4U3vL5LGmePzSaMSwWJOCcVrC+DFkJzJP+1U=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/jaxlib/bin.nix b/pkgs/development/python-modules/jaxlib/bin.nix
index 8c934c4af977..affeab1ba301 100644
--- a/pkgs/development/python-modules/jaxlib/bin.nix
+++ b/pkgs/development/python-modules/jaxlib/bin.nix
@@ -18,7 +18,7 @@
 }:
 
 let
-  version = "0.6.0";
+  version = "0.6.1";
   inherit (python) pythonVersion;
 
   # As of 2023-06-06, google/jax upstream is no longer publishing CPU-only wheels to their GCS bucket. Instead the
@@ -49,65 +49,65 @@ let
       "3.10-x86_64-linux" = getSrcFromPypi {
         platform = "manylinux2014_x86_64";
         dist = "cp310";
-        hash = "sha256-pNQlTHEziIh6MhN508WxogITqNzckD+vFRObqB4+zWE=";
+        hash = "sha256-euWBWtpxtpUyzkQ6ERYKPtJcZ+gqKUoNia+dTSdClDQ=";
       };
       "3.10-aarch64-linux" = getSrcFromPypi {
         platform = "manylinux2014_aarch64";
         dist = "cp310";
-        hash = "sha256-VBpBi5iyjfW9Oh6TxistP2TUSwxwt7YI9/4rSqRSsq8=";
+        hash = "sha256-gQbcMW60QNB7nUYooMjirPdtpWBnQsn1wzEEqqd7CsI=";
       };
       "3.10-aarch64-darwin" = getSrcFromPypi {
         platform = "macosx_11_0_arm64";
         dist = "cp310";
-        hash = "sha256-ZKgvjrQP23uh1G75BzANQuT5jL2pYCou2OcNsamsSmA=";
+        hash = "sha256-J3zH6dZX0Ik6VZJhJ3s+rpFq1/pz4wCmKSYftTfcoPE=";
       };
 
       "3.11-x86_64-linux" = getSrcFromPypi {
         platform = "manylinux2014_x86_64";
         dist = "cp311";
-        hash = "sha256-vtRVJeO7XsCGML/SB8Ca+dYun/E/XwfC7iz9jthBG6E=";
+        hash = "sha256-EfzEscdBoeAFfy/6d9WoK/5+6Xw4ZO2I32dJPnibkXM=";
       };
       "3.11-aarch64-linux" = getSrcFromPypi {
         platform = "manylinux2014_aarch64";
         dist = "cp311";
-        hash = "sha256-wK6VmJmALhMpzI7ForTUvpoHa1vrIFLrSbo3UU5iPrw=";
+        hash = "sha256-WpDufFmywAdzAm+/kYJpx6hnamqBo0oDr5GffXvc6ag=";
       };
       "3.11-aarch64-darwin" = getSrcFromPypi {
         platform = "macosx_11_0_arm64";
         dist = "cp311";
-        hash = "sha256-7xY88H3gC8VpAWnpf6+q3DePHDgfAofopHPnirW6sbU=";
+        hash = "sha256-ArrFFTOJ8BYWUWqf0dzWA40j7lBoHawU5N28Q8yzEzo=";
       };
 
       "3.12-x86_64-linux" = getSrcFromPypi {
         platform = "manylinux2014_x86_64";
         dist = "cp312";
-        hash = "sha256-tthbjR/XkkiwRQNRcgHnL8vNOYDPeR036BRwnqUKPII=";
+        hash = "sha256-0DkSRGhWW785NjsVBMGQ5nGeaviaeUje4lbx3ugTu5Q=";
       };
       "3.12-aarch64-linux" = getSrcFromPypi {
         platform = "manylinux2014_aarch64";
         dist = "cp312";
-        hash = "sha256-JTb6k+wUjVAW2osgd7pmMlsNhqriKJphwSaHfwQrPRw=";
+        hash = "sha256-tYwp/nR2IrcJRuqHgjrTkgLMg9o9k6UpO0Mhc7c4qGg=";
       };
       "3.12-aarch64-darwin" = getSrcFromPypi {
         platform = "macosx_11_0_arm64";
         dist = "cp312";
-        hash = "sha256-fjzi7w7cm0izbicEw2GB8eznoSrBFN91PbQobqLG6Lg=";
+        hash = "sha256-4UGVwj7s1VmmHDECe0Fy6RLlpQ9jAyCRj/366DCQylo=";
       };
 
       "3.13-x86_64-linux" = getSrcFromPypi {
         platform = "manylinux2014_x86_64";
         dist = "cp313";
-        hash = "sha256-0PsSLceDDKKlyjyHSghzY6AFMrZEUJwhnDv9HVRRXo0=";
+        hash = "sha256-5zS+cP4+H6KjFBU2JyEYnZdNEKZrD1OWyEWFWH0QGxU=";
       };
       "3.13-aarch64-linux" = getSrcFromPypi {
         platform = "manylinux2014_aarch64";
         dist = "cp313";
-        hash = "sha256-GJcpY5diBQwXgLBQ6Y/2IEgLHqMr8WdTPgAKXPTFc44=";
+        hash = "sha256-0MNDxRsQUlk+22A931jPf5iBKylRrmxFvW6T4+Hy9iE=";
       };
       "3.13-aarch64-darwin" = getSrcFromPypi {
         platform = "macosx_11_0_arm64";
         dist = "cp313";
-        hash = "sha256-xOl5NMuvUXI0OqWujvDFhGLOJhVN/adUICswNBYMrHs=";
+        hash = "sha256-9Mp12dR6LpAJmt/t4OnJJrg+9wPTSbMom4yI6GHAnl0=";
       };
     };
 in

From a14c69ba2bfa3dc8d8f7ba5e9bc16981772991da Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 23 May 2025 00:22:48 +0200
Subject: [PATCH 071/103] python312Packages.flax: ignore DeprecationWarning
 test failures

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

diff --git a/pkgs/development/python-modules/flax/default.nix b/pkgs/development/python-modules/flax/default.nix
index 50abb5eadef9..2c0f2cdaf367 100644
--- a/pkgs/development/python-modules/flax/default.nix
+++ b/pkgs/development/python-modules/flax/default.nix
@@ -83,6 +83,13 @@ buildPythonPackage rec {
     tensorflow
   ];
 
+  pytestFlagsArray = [
+    "-W"
+    # DeprecationWarning: Triggering of __jax_array__() during abstractification is deprecated.
+    # To avoid this error, either explicitly convert your object using jax.numpy.array(), or register your object as a pytree.
+    "ignore::DeprecationWarning"
+  ];
+
   disabledTestPaths = [
     # Docs test, needs extra deps + we're not interested in it.
     "docs/_ext/codediff_test.py"

From 7f2c43ded7776fa7e59393eccde2764cf9c907e7 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Thu, 22 May 2025 22:39:26 +0000
Subject: [PATCH 072/103] uv: 0.7.6 -> 0.7.7

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

diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix
index cad2c65c315d..6ec05b21580b 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -18,17 +18,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uv";
-  version = "0.7.6";
+  version = "0.7.7";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = finalAttrs.version;
-    hash = "sha256-zFVVvPPb1UM71u9QFphp9YFWgmvYemAHouCttNnQWMk=";
+    hash = "sha256-QWqN8MAIyr8ZvzdznpmR4KJNF0znEkBBb3ASBXBbqns=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-aeOT6HO12J700CF7o2LiqUy6pl0Fzb0OLxHt+G4HW/k=";
+  cargoHash = "sha256-HaalXfQO1cMDZM3jRa35fEU0zQ3BVD1JiuB/AIxcPc0=";
 
   buildInputs = [
     rust-jemalloc-sys

From 29aa636061a9d17f4e414ab22b503211a70bf7cf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 22 May 2025 23:08:32 +0000
Subject: [PATCH 073/103] nextcloud-talk-desktop: 1.1.8 -> 1.1.9

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

diff --git a/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix b/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix
index 391a454af7dc..ae65aee16698 100644
--- a/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix
+++ b/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix
@@ -25,13 +25,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nextcloud-talk-desktop";
-  version = "1.1.8";
+  version = "1.1.9";
 
   # Building from source would require building also building Server and Talk components
   # See https://github.com/nextcloud/talk-desktop?tab=readme-ov-file#%EF%B8%8F-prerequisites
   src = fetchzip {
     url = "https://github.com/nextcloud-releases/talk-desktop/releases/download/v${finalAttrs.version}/Nextcloud.Talk-linux-x64.zip";
-    hash = "sha256-rKUf6BQk/snwI6Sf67+PbNEnoZZY1u+EOEWE11p3dYw=";
+    hash = "sha256-+dYQ6trUlYpKX4ogl+VQa68C5Fy611pgGKryv7IfoCM=";
     stripRoot = false;
   };
 

From 12c057f8e9e828370aa69dfa02ccb736655c75f9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 22 May 2025 23:19:02 +0000
Subject: [PATCH 074/103] vimPlugins.sonarlint-nvim: 0-unstable-2025-04-24 ->
 0-unstable-2025-05-16

---
 .../vim/plugins/non-generated/sonarlint-nvim/default.nix    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/non-generated/sonarlint-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/sonarlint-nvim/default.nix
index aa0110d200b7..d29421a04fc5 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/sonarlint-nvim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/sonarlint-nvim/default.nix
@@ -6,13 +6,13 @@
 }:
 vimUtils.buildVimPlugin {
   pname = "sonarlint.nvim";
-  version = "0-unstable-2025-04-24";
+  version = "0-unstable-2025-05-16";
 
   src = fetchFromGitLab {
     owner = "schrieveslaach";
     repo = "sonarlint.nvim";
-    rev = "89d3d3b0dd239dbbdf4c1d728e41759d5378f049";
-    hash = "sha256-EOAdSvugcDEDuBuFv/HL35HXWvB/V97UtOJqdRuU7ak=";
+    rev = "2aa7a9fd9d8022d1c8d472fb63ce62e021d70130";
+    hash = "sha256-RfQthodqF6r24I6EJxlewjYiX3jLAIb/RMAOVnWs73s=";
   };
 
   passthru.updateScript = nix-update-script {

From 1897b6c6feffa3881a662ac58bfb18187ab531ab Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 23 May 2025 00:36:40 +0000
Subject: [PATCH 075/103] sheldon: 0.8.1 -> 0.8.2

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

diff --git a/pkgs/by-name/sh/sheldon/package.nix b/pkgs/by-name/sh/sheldon/package.nix
index fa13c5fcb0e7..cdcb57ada5da 100644
--- a/pkgs/by-name/sh/sheldon/package.nix
+++ b/pkgs/by-name/sh/sheldon/package.nix
@@ -11,17 +11,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "sheldon";
-  version = "0.8.1";
+  version = "0.8.2";
 
   src = fetchFromGitHub {
     owner = "rossmacarthur";
     repo = pname;
     rev = version;
-    hash = "sha256-C4rGE+tKlpEJabyGAexIoPmUiLvl87GkL6XH5aJHCrU=";
+    hash = "sha256-4tI/D9Z5+BAH7K9mA/sU/qPKWcPvZqpY5v4dDA0qfr0=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-5Ho41WU/DzAdBOGDPmJYipcJMAji6J+Jg8lNQYionng=";
+  cargoHash = "sha256-MHQbCsZng7YRvY5K+l9u90M/zyyfz2nl01RN46EUSXk=";
 
   buildInputs =
     [ openssl ]

From 64160e33ddd3399a9b648ecc997fd293099baa0c Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Fri, 23 May 2025 00:45:36 +0000
Subject: [PATCH 076/103] cherry-studio: 1.3.8 -> 1.3.9

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

diff --git a/pkgs/by-name/ch/cherry-studio/package.nix b/pkgs/by-name/ch/cherry-studio/package.nix
index e3887ee2dc96..dc1c44901537 100644
--- a/pkgs/by-name/ch/cherry-studio/package.nix
+++ b/pkgs/by-name/ch/cherry-studio/package.nix
@@ -18,13 +18,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "cherry-studio";
-  version = "1.3.8";
+  version = "1.3.9";
 
   src = fetchFromGitHub {
     owner = "CherryHQ";
     repo = "cherry-studio";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1It3vUC3SsXjhsvWwOGyUgbkxXAsOp2lsmO53Ad48ZU=";
+    hash = "sha256-nkAVN1BS4QAEiWT6Tgig5q5YNGS38395Q39InfA3QxM=";
   };
 
   postPatch = ''
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   offlineCache = yarn-berry.fetchYarnBerryDeps {
     inherit (finalAttrs) src missingHashes;
-    hash = "sha256-F1HAVG6ZEVb8yYKDXV4MEoBrbG2gXcv/VcCQbDFAnnE=";
+    hash = "sha256-BGxekt94dokb0S+pv4TNggVlOrimjQWbEMq7z5gHV0A=";
   };
 
   nativeBuildInputs = [

From f283f52863b1a6eeb03f037198de0aa63c8700fa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 23 May 2025 00:52:26 +0000
Subject: [PATCH 077/103] gnome-network-displays: 0.96.0 -> 0.97.0

---
 pkgs/by-name/gn/gnome-network-displays/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-network-displays/package.nix b/pkgs/by-name/gn/gnome-network-displays/package.nix
index 1bd0659f21ba..8faee75cea46 100644
--- a/pkgs/by-name/gn/gnome-network-displays/package.nix
+++ b/pkgs/by-name/gn/gnome-network-displays/package.nix
@@ -29,11 +29,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-network-displays";
-  version = "0.96.0";
+  version = "0.97.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-network-displays/${lib.versions.majorMinor finalAttrs.version}/gnome-network-displays-${finalAttrs.version}.tar.xz";
-    sha256 = "sha256-PB5EsTJHEO3l+4uxBZjYX5c0ySPiaM3CSHYFY97qpJc=";
+    sha256 = "sha256-zexoyPmzJrqu5UU3Sowrk8qRnkj0uKQkYcsOsjmNqyc=";
   };
 
   nativeBuildInputs = [

From f0b7be384af0615a91c6eda7928abeecddda785c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 23 May 2025 01:38:39 +0000
Subject: [PATCH 078/103] neothesia: 0.2.1 -> 0.3.0

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

diff --git a/pkgs/by-name/ne/neothesia/package.nix b/pkgs/by-name/ne/neothesia/package.nix
index 40e41361ab67..c51fca410df8 100644
--- a/pkgs/by-name/ne/neothesia/package.nix
+++ b/pkgs/by-name/ne/neothesia/package.nix
@@ -12,13 +12,13 @@
   xorg,
 }:
 let
-  version = "0.2.1";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "PolyMeilex";
     repo = "Neothesia";
     rev = "v${version}";
-    hash = "sha256-bQ2546q+oachvuNKMJHjQzF6uv06LG+f7eFQPoAn6mw=";
+    hash = "sha256-JD1jQ/a6GHtB/d/fRMCiE4ZOO676BIiZ980VIYUloU0=";
   };
 in
 rustPlatform.buildRustPackage {
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage {
   ];
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-qIoH+YhyPXXIWFwgcJBly2KBSuVgaRg5kZtBazaTVJ0=";
+  cargoHash = "sha256-OYdKuYOL3X6eqVYANvmfTRA8TGd4+QLg0zodDH0jxXk=";
 
   cargoBuildFlags = [
     "-p neothesia -p neothesia-cli"

From 07fbfa430bb7a7ff02d83e9c8aa3d856f03a55eb Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Fri, 23 May 2025 10:48:26 +0800
Subject: [PATCH 079/103] musicpod: 2.11.4 -> 2.12.0

---
 pkgs/by-name/mu/musicpod/package.nix       |  6 ++--
 pkgs/by-name/mu/musicpod/pubspec.lock.json | 34 ++++++++++++++--------
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/mu/musicpod/package.nix b/pkgs/by-name/mu/musicpod/package.nix
index 4be5daba1788..1c6eee3a958d 100644
--- a/pkgs/by-name/mu/musicpod/package.nix
+++ b/pkgs/by-name/mu/musicpod/package.nix
@@ -14,13 +14,13 @@
 
 flutter329.buildFlutterApplication rec {
   pname = "musicpod";
-  version = "2.11.4";
+  version = "2.12.0";
 
   src = fetchFromGitHub {
     owner = "ubuntu-flutter-community";
     repo = "musicpod";
     tag = "v${version}";
-    hash = "sha256-bZAVkYSQ8NFW4wAXjfEZYt/Z/gSYn51MPLY+hENWQac=";
+    hash = "sha256-1elK3/jQ9KKqJYdU4CZd7rbIv8WK3H9AdBLH6QMqMmo=";
   };
 
   postPatch = ''
@@ -40,7 +40,7 @@ flutter329.buildFlutterApplication rec {
       media_kit_libs_video = media_kit-hash;
       media_kit_video = media_kit-hash;
       phoenix_theme = "sha256-HGMRQ5wdhoqYNkrjLTfz6mE/dh45IRyuQ79/E4oo+9w=";
-      yaru = "sha256-8TgDrI1vWIi8V1e/DrKVb4PS+KLCguG0bB15/XFFnX4=";
+      yaru = "sha256-7frcJOVfeigQZf0t+7DXf92C2eNiG25RdkPk7+i0NUs=";
     };
 
   buildInputs = [
diff --git a/pkgs/by-name/mu/musicpod/pubspec.lock.json b/pkgs/by-name/mu/musicpod/pubspec.lock.json
index 1aa9bb7278f2..a249b6a877f9 100644
--- a/pkgs/by-name/mu/musicpod/pubspec.lock.json
+++ b/pkgs/by-name/mu/musicpod/pubspec.lock.json
@@ -161,16 +161,6 @@
       "source": "hosted",
       "version": "5.8.2"
     },
-    "blur": {
-      "dependency": "direct main",
-      "description": {
-        "name": "blur",
-        "sha256": "4009ea0c63d55b335794ac5cbbe9544fd10527a21b6272bfb6a44b5eda1a814c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.0.1"
-    },
     "boolean_selector": {
       "dependency": "transitive",
       "description": {
@@ -651,6 +641,26 @@
       "source": "hosted",
       "version": "1.1.1"
     },
+    "flex_color_picker": {
+      "dependency": "direct main",
+      "description": {
+        "name": "flex_color_picker",
+        "sha256": "8f753a1a026a13ea5cc5eddbae3ceb886f2537569ab2e5208efb1e3bb5af72ff",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.7.1"
+    },
+    "flex_seed_scheme": {
+      "dependency": "transitive",
+      "description": {
+        "name": "flex_seed_scheme",
+        "sha256": "b06d8b367b84cbf7ca5c5603c858fa5edae88486c4e4da79ac1044d73b6c62ec",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.5.1"
+    },
     "flutter": {
       "dependency": "direct main",
       "description": "flutter",
@@ -2329,8 +2339,8 @@
       "dependency": "direct main",
       "description": {
         "path": ".",
-        "ref": "b75bb6e2b3c30126b17d73a67577ad43f5c65d7c",
-        "resolved-ref": "b75bb6e2b3c30126b17d73a67577ad43f5c65d7c",
+        "ref": "9902d7230d0d3be31317eb0558114f28afc861ce",
+        "resolved-ref": "9902d7230d0d3be31317eb0558114f28afc861ce",
         "url": "https://github.com/ubuntu/yaru.dart"
       },
       "source": "git",

From 12a19f53143b82bd13b739eef35bf65e8b15dadb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 23 May 2025 03:18:24 +0000
Subject: [PATCH 080/103] libretro.bsnes: 0-unstable-2025-04-11 ->
 0-unstable-2025-05-16

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

diff --git a/pkgs/applications/emulators/libretro/cores/bsnes.nix b/pkgs/applications/emulators/libretro/cores/bsnes.nix
index 846b6d9ddb0f..950bafe1813d 100644
--- a/pkgs/applications/emulators/libretro/cores/bsnes.nix
+++ b/pkgs/applications/emulators/libretro/cores/bsnes.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "bsnes";
-  version = "0-unstable-2025-04-11";
+  version = "0-unstable-2025-05-16";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "bsnes-libretro";
-    rev = "b102d6d5817b25aa059b573cd3b7675f2e375fa4";
-    hash = "sha256-a77SSoz0C189iNHUB2bcO3X76LPbA/V7pAZtUR03u48=";
+    rev = "aadae1cd3d8175a6e71525ab122e6b7a949091a7";
+    hash = "sha256-Tf/mJ4B3PuAbfYJCrFoC0sHOQgf+UCwp6jNlSau7XH0=";
   };
 
   makefile = "Makefile";

From 041c3794c439d7de75440d72cf1c0c455a5a9454 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Thu, 22 May 2025 22:52:52 -0400
Subject: [PATCH 081/103] doc/rl-2505: fix links in lib section

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

diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md
index ae591ca87f1c..ea73c6f1a7b7 100644
--- a/doc/release-notes/rl-2505.section.md
+++ b/doc/release-notes/rl-2505.section.md
@@ -546,8 +546,7 @@
 
 - The `virtualisation.hypervGuest.videoMode` option has been removed. Standard tooling can now be used to configure display modes for Hyper-V VMs.
 
-- [`lib.packagesFromDirectoryRecursive`] now rejects unknown arguments.
-  [`lib.packagesFromDirectoryRecursive`]: https://nixos.org/manual/nixpkgs/stable/#function-library-lib.filesystem.packagesFromDirectoryRecursive
+- [`lib.packagesFromDirectoryRecursive`](https://nixos.org/manual/nixpkgs/unstable/#function-library-lib.filesystem.packagesFromDirectoryRecursive) now rejects unknown arguments.
 
 - The `godot-export-templates` package now has its content at `share/godot/export_templates/$version` instead of the output root. This makes it more convenient for for symlinking into `~/.local`, but scripts expecting the old layout will need to be changed.
 
@@ -573,4 +572,4 @@
 
 ### Additions and Improvements {#sec-nixpkgs-release-25.05-lib-additions-improvements}
 
-- [`lib.packagesFromDirectoryRecursive`] can now construct nested scopes matching the directory tree passed as input.
+- [`lib.packagesFromDirectoryRecursive`](https://nixos.org/manual/nixpkgs/unstable/#function-library-lib.filesystem.packagesFromDirectoryRecursive) can now construct nested scopes matching the directory tree passed as input.

From 00ae2440742360e3330c811d813e593db4480a3a Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Thu, 22 May 2025 22:57:36 -0400
Subject: [PATCH 082/103] doc/rl-2505: move unrelated entries from lib section

---
 doc/release-notes/rl-2505.section.md          | 27 +++++++++----------
 .../manual/release-notes/rl-2505.section.md   |  2 ++
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md
index ea73c6f1a7b7..047eac334277 100644
--- a/doc/release-notes/rl-2505.section.md
+++ b/doc/release-notes/rl-2505.section.md
@@ -399,6 +399,15 @@
   2.0](https://github.com/containerd/containerd/blob/main/docs/containerd-2.0.md) documentation for more
   details.
 
+- The `tinycc` package now has the `dev`, `doc` and `lib` outputs, thus,
+`tinycc.out` may now only provide the tcc and cross compilers binaries.
+
+- The `testTarget` argument of `haskellPackages.mkDerivation` has been deprecated in favour of `testTargets`.
+  `testTarget` took a space separated string of targets, whereas the new `testTargets` argument takes a list of targets.
+  For instance, `testTarget = "foo bar baz"` should become `testTargets = [ "foo" "bar" "baz" ]`.
+
+- `rustPlatform.buildRustPackage` stops handling the deprecated argument `cargoSha256`. Out-of-tree packages that haven't migrated from `cargoSha256` to `cargoHash` now receive errors.
+
 - `nodePackages.stackdriver-statsd-backend` has been removed, as the StackDriver service has been discontinued by Google, and therefore the package no longer works.
 
 - `python3Packages.opentracing` has been removed due to being unmaintained upstream. [OpenTelemetry](https://opentelemetry.io/) is the recommended replacement.
@@ -441,6 +450,8 @@
   - `i18n.supportedLocales` will now trigger a warning when it omits any locale set in `i18n.defaultLocale`, `i18n.extraLocales` or `i18n.extraLocaleSettings`.
   - The options `i18n.defaultCharset` & `i18n.localeCharsets` were added, and they complement `i18n.defaultLocale` & `i18n.extraLocaleSettings` respectively - allowing to control the character set used per locale setting.
 
+- Plasma 5 and Qt 5 based versions of associated software are deprecated in NixOS 25.05, and will be removed in NixOS 25.11. Users are encouraged to upgrade to Plasma 6.
+
 - `titaniumenv`, `titanium`, and `titanium-alloy` have been removed due to lack of maintenance in Nixpkgs []{#sec-nixpkgs-release-25.05-incompatibilities-titanium-removed}.
 
 - `octave` (and `octaveFull`) was updated to version `10.x`. The update broke a few `octavePackages`, and `librsb`. See [the PR's commits](https://github.com/NixOS/nixpkgs/pull/394495/commits) for more details.
@@ -485,6 +496,7 @@
 
   Note that all provided plugins must have versions/tags (string after `@`), even if upstream repo does not tag each release. For untagged plugins, you can either create an empty Go project and run `go get <plugin>` and see changes in `go.mod` to get the pseudo-version number, or provide a commit hash in place of version/tag for the first run, and update the plugin string based on the error output.
 
+- The `godot-export-templates` package now has its content at `share/godot/export_templates/$version` instead of the output root. This makes it more convenient for for symlinking into `~/.local`, but scripts expecting the old layout will need to be changed.
 
 - GOverlay has been updated to 1.2, please check the [upstream changelog](https://github.com/benjamimgois/goverlay/releases) for more details.
 
@@ -541,15 +553,8 @@
   - [`lib.types.enum`](https://nixos.org/manual/nixos/unstable/#sec-option-types-basic): Previously the `functor.payload` was the list of enum values directly. Now it is an attribute set containing the values in the `values` attribute.
   - [`lib.types.separatedString`](https://nixos.org/manual/nixos/unstable/#sec-option-types-string): Previously the `functor.payload` was the separator directly. Now it is an attribute set containing the separator in the `sep` attribute.
 
-- The `tinycc` package now has the `dev`, `doc` and `lib` outputs, thus,
-`tinycc.out` may now only provide the tcc and cross compilers binaries.
-
-- The `virtualisation.hypervGuest.videoMode` option has been removed. Standard tooling can now be used to configure display modes for Hyper-V VMs.
-
 - [`lib.packagesFromDirectoryRecursive`](https://nixos.org/manual/nixpkgs/unstable/#function-library-lib.filesystem.packagesFromDirectoryRecursive) now rejects unknown arguments.
 
-- The `godot-export-templates` package now has its content at `share/godot/export_templates/$version` instead of the output root. This makes it more convenient for for symlinking into `~/.local`, but scripts expecting the old layout will need to be changed.
-
 ### Deprecations {#sec-nixpkgs-release-25.05-lib-deprecations}
 
 - `functor` is an implementation detail and should not be relied upon, but since its status wasn't clear and it has had some use cases without alternatives, changes are being handled as gracefully as possible. Deprecations within functor:
@@ -562,14 +567,6 @@
     - `lib.types.coercedTo`
     - `lib.types.either`
 
-- The `testTarget` argument of `haskellPackages.mkDerivation` has been deprecated in favour of `testTargets`.
-  `testTarget` took a space separated string of targets, whereas the new `testTargets` argument takes a list of targets.
-  For instance, `testTarget = "foo bar baz"` should become `testTargets = [ "foo" "bar" "baz" ]`.
-
-- Plasma 5 and Qt 5 based versions of associated software are deprecated in NixOS 25.05, and will be removed in NixOS 25.11. Users are encouraged to upgrade to Plasma 6.
-
-- `rustPlatform.buildRustPackage` stops handling the deprecated argument `cargoSha256`. Out-of-tree packages that haven't migrated from `cargoSha256` to `cargoHash` now receive errors.
-
 ### Additions and Improvements {#sec-nixpkgs-release-25.05-lib-additions-improvements}
 
 - [`lib.packagesFromDirectoryRecursive`](https://nixos.org/manual/nixpkgs/unstable/#function-library-lib.filesystem.packagesFromDirectoryRecursive) can now construct nested scopes matching the directory tree passed as input.
diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index 7703a23b3df8..cf45ac8fe9e4 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -274,6 +274,8 @@ Alongside many enhancements to NixOS modules and general system improvements, th
   option following this [guide](https://doc.powerdns.com/recursor/appendices/yamlconversion.html).
   Note that options other than `services.pdns-recursor.settings` are unaffacted by this change.
 
+- The `virtualisation.hypervGuest.videoMode` option has been removed. Standard tooling can now be used to configure display modes for Hyper-V VMs.
+
 - Nextcloud's default FPM pool settings have been increased according to upstream recommentations. It's advised
   to review the new defaults and description of
   [](#opt-services.nextcloud.poolSettings).

From b17e45ca7c22aef1c3f838baf3e95d33b21a7235 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Thu, 22 May 2025 23:04:57 -0400
Subject: [PATCH 083/103] doc/rl-2505: fix nexusmods.app entry formatting

I don't really think this needs its own header and section...
---
 doc/redirects.json                   | 6 ++----
 doc/release-notes/rl-2505.section.md | 5 -----
 nixos/doc/manual/redirects.json      | 6 ++----
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/doc/redirects.json b/doc/redirects.json
index 1bcf2a8bf52c..4c243c6cc852 100644
--- a/doc/redirects.json
+++ b/doc/redirects.json
@@ -181,7 +181,8 @@
     "release-notes.html#sec-nixpkgs-release-25.05-highlights"
   ],
   "sec-nixpkgs-release-25.05-incompatibilities": [
-    "release-notes.html#sec-nixpkgs-release-25.05-incompatibilities"
+    "release-notes.html#sec-nixpkgs-release-25.05-incompatibilities",
+    "release-notes.html#sec-nixpkgs-release-25.05-incompatibilities-nexusmods-app-upgraded"
   ],
   "sec-nixpkgs-release-25.05-incompatibilities-titanium-removed": [
     "release-notes.html#sec-nixpkgs-release-25.05-incompatibilities-titanium-removed",
@@ -189,9 +190,6 @@
     "index.html#building-a-titanium-app",
     "index.html#emulating-or-simulating-the-app"
   ],
-  "sec-nixpkgs-release-25.05-incompatibilities-nexusmods-app-upgraded": [
-    "release-notes.html#sec-nixpkgs-release-25.05-incompatibilities-nexusmods-app-upgraded"
-  ],
   "sec-nixpkgs-release-25.05-lib": [
     "release-notes.html#sec-nixpkgs-release-25.05-lib"
   ],
diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md
index 047eac334277..cc29ca766184 100644
--- a/doc/release-notes/rl-2505.section.md
+++ b/doc/release-notes/rl-2505.section.md
@@ -535,14 +535,9 @@
 
 - `ddclient` was updated from 3.11.2 to 4.0.0 [Release notes](https://github.com/ddclient/ddclient/releases/tag/v4.0.0)
 
-### NexusMods.App upgraded {#sec-nixpkgs-release-25.05-incompatibilities-nexusmods-app-upgraded}
-
 - `nexusmods-app` has been upgraded from version 0.6.3 to 0.10.2.
-
   - Before upgrading, you **must reset all app state** (mods, games, settings, etc). NexusMods.App will crash if any state from a version older than 0.7.0 is still present.
-
   - Typically, you can can reset to a clean state by running `NexusMods.App uninstall-app`. See Nexus Mod's [how to uninstall the app](https://nexus-mods.github.io/NexusMods.App/users/Uninstall) documentation for more detail and alternative methods.
-
   - This should not be necessary going forward, because loading app state from 0.7.0 or newer is now supported. This is documented in the [0.7.1 changelog](https://github.com/Nexus-Mods/NexusMods.App/releases/tag/v0.7.1).
 
 ## Nixpkgs Library {#sec-nixpkgs-release-25.05-lib}
diff --git a/nixos/doc/manual/redirects.json b/nixos/doc/manual/redirects.json
index 6f5bbe8b01b5..44ab6c6b860c 100644
--- a/nixos/doc/manual/redirects.json
+++ b/nixos/doc/manual/redirects.json
@@ -2025,7 +2025,8 @@
     "release-notes.html#sec-nixpkgs-release-25.05"
   ],
   "sec-nixpkgs-release-25.05-incompatibilities": [
-    "release-notes.html#sec-nixpkgs-release-25.05-incompatibilities"
+    "release-notes.html#sec-nixpkgs-release-25.05-incompatibilities",
+    "release-notes.html#sec-nixpkgs-release-25.05-incompatibilities-nexusmods-app-upgraded"
   ],
   "sec-nixpkgs-release-25.05-incompatibilities-titanium-removed": [
     "release-notes.html#sec-nixpkgs-release-25.05-incompatibilities-titanium-removed",
@@ -2033,9 +2034,6 @@
     "index.html#building-a-titanium-app",
     "index.html#emulating-or-simulating-the-app"
   ],
-  "sec-nixpkgs-release-25.05-incompatibilities-nexusmods-app-upgraded": [
-    "release-notes.html#sec-nixpkgs-release-25.05-incompatibilities-nexusmods-app-upgraded"
-  ],
   "sec-nixpkgs-release-25.05-lib": [
     "release-notes.html#sec-nixpkgs-release-25.05-lib"
   ],

From 7fb7f0c4a156c115c761f2f978dc563923236829 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Thu, 22 May 2025 23:29:55 -0400
Subject: [PATCH 084/103] nixos/doc/rl-2505: cleanup "new modules" section

---
 doc/release-notes/rl-2505.section.md          |  2 +
 .../manual/release-notes/rl-2505.section.md   | 38 +++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md
index cc29ca766184..b7aad1e44a37 100644
--- a/doc/release-notes/rl-2505.section.md
+++ b/doc/release-notes/rl-2505.section.md
@@ -454,6 +454,8 @@
 
 - `titaniumenv`, `titanium`, and `titanium-alloy` have been removed due to lack of maintenance in Nixpkgs []{#sec-nixpkgs-release-25.05-incompatibilities-titanium-removed}.
 
+- [Cursor](https://cursor.com/) — a vscode-based editor that uses AI to help you write code faster — has been packaged as `cursor`.
+
 - `octave` (and `octaveFull`) was updated to version `10.x`. The update broke a few `octavePackages`, and `librsb`. See [the PR's commits](https://github.com/NixOS/nixpkgs/pull/394495/commits) for more details.
 
 - androidenv has been improved:
diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index cf45ac8fe9e4..39f2919f46d5 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -42,7 +42,7 @@ Alongside many enhancements to NixOS modules and general system improvements, th
   - [programs.amnezia-vpn](#opt-programs.amnezia-vpn.enable): a GUI client which can also deploy a VPN endpoint to a remote server
   - {option}`networking.wireguard` adds support for the [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/) variant of the protocol, featuring better masking against Deep Packet Inspection. The variant to be used is set per interface as `networking.wireguard.interfaces.<name>.type`, defaulting to wireguard.
 
-- [Bazecor](https://github.com/Dygmalab/Bazecor), the graphical configurator for Dygma Products.
+- [Bazecor](https://github.com/Dygmalab/Bazecor), the graphical configurator for Dygma Products. Available as [programs.bazecor](#opt-programs.bazecor.enable).
 
 - [Bonsai](https://git.sr.ht/~stacyharper/bonsai), a general-purpose event mapper/state machine primarily used to create complex key shortcuts, and as part of the [SXMO](https://sxmo.org/) desktop environment. Available as [services.bonsaid](#opt-services.bonsaid.enable).
 
@@ -50,9 +50,9 @@ Alongside many enhancements to NixOS modules and general system improvements, th
 
 - [Kimai](https://www.kimai.org/), a web-based multi-user time-tracking application. Available as [services.kimai](options.html#opt-services.kimai).
 
-- [Kismet](https://www.kismetwireless.net/), a Wi-Fi, Bluetooth, and RF monitoring application supporting a wide range of hardware. Available as {option}`services.kismet`.
+- [Kismet](https://www.kismetwireless.net/), a Wi-Fi, Bluetooth, and RF monitoring application supporting a wide range of hardware. Available as [services.kismet](#opt-services.kismet.enable).
 
-- [vwifi](https://github.com/Raizo62/vwifi), a Wi-Fi simulator daemon leveraging the `mac80211_hwsim` and `vhost_vsock` kernel modules for efficient simulation of multi-node Wi-Fi networks. Available as {option}`services.vwifi`.
+- [vwifi](https://github.com/Raizo62/vwifi), a Wi-Fi simulator daemon leveraging the `mac80211_hwsim` and `vhost_vsock` kernel modules for efficient simulation of multi-node Wi-Fi networks. Available as [services.vwifi](#opt-services.vwifi.client.enable).
 
 - [Oncall](https://oncall.tools), a web-based calendar tool designed for scheduling and managing on-call shifts. Available as [services.oncall](options.html#opt-services.oncall).
 
@@ -62,13 +62,13 @@ Alongside many enhancements to NixOS modules and general system improvements, th
 
 - [Omnom](https://github.com/asciimoo/omnom), a webpage bookmarking and snapshotting service. Available as [services.omnom](options.html#opt-services.omnom.enable).
 
-- [Yggdrasil-Jumper](https://github.com/one-d-wide/yggdrasil-jumper) is an independent project that aims to transparently reduce latency of a connection over Yggdrasil network, utilizing NAT traversal to automatically bypass intermediary nodes.
+- [Yggdrasil-Jumper](https://github.com/one-d-wide/yggdrasil-jumper), an independent project that aims to transparently reduce latency of a connection over Yggdrasil network, utilizing NAT traversal to automatically bypass intermediary nodes. Available as [services.yggdrasil-jumper](#opt-services.yggdrasil-jumper.enable).
 
-- [xpad-noone](https://github.com/medusalix/xpad-noone) is the original upstream xpad driver from the Linux kernel with support for Xbox One controllers removed， especially useful for people who want to use an XBox One controller under the xone driver and an Xbox 360 controller under the xpad driver at the same time. Available as [hardware.xpad-noone](options.html#hardware.xpad-noone).
+- [xpad-noone](https://github.com/medusalix/xpad-noone) is the original upstream xpad driver from the Linux kernel with support for Xbox One controllers removed — especially useful for people who want to use an XBox One controller under the `xone` driver and an Xbox 360 controller under the `xpad` driver at the same time. Available as [hardware.xpad-noone](options.html#hardware.xpad-noone).
 
 - [uMurmur](https://umurmur.net), minimalistic Mumble server primarily targeted to run on embedded computers. Available as [services.umurmur](options.html#opt-services.umurmur).
 
-- [Zenoh](https://zenoh.io/), a pub/sub/query protocol with low overhead. The Zenoh router daemon is available as [services.zenohd](options.html#opt-services.zenohd.enable)
+- [Zenoh](https://zenoh.io/), a pub/sub/query protocol with low overhead. The Zenoh router daemon is available as [services.zenohd](options.html#opt-services.zenohd.enable).
 
 - [ytdl-sub](https://github.com/jmbannon/ytdl-sub), a tool that downloads media via yt-dlp and prepares it for your favorite media player, including Kodi, Jellyfin, Plex, Emby, and modern music players. Available as [services.ytdl-sub](options.html#opt-services.ytdl-sub.instances).
 
@@ -124,7 +124,7 @@ Alongside many enhancements to NixOS modules and general system improvements, th
 
 - [agorakit](https://github.com/agorakit/agorakit), an organization tool for citizens' collectives. Available with [services.agorakit](options.html#opt-services.agorakit.enable).
 
-- [vivid](https://github.com/sharkdp/vivid), a generator for LS_COLOR. Available as [programs.vivid](#opt-programs.vivid.enable).
+- [vivid](https://github.com/sharkdp/vivid), a generator for `LS_COLOR`. Available as [programs.vivid](#opt-programs.vivid.enable).
 
 - [matrix-alertmanager](https://github.com/jaywink/matrix-alertmanager), a bot to receive Alertmanager webhook events and forward them to chosen Matrix rooms. Available as [services.matrix-alertmanager](options.html#opt-services.matrix-alertmanager.enable).
 
@@ -134,13 +134,13 @@ Alongside many enhancements to NixOS modules and general system improvements, th
 
 - [grav](https://getgrav.org/), a modern flat-file CMS. Available with [services.grav](options.html#opt-services.grav.enable).
 
-- [duckdns](https://www.duckdns.org), free dynamic DNS. Available with [services.duckdns](options.html#opt-services.duckdns.enable)
+- [duckdns](https://www.duckdns.org), free dynamic DNS. Available with [services.duckdns](options.html#opt-services.duckdns.enable).
 
-- [Zoxide](https://github.com/ajeetdsouza/zoxide), a smarter cd command, inspired by z and autojump. Available as [programs.zoxide](options.html#opt-programs.zoxide.enable)
+- [Zoxide](https://github.com/ajeetdsouza/zoxide), a smarter cd command, inspired by z and autojump. Available as [programs.zoxide](options.html#opt-programs.zoxide.enable).
 
-- [victorialogs](https://docs.victoriametrics.com/victorialogs/), log database from VictoriaMetrics. Available as [services.victorialogs](#opt-services.victorialogs.enable)
+- [victorialogs](https://docs.victoriametrics.com/victorialogs/), log database from VictoriaMetrics. Available as [services.victorialogs](#opt-services.victorialogs.enable).
 
-- [gokapi](https://github.com/Forceu/Gokapi), Lightweight selfhosted Firefox Send alternative without public upload. AWS S3 supported. Available with [services.gokapi](options.html#opt-services.gokapi.enable)
+- [gokapi](https://github.com/Forceu/Gokapi), Lightweight selfhosted Firefox Send alternative without public upload. AWS S3 supported. Available with [services.gokapi](options.html#opt-services.gokapi.enable).
 
 - [nostr-rs-relay](https://git.sr.ht/~gheartsfield/nostr-rs-relay/), This is a nostr relay, written in Rust. Available as [services.nostr-rs-relay](options.html#opt-services.nostr-rs-relay.enable).
 
@@ -148,7 +148,7 @@ Alongside many enhancements to NixOS modules and general system improvements, th
 
 - [strfry](https://github.com/hoytech/strfry), a relay for the nostr protocol. Available as [services.strfry](options.html#opt-services.strfry.enable).
 
-- [Prometheus Node Cert Exporter](https://github.com/amimof/node-cert-exporter), a prometheus exporter to check for SSL cert expiry. Available under [services.prometheus.exporters.node-cert](#opt-services.prometheus.exporters.node-cert.enable).
+- [Prometheus Node Cert Exporter](https://github.com/amimof/node-cert-exporter), a prometheus exporter to check for SSL cert expiry. Available as [services.prometheus.exporters.node-cert](#opt-services.prometheus.exporters.node-cert.enable).
 
 - [Actual Budget](https://actualbudget.org/), a local-first personal finance app. Available as [services.actual](#opt-services.actual.enable).
 
@@ -164,7 +164,7 @@ Alongside many enhancements to NixOS modules and general system improvements, th
 
 - [alertmanager-ntfy](https://github.com/alexbakker/alertmanager-ntfy), forwards Prometheus Alertmanager notifications to ntfy.sh. Available as [services.prometheus.alertmanager-ntfy](#opt-services.prometheus.alertmanager-ntfy.enable).
 
-- [Stash](https://github.com/stashapp/stash), An organizer for your adult videos/images, written in Go. Available as [services.stash](#opt-services.stash.enable).
+- [Stash](https://github.com/stashapp/stash), an organizer for your adult videos/images, written in Go. Available as [services.stash](#opt-services.stash.enable).
 
 - [vsmartcard-vpcd](https://frankmorgner.github.io/vsmartcard/virtualsmartcard/README.html), a virtual smart card driver. Available as [services.vsmartcard-vpcd](#opt-services.vsmartcard-vpcd.enable).
 
@@ -206,7 +206,7 @@ Alongside many enhancements to NixOS modules and general system improvements, th
 
 - [KanBoard](https://github.com/kanboard/kanboard), a project management tool that focuses on the Kanban methodology. Available as [services.kanboard](#opt-services.kanboard.enable).
 
-- [git-worktree-switcher](https://github.com/mateusauler/git-worktree-switcher), switch between git worktrees with speed. Available as [programs.git-worktree-switcher](#opt-programs.git-worktree-switcher.enable)
+- [git-worktree-switcher](https://github.com/mateusauler/git-worktree-switcher), switch between git worktrees with speed. Available as [programs.git-worktree-switcher](#opt-programs.git-worktree-switcher.enable).
 
 - [GLPI-Agent](https://github.com/glpi-project/glpi-agent), GLPI Agent. Available as [services.glpiAgent](options.html#opt-services.glpiAgent.enable).
 
@@ -216,25 +216,23 @@ Alongside many enhancements to NixOS modules and general system improvements, th
 
 - [Rebuilderd](https://github.com/kpcyrd/rebuilderd) an independent verification of binary packages - Reproducible Builds. Available as [services.rebuilderd](#opt-services.rebuilderd.enable).
 
-- [Limine](https://github.com/limine-bootloader/limine) a modern, advanced, portable, multiprotocol bootloader and boot manager. Available as [boot.loader.limine](#opt-boot.loader.limine.enable)
+- [Limine](https://github.com/limine-bootloader/limine) a modern, advanced, portable, multiprotocol bootloader and boot manager. Available as [boot.loader.limine](#opt-boot.loader.limine.enable).
 
 - [Orthanc](https://orthanc.uclouvain.be/) a lightweight, RESTful DICOM server for healthcare and medical research. Available as [services.orthanc](#opt-services.orthanc.enable).
 
 - [Docling Serve](https://github.com/docling-project/docling-serve) running [Docling](https://github.com/docling-project/docling) as an API service. Available as [services.docling-serve](#opt-services.docling-serve.enable).
 
-- [Pareto Security](https://paretosecurity.com/) is an alternative to corporate compliance solutions for companies that care about security but know it doesn't have to be invasive. Available as [services.paretosecurity](#opt-services.paretosecurity.enable)
-
-- [Cursor](https://cursor.com/) is a vscode-based editor that uses AI to help you write code faster.
+- [Pareto Security](https://paretosecurity.com/) is an alternative to corporate compliance solutions for companies that care about security but know it doesn't have to be invasive. Available as [services.paretosecurity](#opt-services.paretosecurity.enable).
 
 - [GNU Rush](https://gnu.org/software/rush/) is a Restricted User Shell, designed for systems providing limited remote access to their resources. Available as [programs.rush](#opt-programs.rush.enable).
 
-- [ipfs-cluster](https://ipfscluster.io/), Pinset orchestration for IPFS. Available as [services.ipfs-cluster](#opt-services.ipfs-cluster.enable)
+- [ipfs-cluster](https://ipfscluster.io/), Pinset orchestration for IPFS. Available as [services.ipfs-cluster](#opt-services.ipfs-cluster.enable).
 
 - [bitbox-bridge](https://github.com/BitBoxSwiss/bitbox-bridge), a bridge software that connects BitBox hardware wallets to computers & web wallets like [Rabby](https://rabby.io/). Allows one to interact & transact with smart contracts, Web3 websites & financial services without storing private keys anywhere other than the hardware wallet. Available as [services.bitbox-bridge](#opt-services.bitbox-bridge.enable).
 
 - [GoDNS](https://github.com/TimothyYe/godns), a dynamic DNS client written in Go, which supports multiple DNS providers. Available as [services.godns](option.html#opt-services.godns.enable).
 
-- [CookCLI](https://cooklang.org/cli/) Server, a web UI for cooklang recipes.
+- [CookCLI](https://cooklang.org/cli/) Server, a web UI for cooklang recipes. Available as [services.cook-cli](#opt-services.cook-cli.enable).
 
 - [Prometheus eBPF Exporter](https://github.com/cloudflare/ebpf_exporter),
   Prometheus exporter for custom eBPF metrics. Available as

From a3fa8c260689305d6068534671f6e974a3d3a3c3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 23 May 2025 03:56:46 +0000
Subject: [PATCH 085/103] vimPlugins.blink-cmp: 1.3.0 -> 1.3.1

---
 .../editors/vim/plugins/non-generated/blink-cmp/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix
index 26735f7a0be4..45cc5167fcfd 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix
@@ -8,12 +8,12 @@
   gitMinimal,
 }:
 let
-  version = "1.3.0";
+  version = "1.3.1";
   src = fetchFromGitHub {
     owner = "Saghen";
     repo = "blink.cmp";
     tag = "v${version}";
-    hash = "sha256-8lyDDrsh3sY7l0i0TPyhL69Oq0l63+/QPnLaU/mhq5A=";
+    hash = "sha256-ZMq7zXXP3QL73zNfgDNi7xipmrbNwBoFPzK4K0dr6Zs=";
   };
   blink-fuzzy-lib = rustPlatform.buildRustPackage {
     inherit version src;

From 13f585c5a606b3963b243d9f70e0a6a630616491 Mon Sep 17 00:00:00 2001
From: ZHAO Jin-Xiang <xiaoxiangmoe@gmail.com>
Date: Sat, 17 May 2025 23:39:21 +0800
Subject: [PATCH 086/103] ast-grep: remove emulator support

---
 pkgs/by-name/as/ast-grep/package.nix | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/as/ast-grep/package.nix b/pkgs/by-name/as/ast-grep/package.nix
index 4783207b3a6f..e03894c63e96 100644
--- a/pkgs/by-name/as/ast-grep/package.nix
+++ b/pkgs/by-name/as/ast-grep/package.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   stdenv,
   installShellFiles,
-  buildPackages,
   versionCheckHook,
   nix-update-script,
   enableLegacySg ? false,
@@ -35,23 +34,18 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "--package ast-grep --bin ast-grep"
   ] ++ lib.optionals enableLegacySg [ "--package ast-grep --bin sg" ];
 
-  postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) (
-    let
-      emulator = stdenv.hostPlatform.emulator buildPackages;
-    in
-    ''
-      installShellCompletion --cmd ast-grep \
-        --bash <(${emulator} $out/bin/ast-grep completions bash) \
-        --fish <(${emulator} $out/bin/ast-grep completions fish) \
-        --zsh <(${emulator} $out/bin/ast-grep completions zsh)
-    ''
-    + lib.optionalString enableLegacySg ''
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd ast-grep \
+      --bash <($out/bin/ast-grep completions bash) \
+      --fish <($out/bin/ast-grep completions fish) \
+      --zsh <($out/bin/ast-grep completions zsh)
+    ${lib.optionalString enableLegacySg ''
       installShellCompletion --cmd sg \
-        --bash <(${emulator} $out/bin/sg completions bash) \
-        --fish <(${emulator} $out/bin/sg completions fish) \
-        --zsh <(${emulator} $out/bin/sg completions zsh)
-    ''
-  );
+        --bash <($out/bin/sg completions bash) \
+        --fish <($out/bin/sg completions fish) \
+        --zsh <($out/bin/sg completions zsh)
+    ''}
+  '';
 
   nativeInstallCheckInputs = [
     versionCheckHook

From f0fe68a3c525815a398483d3407660b64a70cdad Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Fri, 23 May 2025 12:39:42 +0800
Subject: [PATCH 087/103] iconic: init at 2025.3.2

---
 pkgs/by-name/ic/iconic/package.nix | 75 ++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 pkgs/by-name/ic/iconic/package.nix

diff --git a/pkgs/by-name/ic/iconic/package.nix b/pkgs/by-name/ic/iconic/package.nix
new file mode 100644
index 000000000000..9a7ee856cce2
--- /dev/null
+++ b/pkgs/by-name/ic/iconic/package.nix
@@ -0,0 +1,75 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  meson,
+  ninja,
+  blueprint-compiler,
+  wrapGAppsHook4,
+  desktop-file-utils,
+  rustPlatform,
+  cargo,
+  rustc,
+  pkg-config,
+  glib,
+  libadwaita,
+  libxml2,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "iconic";
+  version = "2025.3.2";
+
+  src = fetchFromGitHub {
+    owner = "youpie";
+    repo = "Iconic";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-mj95GShV/PxFXweL14zTVANO10CGpXyktJjJGtD1XS8=";
+  };
+
+  postPatch = ''
+    substituteInPlace src/windows/file_handling.rs \
+      --replace-fail "/app" "$out"
+    substituteInPlace src/windows/regeneration.rs \
+      --replace-fail "/app" "$out"
+    substituteInPlace src/config.rs \
+      --replace-fail "/app" "$out"
+    substituteInPlace src/window.rs \
+      --replace-fail "create_dir" "create_dir_all"
+  '';
+
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit (finalAttrs) pname version src;
+    hash = "sha256-/D4l85PO2h+172f8AgQFze665otIeouxEdVL56f+hoM=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    blueprint-compiler
+    wrapGAppsHook4
+    rustPlatform.cargoSetupHook
+    cargo
+    rustc
+    desktop-file-utils
+    pkg-config
+  ];
+
+  buildInputs = [
+    glib
+    libadwaita
+    libxml2
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    homepage = "https://github.com/youpie/Iconic";
+    description = "Easilly add images on top of folders";
+    mainProgram = "folder_icon";
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ emaryn ];
+  };
+})

From 01f7e72a9158d179117476a1b8de8c1084939b2b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 23 May 2025 05:07:10 +0000
Subject: [PATCH 088/103] libretro.flycast: 0-unstable-2025-05-10 ->
 0-unstable-2025-05-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 23ab23c3a2cd..9c123e21ef8b 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-05-10";
+  version = "0-unstable-2025-05-22";
 
   src = fetchFromGitHub {
     owner = "flyinghead";
     repo = "flycast";
-    rev = "ffc32d2d8676e1ca35b074196afbfb2697ee7d59";
-    hash = "sha256-IF16YA8YynAhZ42G17aMwKRvlMG3DojrPqslWY43ww8=";
+    rev = "1953eb0eea10f6ddc780bea743ad74c57983b554";
+    hash = "sha256-Y0QmDzML8bSQi1DxFErBptSB31TrXmFGVoTYnd3Ppr0=";
     fetchSubmodules = true;
   };
 

From a05da0eba7838b4d1b296e16984000dc139020c0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 23 May 2025 05:53:19 +0000
Subject: [PATCH 089/103] vscode-extensions.emmanuelbeziat.vscode-great-icons:
 2.1.118 -> 2.1.119

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 62eed5b9ce84..cabb4c7ee39c 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1734,8 +1734,8 @@ let
         mktplcRef = {
           name = "vscode-great-icons";
           publisher = "emmanuelbeziat";
-          version = "2.1.118";
-          hash = "sha256-nc3MsBnvof9MxFsGLRojlGQ4jUK+ia4k2GPCEBSHpuI=";
+          version = "2.1.119";
+          hash = "sha256-mE9VU5K/+NLjHk/XQ7fb+wZ9FNAfsIwmPu7IAoei8Iw=";
         };
         meta = {
           license = lib.licenses.mit;

From 82dfbe95f55235c5b5df6ac5b24f6d3c822b19df Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 22 May 2025 16:50:43 +0300
Subject: [PATCH 090/103] nixos/i18n: Re-add special handling of LANGUAGE

This reverts commit 263297b4e5d3aa820be4b98e20e00a40e33aa4e7 while also
explaining in the docs where exactly LANGUAGE is ignored, and why.

Fixes #409306.
---
 nixos/modules/config/i18n.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix
index 22a47d5bdffa..67b0e2a897af 100644
--- a/nixos/modules/config/i18n.nix
+++ b/nixos/modules/config/i18n.nix
@@ -12,6 +12,8 @@ let
       "${config.i18n.defaultLocale}/${config.i18n.defaultCharset}"
     ]
     ++ lib.pipe config.i18n.extraLocaleSettings [
+      # See description of extraLocaleSettings for why is this ignored here.
+      (lib.filterAttrs (n: v: n != "LANGUAGE"))
       (lib.mapAttrs (n: v: (sanitizeUTF8Capitalization v)))
       (lib.mapAttrsToList (LCRole: lang: lang + "/" + (config.i18n.localeCharsets.${LCRole} or "UTF-8")))
     ]
@@ -92,6 +94,12 @@ in
           character set, and it must not be added manually here. To use a
           non-`UTF-8` character set such as ISO-XXXX-8, the
           {option}`i18n.localeCharsets` can be used.
+
+          Note that if the [`LANGUAGE`
+          key](https://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html)
+          is used in this option, it is ignored when computing the locales
+          required to be installed, because the possible values of this key are
+          more diverse and flexible then the others.
         '';
       };
       localeCharsets = lib.mkOption {

From 524d186748fa7bce49f258774f46610008bf320e Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Wed, 21 May 2025 21:05:37 +0200
Subject: [PATCH 091/103] couchdb-dump: init at 0-unstable-2021-07-24

---
 pkgs/by-name/co/couchdb-dump/gsed.patch  | 19 +++++++
 pkgs/by-name/co/couchdb-dump/package.nix | 64 ++++++++++++++++++++++++
 2 files changed, 83 insertions(+)
 create mode 100644 pkgs/by-name/co/couchdb-dump/gsed.patch
 create mode 100644 pkgs/by-name/co/couchdb-dump/package.nix

diff --git a/pkgs/by-name/co/couchdb-dump/gsed.patch b/pkgs/by-name/co/couchdb-dump/gsed.patch
new file mode 100644
index 000000000000..40c7d45cc41c
--- /dev/null
+++ b/pkgs/by-name/co/couchdb-dump/gsed.patch
@@ -0,0 +1,19 @@
+--- a/couchdb-dump.sh	1970-01-01 01:00:01.000000000 +0100
++++ b/couchdb-dump.sh	2025-05-21 10:08:22.092922719 +0200
+@@ -182,15 +182,8 @@
+ fi
+ file_name_orig=$file_name
+ 
+-# Get OS TYPE (Linux for Linux, Darwin for MacOSX)
+-os_type=`uname -s`
++sed_cmd="@sed_cmd@";
+ 
+-# Pick sed or gsed
+-if [ "$os_type" = "FreeBSD" ]||[ "$os_type" = "Darwin" ]; then
+-    sed_cmd="gsed";
+-else
+-    sed_cmd="sed";
+-fi
+ ## Make sure it's installed
+ echo | $sed_cmd 's/a//' >/dev/null 2>&1 
+ if [ ! $? = 0 ]; then
diff --git a/pkgs/by-name/co/couchdb-dump/package.nix b/pkgs/by-name/co/couchdb-dump/package.nix
new file mode 100644
index 000000000000..48bed57200b2
--- /dev/null
+++ b/pkgs/by-name/co/couchdb-dump/package.nix
@@ -0,0 +1,64 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  makeWrapper,
+  coreutils,
+  curl,
+  gawk,
+  gnugrep,
+  gnused,
+  gzip,
+  sysctl,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "couchdb-dump";
+  version = "0-unstable-2021-07-24";
+
+  src = fetchFromGitHub {
+    owner = "danielebailo";
+    repo = "couchdb-dump";
+    rev = "f59fa242d34e505cb22ecb2ad1ffba0f6402978c";
+    hash = "sha256-fBvbt/1ukpvcu8Aa/uAmVzw0ms8Sp35WLJPvHs9E9Bc=";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  patches = [ ./gsed.patch ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -D couchdb-dump.sh $out/bin/couchdb-dump
+
+    substituteInPlace $out/bin/couchdb-dump \
+      --subst-var-by sed_cmd ${lib.getExe gnused}
+
+    wrapProgram $out/bin/couchdb-dump --prefix PATH : ${
+      lib.makeBinPath (
+        [
+          coreutils
+          curl
+          gawk
+          gnugrep
+          gnused
+          gzip
+        ]
+        ++ lib.optionals (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isFreeBSD) [
+          sysctl
+        ]
+      )
+    }
+
+    runHook postInstall
+  '';
+
+  meta = {
+    inherit (finalAttrs.src.meta) homepage;
+
+    description = "Bash command line scripts to dump & restore a couchdb database";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ DamienCassou ];
+    mainProgram = "couchdb-dump";
+  };
+})

From 6d47315045c4882728c7ef2b0ba2f4072aa998e3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 23 May 2025 06:36:08 +0000
Subject: [PATCH 092/103] spicetify-cli: 2.40.7 -> 2.40.9

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

diff --git a/pkgs/by-name/sp/spicetify-cli/package.nix b/pkgs/by-name/sp/spicetify-cli/package.nix
index 615ca0065927..c1794be0f9ed 100644
--- a/pkgs/by-name/sp/spicetify-cli/package.nix
+++ b/pkgs/by-name/sp/spicetify-cli/package.nix
@@ -8,13 +8,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "spicetify-cli";
-  version = "2.40.7";
+  version = "2.40.9";
 
   src = fetchFromGitHub {
     owner = "spicetify";
     repo = "cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-iNRjRfRrK/pLL4xZX6Q/LV45NyNG1u4CyQGZtZYb2X8=";
+    hash = "sha256-x3M6AbFiVCk1LM3k+D+NAnOclu90LAuBgYI/cBLpH3A=";
   };
 
   vendorHash = "sha256-901njlGcAxr12F9w6yQ+ESsptlwsZsMvKPUmlHxehmA=";

From a0022b5484c22bf4bc76564483c89080dbc303d5 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Thu, 22 May 2025 17:50:48 +0200
Subject: [PATCH 093/103] presenterm: fix `sixel` feature support

---
 pkgs/by-name/pr/presenterm/package.nix | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/pkgs/by-name/pr/presenterm/package.nix b/pkgs/by-name/pr/presenterm/package.nix
index 04aaa97736bf..fe868c832eb9 100644
--- a/pkgs/by-name/pr/presenterm/package.nix
+++ b/pkgs/by-name/pr/presenterm/package.nix
@@ -1,7 +1,9 @@
 {
   lib,
+  stdenv,
   rustPlatform,
   fetchFromGitHub,
+  lld,
   libsixel,
   versionCheckHook,
   nix-update-script,
@@ -18,13 +20,29 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-vBEHk0gQe4kUTtH4qtc0jVfDvYGabnkJrwPxmxt10hs=";
   };
 
+  nativeBuildInputs = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
+    lld
+  ];
+
   buildInputs = [
     libsixel
   ];
 
+  buildFeatures = [
+    "sixel"
+  ];
+
   useFetchCargoVendor = true;
   cargoHash = "sha256-u0wOWKAfzi1Fxmx6x2ckrIv/PKgtqKrDiDauD4/BY24=";
 
+  env = lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) {
+    NIX_CFLAGS_LINK = "-fuse-ld=lld";
+  };
+
+  checkFeatures = [
+    "sixel"
+  ];
+
   checkFlags = [
     # failed to load .tmpEeeeaQ: No such file or directory (os error 2)
     "--skip=external_snippet"

From 2b1782e2a2a12034f3dc15ad0a4e3247688cabeb Mon Sep 17 00:00:00 2001
From: nat <nat@nekopon.pl>
Date: Wed, 21 May 2025 23:42:56 +0200
Subject: [PATCH 094/103] lucida-downloader: init at 0.2.0

---
 pkgs/by-name/lu/lucida-downloader/package.nix | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 pkgs/by-name/lu/lucida-downloader/package.nix

diff --git a/pkgs/by-name/lu/lucida-downloader/package.nix b/pkgs/by-name/lu/lucida-downloader/package.nix
new file mode 100644
index 000000000000..ce81a0aace4c
--- /dev/null
+++ b/pkgs/by-name/lu/lucida-downloader/package.nix
@@ -0,0 +1,32 @@
+{
+  fetchFromGitHub,
+  gitUpdater,
+  lib,
+  rustPlatform,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "lucida-downloader";
+  version = "0.2.0";
+
+  src = fetchFromGitHub {
+    owner = "jelni";
+    repo = "lucida-downloader";
+    tag = "v${version}";
+    hash = "sha256-9wXnxsgZZprUez3PggBWbTU/Vx7JFkNC7fuOiqWG87Y=";
+  };
+
+  passthru.updateScript = gitUpdater { rev-prefix = "v"; };
+
+  cargoHash = "sha256-OfnCKFWUxpFu6NU4MNMCimXAbhspBf1n6Qz5ff7MHI4=";
+
+  meta = {
+    description = "Multithreaded client for downloading music for free with lucida";
+    homepage = "https://github.com/jelni/lucida-downloader";
+    license = lib.licenses.gpl3Plus;
+    mainProgram = "lucida";
+    maintainers = with lib.maintainers; [
+      surfaceflinger
+    ];
+  };
+}

From 81ba6a15c20f0a7ab137c6d5a11b6c93a12c46df Mon Sep 17 00:00:00 2001
From: fsagbuya <fa@m-labs.ph>
Date: Fri, 23 May 2025 15:25:25 +0800
Subject: [PATCH 095/103] mattermost: remove fsagbuya as maintainer

---
 pkgs/by-name/ma/mattermost/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/ma/mattermost/package.nix b/pkgs/by-name/ma/mattermost/package.nix
index ce550636506c..a964e3e33573 100644
--- a/pkgs/by-name/ma/mattermost/package.nix
+++ b/pkgs/by-name/ma/mattermost/package.nix
@@ -261,7 +261,6 @@ buildMattermost rec {
       numinit
       kranzes
       mgdelacroix
-      fsagbuya
     ];
     platforms = lib.platforms.linux;
     mainProgram = "mattermost";

From 436e8de8cbff5cd9314830ef7d880c95177a19fd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 23 May 2025 08:14:03 +0000
Subject: [PATCH 096/103] python3Packages.pysmartthings: 3.2.2 -> 3.2.3

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

diff --git a/pkgs/development/python-modules/pysmartthings/default.nix b/pkgs/development/python-modules/pysmartthings/default.nix
index 0d5af45b0193..7bc19b5cf2b9 100644
--- a/pkgs/development/python-modules/pysmartthings/default.nix
+++ b/pkgs/development/python-modules/pysmartthings/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "pysmartthings";
-  version = "3.2.2";
+  version = "3.2.3";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "andrewsayre";
     repo = "pysmartthings";
     tag = "v${version}";
-    hash = "sha256-tQ+AQDHwr9JO4AQ+2ZAGQbSrfnuzPUEi2F19wLijv1Y=";
+    hash = "sha256-Bi/BHOvECzXhIBe+SK6wTmFnDbt1T28QAs7QETPH/YE=";
   };
 
   build-system = [ poetry-core ];

From a5852b482eb9fab91dabbe5598ff8cd9bc161966 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 23 May 2025 09:11:01 +0000
Subject: [PATCH 097/103] vimPlugins.avante-nvim: 0.0.23-unstable-2025-05-12 ->
 0.0.23-unstable-2025-05-20

---
 .../vim/plugins/non-generated/avante-nvim/default.nix       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix
index f038c61b53b5..1bd3195a91f1 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix
@@ -12,12 +12,12 @@
   pkgs,
 }:
 let
-  version = "0.0.23-unstable-2025-05-12";
+  version = "0.0.23-unstable-2025-05-20";
   src = fetchFromGitHub {
     owner = "yetone";
     repo = "avante.nvim";
-    rev = "aae4cc4014149e544fb00e78687bcdef8335dd10";
-    hash = "sha256-ixJcD8V2rCLCrqE7hHtHfEtQuHeVyIDgyZ1VOY1jmD0=";
+    rev = "87c4c6b4937d1884960759aba4a0e42645688f2f";
+    hash = "sha256-yDPu3bmOFeNdcD0o+nC6Cq1hij1A8ZoT5uipj7qf7cc=";
   };
   avante-nvim-lib = rustPlatform.buildRustPackage {
     pname = "avante-nvim-lib";

From 575a550b48d3eee37544cdef6ef83d211ea76b33 Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Fri, 23 May 2025 17:11:45 +0800
Subject: [PATCH 098/103] gh-ost: use finalAttrs

---
 pkgs/by-name/gh/gh-ost/package.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/gh/gh-ost/package.nix b/pkgs/by-name/gh/gh-ost/package.nix
index 29b0e58ef0f3..3a9ef0034952 100644
--- a/pkgs/by-name/gh/gh-ost/package.nix
+++ b/pkgs/by-name/gh/gh-ost/package.nix
@@ -3,17 +3,16 @@
   buildGoModule,
   fetchFromGitHub,
   testers,
-  gh-ost,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "gh-ost";
   version = "1.1.7";
 
   src = fetchFromGitHub {
     owner = "github";
     repo = "gh-ost";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-TTc69dWasqMVwwJNo+M9seMKEWgerZ2ZR7dwDfM1gWI=";
   };
 
@@ -22,7 +21,7 @@ buildGoModule rec {
   ldflags = [
     "-s"
     "-w"
-    "-X main.AppVersion=${version}"
+    "-X main.AppVersion=${finalAttrs.version}"
   ];
 
   checkFlags =
@@ -37,7 +36,7 @@ buildGoModule rec {
     [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
 
   passthru.tests.version = testers.testVersion {
-    package = gh-ost;
+    package = finalAttrs.finalPackage;
   };
 
   meta = {
@@ -47,4 +46,4 @@ buildGoModule rec {
     maintainers = with lib.maintainers; [ aaronjheng ];
     mainProgram = "gh-ost";
   };
-}
+})

From 4fedf57b147a717f7e3c9c1a165cd8c2cba16ff8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A5=94=E8=B7=91=E7=9A=84=E5=B0=8F=E8=8D=89?=
 <hi@grass.show>
Date: Fri, 23 May 2025 10:49:55 +0800
Subject: [PATCH 099/103] maintainers: remove runging-grass from maintainers

---
 .../emacs/elisp-packages/manual-packages/codeium/default.nix    | 2 +-
 pkgs/by-name/an/anytype/package.nix                             | 1 -
 pkgs/by-name/li/listen1/package.nix                             | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/codeium/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/codeium/default.nix
index bb6ad95c94b5..1a4400b6e785 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/codeium/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/codeium/default.nix
@@ -30,7 +30,7 @@ melpaBuild {
     description = "Free, ultrafast Copilot alternative for Emacs";
     homepage = "https://github.com/Exafunction/codeium.el";
     license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.running-grass ];
+    maintainers = [ ];
     inherit (codeium.meta) platforms;
     sourceProvenance = [ lib.sourceTypes.fromSource ];
   };
diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix
index d59a40637481..268e3734b812 100644
--- a/pkgs/by-name/an/anytype/package.nix
+++ b/pkgs/by-name/an/anytype/package.nix
@@ -123,7 +123,6 @@ buildNpmPackage {
     license = lib.licenses.unfreeRedistributable;
     mainProgram = "anytype";
     maintainers = with lib.maintainers; [
-      running-grass
       autrimpo
       adda
     ];
diff --git a/pkgs/by-name/li/listen1/package.nix b/pkgs/by-name/li/listen1/package.nix
index f159d5d42514..30f32f42b0e1 100644
--- a/pkgs/by-name/li/listen1/package.nix
+++ b/pkgs/by-name/li/listen1/package.nix
@@ -28,7 +28,7 @@ appimageTools.wrapType2 {
     description = "One for all free music in China";
     homepage = "http://listen1.github.io/listen1/";
     license = licenses.mit;
-    maintainers = with maintainers; [ running-grass ];
+    maintainers = with maintainers; [ ];
     platforms = [ "x86_64-linux" ];
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     mainProgram = "listen1";

From ac26f78d1b5f1fbdedafd250d2e8c42f9062a712 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 23 May 2025 09:01:21 +0000
Subject: [PATCH 100/103] hyprprop: 0.1-unstable-2025-05-12 ->
 0.1-unstable-2025-05-18

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

diff --git a/pkgs/by-name/hy/hyprprop/package.nix b/pkgs/by-name/hy/hyprprop/package.nix
index 6ce676e19d7a..ba9e1be21d2d 100644
--- a/pkgs/by-name/hy/hyprprop/package.nix
+++ b/pkgs/by-name/hy/hyprprop/package.nix
@@ -14,13 +14,13 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "hyprprop";
-  version = "0.1-unstable-2025-05-12";
+  version = "0.1-unstable-2025-05-18";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "contrib";
-    rev = "8e6c02ac3dfbff878ef300266598737ee9cedf94";
-    hash = "sha256-VKs/GtedyOrcWiEOf9JPPX6ZgKzngXTVMUlqsL60G/c=";
+    rev = "910dad4c5755c1735d30da10c96d9086aa2a608d";
+    hash = "sha256-PMQoXbfmWPuXnF8EaWqRmvTvl7+WFUrDVgufFRPgOM4=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/hyprprop";

From 2d0d8aaba561eeeb896f377ed7300526db722c5e Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 23 May 2025 12:23:24 +0200
Subject: [PATCH 101/103] teams/apm: remove wolfgangwalther

---
 maintainers/team-list.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index fbd079df3460..3ac3b6fe6e19 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -63,7 +63,6 @@ with lib.maintainers;
     shortName = "apm employees";
     # Edits to this list should only be done by an already existing member.
     members = [
-      wolfgangwalther
       DutchGerman
     ];
   };

From f05abeb30e74c7293176a4ac68986bef61a06f34 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Fri, 23 May 2025 20:18:32 +0900
Subject: [PATCH 102/103] argbash: update meta.homepage

Upstream replaced the link in https://github.com/matejak/argbash/commit/48a7252cfe8ef0d43feb944d42a1778986005d43
---
 pkgs/by-name/ar/argbash/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ar/argbash/package.nix b/pkgs/by-name/ar/argbash/package.nix
index a3fe1d4026f2..919968346448 100644
--- a/pkgs/by-name/ar/argbash/package.nix
+++ b/pkgs/by-name/ar/argbash/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   meta = {
-    homepage = "https://argbash.io/";
+    homepage = "https://argbash.dev/";
     description = "Bash argument parsing code generator";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ ];

From e2cbbf11fcfc5dc6c7625c5f10f31913dd3003ac Mon Sep 17 00:00:00 2001
From: Savchenko Dmitriy <apicalium@gmail.com>
Date: Fri, 23 May 2025 14:57:30 +0300
Subject: [PATCH 103/103] pencil2d: init at 0.7.0 (#402895)

---
 pkgs/by-name/pe/pencil2d/package.nix | 41 ++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 pkgs/by-name/pe/pencil2d/package.nix

diff --git a/pkgs/by-name/pe/pencil2d/package.nix b/pkgs/by-name/pe/pencil2d/package.nix
new file mode 100644
index 000000000000..0cb6cbd4a433
--- /dev/null
+++ b/pkgs/by-name/pe/pencil2d/package.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  qt5,
+}:
+
+stdenv.mkDerivation (FinalAttrs: {
+  pname = "pencil2d";
+  version = "0.7.0";
+
+  src = fetchFromGitHub {
+    owner = "pencil2d";
+    repo = "pencil";
+    tag = "v${FinalAttrs.version}";
+    hash = "sha256-OuZpKgX2BgfuQdnjk/RTBww/blO1CIrYWr7KytqcIbQ=";
+  };
+
+  nativeBuildInputs = with qt5; [
+    qmake
+    wrapQtAppsHook
+    qttools
+  ];
+
+  buildInputs = with qt5; [
+    qtbase
+    qtmultimedia
+    qtsvg
+    qtwayland
+  ];
+
+  meta = {
+    description = "Easy, intuitive tool to make 2D hand-drawn animations";
+    homepage = "https://www.pencil2d.org/";
+    downloadPage = "https://github.com/pencil2d/pencil";
+    license = lib.licenses.gpl2;
+    maintainers = with lib.maintainers; [ agvantibo ];
+    platforms = lib.platforms.linux;
+    mainProgram = "pencil2d";
+  };
+})