From 34fc9a0b25a25e95746ab264f96338557ba4a426 Mon Sep 17 00:00:00 2001
From: sdedovic <stevan@dedovic.com>
Date: Fri, 21 Mar 2025 00:04:12 -0500
Subject: [PATCH 01/57] maintainers: add sdedovic

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 9bc461a0c704..eb523f0fa8ad 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -21415,6 +21415,12 @@
     github = "sdaqo";
     githubId = 63876564;
   };
+  sdedovic = {
+    name = "Stevan Dedovic";
+    email = "stevan@dedovic.com";
+    github = "sdedovic";
+    githubId = 599915;
+  };
   sdht0 = {
     email = "nixpkgs@sdht.in";
     github = "sdht0";

From 2f0949c45d38745d066d848da04c4b21c3c69de5 Mon Sep 17 00:00:00 2001
From: sdedovic <stevan@dedovic.com>
Date: Wed, 19 Mar 2025 22:47:59 -0500
Subject: [PATCH 02/57] tsx: init at 4.19.3

---
 pkgs/by-name/ts/tsx/package.nix | 92 +++++++++++++++++++++++++++++++++
 1 file changed, 92 insertions(+)
 create mode 100644 pkgs/by-name/ts/tsx/package.nix

diff --git a/pkgs/by-name/ts/tsx/package.nix b/pkgs/by-name/ts/tsx/package.nix
new file mode 100644
index 000000000000..f902d7a7bccd
--- /dev/null
+++ b/pkgs/by-name/ts/tsx/package.nix
@@ -0,0 +1,92 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  pnpm_9,
+  nodejs_22,
+  versionCheckHook,
+}:
+stdenv.mkDerivation rec {
+  pname = "tsx";
+  version = "4.19.3";
+
+  src = fetchFromGitHub {
+    owner = "privatenumber";
+    repo = "tsx";
+    tag = "v${version}";
+    hash = "sha256-wdv2oqJNc6U0Fyv4jT+0LUcYaDfodHk1vQZGMdyFF/E=";
+  };
+
+  pnpmDeps = pnpm_9.fetchDeps {
+    inherit pname version src;
+    hash = "sha256-57KDZ9cHb7uqnypC0auIltmYMmIhs4PWyf0HTRWEFiU=";
+  };
+
+  nativeBuildInputs = [
+    nodejs_22
+    pnpm_9.configHook
+  ];
+
+  buildInputs = [
+    nodejs_22
+  ];
+
+  patchPhase = ''
+    runHook prePatch
+
+    # by default pnpm builds the docs workspace and this was just
+    #  the easiest way I found to stop that, as pnpmWorkspaces and
+    #  other flags did not work
+    rm pnpm-workspace.yaml
+
+    # because tsx uses semantic-release, the package.json has a placeholder
+    #  version number. this patches it to match the version of the nix package,
+    #  which in turn is the release version in github.
+    substituteInPlace package.json --replace-fail "0.0.0-semantic-release" "${version}"
+
+    runHook postPatch
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+
+    npm run build
+
+    # remove devDependencies that are only required to build
+    #  and package the typescript code
+    pnpm prune --prod
+
+    # Clean up broken symlinks left behind by `pnpm prune`
+    # https://github.com/pnpm/pnpm/issues/3645
+    find node_modules -xtype l -delete
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/{bin,lib/tsx}
+    cp -r {dist,node_modules} $out/lib/tsx
+    chmod +x $out/lib/tsx/dist/cli.mjs
+    ln -s $out/lib/tsx/dist/cli.mjs $out/bin/tsx
+
+    runHook postInstall
+  '';
+
+  # 8 / 85 tests are failing, I do not know why, while regular usage shows no issues.
+  doCheck = false;
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+  versionCheckProgramArg = "--version";
+
+  meta = {
+    description = "TypeScript Execute (tsx): The easiest way to run TypeScript in Node.js";
+    homepage = "https://tsx.is";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.sdedovic ];
+    mainProgram = "tsx";
+  };
+}

From d61f4af5b6df73b3695cd13cef4a7941eb7e0dee Mon Sep 17 00:00:00 2001
From: Artur Manuel <amad@atl.tools>
Date: Wed, 16 Apr 2025 13:41:19 +0100
Subject: [PATCH 03/57] rose-pine-kvantum: 0-unstable-2025-03-26 ->
 0-unstable-2025-04-16

---
 pkgs/by-name/ro/rose-pine-kvantum/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ro/rose-pine-kvantum/package.nix b/pkgs/by-name/ro/rose-pine-kvantum/package.nix
index ea0b6a3ed42c..5f390d2a218d 100644
--- a/pkgs/by-name/ro/rose-pine-kvantum/package.nix
+++ b/pkgs/by-name/ro/rose-pine-kvantum/package.nix
@@ -5,13 +5,13 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "rose-pine-kvantum";
-  version = "0-unstable-2025-03-26";
+  version = "0-unstable-2025-04-16";
 
   src = fetchFromGitHub {
     owner = "rose-pine";
     repo = "kvantum";
-    rev = "5a51f5892ba752088dee062a6188b9f0bb59324b";
-    hash = "sha256-lUO3Bg9+KbPkllKu2sv9ueV1dcZu4qRn32N/+4+2B4A=";
+    rev = "48edf9e2d772b166ed50af3e182a19196e5d3fe6";
+    hash = "sha256-0xSMYYPsW7Rw5O8FL0iAt63Hya8GkI2VuOZf64PewyQ=";
   };
 
   dontBuild = true;
@@ -31,6 +31,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     homepage = "https://github.com/rose-pine/kvantum";
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ amadaluzia ];
-    license = lib.licenses.unfree; # rose-pine/kvantum#1
+    license = lib.licenses.mit;
   };
 })

From 4abce219e7b9f52780ec4e459b6eea0e2c8a2f89 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 21 May 2025 02:53:54 +0000
Subject: [PATCH 04/57] beetsPackages.audible: 1.0.1 -> 1.0.2

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

diff --git a/pkgs/tools/audio/beets/plugins/audible.nix b/pkgs/tools/audio/beets/plugins/audible.nix
index 7e090bf2358f..9bc10074d2f2 100644
--- a/pkgs/tools/audio/beets/plugins/audible.nix
+++ b/pkgs/tools/audio/beets/plugins/audible.nix
@@ -7,14 +7,14 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "beets-audible";
-  version = "1.0.1";
+  version = "1.0.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Neurrone";
     repo = "beets-audible";
     rev = "v${version}";
-    hash = "sha256-Sds16h+W9t7N755ADPXXDi+SxwouBMxP9ApUqaXedqY=";
+    hash = "sha256-6rf8U63SW+gwfT7ZdN/ymYKHRs0HSMDTP2ZBfULLsJs=";
   };
 
   nativeBuildInputs = [

From 6d895f43c2b28c8c6035859e6964daff97cfd120 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 30 May 2025 19:45:47 +0000
Subject: [PATCH 05/57] gum: 0.16.0 -> 0.16.1

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

diff --git a/pkgs/by-name/gu/gum/package.nix b/pkgs/by-name/gu/gum/package.nix
index 65cb469ecc50..c69959c33ae8 100644
--- a/pkgs/by-name/gu/gum/package.nix
+++ b/pkgs/by-name/gu/gum/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "gum";
-  version = "0.16.0";
+  version = "0.16.1";
 
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = "gum";
     rev = "v${version}";
-    hash = "sha256-77102I7pOGfpPBSGelsA/9GJYos05akF0kdmr522RC0=";
+    hash = "sha256-3tn126Ars64ZhOY68aCrE7j14YDVGmllbHvYMHAgLR0=";
   };
 
-  vendorHash = "sha256-wrl4Zo5NSaTTMrc95Fs9cevG7ITJtHuV3pGkFd8jpxU=";
+  vendorHash = "sha256-SsnULG12NjyetLhL7vYjjpDI8vqqdeSyoZj0U3KP/nI=";
 
   nativeBuildInputs = [
     installShellFiles

From 284bf4fd54e4757f192ff89d0784d5045f442b5f Mon Sep 17 00:00:00 2001
From: Steffen Beyer <steffen@beyer.io>
Date: Sat, 31 May 2025 16:26:34 +0200
Subject: [PATCH 06/57] androidenv: emulator: fix non-Linux path/binary symlink

---
 pkgs/development/mobile/androidenv/emulator.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/emulator.nix b/pkgs/development/mobile/androidenv/emulator.nix
index e2f724ada13c..473a9d1d1c06 100644
--- a/pkgs/development/mobile/androidenv/emulator.nix
+++ b/pkgs/development/mobile/androidenv/emulator.nix
@@ -57,7 +57,7 @@ deployAndroidPackage {
       libxshmfence
     ])
     ++ lib.optional (os == "linux" && stdenv.isx86_64) pkgsi686Linux.glibc;
-  patchInstructions = lib.optionalString (os == "linux") ''
+  patchInstructions = (lib.optionalString (os == "linux") ''
     addAutoPatchelfSearchPath $packageBaseDir/lib
     addAutoPatchelfSearchPath $packageBaseDir/lib64
     addAutoPatchelfSearchPath $packageBaseDir/lib64/qt/lib
@@ -85,7 +85,8 @@ deployAndroidPackage {
       } \
       --set QT_XKB_CONFIG_ROOT ${pkgs.xkeyboard_config}/share/X11/xkb \
       --set QTCOMPOSE ${pkgs.xorg.libX11.out}/share/X11/locale
-
+  '')
+  + ''
     mkdir -p $out/bin
     cd $out/bin
     find $out/libexec/android-sdk/emulator -type f -executable -mindepth 1 -maxdepth 1 | while read i; do

From 4a2735dfd54561bdc278852fcb65d5ebed790f38 Mon Sep 17 00:00:00 2001
From: Steffen Beyer <steffen@beyer.io>
Date: Sat, 31 May 2025 16:54:39 +0200
Subject: [PATCH 07/57] androidenv: emulator: nixfmt emulator.nix

---
 .../mobile/androidenv/emulator.nix            | 69 ++++++++++---------
 1 file changed, 35 insertions(+), 34 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/emulator.nix b/pkgs/development/mobile/androidenv/emulator.nix
index 473a9d1d1c06..afb7634e36f5 100644
--- a/pkgs/development/mobile/androidenv/emulator.nix
+++ b/pkgs/development/mobile/androidenv/emulator.nix
@@ -57,45 +57,46 @@ deployAndroidPackage {
       libxshmfence
     ])
     ++ lib.optional (os == "linux" && stdenv.isx86_64) pkgsi686Linux.glibc;
-  patchInstructions = (lib.optionalString (os == "linux") ''
-    addAutoPatchelfSearchPath $packageBaseDir/lib
-    addAutoPatchelfSearchPath $packageBaseDir/lib64
-    addAutoPatchelfSearchPath $packageBaseDir/lib64/qt/lib
-    # autoPatchelf is not detecting libuuid :(
-    addAutoPatchelfSearchPath ${pkgs.libuuid.out}/lib
+  patchInstructions =
+    (lib.optionalString (os == "linux") ''
+      addAutoPatchelfSearchPath $packageBaseDir/lib
+      addAutoPatchelfSearchPath $packageBaseDir/lib64
+      addAutoPatchelfSearchPath $packageBaseDir/lib64/qt/lib
+      # autoPatchelf is not detecting libuuid :(
+      addAutoPatchelfSearchPath ${pkgs.libuuid.out}/lib
 
-    # This library is linked against a version of libtiff that nixpkgs doesn't have
-    for file in $out/libexec/android-sdk/emulator/*/qt/plugins/imageformats/libqtiffAndroidEmu.so; do
-      patchelf --replace-needed libtiff.so.5 libtiff.so "$file" || true
-    done
+      # This library is linked against a version of libtiff that nixpkgs doesn't have
+      for file in $out/libexec/android-sdk/emulator/*/qt/plugins/imageformats/libqtiffAndroidEmu.so; do
+        patchelf --replace-needed libtiff.so.5 libtiff.so "$file" || true
+      done
 
-    for file in $out/libexec/android-sdk/emulator/lib64/vulkan/libvulkan_lvp.so; do
-      patchelf --replace-needed libLLVM-15.so.1 libLLVM-15.so "$file" || true
-    done
+      for file in $out/libexec/android-sdk/emulator/lib64/vulkan/libvulkan_lvp.so; do
+        patchelf --replace-needed libLLVM-15.so.1 libLLVM-15.so "$file" || true
+      done
 
-    autoPatchelf $out
+      autoPatchelf $out
 
-    # Wrap emulator so that it can load required libraries at runtime
-    wrapProgram $out/libexec/android-sdk/emulator/emulator \
-      --prefix LD_LIBRARY_PATH : ${
-        lib.makeLibraryPath [
-          pkgs.dbus
-          pkgs.systemd
-        ]
-      } \
-      --set QT_XKB_CONFIG_ROOT ${pkgs.xkeyboard_config}/share/X11/xkb \
-      --set QTCOMPOSE ${pkgs.xorg.libX11.out}/share/X11/locale
-  '')
-  + ''
-    mkdir -p $out/bin
-    cd $out/bin
-    find $out/libexec/android-sdk/emulator -type f -executable -mindepth 1 -maxdepth 1 | while read i; do
-      ln -s $i
-    done
+      # Wrap emulator so that it can load required libraries at runtime
+      wrapProgram $out/libexec/android-sdk/emulator/emulator \
+        --prefix LD_LIBRARY_PATH : ${
+          lib.makeLibraryPath [
+            pkgs.dbus
+            pkgs.systemd
+          ]
+        } \
+        --set QT_XKB_CONFIG_ROOT ${pkgs.xkeyboard_config}/share/X11/xkb \
+        --set QTCOMPOSE ${pkgs.xorg.libX11.out}/share/X11/locale
+    '')
+    + ''
+      mkdir -p $out/bin
+      cd $out/bin
+      find $out/libexec/android-sdk/emulator -type f -executable -mindepth 1 -maxdepth 1 | while read i; do
+        ln -s $i
+      done
 
-    cd $out/libexec/android-sdk
-    ${postInstall}
-  '';
+      cd $out/libexec/android-sdk
+      ${postInstall}
+    '';
   dontMoveLib64 = true;
 
   inherit meta;

From 56d25e02f1294bf3e6c6923b8edc0bc98957690f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 16:14:47 +0000
Subject: [PATCH 08/57] MMA: 21.09 -> 25.05.0

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

diff --git a/pkgs/by-name/mm/MMA/package.nix b/pkgs/by-name/mm/MMA/package.nix
index b5e52bd42332..b3e83c1e1d37 100644
--- a/pkgs/by-name/mm/MMA/package.nix
+++ b/pkgs/by-name/mm/MMA/package.nix
@@ -9,12 +9,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "21.09";
+  version = "25.05.0";
   pname = "mma";
 
   src = fetchurl {
     url = "https://www.mellowood.ca/mma/mma-bin-${version}.tar.gz";
-    sha256 = "sha256-5YzdaZ499AGiKAPUsgBCj3AQ9s0WlfgAbHhOQSOLLO8=";
+    sha256 = "sha256-J72uTwAlWa/dRPf7/lO1epbmjTQar+3/U//+IJ9u4PM=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 2935f0dbd4418f13541e8bcbee043c9052195df2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 19:29:26 +0000
Subject: [PATCH 09/57] libusbmuxd: 2.1.0 -> 2.1.1

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

diff --git a/pkgs/by-name/li/libusbmuxd/package.nix b/pkgs/by-name/li/libusbmuxd/package.nix
index 5b83647f9a3b..0c8ccdc34737 100644
--- a/pkgs/by-name/li/libusbmuxd/package.nix
+++ b/pkgs/by-name/li/libusbmuxd/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libusbmuxd";
-  version = "2.1.0";
+  version = "2.1.1";
 
   src = fetchFromGitHub {
     owner = "libimobiledevice";
     repo = "libusbmuxd";
     rev = version;
-    hash = "sha256-coQqNGPsqrOYbBjO0eQZQNK8ZTB+ZzfMWvQ6Z1by9PY=";
+    hash = "sha256-o1EFY/cv+pQrGexvPOwMs5mz9KRcffnloXCQXMzbmDY=";
   };
 
   nativeBuildInputs = [

From 0be43c55b01518394604743e20f10c431c5cdbd6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Jun 2025 08:00:09 +0000
Subject: [PATCH 10/57] shellhub-agent: 0.18.3 -> 0.19.0

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

diff --git a/pkgs/by-name/sh/shellhub-agent/package.nix b/pkgs/by-name/sh/shellhub-agent/package.nix
index 1131ec60fa85..90510e9816e4 100644
--- a/pkgs/by-name/sh/shellhub-agent/package.nix
+++ b/pkgs/by-name/sh/shellhub-agent/package.nix
@@ -12,18 +12,18 @@
 
 buildGoModule rec {
   pname = "shellhub-agent";
-  version = "0.18.3";
+  version = "0.19.0";
 
   src = fetchFromGitHub {
     owner = "shellhub-io";
     repo = "shellhub";
     rev = "v${version}";
-    hash = "sha256-ByKj9rnRGS3B+BEqeo7QJvjSxVXytOXydmZMx7lK8Xc=";
+    hash = "sha256-xoGOiaUIjlR2l+l+oM1s3J7YBW9af2dfd+hXwq8zZU8=";
   };
 
   modRoot = "./agent";
 
-  vendorHash = "sha256-L+oww1HlPWgAYK16OG5bWiDb/OW7uarY8LZyw9b85ac=";
+  vendorHash = "sha256-VjxgBXPrgwm8L3VIy7eLG2pVP+iYnpn1oR+ARRh3EAQ=";
 
   ldflags = [
     "-s"

From 741c9d1b99b4660eaeb2a7f6b34475eb9f1dd7d0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Jun 2025 03:16:21 +0000
Subject: [PATCH 11/57] livebook: 0.16.1 -> 0.16.2

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

diff --git a/pkgs/by-name/li/livebook/package.nix b/pkgs/by-name/li/livebook/package.nix
index 9bdef0421da4..33e0df984151 100644
--- a/pkgs/by-name/li/livebook/package.nix
+++ b/pkgs/by-name/li/livebook/package.nix
@@ -11,7 +11,7 @@
 }:
 beamPackages.mixRelease rec {
   pname = "livebook";
-  version = "0.16.1";
+  version = "0.16.2";
 
   inherit elixir;
 
@@ -23,7 +23,7 @@ beamPackages.mixRelease rec {
     owner = "livebook-dev";
     repo = "livebook";
     tag = "v${version}";
-    hash = "sha256-vZFmd9Y5KEnQqzvCmGKGUbY+yR7IEc+0n0sycPDMxa8=";
+    hash = "sha256-x4h5vT2p1SL/8p04DRpKbIbwL7XzctH27f4ZAwj0QOg=";
   };
 
   mixFodDeps = beamPackages.fetchMixDeps {

From ae3ac94bf45676f46d4532904c252486b440b932 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Jun 2025 13:51:08 +0000
Subject: [PATCH 12/57] wavebox: 10.136.15-2 -> 10.137.9-2

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

diff --git a/pkgs/by-name/wa/wavebox/package.nix b/pkgs/by-name/wa/wavebox/package.nix
index 56e33611b1ec..0f5cb88fa46a 100644
--- a/pkgs/by-name/wa/wavebox/package.nix
+++ b/pkgs/by-name/wa/wavebox/package.nix
@@ -156,11 +156,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "wavebox";
-  version = "10.136.15-2";
+  version = "10.137.9-2";
 
   src = fetchurl {
     url = "https://download.wavebox.app/stable/linux/deb/amd64/wavebox_${finalAttrs.version}_amd64.deb";
-    hash = "sha256-VY8SIFg4aN5dH3CXB6r/mv1lh2KWNSPDHZkNFXptQJo=";
+    hash = "sha256-knJKdBegAeC2xQWnkdvx2Xyyfr3Q9uHaXlD62PnMngs=";
   };
 
   nativeBuildInputs = [

From 4aa741451ebc26efcc1f6149600741e18b4dbb09 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 8 Jun 2025 19:53:00 +0000
Subject: [PATCH 13/57] goctl: 1.8.3 -> 1.8.4

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

diff --git a/pkgs/by-name/go/goctl/package.nix b/pkgs/by-name/go/goctl/package.nix
index 95c9c1befec9..2b3ad122f511 100644
--- a/pkgs/by-name/go/goctl/package.nix
+++ b/pkgs/by-name/go/goctl/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "goctl";
-  version = "1.8.3";
+  version = "1.8.4";
 
   src = fetchFromGitHub {
     owner = "zeromicro";
     repo = "go-zero";
     tag = "v${version}";
-    hash = "sha256-v5WzqMotF9C7i9hTYSjaPmTwveBVDVn+SKQXYuS4Rdc=";
+    hash = "sha256-N0U/8YbqhyD5kb14lq8JKWwfYHUZ57Z/KZyIf6kKl0U=";
   };
 
-  vendorHash = "sha256-tOIlfYiAI9m7oTZyPDCzTXg9XTwBb6EOVLzDfZnzL4E=";
+  vendorHash = "sha256-D56zTwn4y03eaP2yP8Q2F6ixGMaQJwKEqonHNJGp2Ec=";
 
   modRoot = "tools/goctl";
   subPackages = [ "." ];

From 0b3d48d72aa8957ed72dac03e4b6656d7e865a0d Mon Sep 17 00:00:00 2001
From: guylamar2006 <guychronister@outlook.com>
Date: Wed, 11 Jun 2025 19:12:14 -0500
Subject: [PATCH 14/57] pngpaste: fix issue where file named bin was created

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

diff --git a/pkgs/by-name/pn/pngpaste/package.nix b/pkgs/by-name/pn/pngpaste/package.nix
index 53ef54ea5099..b929c63a677a 100644
--- a/pkgs/by-name/pn/pngpaste/package.nix
+++ b/pkgs/by-name/pn/pngpaste/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   installPhase = ''
     runHook preInstall
-    install -Dm555 pngpaste $out/bin
+    install -Dm555 pngpaste $out/bin/pngpaste
     runHook postInstall
   '';
 

From bc4e0b4dc74bd1967288b98d12122962e9d07d6a Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Fri, 13 Jun 2025 12:22:54 +0800
Subject: [PATCH 15/57] server-box: 1.0.1130-unstable-2025-04-25 -> 1.0.1189

---
 pkgs/by-name/se/server-box/package.nix       |  18 +-
 pkgs/by-name/se/server-box/pubspec.lock.json | 684 +++++++++++--------
 2 files changed, 403 insertions(+), 299 deletions(-)

diff --git a/pkgs/by-name/se/server-box/package.nix b/pkgs/by-name/se/server-box/package.nix
index 4a763d51cfe4..10482a1db3ef 100644
--- a/pkgs/by-name/se/server-box/package.nix
+++ b/pkgs/by-name/se/server-box/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  flutter329,
+  flutter332,
   fetchFromGitHub,
   autoPatchelfHook,
   copyDesktopItems,
@@ -12,15 +12,15 @@
   gitUpdater,
 }:
 
-flutter329.buildFlutterApplication {
+flutter332.buildFlutterApplication rec {
   pname = "server-box";
-  version = "1.0.1130-unstable-2025-04-25";
+  version = "1.0.1189";
 
   src = fetchFromGitHub {
     owner = "lollipopkit";
     repo = "flutter_server_box";
-    rev = "8f09085cf30f9b48209c7c3c1e9dceac5aa5eeeb";
-    hash = "sha256-D2FzL34FV+7FnxyEVi/Rm2qO3c9eQmCjlH/4pMWlU5s=";
+    tag = "v${version}";
+    hash = "sha256-gz+4uJe0JHi8oYNz/oLylkYUmHQA8wnxp/4TadYNMfo=";
   };
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;
@@ -28,12 +28,12 @@ flutter329.buildFlutterApplication {
   gitHashes = {
     circle_chart = "sha256-BcnL/hRf+Yv2U8Nkl7pc8BtncBW+M2by86jO5IbFIRk=";
     computer = "sha256-qaD6jn78zDyZBktwJ4WTQa8oCvCWQJOBDaozBVsXNb8=";
-    dartssh2 = "sha256-bS916CwUuOKhRyymtmvMxt7vGXmlyiLep4AZsxRJ6iU=";
-    fl_build = "sha256-CSKe2yEIisftM0q79HbDTghShirWg02zi9v+hD5R57g=";
-    fl_lib = "sha256-+eHUpn89BI7k/MbCp09gUWGMlqLBrxOy9PgL9uXnkDI=";
+    dartssh2 = "sha256-XlbruyraMmZGNRppQdBLS89Qyd7mm5Noiap2BhZjEPw=";
+    fl_build = "sha256-hCojuXFuN33/prCyuPcMoehWiGfaR2yOJA2V6dOuz4E=";
+    fl_lib = "sha256-cauq5kbcCE52Jp3K/xBdHEmdfuF8aQsujNTjbE93Pww=";
     plain_notification_token = "sha256-Cy1/S8bAtKCBnjfDEeW4Q2nP4jtwyCstAC1GH1efu8I=";
     watch_connectivity = "sha256-9TyuElr0PNoiUvbSTOakdw1/QwWp6J2GAwzVHsgYWtM=";
-    xterm = "sha256-LTCMaGVqehL+wFSzWd63KeTBjjU4xCyuhfD9QmQaP0Q=";
+    xterm = "sha256-yMETVh1qEdQAIYaQWbL5958N5dGpczJ/Y8Zvl1WjRnw=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/se/server-box/pubspec.lock.json b/pkgs/by-name/se/server-box/pubspec.lock.json
index 8d80c4e65837..efdf39f7e22a 100644
--- a/pkgs/by-name/se/server-box/pubspec.lock.json
+++ b/pkgs/by-name/se/server-box/pubspec.lock.json
@@ -4,27 +4,41 @@
       "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",
+      "dependency": "direct dev",
       "description": {
         "name": "analyzer",
-        "sha256": "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e",
+        "sha256": "904ae5bb474d32c38fb9482e2d925d5454cda04ddd0e55d2e6826bc72f6ba8c0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.11.0"
+      "version": "7.4.5"
+    },
+    "analyzer_plugin": {
+      "dependency": "transitive",
+      "description": {
+        "name": "analyzer_plugin",
+        "sha256": "ee188b6df6c85f1441497c7171c84f1392affadc0384f71089cb10a3bc508cef",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.13.1"
+    },
+    "animations": {
+      "dependency": "transitive",
+      "description": {
+        "name": "animations",
+        "sha256": "d3d6dcfb218225bbe68e87ccf6378bbb2e32a94900722c5f81611dad089911cb",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.11"
     },
     "ansicolor": {
       "dependency": "transitive",
@@ -80,11 +94,11 @@
       "dependency": "transitive",
       "description": {
         "name": "archive",
-        "sha256": "7dcbd0f87fe5f61cb28da39a1a8b70dbc106e2fe0516f7836eb7bb2948481a12",
+        "sha256": "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.0.5"
+      "version": "4.0.7"
     },
     "args": {
       "dependency": "transitive",
@@ -100,21 +114,21 @@
       "dependency": "transitive",
       "description": {
         "name": "asn1lib",
-        "sha256": "e02d018628c870ef2d7f03e33f9ad179d89ff6ec52ca6c56bcb80bcef979867f",
+        "sha256": "0511d6be23b007e95105ae023db599aea731df604608978dada7f9faf2637623",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.6.2"
+      "version": "1.6.4"
     },
     "async": {
       "dependency": "transitive",
       "description": {
         "name": "async",
-        "sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63",
+        "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.12.0"
+      "version": "2.13.0"
     },
     "boolean_selector": {
       "dependency": "transitive",
@@ -200,11 +214,11 @@
       "dependency": "transitive",
       "description": {
         "name": "built_value",
-        "sha256": "ea90e81dc4a25a043d9bee692d20ed6d1c4a1662a28c03a96417446c093ed6b4",
+        "sha256": "082001b5c3dc495d4a42f1d5789990505df20d8547d42507c29050af6933ee27",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.9.5"
+      "version": "8.10.1"
     },
     "camera": {
       "dependency": "transitive",
@@ -220,31 +234,31 @@
       "dependency": "transitive",
       "description": {
         "name": "camera_android_camerax",
-        "sha256": "13784f539c7f104766bff84e4479a70f03b29d78b208278be45c939250d9d7f5",
+        "sha256": "68d7ec97439108ac22cfba34bb74d0ab53adbc017175116d2cbc5a3d8fc8ea5e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.6.14+1"
+      "version": "0.6.18+2"
     },
     "camera_avfoundation": {
       "dependency": "transitive",
       "description": {
         "name": "camera_avfoundation",
-        "sha256": "ba48b65a3a97004276ede882e6b838d9667642ff462c95a8bb57ca8a82b6bd25",
+        "sha256": "a33cd9a250296271cdf556891b7c0986a93772426f286595eccd5f45b185933c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.9.18+11"
+      "version": "0.9.18+14"
     },
     "camera_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "camera_platform_interface",
-        "sha256": "953e7baed3a7c8fae92f7200afeb2be503ff1a17c3b4e4ed7b76f008c2810a31",
+        "sha256": "2f757024a48696ff4814a789b0bd90f5660c0fb25f393ab4564fb483327930e2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.9.0"
+      "version": "2.10.0"
     },
     "camera_web": {
       "dependency": "transitive",
@@ -280,11 +294,11 @@
       "dependency": "transitive",
       "description": {
         "name": "checked_yaml",
-        "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff",
+        "sha256": "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.3"
+      "version": "2.0.4"
     },
     "choice": {
       "dependency": "direct main",
@@ -307,6 +321,16 @@
       "source": "git",
       "version": "0.0.3"
     },
+    "cli_config": {
+      "dependency": "transitive",
+      "description": {
+        "name": "cli_config",
+        "sha256": "ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
     "clock": {
       "dependency": "transitive",
       "description": {
@@ -317,16 +341,6 @@
       "source": "hosted",
       "version": "1.1.2"
     },
-    "cloudflare_turnstile": {
-      "dependency": "transitive",
-      "description": {
-        "name": "cloudflare_turnstile",
-        "sha256": "d13cbec55a1c4916bca1d4dbd84fbe7b655ae35a264513750fdb8250486269e0",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.3.1"
-    },
     "code_builder": {
       "dependency": "transitive",
       "description": {
@@ -337,16 +351,6 @@
       "source": "hosted",
       "version": "4.10.1"
     },
-    "code_text_field": {
-      "dependency": "direct main",
-      "description": {
-        "name": "code_text_field",
-        "sha256": "0cbffbb2932cf82e1d022996388041de3493a476acad3fbb13e5917cac0fc5f2",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.1.0"
-    },
     "collection": {
       "dependency": "transitive",
       "description": {
@@ -378,6 +382,16 @@
       "source": "hosted",
       "version": "3.1.2"
     },
+    "coverage": {
+      "dependency": "transitive",
+      "description": {
+        "name": "coverage",
+        "sha256": "aa07dbe5f2294c827b7edb9a87bba44a9c15a3cc81bc8da2ca19b37322d30080",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.14.1"
+    },
     "cross_file": {
       "dependency": "transitive",
       "description": {
@@ -408,22 +422,42 @@
       "source": "hosted",
       "version": "1.0.2"
     },
+    "custom_lint_core": {
+      "dependency": "transitive",
+      "description": {
+        "name": "custom_lint_core",
+        "sha256": "31110af3dde9d29fb10828ca33f1dce24d2798477b167675543ce3d208dee8be",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.7.5"
+    },
+    "custom_lint_visitor": {
+      "dependency": "transitive",
+      "description": {
+        "name": "custom_lint_visitor",
+        "sha256": "cba5b6d7a6217312472bf4468cdf68c949488aed7ffb0eab792cd0b6c435054d",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.0+7.4.5"
+    },
     "dart_style": {
       "dependency": "transitive",
       "description": {
         "name": "dart_style",
-        "sha256": "7306ab8a2359a48d22310ad823521d723acfed60ee1f7e37388e8986853b6820",
+        "sha256": "5b236382b47ee411741447c1f1e111459c941ea1b3f2b540dde54c210a3662af",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.8"
+      "version": "3.1.0"
     },
     "dartssh2": {
       "dependency": "direct main",
       "description": {
         "path": ".",
-        "ref": "master",
-        "resolved-ref": "262f41491ec6e558f4799935924b3c222869e698",
+        "ref": "v1.0.285",
+        "resolved-ref": "18fb1ad15ee6d2c8c5ec67722bf8b90fe0f4746d",
         "url": "https://github.com/lollipopkit/dartssh2"
       },
       "source": "git",
@@ -479,16 +513,6 @@
       "source": "hosted",
       "version": "1.3.1"
     },
-    "encrypt": {
-      "dependency": "transitive",
-      "description": {
-        "name": "encrypt",
-        "sha256": "62d9aa4670cc2a8798bab89b39fc71b6dfbacf615de6cf5001fb39f7e4a996a2",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "5.0.3"
-    },
     "equatable": {
       "dependency": "transitive",
       "description": {
@@ -503,31 +527,31 @@
       "dependency": "direct main",
       "description": {
         "name": "extended_image",
-        "sha256": "fcefcf3cba32696c639e9e305a790039709d05a7139320b91bb9d300993452e2",
+        "sha256": "f6cbb1d798f51262ed1a3d93b4f1f2aa0d76128df39af18ecb77fa740f88b2e0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.0.0"
+      "version": "10.0.1"
     },
     "extended_image_library": {
       "dependency": "transitive",
       "description": {
         "name": "extended_image_library",
-        "sha256": "ae468c31c375064964de11cbb31310a58c4462df6e3bae1a0bc0066f586795d5",
+        "sha256": "1f9a24d3a00c2633891c6a7b5cab2807999eb2d5b597e5133b63f49d113811fe",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.0.0"
+      "version": "5.0.1"
     },
     "fake_async": {
       "dependency": "transitive",
       "description": {
         "name": "fake_async",
-        "sha256": "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc",
+        "sha256": "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.2"
+      "version": "1.3.3"
     },
     "ffi": {
       "dependency": "transitive",
@@ -553,11 +577,11 @@
       "dependency": "direct main",
       "description": {
         "name": "file_picker",
-        "sha256": "8d938fd5c11dc81bf1acd4f7f0486c683fe9e79a0b13419e27730f9ce4d8a25b",
+        "sha256": "77f8e81d22d2a07d0dee2c62e1dda71dc1da73bf43bb2d45af09727406167964",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.2.1"
+      "version": "10.1.9"
     },
     "fixnum": {
       "dependency": "transitive",
@@ -573,8 +597,8 @@
       "dependency": "direct dev",
       "description": {
         "path": ".",
-        "ref": "v1.0.48",
-        "resolved-ref": "9a589bb5b8d8376e32fb73793e8cf7c4ec4894a5",
+        "ref": "v1.0.51",
+        "resolved-ref": "430672b7c7608b68ceda785533ec11e1ac3e9ca7",
         "url": "https://github.com/lppcg/fl_build.git"
       },
       "source": "git",
@@ -584,18 +608,18 @@
       "dependency": "direct main",
       "description": {
         "name": "fl_chart",
-        "sha256": "5276944c6ffc975ae796569a826c38a62d2abcf264e26b88fa6f482e107f4237",
+        "sha256": "577aeac8ca414c25333334d7c4bb246775234c0e44b38b10a82b559dd4d764e7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.70.2"
+      "version": "1.0.0"
     },
     "fl_lib": {
       "dependency": "direct main",
       "description": {
         "path": ".",
-        "ref": "v1.0.263",
-        "resolved-ref": "42579f45363029584c6fbe11f84b6aa0780339e7",
+        "ref": "v1.0.321",
+        "resolved-ref": "e0b3338be10fa71c96d017d873f5e10bb4374709",
         "url": "https://github.com/lppcg/fl_lib"
       },
       "source": "git",
@@ -607,16 +631,6 @@
       "source": "sdk",
       "version": "0.0.0"
     },
-    "flutter_adaptive_scaffold": {
-      "dependency": "direct main",
-      "description": {
-        "name": "flutter_adaptive_scaffold",
-        "sha256": "7279d74da2f2531a16d21c2ec327308778c3aedd672dfe4eaf3bf416463501f8",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.3.2"
-    },
     "flutter_displaymode": {
       "dependency": "direct main",
       "description": {
@@ -637,95 +651,15 @@
       "source": "hosted",
       "version": "0.7.0"
     },
-    "flutter_inappwebview": {
-      "dependency": "transitive",
-      "description": {
-        "name": "flutter_inappwebview",
-        "sha256": "a8f5c9dd300a8cc7fde7bb902ae57febe95e9269424e4d08d5a1a56214e1e6ff",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "6.2.0-beta.2"
-    },
-    "flutter_inappwebview_android": {
-      "dependency": "transitive",
-      "description": {
-        "name": "flutter_inappwebview_android",
-        "sha256": "2427e89d9c7b00cc756f800932d7ab8f3272d3fbc71544e1aedb3dbc17dae074",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.2.0-beta.2"
-    },
-    "flutter_inappwebview_internal_annotations": {
-      "dependency": "transitive",
-      "description": {
-        "name": "flutter_inappwebview_internal_annotations",
-        "sha256": "787171d43f8af67864740b6f04166c13190aa74a1468a1f1f1e9ee5b90c359cd",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.2.0"
-    },
-    "flutter_inappwebview_ios": {
-      "dependency": "transitive",
-      "description": {
-        "name": "flutter_inappwebview_ios",
-        "sha256": "7ff65d7408e453f9a4ff38f74673aeec8cae824cba8276b4b77350262bfe356a",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.2.0-beta.2"
-    },
-    "flutter_inappwebview_macos": {
-      "dependency": "transitive",
-      "description": {
-        "name": "flutter_inappwebview_macos",
-        "sha256": "be8b8ab0100c94ec9fc079a4d48b2bc8dd1a8b4c2647da34f1d3dae93cd5f88a",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.2.0-beta.2"
-    },
-    "flutter_inappwebview_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "flutter_inappwebview_platform_interface",
-        "sha256": "2c99bf767900ba029d825bc6f494d30169ee83cdaa038d86e85fe70571d0a655",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.4.0-beta.2"
-    },
-    "flutter_inappwebview_web": {
-      "dependency": "transitive",
-      "description": {
-        "name": "flutter_inappwebview_web",
-        "sha256": "6c4bb61ea9d52e51d79ea23da27c928d0430873c04ad380df39c1ef442b11f4e",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.2.0-beta.2"
-    },
-    "flutter_inappwebview_windows": {
-      "dependency": "transitive",
-      "description": {
-        "name": "flutter_inappwebview_windows",
-        "sha256": "0ff241f814b7caff63b9632cf858b6d3d9c35758040620a9745e5f6e9dd94d74",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.7.0-beta.2"
-    },
     "flutter_lints": {
       "dependency": "direct dev",
       "description": {
         "name": "flutter_lints",
-        "sha256": "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1",
+        "sha256": "3105dc8492f6183fb076ccf1f351ac3d60564bff92e20bfc4af9cc1651f4e7e1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.0.0"
+      "version": "6.0.0"
     },
     "flutter_localizations": {
       "dependency": "direct main",
@@ -737,11 +671,11 @@
       "dependency": "transitive",
       "description": {
         "name": "flutter_markdown",
-        "sha256": "e7bbc718adc9476aa14cfddc1ef048d2e21e4e8f18311aaac723266db9f9e7b5",
+        "sha256": "08fb8315236099ff8e90cb87bb2b935e0a724a3af1623000a9cec930468e0f27",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.6+2"
+      "version": "0.7.7+1"
     },
     "flutter_markdown_latex": {
       "dependency": "transitive",
@@ -757,44 +691,34 @@
       "dependency": "transitive",
       "description": {
         "name": "flutter_math_fork",
-        "sha256": "284bab89b2fbf1bc3a0baf13d011c1dd324d004e35d177626b77f2fc056366ac",
+        "sha256": "6d5f2f1aa57ae539ffb0a04bb39d2da67af74601d685a161aff7ce5bda5fa407",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.3"
+      "version": "0.7.4"
     },
     "flutter_native_splash": {
       "dependency": "direct dev",
       "description": {
         "name": "flutter_native_splash",
-        "sha256": "edb09c35ee9230c4b03f13dd45bb3a276d0801865f0a4650b7e2a3bba61a803a",
+        "sha256": "8321a6d11a8d13977fa780c89de8d257cce3d841eecfb7a4cadffcc4f12d82dc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.5"
+      "version": "2.4.6"
     },
     "flutter_plugin_android_lifecycle": {
       "dependency": "transitive",
       "description": {
         "name": "flutter_plugin_android_lifecycle",
-        "sha256": "5a1e6fb2c0561958d7e4c33574674bda7b77caaca7a33b758876956f2902eea3",
+        "sha256": "f948e346c12f8d5480d2825e03de228d0eb8c3a737e4cdaa122267b89c022b5e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.27"
-    },
-    "flutter_reorderable_grid_view": {
-      "dependency": "direct main",
-      "description": {
-        "name": "flutter_reorderable_grid_view",
-        "sha256": "f5db90ae62f8307daef9a884e09ed2d883838592e92185017a4431fe8e78899e",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "5.5.0"
+      "version": "2.0.28"
     },
     "flutter_riverpod": {
-      "dependency": "transitive",
+      "dependency": "direct main",
       "description": {
         "name": "flutter_riverpod",
         "sha256": "9532ee6db4a943a1ed8383072a2e3eeda041db5657cdf6d2acecf3c21ecbe7e1",
@@ -807,11 +731,11 @@
       "dependency": "transitive",
       "description": {
         "name": "flutter_svg",
-        "sha256": "c200fd79c918a40c5cd50ea0877fa13f81bdaf6f0a5d3dbcc2a13e3285d6aa1b",
+        "sha256": "d44bf546b13025ec7353091516f6881f1d4c633993cb109c3916c3a0159dadf1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.17"
+      "version": "2.1.0"
     },
     "flutter_test": {
       "dependency": "direct dev",
@@ -825,15 +749,25 @@
       "source": "sdk",
       "version": "0.0.0"
     },
-    "freezed_annotation": {
-      "dependency": "transitive",
+    "freezed": {
+      "dependency": "direct dev",
       "description": {
-        "name": "freezed_annotation",
-        "sha256": "c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2",
+        "name": "freezed",
+        "sha256": "6022db4c7bfa626841b2a10f34dd1e1b68e8f8f9650db6112dcdeeca45ca793c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.4"
+      "version": "3.0.6"
+    },
+    "freezed_annotation": {
+      "dependency": "direct main",
+      "description": {
+        "name": "freezed_annotation",
+        "sha256": "c87ff004c8aa6af2d531668b46a4ea379f7191dc6dfa066acd53d506da6e044b",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.0"
     },
     "frontend_server_client": {
       "dependency": "transitive",
@@ -885,55 +819,55 @@
       "source": "hosted",
       "version": "0.7.0"
     },
-    "hive": {
+    "hive_ce": {
       "dependency": "transitive",
       "description": {
-        "name": "hive",
-        "sha256": "8dcf6db979d7933da8217edcec84e9df1bdb4e4edc7fc77dbd5aa74356d6d941",
+        "name": "hive_ce",
+        "sha256": "708bb39050998707c5d422752159f91944d3c81ab42d80e1bd0ee37d8e130658",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.3"
+      "version": "2.11.3"
     },
-    "hive_flutter": {
+    "hive_ce_flutter": {
       "dependency": "direct main",
       "description": {
-        "name": "hive_flutter",
-        "sha256": "dca1da446b1d808a51689fb5d0c6c9510c0a2ba01e22805d492c73b68e33eecc",
+        "name": "hive_ce_flutter",
+        "sha256": "a0989670652eab097b47544f1e5a4456e861b1b01b050098ea0b80a5fabe9909",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.0"
+      "version": "2.3.1"
     },
-    "hive_generator": {
+    "hive_ce_generator": {
       "dependency": "direct dev",
       "description": {
-        "name": "hive_generator",
-        "sha256": "06cb8f58ace74de61f63500564931f9505368f45f98958bd7a6c35ba24159db4",
+        "name": "hive_ce_generator",
+        "sha256": "609678c10ebee7503505a0007050af40a0a4f498b1fb7def3220df341e573a89",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.1"
+      "version": "1.9.2"
     },
     "html": {
       "dependency": "transitive",
       "description": {
         "name": "html",
-        "sha256": "1fc58edeaec4307368c60d59b7e15b9d658b57d7f3125098b6294153c75337ec",
+        "sha256": "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.15.5"
+      "version": "0.15.6"
     },
     "http": {
       "dependency": "transitive",
       "description": {
         "name": "http",
-        "sha256": "fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f",
+        "sha256": "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.0"
+      "version": "1.4.0"
     },
     "http_client_helper": {
       "dependency": "transitive",
@@ -999,11 +933,11 @@
       "dependency": "direct main",
       "description": {
         "name": "intl",
-        "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf",
+        "sha256": "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.19.0"
+      "version": "0.20.2"
     },
     "io": {
       "dependency": "transitive",
@@ -1015,6 +949,36 @@
       "source": "hosted",
       "version": "1.0.5"
     },
+    "isolate_channel": {
+      "dependency": "transitive",
+      "description": {
+        "name": "isolate_channel",
+        "sha256": "f3d36f783b301e6b312c3450eeb2656b0e7d1db81331af2a151d9083a3f6b18d",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.2+1"
+    },
+    "isolate_contactor": {
+      "dependency": "transitive",
+      "description": {
+        "name": "isolate_contactor",
+        "sha256": "6ba8434ceb58238a1389d6365111a3efe7baa1c68a66f4db6d63d351cf6c3a0f",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.1.0"
+    },
+    "isolate_manager": {
+      "dependency": "transitive",
+      "description": {
+        "name": "isolate_manager",
+        "sha256": "22ed0c25f80ec3b5f21e3a55d060f4650afff33f27c2dff34c0f9409d5759ae5",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.1.5+1"
+    },
     "js": {
       "dependency": "transitive",
       "description": {
@@ -1039,21 +1003,21 @@
       "dependency": "direct dev",
       "description": {
         "name": "json_serializable",
-        "sha256": "c2fcb3920cf2b6ae6845954186420fca40bc0a8abcc84903b7801f17d7050d7c",
+        "sha256": "c50ef5fc083d5b5e12eef489503ba3bf5ccc899e487d691584699b4bdefeea8c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.9.0"
+      "version": "6.9.5"
     },
     "leak_tracker": {
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker",
-        "sha256": "c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec",
+        "sha256": "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.0.8"
+      "version": "10.0.9"
     },
     "leak_tracker_flutter_testing": {
       "dependency": "transitive",
@@ -1075,25 +1039,15 @@
       "source": "hosted",
       "version": "3.0.1"
     },
-    "linked_scroll_controller": {
-      "dependency": "transitive",
-      "description": {
-        "name": "linked_scroll_controller",
-        "sha256": "e6020062bcf4ffc907ee7fd090fa971e65d8dfaac3c62baf601a3ced0b37986a",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.2.0"
-    },
     "lints": {
       "dependency": "transitive",
       "description": {
         "name": "lints",
-        "sha256": "c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7",
+        "sha256": "a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.1.1"
+      "version": "6.0.0"
     },
     "local_auth": {
       "dependency": "transitive",
@@ -1109,11 +1063,11 @@
       "dependency": "transitive",
       "description": {
         "name": "local_auth_android",
-        "sha256": "0abe4e72f55c785b28900de52a2522c86baba0988838b5dc22241b072ecccd74",
+        "sha256": "63ad7ca6396290626dc0cb34725a939e4cfe965d80d36112f08d49cf13a8136e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.48"
+      "version": "1.0.49"
     },
     "local_auth_darwin": {
       "dependency": "transitive",
@@ -1165,16 +1119,6 @@
       "source": "hosted",
       "version": "1.3.0"
     },
-    "macros": {
-      "dependency": "transitive",
-      "description": {
-        "name": "macros",
-        "sha256": "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.3-main.0"
-    },
     "markdown": {
       "dependency": "transitive",
       "description": {
@@ -1225,6 +1169,16 @@
       "source": "hosted",
       "version": "2.0.0"
     },
+    "multi_split_view": {
+      "dependency": "transitive",
+      "description": {
+        "name": "multi_split_view",
+        "sha256": "99c02f128e7423818d13b8f2e01e3027e953b35508019dcee214791bd0525db5",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.6.0"
+    },
     "nested": {
       "dependency": "transitive",
       "description": {
@@ -1235,6 +1189,16 @@
       "source": "hosted",
       "version": "1.0.0"
     },
+    "node_preamble": {
+      "dependency": "transitive",
+      "description": {
+        "name": "node_preamble",
+        "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.2"
+    },
     "package_config": {
       "dependency": "transitive",
       "description": {
@@ -1299,11 +1263,11 @@
       "dependency": "transitive",
       "description": {
         "name": "path_provider_android",
-        "sha256": "0ca7359dad67fd7063cb2892ab0c0737b2daafd807cf1acecd62374c8fae6c12",
+        "sha256": "d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.16"
+      "version": "2.2.17"
     },
     "path_provider_foundation": {
       "dependency": "transitive",
@@ -1400,11 +1364,11 @@
       "dependency": "transitive",
       "description": {
         "name": "pointycastle",
-        "sha256": "4be0097fcf3fd3e8449e53730c631200ebc7b88016acecab2b0da2f0149222fe",
+        "sha256": "92aa3841d083cc4b0f4709b5c74fd6409a3e6ba833ffc7dc6a8fee096366acf5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.9.1"
+      "version": "4.0.0"
     },
     "pool": {
       "dependency": "transitive",
@@ -1420,31 +1384,31 @@
       "dependency": "transitive",
       "description": {
         "name": "posix",
-        "sha256": "a0117dc2167805aa9125b82eee515cc891819bac2f538c83646d355b16f58b9a",
+        "sha256": "f0d7856b6ca1887cfa6d1d394056a296ae33489db914e365e2044fdada449e62",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.0.1"
+      "version": "6.0.2"
     },
     "pretty_qr_code": {
       "dependency": "transitive",
       "description": {
         "name": "pretty_qr_code",
-        "sha256": "cbdb4af29da1c1fa21dd76f809646c591320ab9e435d3b0eab867492d43607d5",
+        "sha256": "b078bd5d51956dea4342378af1b092ad962b81bdbb55b10fffce03461da8db74",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.3.0"
+      "version": "3.4.0"
     },
     "provider": {
       "dependency": "transitive",
       "description": {
         "name": "provider",
-        "sha256": "c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c",
+        "sha256": "4abbd070a04e9ddc287673bf5a030c7ca8b685ff70218720abab8b092f53dd84",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.1.2"
+      "version": "6.1.5"
     },
     "pub_semver": {
       "dependency": "transitive",
@@ -1476,15 +1440,25 @@
       "source": "hosted",
       "version": "3.0.2"
     },
+    "qr_code_dart_decoder": {
+      "dependency": "transitive",
+      "description": {
+        "name": "qr_code_dart_decoder",
+        "sha256": "6da7eda27726d504bed3c30eabf78ddca3eb9265e1c8dc49b30ef5974b9c267f",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.0.5"
+    },
     "qr_code_dart_scan": {
       "dependency": "transitive",
       "description": {
         "name": "qr_code_dart_scan",
-        "sha256": "a21340c4a2ca14e2e114915940fcad166f15c1a065fed8b4fede4a4aba5bc4ff",
+        "sha256": "6e1aab64b8f5f768416b471dbc3fb0fc94969c3e236157a96b52a70f9fe12ebb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.9.11"
+      "version": "0.10.1"
     },
     "quiver": {
       "dependency": "transitive",
@@ -1496,6 +1470,36 @@
       "source": "hosted",
       "version": "3.2.2"
     },
+    "re_editor": {
+      "dependency": "direct main",
+      "description": {
+        "name": "re_editor",
+        "sha256": "17e430f0591dd361992ec2dd6f69191c1853fa46e05432e095310a8f82ee820e",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.7.0"
+    },
+    "re_highlight": {
+      "dependency": "transitive",
+      "description": {
+        "name": "re_highlight",
+        "sha256": "6c4ac3f76f939fb7ca9df013df98526634e17d8f7460e028bd23a035870024f2",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.0.3"
+    },
+    "responsive_framework": {
+      "dependency": "direct main",
+      "description": {
+        "name": "responsive_framework",
+        "sha256": "a8e1c13d4ba980c60cbf6fa1e9907cd60662bf2585184d7c96ca46c43de91552",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.5.1"
+    },
     "riverpod": {
       "dependency": "transitive",
       "description": {
@@ -1506,8 +1510,18 @@
       "source": "hosted",
       "version": "2.6.1"
     },
-    "riverpod_annotation": {
+    "riverpod_analyzer_utils": {
       "dependency": "transitive",
+      "description": {
+        "name": "riverpod_analyzer_utils",
+        "sha256": "03a17170088c63aab6c54c44456f5ab78876a1ddb6032ffde1662ddab4959611",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.5.10"
+    },
+    "riverpod_annotation": {
+      "dependency": "direct main",
       "description": {
         "name": "riverpod_annotation",
         "sha256": "e14b0bf45b71326654e2705d462f21b958f987087be850afd60578fcd502d1b8",
@@ -1516,6 +1530,16 @@
       "source": "hosted",
       "version": "2.6.1"
     },
+    "riverpod_generator": {
+      "dependency": "direct dev",
+      "description": {
+        "name": "riverpod_generator",
+        "sha256": "44a0992d54473eb199ede00e2260bd3c262a86560e3c6f6374503d86d0580e36",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.6.5"
+    },
     "screen_retriever": {
       "dependency": "transitive",
       "description": {
@@ -1580,41 +1604,41 @@
       "dependency": "transitive",
       "description": {
         "name": "share_plus",
-        "sha256": "fce43200aa03ea87b91ce4c3ac79f0cecd52e2a7a56c7a4185023c271fbfa6da",
+        "sha256": "b2961506569e28948d75ec346c28775bb111986bb69dc6a20754a457e3d97fa0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.1.4"
+      "version": "11.0.0"
     },
     "share_plus_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "share_plus_platform_interface",
-        "sha256": "cc012a23fc2d479854e6c80150696c4a5f5bb62cb89af4de1c505cf78d0a5d0b",
+        "sha256": "1032d392bc5d2095a77447a805aa3f804d2ae6a4d5eef5e6ebb3bd94c1bc19ef",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.0.2"
+      "version": "6.0.0"
     },
     "shared_preferences": {
       "dependency": "direct main",
       "description": {
         "name": "shared_preferences",
-        "sha256": "846849e3e9b68f3ef4b60c60cf4b3e02e9321bc7f4d8c4692cf87ffa82fc8a3a",
+        "sha256": "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.2"
+      "version": "2.5.3"
     },
     "shared_preferences_android": {
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_android",
-        "sha256": "3ec7210872c4ba945e3244982918e502fa2bfb5230dff6832459ca0e1879b7ad",
+        "sha256": "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.8"
+      "version": "2.4.10"
     },
     "shared_preferences_foundation": {
       "dependency": "transitive",
@@ -1676,6 +1700,26 @@
       "source": "hosted",
       "version": "1.4.2"
     },
+    "shelf_packages_handler": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shelf_packages_handler",
+        "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.2"
+    },
+    "shelf_static": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shelf_static",
+        "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.1.3"
+    },
     "shelf_web_socket": {
       "dependency": "transitive",
       "description": {
@@ -1696,11 +1740,11 @@
       "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",
@@ -1712,6 +1756,26 @@
       "source": "hosted",
       "version": "1.3.5"
     },
+    "source_map_stack_trace": {
+      "dependency": "transitive",
+      "description": {
+        "name": "source_map_stack_trace",
+        "sha256": "c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.2"
+    },
+    "source_maps": {
+      "dependency": "transitive",
+      "description": {
+        "name": "source_maps",
+        "sha256": "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.10.13"
+    },
     "source_span": {
       "dependency": "transitive",
       "description": {
@@ -1792,6 +1856,16 @@
       "source": "hosted",
       "version": "1.2.2"
     },
+    "test": {
+      "dependency": "direct dev",
+      "description": {
+        "name": "test",
+        "sha256": "301b213cd241ca982e9ba50266bd3f5bd1ea33f1455554c5abb85d1be0e2d87e",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.25.15"
+    },
     "test_api": {
       "dependency": "transitive",
       "description": {
@@ -1802,6 +1876,16 @@
       "source": "hosted",
       "version": "0.7.4"
     },
+    "test_core": {
+      "dependency": "transitive",
+      "description": {
+        "name": "test_core",
+        "sha256": "84d17c3486c8dfdbe5e12a50c8ae176d15e2a771b96909a9442b40173649ccaa",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.6.8"
+    },
     "timing": {
       "dependency": "transitive",
       "description": {
@@ -1856,21 +1940,21 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_android",
-        "sha256": "1d0eae19bd7606ef60fe69ef3b312a437a16549476c42321d5dc1506c9ca3bf4",
+        "sha256": "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.15"
+      "version": "6.3.16"
     },
     "url_launcher_ios": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_ios",
-        "sha256": "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626",
+        "sha256": "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.2"
+      "version": "6.3.3"
     },
     "url_launcher_linux": {
       "dependency": "transitive",
@@ -1906,11 +1990,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",
@@ -1956,11 +2040,11 @@
       "dependency": "transitive",
       "description": {
         "name": "vector_graphics_compiler",
-        "sha256": "1b4b9e706a10294258727674a340ae0d6e64a7231980f9f9a3d12e4b42407aad",
+        "sha256": "557a315b7d2a6dbb0aaaff84d857967ce6bdc96a63dc6ee2a57ce5a6ee5d3331",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.16"
+      "version": "1.1.17"
     },
     "vector_math": {
       "dependency": "transitive",
@@ -1976,11 +2060,11 @@
       "dependency": "transitive",
       "description": {
         "name": "vm_service",
-        "sha256": "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14",
+        "sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "14.3.1"
+      "version": "15.0.0"
     },
     "wake_on_lan": {
       "dependency": "direct main",
@@ -1996,21 +2080,21 @@
       "dependency": "direct main",
       "description": {
         "name": "wakelock_plus",
-        "sha256": "36c88af0b930121941345306d259ec4cc4ecca3b151c02e3a9e71aede83c615e",
+        "sha256": "a474e314c3e8fb5adef1f9ae2d247e57467ad557fa7483a2b895bc1b421c5678",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.10"
+      "version": "1.3.2"
     },
     "wakelock_plus_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "wakelock_plus_platform_interface",
-        "sha256": "70e780bc99796e1db82fe764b1e7dcb89a86f1e5b3afb1db354de50f2e41eb7a",
+        "sha256": "e10444072e50dbc4999d7316fd303f7ea53d31c824aa5eb05d7ccbdd98985207",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.2"
+      "version": "1.2.3"
     },
     "watch_connectivity": {
       "dependency": "direct main",
@@ -2047,21 +2131,21 @@
       "dependency": "transitive",
       "description": {
         "name": "web_socket",
-        "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83",
+        "sha256": "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.1.6"
+      "version": "1.0.1"
     },
     "web_socket_channel": {
       "dependency": "transitive",
       "description": {
         "name": "web_socket_channel",
-        "sha256": "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5",
+        "sha256": "d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.2"
+      "version": "3.0.3"
     },
     "webdav_client_plus": {
       "dependency": "direct main",
@@ -2073,25 +2157,35 @@
       "source": "hosted",
       "version": "1.0.2"
     },
+    "webkit_inspection_protocol": {
+      "dependency": "transitive",
+      "description": {
+        "name": "webkit_inspection_protocol",
+        "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.2.1"
+    },
     "win32": {
       "dependency": "transitive",
       "description": {
         "name": "win32",
-        "sha256": "dc6ecaa00a7c708e5b4d10ee7bec8c270e9276dfcab1783f57e9962d7884305f",
+        "sha256": "329edf97fdd893e0f1e3b9e88d6a0e627128cc17cc316a8d67fda8f1451178ba",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.12.0"
+      "version": "5.13.0"
     },
     "window_manager": {
       "dependency": "transitive",
       "description": {
         "name": "window_manager",
-        "sha256": "732896e1416297c63c9e3fb95aea72d0355f61390263982a47fd519169dc5059",
+        "sha256": "51d50168ab267d344b975b15390426b1243600d436770d3f13de67e55b05ec16",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.4.3"
+      "version": "0.5.0"
     },
     "xdg_directories": {
       "dependency": "transitive",
@@ -2117,8 +2211,8 @@
       "dependency": "direct main",
       "description": {
         "path": ".",
-        "ref": "v1.0.586",
-        "resolved-ref": "b8c73bec722055f24c5724cd2f2297859e95b6af",
+        "ref": "v1.0.588",
+        "resolved-ref": "d28207b988b5bed38c799618b9c412486592c689",
         "url": "https://github.com/lollipopkit/xterm.dart"
       },
       "source": "git",
@@ -2134,6 +2228,16 @@
       "source": "hosted",
       "version": "3.1.3"
     },
+    "yaml_writer": {
+      "dependency": "transitive",
+      "description": {
+        "name": "yaml_writer",
+        "sha256": "69651cd7238411179ac32079937d4aa9a2970150d6b2ae2c6fe6de09402a5dc5",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.0"
+    },
     "zmodem": {
       "dependency": "transitive",
       "description": {
@@ -2148,15 +2252,15 @@
       "dependency": "transitive",
       "description": {
         "name": "zxing_lib",
-        "sha256": "870a63610be3f20009ca9201f7ba2d53d7eaefa675c154b3e8c1f6fc55984d04",
+        "sha256": "d5d81917be2e18b06a2cf4ca12927f3ab957dfbd25bd7b8175b3e9a0ce5c2e2b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.2"
+      "version": "1.1.3"
     }
   },
   "sdks": {
-    "dart": ">=3.7.0 <4.0.0",
-    "flutter": ">=3.29.0"
+    "dart": ">=3.8.0 <4.0.0",
+    "flutter": ">=3.32.1"
   }
 }

From 2b0f44416890ad41a4d7a4f02f541bc68467b0bb Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Fri, 13 Jun 2025 23:28:58 +0530
Subject: [PATCH 16/57] gotools: 0.30.0 -> 0.34.0

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

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

From 4d612f08bab8acfcdd44a60a697b1b4279318d27 Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Fri, 13 Jun 2025 23:29:06 +0530
Subject: [PATCH 17/57] gotools: modernize derivation

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
---
 pkgs/by-name/go/gotools/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/go/gotools/package.nix b/pkgs/by-name/go/gotools/package.nix
index ed9cdf1d9c1b..74392d52e6eb 100644
--- a/pkgs/by-name/go/gotools/package.nix
+++ b/pkgs/by-name/go/gotools/package.nix
@@ -6,15 +6,15 @@
   go,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "gotools";
   version = "0.34.0";
 
-  # using GitHub instead of https://go.googlesource.com/tools because Gitiles UI is to basic to browse
+  # using GitHub instead of https://go.googlesource.com/tools because Gitiles UI is too basic to browse
   src = fetchFromGitHub {
     owner = "golang";
     repo = "tools";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-C+P2JoD4NzSAkAQuA20bVrfLZrMHXekvXn8KPOM5Nj4=";
   };
 
@@ -45,16 +45,16 @@ buildGoModule rec {
       --suffix PATH : ${lib.makeBinPath [ go ]}
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Additional tools for Go development";
     longDescription = ''
       This package contains tools like: godoc, goimports, callgraph, digraph, stringer or toolstash.
     '';
     homepage = "https://go.googlesource.com/tools";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [
       SuperSandro2000
       techknowlogick
     ];
   };
-}
+})

From 27eb7519a9a868f90753f35d408efff62179d720 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 13 Jun 2025 18:18:26 +0000
Subject: [PATCH 18/57] cockpit: 338 -> 340

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

diff --git a/pkgs/by-name/co/cockpit/package.nix b/pkgs/by-name/co/cockpit/package.nix
index a58a3ee4c2be..9f6f47e421a9 100644
--- a/pkgs/by-name/co/cockpit/package.nix
+++ b/pkgs/by-name/co/cockpit/package.nix
@@ -40,13 +40,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cockpit";
-  version = "338";
+  version = "340";
 
   src = fetchFromGitHub {
     owner = "cockpit-project";
     repo = "cockpit";
     tag = finalAttrs.version;
-    hash = "sha256-ZNvMLzkDh1SuyHuChWM0YykSYu152JHvjrKVm+u0Upw=";
+    hash = "sha256-I/T1bovkf2H/GJqocRxsiRxqRw9HMdscKpWQ+M6IdrU=";
     fetchSubmodules = true;
   };
 

From 7712d993c38ea48111a5b9b06d9e61f19eb7d507 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 14 Jun 2025 04:27:30 +0000
Subject: [PATCH 19/57] reth: 1.4.3 -> 1.4.8

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

diff --git a/pkgs/by-name/re/reth/package.nix b/pkgs/by-name/re/reth/package.nix
index c6ef3b794d23..d6f1a43d58f5 100644
--- a/pkgs/by-name/re/reth/package.nix
+++ b/pkgs/by-name/re/reth/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "reth";
-  version = "1.4.3";
+  version = "1.4.8";
 
   src = fetchFromGitHub {
     owner = "paradigmxyz";
     repo = "reth";
     rev = "v${version}";
-    hash = "sha256-pl0eQU7BjkSg8ECxeB13oNMO9CNIwLyOOHiWWC4CWhY=";
+    hash = "sha256-slVf2yVukW3fkDlpaz+rdPKf6QdsFa9HwySZkItHvoQ=";
   };
 
-  cargoHash = "sha256-85mtKJWhDguOeNJhsqJyb99xVVF1H7D/2lWRmXF3LSg=";
+  cargoHash = "sha256-vNe8eACwwlPspUQgI65T9O2SaQYl7FihDZRpljkA/4U=";
 
   nativeBuildInputs = [
     rustPlatform.bindgenHook

From fbf73c1927f95c57efac9ac319cf629ff548fd75 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 14 Jun 2025 05:17:51 +0000
Subject: [PATCH 20/57] sbt-with-scala-native: 1.11.1 -> 1.11.2

---
 pkgs/development/tools/build-managers/sbt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix
index eafda766ba6c..f12f22550544 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sbt";
-  version = "1.11.1";
+  version = "1.11.2";
 
   src = fetchurl {
     url = "https://github.com/sbt/sbt/releases/download/v${finalAttrs.version}/sbt-${finalAttrs.version}.tgz";
-    hash = "sha256-pVTTb93SZ3q81VsKPw3OA6tJTjUK4y2ik252whHYXuQ=";
+    hash = "sha256-hMe52OIMXcg1YVSltxRsCouGq6lyaM6f4aWF0siQj08=";
   };
 
   postPatch = ''

From 1e669728bb74d926ae614461b114639396c97dc0 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 14 Jun 2025 14:39:02 +0200
Subject: [PATCH 21/57] protobuf_28: drop

---
 pkgs/development/libraries/protobuf/28.nix | 9 ---------
 pkgs/top-level/aliases.nix                 | 1 +
 pkgs/top-level/all-packages.nix            | 2 --
 3 files changed, 1 insertion(+), 11 deletions(-)
 delete mode 100644 pkgs/development/libraries/protobuf/28.nix

diff --git a/pkgs/development/libraries/protobuf/28.nix b/pkgs/development/libraries/protobuf/28.nix
deleted file mode 100644
index ae6940fa050e..000000000000
--- a/pkgs/development/libraries/protobuf/28.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ callPackage, ... }@args:
-
-callPackage ./generic.nix (
-  {
-    version = "28.3";
-    hash = "sha256-+bb5RxITzxuX50ItmpQhWEG1kMfvlizWTMJJzwlhhYM=";
-  }
-  // args
-)
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 3f0235e09a09..413c261b5d25 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1611,6 +1611,7 @@ mapAliases {
   prometheus-minio-exporter = throw "'prometheus-minio-exporter' has been removed from nixpkgs, use Minio's built-in Prometheus integration instead"; # Added 2024-06-10
   prometheus-tor-exporter = throw "'prometheus-tor-exporter' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-10-30
   protobuf_23 = throw "'protobuf_23' has been removed from nixpkgs. Consider using a more recent version of the protobuf library"; # Added 2025-04-20
+  protobuf_28 = throw "'protobuf_28' has been removed from nixpkgs. Consider using a more recent version of the protobuf library"; # Added 2025-06-14
   protobuf3_24 = protobuf_24;
   protobuf3_23 = protobuf_23;
   protobuf3_21 = protobuf_21;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a7e155283026..520375f37eac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9330,7 +9330,6 @@ with pkgs;
       protobuf_31 = callPackage ../development/libraries/protobuf/31.nix { };
       protobuf_30 = callPackage ../development/libraries/protobuf/30.nix { };
       protobuf_29 = callPackage ../development/libraries/protobuf/29.nix { };
-      protobuf_28 = callPackage ../development/libraries/protobuf/28.nix { };
       protobuf_27 = callPackage ../development/libraries/protobuf/27.nix { };
       protobuf_26 = callPackage ../development/libraries/protobuf/26.nix { };
       protobuf_25 = callPackage ../development/libraries/protobuf/25.nix { };
@@ -9342,7 +9341,6 @@ with pkgs;
     protobuf_31
     protobuf_30
     protobuf_29
-    protobuf_28
     protobuf_27
     protobuf_26
     protobuf_25

From 6ae1ab85e05dbe0a2544b2395e6a7bb7097451e4 Mon Sep 17 00:00:00 2001
From: Anton Mosich <anton@mosich.at>
Date: Mon, 27 Nov 2023 00:46:47 +0100
Subject: [PATCH 22/57] python3Packages.vl-convert-python: init at 1.7.0

Co-authored-by: Nathan Henrie <nate@n8henrie.com>
---
 .../vl-convert-python/default.nix             | 61 +++++++++++++++++++
 .../libffi-sys-system-feature.patch           | 10 +++
 .../vl-convert-python/librusty_v8.nix         | 28 +++++++++
 pkgs/top-level/python-packages.nix            |  4 ++
 4 files changed, 103 insertions(+)
 create mode 100644 pkgs/development/python-modules/vl-convert-python/default.nix
 create mode 100644 pkgs/development/python-modules/vl-convert-python/libffi-sys-system-feature.patch
 create mode 100644 pkgs/development/python-modules/vl-convert-python/librusty_v8.nix

diff --git a/pkgs/development/python-modules/vl-convert-python/default.nix b/pkgs/development/python-modules/vl-convert-python/default.nix
new file mode 100644
index 000000000000..dcce1668bba9
--- /dev/null
+++ b/pkgs/development/python-modules/vl-convert-python/default.nix
@@ -0,0 +1,61 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  rustPlatform,
+  protobuf,
+  libffi,
+  callPackage,
+  librusty_v8 ? callPackage ./librusty_v8.nix { },
+  nix-update-script,
+}:
+buildPythonPackage rec {
+  pname = "vl-convert-python";
+  version = "1.7.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "vega";
+    repo = "vl-convert";
+    tag = "v${version}";
+    hash = "sha256-dmfY05i5nCiM2felvBcSuVyY8G70HhpJP3KrRGQ7wq8=";
+  };
+
+  patches = [ ./libffi-sys-system-feature.patch ];
+
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit src;
+    name = "${pname}-${version}";
+    hash = "sha256-t952WH6zq7POVvdX3fI7kXXfPiaAXjfsvoqI/aq5Fn0=";
+  };
+
+  buildAndTestSubdir = "vl-convert-python";
+
+  env.RUSTY_V8_ARCHIVE = librusty_v8;
+
+  build-system = [
+    rustPlatform.maturinBuildHook
+    rustPlatform.cargoSetupHook
+  ];
+
+  nativeBuildInputs = [ protobuf ];
+
+  buildInputs = [ libffi ];
+
+  pythonImportsCheck = [ "vl_convert" ];
+
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version-regex"
+      "vl-convert-python@(.*)"
+    ];
+  };
+
+  meta = {
+    description = "Utilities for converting Vega-Lite specs from the command line and Python";
+    license = lib.licenses.bsd3;
+    homepage = "https://github.com/vega/vl-convert";
+    changelog = "https://github.com/vega/vl-convert/releases/tag/v${version}";
+    maintainers = with lib.maintainers; [ antonmosich ];
+  };
+}
diff --git a/pkgs/development/python-modules/vl-convert-python/libffi-sys-system-feature.patch b/pkgs/development/python-modules/vl-convert-python/libffi-sys-system-feature.patch
new file mode 100644
index 000000000000..bb86dd292cdb
--- /dev/null
+++ b/pkgs/development/python-modules/vl-convert-python/libffi-sys-system-feature.patch
@@ -0,0 +1,10 @@
+diff --git a/vl-convert-python/Cargo.toml b/vl-convert-python/Cargo.toml
+index 3d24fa4..25020db 100644
+--- a/vl-convert-python/Cargo.toml
++++ b/vl-convert-python/Cargo.toml
+@@ -22,3 +22,5 @@ lazy_static = { workspace = true }
+ futures = { workspace = true }
+ pythonize = { workspace = true }
+ tokio = { workspace = true }
++
++libffi = { version = "3.2.0", features = ["system"] }
diff --git a/pkgs/development/python-modules/vl-convert-python/librusty_v8.nix b/pkgs/development/python-modules/vl-convert-python/librusty_v8.nix
new file mode 100644
index 000000000000..53aaf4910485
--- /dev/null
+++ b/pkgs/development/python-modules/vl-convert-python/librusty_v8.nix
@@ -0,0 +1,28 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+}:
+
+let
+  fetch_librusty_v8 =
+    args:
+    fetchurl {
+      name = "librusty_v8-${args.version}";
+      url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${stdenv.hostPlatform.rust.rustcTarget}.a.gz";
+      sha256 = args.shas.${stdenv.hostPlatform.system};
+      meta = {
+        inherit (args) version;
+        sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+      };
+    };
+in
+fetch_librusty_v8 {
+  version = "0.105.1";
+  shas = {
+    x86_64-linux = "sha256-f7aDA74Jn2h4rp9sACGHX4DBbN6yevgWCEKdfI1fJDU=";
+    aarch64-linux = "sha256-vuEP7in+A/PrBXSunRq1SC77dOuMiScsKcA712AuNuk=";
+    x86_64-darwin = "sha256-sNe2VCwZvy64jdbPwx7pZ91fFRv1xosOcGiAtSPbt8A=";
+    aarch64-darwin = "sha256-GmwTJADMxArwOvRN/w5KVmWGc1+WfraBc/wWe7dxHMg=";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7f725c55c9c1..929e16d885ac 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18514,6 +18514,10 @@ self: super: with self; {
     inherit (pkgs.libsForQt5) wrapQtAppsHook;
   };
 
+  vl-convert-python = callPackage ../development/python-modules/vl-convert-python {
+    inherit (pkgs) protobuf;
+  };
+
   vllm = callPackage ../development/python-modules/vllm { };
 
   vmprof = callPackage ../development/python-modules/vmprof { };

From d94ee29780abd76d269b855781b3b4767ba4e4fe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 14 Jun 2025 17:52:59 +0000
Subject: [PATCH 23/57] openxr-loader: 1.1.47 -> 1.1.49

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

diff --git a/pkgs/by-name/op/openxr-loader/package.nix b/pkgs/by-name/op/openxr-loader/package.nix
index b6f31e85b909..4605a1ba0e1a 100644
--- a/pkgs/by-name/op/openxr-loader/package.nix
+++ b/pkgs/by-name/op/openxr-loader/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "openxr-loader";
-  version = "1.1.47";
+  version = "1.1.49";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "OpenXR-SDK-Source";
     tag = "release-${version}";
-    hash = "sha256-7VW99dtE7gz0Y9pKyAdyeKHL6zgk5KvA8jPfgG1O5sc=";
+    hash = "sha256-fQmS8oJZ7Oy/miKCtOQGSvZFDIEMFOcUyz2D6P8hNZY=";
   };
 
   nativeBuildInputs = [

From 7e582dca5f2aace504f82bd28df219fc5b7afa4c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 14 Jun 2025 19:34:01 +0000
Subject: [PATCH 24/57] linuxPackages.corefreq: 2.0.5 -> 2.0.7

---
 pkgs/os-specific/linux/corefreq/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/corefreq/default.nix b/pkgs/os-specific/linux/corefreq/default.nix
index 18efe6dae441..d1dabe816c12 100644
--- a/pkgs/os-specific/linux/corefreq/default.nix
+++ b/pkgs/os-specific/linux/corefreq/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "corefreq";
-  version = "2.0.5";
+  version = "2.0.7";
 
   src = fetchFromGitHub {
     owner = "cyring";
     repo = "CoreFreq";
     rev = version;
-    hash = "sha256-9RANWw0zdsNFHdHPc0AjPQTZSlaejChsrZmxNXeBzK0=";
+    hash = "sha256-k9tw32yG8WGGCY0/5WWvRTBzz+jka7PZ9WU05rwnunI=";
   };
 
   nativeBuildInputs = kernel.moduleBuildDependencies;

From 09257c88570133278e8bba7bc0cfbdf5fce552d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 14 Jun 2025 19:49:02 -0700
Subject: [PATCH 25/57] python3Packages.here-routing: 1.0.1 -> 1.1.3

Diff: https://github.com/eifinger/here_routing/compare/v1.0.1...v1.1.3

Changelog: https://github.com/eifinger/here_routing/releases/tag/v1.1.0
           https://github.com/eifinger/here_routing/releases/tag/v1.1.1
           https://github.com/eifinger/here_routing/releases/tag/v1.1.2
           https://github.com/eifinger/here_routing/releases/tag/v1.1.3
---
 .../python-modules/here-routing/default.nix    | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/here-routing/default.nix b/pkgs/development/python-modules/here-routing/default.nix
index d8e6e4a3c800..8175d9f11d90 100644
--- a/pkgs/development/python-modules/here-routing/default.nix
+++ b/pkgs/development/python-modules/here-routing/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
   hatchling,
   aiohttp,
@@ -9,28 +8,22 @@
   yarl,
   aresponses,
   pytest-asyncio,
+  pytest-cov-stub,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "here-routing";
-  version = "1.0.1";
-
-  disabled = pythonOlder "3.10";
-
+  version = "1.1.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "eifinger";
     repo = "here_routing";
-    rev = "v${version}";
-    hash = "sha256-sdNs5QNYvL1Cpbk9Yi+7PSiDZ6LEgAXQ19IYSAY78p0=";
+    tag = "v${version}";
+    hash = "sha256-56Sx8pbfsuCj7mqG15HK3QoGGiQDFFrbkOdNedV+HY4=";
   };
 
-  postPatch = ''
-    sed -i "/^addopts/d" pyproject.toml
-  '';
-
   build-system = [ hatchling ];
 
   dependencies = [
@@ -42,13 +35,14 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     aresponses
     pytest-asyncio
+    pytest-cov-stub
     pytestCheckHook
   ];
 
   pythonImportsCheck = [ "here_routing" ];
 
   meta = {
-    changelog = "https://github.com/eifinger/here_routing/releases/tag/v${version}";
+    changelog = "https://github.com/eifinger/here_routing/releases/tag/${src.tag}";
     description = "Asynchronous Python client for the HERE Routing V8 API";
     homepage = "https://github.com/eifinger/here_routing";
     license = lib.licenses.mit;

From ffd4301f5708a1be1e634f08d34564534076c609 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sun, 15 Jun 2025 12:37:53 +0800
Subject: [PATCH 26/57] dart.super_native_extensions: support git source

---
 .../super_native_extensions/default.nix       | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/dart/package-source-builders/super_native_extensions/default.nix b/pkgs/development/compilers/dart/package-source-builders/super_native_extensions/default.nix
index 8528855f2b10..0fd428a26506 100644
--- a/pkgs/development/compilers/dart/package-source-builders/super_native_extensions/default.nix
+++ b/pkgs/development/compilers/dart/package-source-builders/super_native_extensions/default.nix
@@ -17,12 +17,26 @@ let
     pname = "super_native_extensions-rs";
     inherit version src;
 
+    unpackPhase = ''
+      runHook preUnpack
+
+      if [ -d $src/super_native_extensions ]; then
+        cp -r $src/super_native_extensions ${src.name}
+      else
+        cp -r $src ${src.name}
+      fi
+      chmod -R u+w -- "$sourceRoot"
+
+      runHook postUnpack
+    '';
+
     sourceRoot = "${src.name}/rust";
 
     useFetchCargoVendor = true;
 
     cargoHash =
       rec {
+        _0_9_1 = _0_9_0-dev_6;
         _0_9_0-dev_6 = "sha256-1yJIbBxScmkCwy/e+/z2cYA8qQBfT0yoIBmOSPVd4h4=";
         _0_9_0-dev_5 = _0_8_22;
         _0_9_0-dev_3 = _0_8_22;
@@ -69,8 +83,14 @@ stdenv.mkDerivation {
     runHook preInstall
 
     cp -r "$src" "$out"
-    chmod +rwx $out/cargokit/cmake/cargokit.cmake
-    cp ${fakeCargokitCmake} $out/cargokit/cmake/cargokit.cmake
+    if [ -d $out/super_native_extensions ]; then
+      pushd $out/super_native_extensions
+    else
+      pushd $out
+    fi
+    chmod +rwx cargokit/cmake/cargokit.cmake
+    cp ${fakeCargokitCmake} cargokit/cmake/cargokit.cmake
+    popd
 
     runHook postInstall
   '';

From a0ffb4b33b8b46463ca1e9b2eb05156ccbaba1bd Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sun, 15 Jun 2025 12:38:14 +0800
Subject: [PATCH 27/57] saber: 0.25.6 -> 0.25.9

---
 pkgs/by-name/sa/saber/package.nix       |  14 ++-
 pkgs/by-name/sa/saber/pubspec.lock.json | 151 ++++++++++--------------
 2 files changed, 73 insertions(+), 92 deletions(-)

diff --git a/pkgs/by-name/sa/saber/package.nix b/pkgs/by-name/sa/saber/package.nix
index 738f7f414964..d9bf624e9db4 100644
--- a/pkgs/by-name/sa/saber/package.nix
+++ b/pkgs/by-name/sa/saber/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  flutter329,
+  flutter332,
   fetchFromGitHub,
   gst_all_1,
   libunwind,
@@ -15,21 +15,23 @@
   gitUpdater,
 }:
 
-flutter329.buildFlutterApplication rec {
+flutter332.buildFlutterApplication rec {
   pname = "saber";
-  version = "0.25.6";
+  version = "0.25.9";
 
   src = fetchFromGitHub {
     owner = "saber-notes";
     repo = "saber";
     tag = "v${version}";
-    hash = "sha256-OknqEbWAYLlxSTDWcggM6GP2V8cdKIAksbm7TmKzjKY=";
+    hash = "sha256-l1TPk6JiT/o0Pl67Vqv4NE2n/FrZKy/SqwhW58A3c6w=";
   };
 
   gitHashes = {
     receive_sharing_intent = "sha256-8D5ZENARPZ7FGrdIErxOoV3Ao35/XoQ2tleegI42ZUY=";
-    json2yaml = "sha256-Vb0Bt11OHGX5+lDf8KqYZEGoXleGi5iHXVS2k7CEmDw=";
-    workmanager = "sha256-fpB8CwNIn+HCQujyIXciq7Y9yd78Ie0IjkSewv3u5iw=";
+    flutter_secure_storage_linux = "sha256-cFNHW7dAaX8BV7arwbn68GgkkBeiAgPfhMOAFSJWlyY=";
+    irondash_engine_context = "sha256-/ohreOZDsVqfPoJ6wK7ylTQAgWw23v0b31bDQw5L2Hw=";
+    super_native_extensions = "sha256-0WZ5+imtLJE8GhbAgLyCC502vvlDl5QG3xtG2nCAnQI=";
+    yaru = "sha256-j0aPyHx79kzT/eLf0Y3cq4qQkQ4c76GdpjLaVNp8MuI=";
   };
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;
diff --git a/pkgs/by-name/sa/saber/pubspec.lock.json b/pkgs/by-name/sa/saber/pubspec.lock.json
index 75ef121f775c..029df05923bf 100644
--- a/pkgs/by-name/sa/saber/pubspec.lock.json
+++ b/pkgs/by-name/sa/saber/pubspec.lock.json
@@ -84,11 +84,11 @@
       "dependency": "transitive",
       "description": {
         "name": "async",
-        "sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63",
+        "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.12.0"
+      "version": "2.13.0"
     },
     "audioplayers": {
       "dependency": "direct main",
@@ -214,11 +214,11 @@
       "dependency": "transitive",
       "description": {
         "name": "built_value",
-        "sha256": "ea90e81dc4a25a043d9bee692d20ed6d1c4a1662a28c03a96417446c093ed6b4",
+        "sha256": "082001b5c3dc495d4a42f1d5789990505df20d8547d42507c29050af6933ee27",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.9.5"
+      "version": "8.10.1"
     },
     "chalkdart": {
       "dependency": "transitive",
@@ -374,11 +374,11 @@
       "dependency": "transitive",
       "description": {
         "name": "decimal",
-        "sha256": "4140a688f9e443e2f4de3a1162387bf25e1ac6d51e24c9da263f245210f41440",
+        "sha256": "28239b8b929c1bd8618702e6dbc96e2618cf99770bbe9cb040d6cf56a11e4ec3",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.2"
+      "version": "3.2.1"
     },
     "defer_pointer": {
       "dependency": "direct main",
@@ -474,11 +474,11 @@
       "dependency": "transitive",
       "description": {
         "name": "fake_async",
-        "sha256": "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc",
+        "sha256": "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.2"
+      "version": "1.3.3"
     },
     "fast_image_resizer": {
       "dependency": "direct main",
@@ -514,11 +514,11 @@
       "dependency": "direct main",
       "description": {
         "name": "file_picker",
-        "sha256": "a222f231db4f822fc49e3b753674bda630e981873c84bf8604bceeb77fce0b24",
+        "sha256": "ef9908739bdd9c476353d6adff72e88fd00c625f5b959ae23f7567bd5137db0a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.1.7"
+      "version": "10.2.0"
     },
     "file_selector_linux": {
       "dependency": "transitive",
@@ -656,11 +656,11 @@
       "dependency": "direct dev",
       "description": {
         "name": "flutter_lints",
-        "sha256": "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1",
+        "sha256": "3105dc8492f6183fb076ccf1f351ac3d60564bff92e20bfc4af9cc1651f4e7e1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.0.0"
+      "version": "6.0.0"
     },
     "flutter_localizations": {
       "dependency": "direct main",
@@ -682,11 +682,11 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_quill",
-        "sha256": "de019f6160023d36ad3e89343da6d740ab66ae7839875c89871fbeabcb9e8f9b",
+        "sha256": "7e60963632bbc8615627f0bae8e178515f69ecb378ad49fa68c43c2aabf33e21",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "11.4.0"
+      "version": "11.4.1"
     },
     "flutter_quill_delta_from_html": {
       "dependency": "transitive",
@@ -719,13 +719,14 @@
       "version": "0.1.0"
     },
     "flutter_secure_storage_linux": {
-      "dependency": "transitive",
+      "dependency": "direct overridden",
       "description": {
-        "name": "flutter_secure_storage_linux",
-        "sha256": "9b4b73127e857cd3117d43a70fa3dddadb6e0b253be62e6a6ab85caa0742182c",
-        "url": "https://pub.dev"
+        "path": "flutter_secure_storage_linux",
+        "ref": "patch-2",
+        "resolved-ref": "f076cbb65b075afd6e3b648122987a67306dc298",
+        "url": "https://github.com/m-berto/flutter_secure_storage.git"
       },
-      "source": "hosted",
+      "source": "git",
       "version": "2.0.1"
     },
     "flutter_secure_storage_platform_interface": {
@@ -850,31 +851,21 @@
       "dependency": "direct main",
       "description": {
         "name": "go_router",
-        "sha256": "0b1e06223bee260dee31a171fb1153e306907563a0b0225e8c1733211911429a",
+        "sha256": "b453934c36e289cef06525734d1e676c1f91da9e22e2017d9dcab6ce0f999175",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "15.1.2"
+      "version": "15.1.3"
     },
     "golden_screenshot": {
       "dependency": "direct dev",
       "description": {
         "name": "golden_screenshot",
-        "sha256": "0ecff8fde3eaea98d2f19449fb2becf67583cb0e98326b1a6ad47226137099a1",
+        "sha256": "8178266a5827eb74caf7547a19d42051e7493a4bbcc206917f62f4830729b6c3",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.2.1"
-    },
-    "golden_toolkit": {
-      "dependency": "transitive",
-      "description": {
-        "name": "golden_toolkit",
-        "sha256": "8f74adab33154fe7b731395782797021f97d2edc52f7bfb85ff4f1b5c4a215f0",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.15.0"
+      "version": "3.3.0"
     },
     "gsettings": {
       "dependency": "transitive",
@@ -956,21 +947,21 @@
       "dependency": "direct main",
       "description": {
         "name": "intl",
-        "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf",
+        "sha256": "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.19.0"
+      "version": "0.20.2"
     },
     "irondash_engine_context": {
       "dependency": "transitive",
       "description": {
         "name": "irondash_engine_context",
-        "sha256": "cd7b769db11a2b5243b037c8a9b1ecaef02e1ae27a2d909ffa78c1dad747bb10",
+        "sha256": "2bb0bc13dfda9f5aaef8dde06ecc5feb1379f5bb387d59716d799554f3f305d7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.5.4"
+      "version": "0.5.5"
     },
     "irondash_message_channel": {
       "dependency": "transitive",
@@ -992,17 +983,6 @@
       "source": "hosted",
       "version": "0.7.2"
     },
-    "json2yaml": {
-      "dependency": "direct overridden",
-      "description": {
-        "path": ".",
-        "ref": "fix-string-ends-with-colon",
-        "resolved-ref": "618fc6b7c57acd17cfa98ef7895a771938374456",
-        "url": "https://github.com/adil192/json2yaml"
-      },
-      "source": "git",
-      "version": "3.0.1"
-    },
     "json_annotation": {
       "dependency": "transitive",
       "description": {
@@ -1027,11 +1007,11 @@
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker",
-        "sha256": "c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec",
+        "sha256": "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.0.8"
+      "version": "10.0.9"
     },
     "leak_tracker_flutter_testing": {
       "dependency": "transitive",
@@ -1057,11 +1037,11 @@
       "dependency": "transitive",
       "description": {
         "name": "lints",
-        "sha256": "c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7",
+        "sha256": "a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.1.1"
+      "version": "6.0.0"
     },
     "list_utilities": {
       "dependency": "transitive",
@@ -1117,11 +1097,11 @@
       "dependency": "direct main",
       "description": {
         "name": "material_symbols_icons",
-        "sha256": "d45b6c36c3effa8cb51b1afb8698107d5ff1f88fa4631428f34a8a01abc295d7",
+        "sha256": "7c50901b39d1ad645ee25d920aed008061e1fd541a897b4ebf2c01d966dbf16b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.2815.0"
+      "version": "4.2815.1"
     },
     "matrix4_transform": {
       "dependency": "transitive",
@@ -1416,11 +1396,11 @@
       "dependency": "direct main",
       "description": {
         "name": "pdfrx",
-        "sha256": "1bde1885de38ac8ad9f8d5e4be37a57f36f23467a9bb5a586607d5e4aa153ab8",
+        "sha256": "4640c561aa31598c9c8ff9042675f7c1ecb2ca2b1190dff6e2ecaa677d1bc416",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.28"
+      "version": "1.1.35"
     },
     "perfect_freehand": {
       "dependency": "direct main",
@@ -1923,11 +1903,11 @@
       "dependency": "direct main",
       "description": {
         "name": "slang",
-        "sha256": "13132690084bef34fb74dbc698a1e5496f97afbcd3eb58e20c09393e77ac46e6",
+        "sha256": "6668a08355b370d5cb5446fc869c4492ed23c6433934fe88228876460fedac22",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.7.1"
+      "version": "4.7.2"
     },
     "slang_flutter": {
       "dependency": "direct main",
@@ -1993,21 +1973,21 @@
       "dependency": "direct main",
       "description": {
         "name": "super_clipboard",
-        "sha256": "5203c881d24033c3e6154c2ae01afd94e7f0a3201280373f28e540f1defa3f40",
+        "sha256": "e73f3bb7e66cc9260efa1dc507f979138e7e106c3521e2dda2d0311f6d728a16",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.9.0-dev.6"
+      "version": "0.9.1"
     },
     "super_native_extensions": {
       "dependency": "transitive",
       "description": {
         "name": "super_native_extensions",
-        "sha256": "09ccc40c475e6f91770eaeb2553bf4803812d7beadc3759aa57d643370619c86",
+        "sha256": "b9611dcb68f1047d6f3ef11af25e4e68a21b1a705bbcc3eb8cb4e9f5c3148569",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.9.0-dev.6"
+      "version": "0.9.1"
     },
     "sync_http": {
       "dependency": "transitive",
@@ -2183,11 +2163,11 @@
       "dependency": "transitive",
       "description": {
         "name": "vector_graphics",
-        "sha256": "44cc7104ff32563122a929e4620cf3efd584194eec6d1d913eb5ba593dbcf6de",
+        "sha256": "a4f059dc26fc8295b5921376600a194c4ec7d55e72f2fe4c7d2831e103d461e6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.18"
+      "version": "1.1.19"
     },
     "vector_graphics_codec": {
       "dependency": "transitive",
@@ -2203,11 +2183,11 @@
       "dependency": "transitive",
       "description": {
         "name": "vector_graphics_compiler",
-        "sha256": "1b4b9e706a10294258727674a340ae0d6e64a7231980f9f9a3d12e4b42407aad",
+        "sha256": "557a315b7d2a6dbb0aaaff84d857967ce6bdc96a63dc6ee2a57ce5a6ee5d3331",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.16"
+      "version": "1.1.17"
     },
     "vector_math": {
       "dependency": "direct main",
@@ -2233,21 +2213,21 @@
       "dependency": "transitive",
       "description": {
         "name": "vm_service",
-        "sha256": "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14",
+        "sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "14.3.1"
+      "version": "15.0.0"
     },
     "watcher": {
       "dependency": "transitive",
       "description": {
         "name": "watcher",
-        "sha256": "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104",
+        "sha256": "0b7fd4a0bbc4b92641dbf20adfd7e3fd1398fe17102d94b674234563e110088a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.1"
+      "version": "1.1.2"
     },
     "web": {
       "dependency": "transitive",
@@ -2263,21 +2243,21 @@
       "dependency": "transitive",
       "description": {
         "name": "webdriver",
-        "sha256": "3d773670966f02a646319410766d3b5e1037efb7f07cc68f844d5e06cd4d61c8",
+        "sha256": "2f3a14ca026957870cfd9c635b83507e0e51d8091568e90129fbf805aba7cade",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.4"
+      "version": "3.1.0"
     },
     "win32": {
       "dependency": "transitive",
       "description": {
         "name": "win32",
-        "sha256": "329edf97fdd893e0f1e3b9e88d6a0e627128cc17cc316a8d67fda8f1451178ba",
+        "sha256": "66814138c3562338d05613a6e368ed8cfb237ad6d64a9e9334be3f309acfca03",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.13.0"
+      "version": "5.14.0"
     },
     "win32_registry": {
       "dependency": "transitive",
@@ -2313,22 +2293,21 @@
       "dependency": "direct main",
       "description": {
         "name": "worker_manager",
-        "sha256": "eb8ad7013f823539e259f2452b40f8bf77c0aacc7a73f66195f1ad3166eafcf8",
+        "sha256": "af3db5e6c6c8a74ab8f72e25e9d305f8ff60984ca55551397e3c8828ebf30509",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.2.4"
+      "version": "7.2.6"
     },
     "workmanager": {
       "dependency": "direct main",
       "description": {
-        "path": "workmanager",
-        "ref": "main",
-        "resolved-ref": "4ce065135dc1b91fee918f81596b42a56850391d",
-        "url": "https://github.com/fluttercommunity/flutter_workmanager"
+        "name": "workmanager",
+        "sha256": "f3c3ce6d79cce53eee4a29dd2e8328c25db5ba5d9062fcc5e8f3c71e0af9b7e4",
+        "url": "https://pub.dev"
       },
-      "source": "git",
-      "version": "0.5.2"
+      "source": "hosted",
+      "version": "0.6.0"
     },
     "xdg_directories": {
       "dependency": "transitive",
@@ -2374,11 +2353,11 @@
       "dependency": "direct main",
       "description": {
         "name": "yaru",
-        "sha256": "f149399d81ecd3d20bfcc79afd5ddd9bcd7e4c901d5e602a8577fe59c71c8617",
+        "sha256": "d9149e87ddcbabd6214fe629bfd0b6a94b9d81ca55a5618949ffc47a3d8a7b69",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.0.0"
+      "version": "8.0.0"
     },
     "yaru_window": {
       "dependency": "transitive",
@@ -2432,7 +2411,7 @@
     }
   },
   "sdks": {
-    "dart": ">=3.7.0 <4.0.0",
-    "flutter": ">=3.29.0"
+    "dart": ">=3.8.0 <4.0.0",
+    "flutter": ">=3.32.0"
   }
 }

From 46c0493cc65d22bcc202a8185a6b93903c6c4ff2 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sun, 15 Jun 2025 00:01:04 -0600
Subject: [PATCH 28/57] teams-for-linux: 2.0.14 -> 2.0.16

Diff: https://github.com/IsmaelMartinez/teams-for-linux/compare/v2.0.14...v2.0.16
---
 pkgs/by-name/te/teams-for-linux/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix
index 434226ffef39..5d2c282439ce 100644
--- a/pkgs/by-name/te/teams-for-linux/package.nix
+++ b/pkgs/by-name/te/teams-for-linux/package.nix
@@ -16,16 +16,16 @@
 
 buildNpmPackage rec {
   pname = "teams-for-linux";
-  version = "2.0.14";
+  version = "2.0.16";
 
   src = fetchFromGitHub {
     owner = "IsmaelMartinez";
     repo = "teams-for-linux";
     tag = "v${version}";
-    hash = "sha256-B7u5xJHss09QOP1AHoHZWIiHyd2RBcF/XU3BB9N2C60=";
+    hash = "sha256-+0sVumtXEJQEP3vFQ7QU4zA4PuqCRDH5+fetD8PqtBg=";
   };
 
-  npmDepsHash = "sha256-JJUkZlol09Hehxc26DMdEzdxy8Nxa16G8YdTZkHhi78=";
+  npmDepsHash = "sha256-I9h/5sIOXJWm/+YJbXQ5QUfoMnTNiOz27LSEiVS4FXA=";
 
   nativeBuildInputs = [
     makeWrapper

From cf39ba5e07cf38a4171265c66a3fdfbca1c90c7a Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 15 Jun 2025 13:17:46 +0800
Subject: [PATCH 29/57] nixos/{budgie,cinnamon,mate}: Hack around SSH_AUTH_SOCK

Make sure SSH_AUTH_SOCK is known by these sessions, which are not
systemd managed. It should not be a problem for users who know this
environment variable and use multiple desktops environments to
opt-out of this and I would prefer a more out-of-the-box experience
for those who don't.
---
 .../services/x11/desktop-managers/budgie.nix  | 28 ++++++++++++-------
 .../x11/desktop-managers/cinnamon.nix         | 28 ++++++++++++-------
 .../services/x11/desktop-managers/mate.nix    |  8 ++++++
 3 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/budgie.nix b/nixos/modules/services/x11/desktop-managers/budgie.nix
index cdd2e9453133..9d7161a7560c 100644
--- a/nixos/modules/services/x11/desktop-managers/budgie.nix
+++ b/nixos/modules/services/x11/desktop-managers/budgie.nix
@@ -130,17 +130,25 @@ in
 
     services.xserver.desktopManager.budgie.sessionPath = [ pkgs.budgie-desktop-view ];
 
-    environment.extraInit = ''
-      ${concatMapStrings (p: ''
-        if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then
-          export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${p}/share/gsettings-schemas/${p.name}
+    environment.extraInit =
+      ''
+        ${concatMapStrings (p: ''
+          if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then
+            export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${p}/share/gsettings-schemas/${p.name}
+          fi
+          if [ -d "${p}/lib/girepository-1.0" ]; then
+            export GI_TYPELIB_PATH=$GI_TYPELIB_PATH''${GI_TYPELIB_PATH:+:}${p}/lib/girepository-1.0
+            export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${p}/lib
+          fi
+        '') cfg.sessionPath}
+      ''
+      + lib.optionalString config.services.gnome.gcr-ssh-agent.enable ''
+        # Hack: https://bugzilla.redhat.com/show_bug.cgi?id=2250704 still
+        # applies to sessions not managed by systemd.
+        if [ -z "$SSH_AUTH_SOCK" ] && [ -n "$XDG_RUNTIME_DIR" ]; then
+          export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/gcr/ssh"
         fi
-        if [ -d "${p}/lib/girepository-1.0" ]; then
-          export GI_TYPELIB_PATH=$GI_TYPELIB_PATH''${GI_TYPELIB_PATH:+:}${p}/lib/girepository-1.0
-          export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${p}/lib
-        fi
-      '') cfg.sessionPath}
-    '';
+      '';
 
     environment.systemPackages =
       with pkgs;
diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
index 60880d826962..44068bfb62d6 100644
--- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix
+++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
@@ -87,18 +87,26 @@ in
       };
 
       # Have to take care of GDM + Cinnamon on Wayland users
-      environment.extraInit = ''
-        ${concatMapStrings (p: ''
-          if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then
-            export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${p}/share/gsettings-schemas/${p.name}
-          fi
+      environment.extraInit =
+        ''
+          ${concatMapStrings (p: ''
+            if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then
+              export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${p}/share/gsettings-schemas/${p.name}
+            fi
 
-          if [ -d "${p}/lib/girepository-1.0" ]; then
-            export GI_TYPELIB_PATH=$GI_TYPELIB_PATH''${GI_TYPELIB_PATH:+:}${p}/lib/girepository-1.0
-            export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${p}/lib
+            if [ -d "${p}/lib/girepository-1.0" ]; then
+              export GI_TYPELIB_PATH=$GI_TYPELIB_PATH''${GI_TYPELIB_PATH:+:}${p}/lib/girepository-1.0
+              export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${p}/lib
+            fi
+          '') cfg.sessionPath}
+        ''
+        + lib.optionalString config.services.gnome.gcr-ssh-agent.enable ''
+          # Hack: https://bugzilla.redhat.com/show_bug.cgi?id=2250704 still
+          # applies to sessions not managed by systemd.
+          if [ -z "$SSH_AUTH_SOCK" ] && [ -n "$XDG_RUNTIME_DIR" ]; then
+            export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/gcr/ssh"
           fi
-        '') cfg.sessionPath}
-      '';
+        '';
 
       # Default services
       services.blueman.enable = mkDefault (notExcluded pkgs.blueman);
diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix
index dd8f10061910..74cbca78e6b2 100644
--- a/nixos/modules/services/x11/desktop-managers/mate.nix
+++ b/nixos/modules/services/x11/desktop-managers/mate.nix
@@ -59,6 +59,14 @@ in
         pkgs.mate.mate-session-manager
       ];
 
+      environment.extraInit = lib.optionalString config.services.gnome.gcr-ssh-agent.enable ''
+        # Hack: https://bugzilla.redhat.com/show_bug.cgi?id=2250704 still
+        # applies to sessions not managed by systemd.
+        if [ -z "$SSH_AUTH_SOCK" ] && [ -n "$XDG_RUNTIME_DIR" ]; then
+          export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/gcr/ssh"
+        fi
+      '';
+
       # Debugging
       environment.sessionVariables.MATE_SESSION_DEBUG = mkIf cfg.debug "1";
 

From 4131df3bf4c88a3ad1e21a00c24cb200ef04d981 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 15 Jun 2025 13:53:54 +0800
Subject: [PATCH 30/57] nixos/tests/{budgie,cinnamon,mate,pantheon}: Add tests
 for SSH_AUTH_SOCK

As a follow-up to the previous commit.

Note that Pantheon is systemd managed so no hacks are needed.
---
 nixos/tests/budgie.nix           | 2 ++
 nixos/tests/cinnamon-wayland.nix | 7 +++++++
 nixos/tests/cinnamon.nix         | 7 +++++++
 nixos/tests/mate-wayland.nix     | 2 ++
 nixos/tests/mate.nix             | 2 ++
 nixos/tests/pantheon-wayland.nix | 2 ++
 nixos/tests/pantheon.nix         | 2 ++
 7 files changed, 24 insertions(+)

diff --git a/nixos/tests/budgie.nix b/nixos/tests/budgie.nix
index 04e5300ec4fb..a6c40f6a9ab4 100644
--- a/nixos/tests/budgie.nix
+++ b/nixos/tests/budgie.nix
@@ -68,6 +68,8 @@
           cmd = "xargs --null --max-args=1 echo < /proc/$(pgrep -xf /run/current-system/sw/bin/budgie-wm)/environ"
           machine.succeed(f"{cmd} | grep 'XDG_CURRENT_DESKTOP' | grep 'Budgie:GNOME'")
           machine.succeed(f"{cmd} | grep 'BUDGIE_PLUGIN_DATADIR' | grep '${pkgs.budgie-desktop-with-plugins.pname}'")
+          # From the nixos/budgie module
+          machine.succeed(f"{cmd} | grep 'SSH_AUTH_SOCK' | grep 'gcr'")
 
       with subtest("Open run dialog"):
           machine.send_key("alt-f2")
diff --git a/nixos/tests/cinnamon-wayland.nix b/nixos/tests/cinnamon-wayland.nix
index a80199956cc2..d19ac920b388 100644
--- a/nixos/tests/cinnamon-wayland.nix
+++ b/nixos/tests/cinnamon-wayland.nix
@@ -58,6 +58,13 @@
       with subtest("Check if sessionPath option actually works"):
           machine.succeed("${eval "imports.gi.GIRepository.Repository.get_search_path\\(\\)"} | grep gpaste")
 
+      with subtest("Check if various environment variables are set"):
+          cmd = "xargs --null --max-args=1 echo < /proc/$(pgrep -xf /run/current-system/sw/bin/nemo-desktop)/environ"
+          machine.succeed(f"{cmd} | grep 'XDG_SESSION_TYPE' | grep 'wayland'")
+          machine.succeed(f"{cmd} | grep '__NIXOS_SET_ENVIRONMENT_DONE' | grep '1'")
+          # From the nixos/cinnamon module
+          machine.succeed(f"{cmd} | grep 'SSH_AUTH_SOCK' | grep 'gcr'")
+
       with subtest("Open Cinnamon Settings"):
           machine.succeed("${su "cinnamon-settings themes >&2 &"}")
           machine.wait_until_succeeds("${eval "global.display.focus_window.wm_class"} | grep -i 'cinnamon-settings'")
diff --git a/nixos/tests/cinnamon.nix b/nixos/tests/cinnamon.nix
index 3230d7b07358..9ff43a8dbbb7 100644
--- a/nixos/tests/cinnamon.nix
+++ b/nixos/tests/cinnamon.nix
@@ -69,6 +69,13 @@
       with subtest("Check if sessionPath option actually works"):
           machine.succeed("${eval "imports.gi.GIRepository.Repository.get_search_path\\(\\)"} | grep gpaste")
 
+      with subtest("Check if various environment variables are set"):
+          cmd = "xargs --null --max-args=1 echo < /proc/$(pgrep -xf /run/current-system/sw/bin/nemo-desktop)/environ"
+          machine.succeed(f"{cmd} | grep 'XDG_SESSION_TYPE' | grep 'x11'")
+          machine.succeed(f"{cmd} | grep '__NIXOS_SET_ENVIRONMENT_DONE' | grep '1'")
+          # From the nixos/cinnamon module
+          machine.succeed(f"{cmd} | grep 'SSH_AUTH_SOCK' | grep 'gcr'")
+
       with subtest("Open Cinnamon Settings"):
           machine.succeed("${su "cinnamon-settings themes >&2 &"}")
           machine.wait_until_succeeds("${eval "global.display.focus_window.wm_class"} | grep -i 'cinnamon-settings'")
diff --git a/nixos/tests/mate-wayland.nix b/nixos/tests/mate-wayland.nix
index 42b88439357a..c2e0ee1feaf7 100644
--- a/nixos/tests/mate-wayland.nix
+++ b/nixos/tests/mate-wayland.nix
@@ -52,6 +52,8 @@
           machine.succeed(f"{cmd} | grep 'XDG_SESSION_TYPE' | grep 'wayland'")
           machine.succeed(f"{cmd} | grep 'XDG_SESSION_DESKTOP' | grep 'MATE'")
           machine.succeed(f"{cmd} | grep 'MATE_PANEL_APPLETS_DIR' | grep '${pkgs.mate.mate-panel-with-applets.pname}'")
+          # From the nixos/mate module
+          machine.succeed(f"{cmd} | grep 'SSH_AUTH_SOCK' | grep 'gcr'")
 
       with subtest("Check if Wayfire config is properly configured"):
           for i in ["button_style = mate", "firedecor", "mate-wayland-components.sh"]:
diff --git a/nixos/tests/mate.nix b/nixos/tests/mate.nix
index 6112044837db..45fd877c1ca4 100644
--- a/nixos/tests/mate.nix
+++ b/nixos/tests/mate.nix
@@ -58,6 +58,8 @@
           machine.succeed("xargs --null --max-args=1 echo < /proc/$(pgrep -xf marco)/environ | grep 'XDG_CURRENT_DESKTOP' | grep 'MATE'")
           # From mate-panel-with-applets packaging
           machine.succeed("xargs --null --max-args=1 echo < /proc/$(pgrep -xf mate-panel)/environ | grep 'MATE_PANEL_APPLETS_DIR' | grep '${pkgs.mate.mate-panel-with-applets.pname}'")
+          # From the nixos/mate module
+          machine.succeed("xargs --null --max-args=1 echo < /proc/$(pgrep -xf mate-panel)/environ | grep 'SSH_AUTH_SOCK' | grep 'gcr'")
 
       with subtest("Check if applets are built with in-process support"):
           # This is needed for Wayland support
diff --git a/nixos/tests/pantheon-wayland.nix b/nixos/tests/pantheon-wayland.nix
index 6bda9e508ef2..87c8b17a692c 100644
--- a/nixos/tests/pantheon-wayland.nix
+++ b/nixos/tests/pantheon-wayland.nix
@@ -78,6 +78,8 @@
           machine.succeed(f"{cmd} | grep 'XDG_DATA_DIRS' | grep 'gsettings-schemas/pantheon-agent-geoclue2'")
           # Hopefully from login shell.
           machine.succeed(f"{cmd} | grep '__NIXOS_SET_ENVIRONMENT_DONE' | grep '1'")
+          # Hopefully from gcr-ssh-agent.
+          machine.succeed(f"{cmd} | grep 'SSH_AUTH_SOCK' | grep 'gcr'")
 
       with subtest("Wait for elementary videos autostart"):
           machine.wait_until_succeeds("pgrep -f io.elementary.videos")
diff --git a/nixos/tests/pantheon.nix b/nixos/tests/pantheon.nix
index b8cb0512c542..855d0f48f80c 100644
--- a/nixos/tests/pantheon.nix
+++ b/nixos/tests/pantheon.nix
@@ -73,6 +73,8 @@
           machine.succeed(f"{cmd} | grep 'XDG_DATA_DIRS' | grep 'gsettings-schemas/pantheon-agent-geoclue2'")
           # Hopefully from login shell.
           machine.succeed(f"{cmd} | grep '__NIXOS_SET_ENVIRONMENT_DONE' | grep '1'")
+          # Hopefully from gcr-ssh-agent.
+          machine.succeed(f"{cmd} | grep 'SSH_AUTH_SOCK' | grep 'gcr'")
 
       with subtest("Open elementary videos"):
           machine.execute("su - ${user.name} -c 'DISPLAY=:0 io.elementary.videos >&2 &'")

From 3cb450ed73eb73a0f613a2d62e89fe6cd3303461 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 15 Jun 2025 07:23:20 +0000
Subject: [PATCH 31/57] xpipe: 16.4.1 -> 16.6

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

diff --git a/pkgs/by-name/xp/xpipe/package.nix b/pkgs/by-name/xp/xpipe/package.nix
index ceca00e58643..37eee295a66a 100644
--- a/pkgs/by-name/xp/xpipe/package.nix
+++ b/pkgs/by-name/xp/xpipe/package.nix
@@ -39,7 +39,7 @@ let
 
   hash =
     {
-      x86_64-linux = "sha256-Ma2WWknZ0rF9NZNqOaPyQ2eil34HWmgSIHMnfaSaFjs=";
+      x86_64-linux = "sha256-BQNynZwQevXl+PlAi+OhaIUIf9TaNW5JowD3mLGgJxE=";
     }
     .${system} or throwSystem;
 
@@ -48,7 +48,7 @@ let
 in
 stdenvNoCC.mkDerivation rec {
   pname = "xpipe";
-  version = "16.4.1";
+  version = "16.6";
 
   src = fetchzip {
     url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz";

From 243032de402996b26908d3352b2bba34f859c831 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 15 Jun 2025 08:11:07 +0000
Subject: [PATCH 32/57] lavalink: 4.0.8 -> 4.1.1

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

diff --git a/pkgs/by-name/la/lavalink/package.nix b/pkgs/by-name/la/lavalink/package.nix
index 1ca9d11765e2..8419baae68a7 100644
--- a/pkgs/by-name/la/lavalink/package.nix
+++ b/pkgs/by-name/la/lavalink/package.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lavalink";
-  version = "4.0.8";
+  version = "4.1.1";
 
   src = fetchurl {
     url = "https://github.com/lavalink-devs/Lavalink/releases/download/${finalAttrs.version}/Lavalink.jar";
-    hash = "sha256-G4a9ltPq/L0vcazTQjStTlOOtwrBi37bYUNQHy5CV9Y=";
+    hash = "sha256-ZR/5YDgbziAqOR8fex3aMzybPmLy/KOGtNM12Zj/ttg=";
   };
 
   nativeBuildInputs = [

From c5bf33ef76c648a0ad3b92d962cca55e4b453eb1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 15 Jun 2025 08:42:06 +0000
Subject: [PATCH 33/57] bitwarden-desktop: 2025.5.0 -> 2025.5.1

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

diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix
index b2f9ab146577..0bfb9cc7c1c5 100644
--- a/pkgs/by-name/bi/bitwarden-desktop/package.nix
+++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix
@@ -34,13 +34,13 @@ let
 in
 buildNpmPackage' rec {
   pname = "bitwarden-desktop";
-  version = "2025.5.0";
+  version = "2025.5.1";
 
   src = fetchFromGitHub {
     owner = "bitwarden";
     repo = "clients";
     rev = "desktop-v${version}";
-    hash = "sha256-8jVKwqKhTfhur226SER4sb1i4dY+TjJRYmOY8YtO6CY=";
+    hash = "sha256-1gxd73E7Y7e1A6yU+J3XYQ4QzXZTxuKd+AE+t8HD478=";
   };
 
   patches = [

From ee1f9ad6bf884a0d2d77a4588dc50f71a6625e07 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 15 Jun 2025 09:44:37 +0000
Subject: [PATCH 34/57] gpxsee: 13.43 -> 13.44

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

diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix
index 69e516c7309d..68f295594d51 100644
--- a/pkgs/applications/misc/gpxsee/default.nix
+++ b/pkgs/applications/misc/gpxsee/default.nix
@@ -19,13 +19,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "gpxsee";
-  version = "13.43";
+  version = "13.44";
 
   src = fetchFromGitHub {
     owner = "tumic0";
     repo = "GPXSee";
     tag = finalAttrs.version;
-    hash = "sha256-IP5l8YUsCNm9rixgpQqbyyhfcBNQgrZha1MNjetug2c=";
+    hash = "sha256-eFANrUMESQVsZwTfz20VW2Qf7hiSgtkeKszCiJ8i/jk=";
   };
 
   buildInputs =

From 5c44b02d95616376992513d02756104b311cf4cb Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sun, 15 Jun 2025 11:16:19 +0200
Subject: [PATCH 35/57] firefox-bin: fix updateScript

---
 .../networking/browsers/firefox-bin/default.nix      |  1 -
 .../networking/browsers/firefox-bin/update.nix       | 12 ++----------
 .../mailreaders/thunderbird-bin/default.nix          |  2 --
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 16529d7ed100..dba0cf0e30cb 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -142,7 +142,6 @@ stdenv.mkDerivation {
     updateScript = import ./update.nix {
       inherit
         pname
-        lib
         writeScript
         xidel
         coreutils
diff --git a/pkgs/applications/networking/browsers/firefox-bin/update.nix b/pkgs/applications/networking/browsers/firefox-bin/update.nix
index 00f1c18dc422..991ebd844a67 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/update.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/update.nix
@@ -1,7 +1,5 @@
 {
   pname,
-  channel,
-  lib,
   writeScript,
   xidel,
   coreutils,
@@ -16,10 +14,6 @@
   versionSuffix ? "",
 }:
 
-let
-  isBeta = channel != "release";
-
-in
 writeScript "update-${pname}" ''
   #!${runtimeShell}
   PATH=${coreutils}/bin:${gnused}/bin:${gnugrep}/bin:${xidel}/bin:${curl}/bin:${gnupg}/bin
@@ -49,9 +43,7 @@ writeScript "update-${pname}" ''
            grep "^[0-9]" | \
            sort --version-sort | \
            grep -v "funnelcake" | \
-           grep -e "${lib.optionalString isBeta "b"}\([[:digit:]]\|[[:digit:]][[:digit:]]\)${versionSuffix}$" | ${
-             lib.optionalString (!isBeta) "grep -v \"b\" |"
-           } \
+           grep -e "\([[:digit:]]\|[[:digit:]][[:digit:]]\)${versionSuffix}$" | grep -v "b" | \
            tail -1`
 
   curl --silent -o $HOME/shasums "$url$version/SHA256SUMS"
@@ -94,7 +86,7 @@ writeScript "update-${pname}" ''
   }
   EOF
 
-  mv $tmpfile ${channel}${if versionSuffix == "" then "" else "_${versionSuffix}"}_sources.nix
+  mv $tmpfile release${if versionSuffix == "" then "" else "_${versionSuffix}"}_sources.nix
 
   popd
 ''
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
index f86e352bcc6a..a94c451aa0e7 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
@@ -104,7 +104,6 @@ stdenv.mkDerivation {
   passthru.updateScript = import ./../../browsers/firefox-bin/update.nix {
     inherit
       pname
-      lib
       writeScript
       xidel
       coreutils
@@ -116,7 +115,6 @@ stdenv.mkDerivation {
       versionSuffix
       ;
     baseName = "thunderbird";
-    channel = "release";
     basePath = "pkgs/applications/networking/mailreaders/thunderbird-bin";
     baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/";
   };

From 6f0de2a6ca7be6b4c61cac780fb7425f2cee040f Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Sun, 15 Jun 2025 14:53:24 +0200
Subject: [PATCH 36/57] live-server: 0.10.0 -> 0.10.1

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

diff --git a/pkgs/by-name/li/live-server/package.nix b/pkgs/by-name/li/live-server/package.nix
index 0257a426b04f..666bff34497b 100644
--- a/pkgs/by-name/li/live-server/package.nix
+++ b/pkgs/by-name/li/live-server/package.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "live-server";
-  version = "0.10.0";
+  version = "0.10.1";
 
   src = fetchFromGitHub {
     owner = "lomirus";
     repo = "live-server";
     rev = "v${version}";
-    hash = "sha256-8NM3XJ7RC7cUNKN1DPW2huvkx7tfA8zDrETkwDMbaT8=";
+    hash = "sha256-0IP7F8+Vdl/h4+zcghRqowvzz6zjQYDTjMSZPuGOOj4=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-tUKhVDv+ZDGRpJC/sSYcQxYhGsAyOsflc+GeUyBaeEk=";
+  cargoHash = "sha256-MMeeUoj3vYd1lv15N3+qjHbn991IVMhIUCMd0isCNhk=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 31a3e7dc4165f2aff4c390a20fa5832ebf02ea56 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Sun, 15 Jun 2025 14:54:03 +0200
Subject: [PATCH 37/57] live-server: `rec` -> `finalAttrs`

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

diff --git a/pkgs/by-name/li/live-server/package.nix b/pkgs/by-name/li/live-server/package.nix
index 666bff34497b..8f8cd32cbde5 100644
--- a/pkgs/by-name/li/live-server/package.nix
+++ b/pkgs/by-name/li/live-server/package.nix
@@ -6,14 +6,14 @@
   pkg-config,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "live-server";
   version = "0.10.1";
 
   src = fetchFromGitHub {
     owner = "lomirus";
     repo = "live-server";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-0IP7F8+Vdl/h4+zcghRqowvzz6zjQYDTjMSZPuGOOj4=";
   };
 
@@ -33,4 +33,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = [ maintainers.philiptaron ];
     platforms = platforms.unix;
   };
-}
+})

From a93fbfd8f1bdfa3065fd8f80cf3af6dfe5d88cce Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Sun, 15 Jun 2025 14:55:17 +0200
Subject: [PATCH 38/57] live-server: remove `with lib;`

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

diff --git a/pkgs/by-name/li/live-server/package.nix b/pkgs/by-name/li/live-server/package.nix
index 8f8cd32cbde5..0429dfdfc32d 100644
--- a/pkgs/by-name/li/live-server/package.nix
+++ b/pkgs/by-name/li/live-server/package.nix
@@ -24,13 +24,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   buildInputs = [ openssl ];
 
-  meta = with lib; {
+  meta = {
     description = "Local network server with live reload feature for static pages";
     downloadPage = "https://github.com/lomirus/live-server/releases";
     homepage = "https://github.com/lomirus/live-server";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     mainProgram = "live-server";
-    maintainers = [ maintainers.philiptaron ];
-    platforms = platforms.unix;
+    maintainers = [ lib.maintainers.philiptaron ];
+    platforms = lib.platforms.unix;
   };
 })

From 3cbe2e254f54bce52f22226af4d8b55456ba3c31 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Sun, 15 Jun 2025 14:56:18 +0200
Subject: [PATCH 39/57] live-server: set `meta.changelog`

---
 pkgs/by-name/li/live-server/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/li/live-server/package.nix b/pkgs/by-name/li/live-server/package.nix
index 0429dfdfc32d..655331b52e5f 100644
--- a/pkgs/by-name/li/live-server/package.nix
+++ b/pkgs/by-name/li/live-server/package.nix
@@ -28,6 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Local network server with live reload feature for static pages";
     downloadPage = "https://github.com/lomirus/live-server/releases";
     homepage = "https://github.com/lomirus/live-server";
+    changelog = "https://github.com/lomirus/live-server/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     mainProgram = "live-server";
     maintainers = [ lib.maintainers.philiptaron ];

From c5454daaaf3d900478beaaf086a978b24b21cb6e Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Sun, 15 Jun 2025 14:57:19 +0200
Subject: [PATCH 40/57] live-server: set `passthru.updateScript`

---
 pkgs/by-name/li/live-server/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/li/live-server/package.nix b/pkgs/by-name/li/live-server/package.nix
index 655331b52e5f..f02c1f314641 100644
--- a/pkgs/by-name/li/live-server/package.nix
+++ b/pkgs/by-name/li/live-server/package.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   openssl,
   pkg-config,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -24,6 +25,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   buildInputs = [ openssl ];
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Local network server with live reload feature for static pages";
     downloadPage = "https://github.com/lomirus/live-server/releases";

From b21cbbc953c1bf01db74f20166fc27f6da007e58 Mon Sep 17 00:00:00 2001
From: Nikita Krasnov <nikita.nikita.krasnov@gmail.com>
Date: Sun, 15 Jun 2025 16:07:31 +0300
Subject: [PATCH 41/57] pkgs/README: `gtkspell` was renamed into `gspell`

https://github.com/NixOS/nixpkgs/blob/cbfb263ce1c171b034095fced9b85de27c967c48/pkgs/by-name/pa/pan/package.nix#L8
---
 pkgs/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/README.md b/pkgs/README.md
index 6201839f23c4..6c5c54f437a7 100644
--- a/pkgs/README.md
+++ b/pkgs/README.md
@@ -97,7 +97,7 @@ Now that this is out of the way. To add a package to Nixpkgs:
 
    - GNU Multiple Precision arithmetic library (GMP): [`pkgs/development/libraries/gmp`](development/libraries/gmp). Also done by the generic builder, but has a dependency on `m4`.
 
-   - Pan, a GTK-based newsreader: [`pkgs/by-name/pa/pan/package.nix`](./by-name/pa/pan/package.nix). Has an optional dependency on `gtkspell`, which is only built if `spellCheck` is `true`.
+   - Pan, a GTK-based newsreader: [`pkgs/by-name/pa/pan/package.nix`](./by-name/pa/pan/package.nix). Has an optional dependency on `gspell`, which is only built if `spellCheck` is `true`.
 
    - Apache HTTPD: [`pkgs/servers/http/apache-httpd/2.4.nix`](servers/http/apache-httpd/2.4.nix). A bunch of optional features, variable substitutions in the configure flags, a post-install hook, and miscellaneous hackery.
 

From ac4ce0327425a2d3b219b08234598550686a473f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 15 Jun 2025 19:00:49 +0200
Subject: [PATCH 42/57] nixos/pdns-recursor: configure as local resolver

When pdns-recursor is enabled it should ideally be the default resolver
for the host as well. This is probably good for 95% of the use-cases out
there, and the default for unbound and kresd, but also bind and dnsmasq.
---
 nixos/modules/services/networking/pdns-recursor.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/networking/pdns-recursor.nix b/nixos/modules/services/networking/pdns-recursor.nix
index 04ae59b7fca9..581c206eb3c7 100644
--- a/nixos/modules/services/networking/pdns-recursor.nix
+++ b/nixos/modules/services/networking/pdns-recursor.nix
@@ -252,6 +252,8 @@ in
 
     environment.etc."/pdns-recursor/recursor.yml".source = configFile;
 
+    networking.resolvconf.useLocalResolver = lib.mkDefault true;
+
     services.pdns-recursor.yaml-settings = {
       incoming = mkDefaultAttrs {
         listen = cfg.dns.address;

From 310d1b95a6a12546cf785c9ebee1eb36648bcb46 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 15 Jun 2025 17:12:58 +0000
Subject: [PATCH 43/57] ollama: 0.9.0 -> 0.9.1

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

diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix
index 0a5c925c77bd..6857406a107a 100644
--- a/pkgs/by-name/ol/ollama/package.nix
+++ b/pkgs/by-name/ol/ollama/package.nix
@@ -117,17 +117,17 @@ in
 goBuild (finalAttrs: {
   pname = "ollama";
   # don't forget to invalidate all hashes each update
-  version = "0.9.0";
+  version = "0.9.1";
 
   src = fetchFromGitHub {
     owner = "ollama";
     repo = "ollama";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+8UHE9M2JWUARuuIRdKwNkn1hoxtuitVH7do5V5uEg0=";
+    hash = "sha256-6ha8aGRljb/uN+CtPpZDpcAVmpZccCq/1TSCQ5FVL8E=";
     fetchSubmodules = true;
   };
 
-  vendorHash = "sha256-t7+GLNC6mRcXq9ErxN6gGki5WWWoEcMfzRVjta4fddA=";
+  vendorHash = "sha256-svJt7Cuy+auVd8II3+JaAefiZcG88QyDgjWPnpoxfts=";
 
   env =
     lib.optionalAttrs enableRocm {

From cdeb77eb7df28c0196e587fb6d09afb9c1777086 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Mon, 16 Jun 2025 01:26:26 +0800
Subject: [PATCH 44/57] flet-client-flutter: 0.27.6 -> 0.28.3

---
 .../fl/flet-client-flutter/package.nix        |   8 +-
 .../fl/flet-client-flutter/pubspec.lock.json  | 108 +++++++++---------
 2 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/pkgs/by-name/fl/flet-client-flutter/package.nix b/pkgs/by-name/fl/flet-client-flutter/package.nix
index 460e6af4cfa3..d3668ce55c0d 100644
--- a/pkgs/by-name/fl/flet-client-flutter/package.nix
+++ b/pkgs/by-name/fl/flet-client-flutter/package.nix
@@ -2,7 +2,7 @@
   lib,
   fetchFromGitHub,
   pkg-config,
-  flutter327,
+  flutter329,
   gst_all_1,
   libunwind,
   makeWrapper,
@@ -18,15 +18,15 @@
   fletTarget ? "linux",
 }:
 
-flutter327.buildFlutterApplication rec {
+flutter329.buildFlutterApplication rec {
   pname = "flet-client-flutter";
-  version = "0.27.6";
+  version = "0.28.3";
 
   src = fetchFromGitHub {
     owner = "flet-dev";
     repo = "flet";
     tag = "v${version}";
-    hash = "sha256-ZtIAfLdj9209ZzgmNzTHMyzCTohxYK0Va4M8NYyie64=";
+    hash = "sha256-fD42AcfU3a/7sNvLE81pd1jdwUn5dEro3uKzaRBCWIU=";
   };
 
   sourceRoot = "${src.name}/client";
diff --git a/pkgs/by-name/fl/flet-client-flutter/pubspec.lock.json b/pkgs/by-name/fl/flet-client-flutter/pubspec.lock.json
index ef2b7145add1..4800dc547cd7 100644
--- a/pkgs/by-name/fl/flet-client-flutter/pubspec.lock.json
+++ b/pkgs/by-name/fl/flet-client-flutter/pubspec.lock.json
@@ -24,11 +24,11 @@
       "dependency": "transitive",
       "description": {
         "name": "async",
-        "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c",
+        "sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.11.0"
+      "version": "2.12.0"
     },
     "audioplayers": {
       "dependency": "transitive",
@@ -104,21 +104,21 @@
       "dependency": "transitive",
       "description": {
         "name": "boolean_selector",
-        "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66",
+        "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.1"
+      "version": "2.1.2"
     },
     "characters": {
       "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",
@@ -144,21 +144,21 @@
       "dependency": "transitive",
       "description": {
         "name": "clock",
-        "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf",
+        "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.1"
+      "version": "1.1.2"
     },
     "collection": {
       "dependency": "transitive",
       "description": {
         "name": "collection",
-        "sha256": "a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf",
+        "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.19.0"
+      "version": "1.19.1"
     },
     "cross_file": {
       "dependency": "transitive",
@@ -264,41 +264,41 @@
       "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": "transitive",
       "description": {
         "name": "ffi",
-        "sha256": "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21",
+        "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.2"
+      "version": "2.1.3"
     },
     "file": {
       "dependency": "transitive",
       "description": {
         "name": "file",
-        "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c",
+        "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.0.0"
+      "version": "7.0.1"
     },
     "file_picker": {
       "dependency": "transitive",
       "description": {
         "name": "file_picker",
-        "sha256": "aac85f20436608e01a6ffd1fdd4e746a7f33c93a2c83752e626bdfaea139b877",
+        "sha256": "ab13ae8ef5580a411c458d6207b6774a6c237d77ac37011b13994879f68a8810",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.1.3"
+      "version": "8.3.7"
     },
     "fixnum": {
       "dependency": "transitive",
@@ -327,7 +327,7 @@
         "relative": true
       },
       "source": "path",
-      "version": "0.27.5"
+      "version": "0.27.6"
     },
     "flet_ads": {
       "dependency": "direct main",
@@ -542,11 +542,11 @@
       "dependency": "transitive",
       "description": {
         "name": "flutter_plugin_android_lifecycle",
-        "sha256": "9d98bd47ef9d34e803d438f17fd32b116d31009f534a6fa5ce3a1167f189a6de",
+        "sha256": "615a505aef59b151b46bbeef55b36ce2b6ed299d160c51d84281946f0aa0ce0e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.21"
+      "version": "2.0.24"
     },
     "flutter_redux": {
       "dependency": "transitive",
@@ -756,21 +756,21 @@
       "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",
@@ -846,11 +846,11 @@
       "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",
@@ -956,11 +956,11 @@
       "dependency": "transitive",
       "description": {
         "name": "meta",
-        "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7",
+        "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.15.0"
+      "version": "1.16.0"
     },
     "mgrs_dart": {
       "dependency": "transitive",
@@ -996,11 +996,11 @@
       "dependency": "transitive",
       "description": {
         "name": "path",
-        "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af",
+        "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.9.0"
+      "version": "1.9.1"
     },
     "path_parsing": {
       "dependency": "transitive",
@@ -1146,11 +1146,11 @@
       "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": "transitive",
@@ -1176,11 +1176,11 @@
       "dependency": "transitive",
       "description": {
         "name": "process",
-        "sha256": "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32",
+        "sha256": "107d8be718f120bbba9dcd1e95e3bd325b1b4a4f07db64154635ba03f2567a0d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.0.2"
+      "version": "5.0.3"
     },
     "proj4dart": {
       "dependency": "transitive",
@@ -1512,11 +1512,11 @@
       "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",
@@ -1532,31 +1532,31 @@
       "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"
     },
     "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"
     },
     "sync_http": {
       "dependency": "transitive",
@@ -1582,21 +1582,21 @@
       "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"
     },
     "torch_light": {
       "dependency": "transitive",
@@ -1792,11 +1792,11 @@
       "dependency": "transitive",
       "description": {
         "name": "vm_service",
-        "sha256": "f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b",
+        "sha256": "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "14.3.0"
+      "version": "14.3.1"
     },
     "volume_controller": {
       "dependency": "transitive",
@@ -1832,11 +1832,11 @@
       "dependency": "transitive",
       "description": {
         "name": "web",
-        "sha256": "d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062",
+        "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.0"
+      "version": "1.1.0"
     },
     "web_socket_channel": {
       "dependency": "transitive",
@@ -1912,11 +1912,11 @@
       "dependency": "transitive",
       "description": {
         "name": "win32",
-        "sha256": "015002c060f1ae9f41a818f2d5640389cc05283e368be19dc8d77cecb43c40c9",
+        "sha256": "daf97c9d80197ed7b619040e86c8ab9a9dad285e7671ee7390f9180cc828a51e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.5.3"
+      "version": "5.10.1"
     },
     "win32_registry": {
       "dependency": "transitive",
@@ -1990,7 +1990,7 @@
     }
   },
   "sdks": {
-    "dart": ">=3.5.0 <4.0.0",
+    "dart": ">=3.7.0-0 <4.0.0",
     "flutter": ">=3.24.0"
   }
 }

From f2adfea468a8298f551a7287de9413ea0686a721 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 15 Jun 2025 19:31:26 +0200
Subject: [PATCH 45/57] python313Packages.numexpr: 2.10.2 -> 2.11.0

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

diff --git a/pkgs/development/python-modules/numexpr/default.nix b/pkgs/development/python-modules/numexpr/default.nix
index 294357dc833a..2c6a4c3de606 100644
--- a/pkgs/development/python-modules/numexpr/default.nix
+++ b/pkgs/development/python-modules/numexpr/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "numexpr";
-  version = "2.10.2";
+  version = "2.11.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-sK/2tI68mdL1Tye19zpYy5L95lCu/xs5fHHIeItP/xo=";
+    hash = "sha256-dbLAGk7aLnw1e8Z6P1w912UGwVtf1NxChF7y4YIYG60=";
   };
 
   build-system = [

From 4fc90bff17ef453593ee46b80bb0551451826a1f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 15 Jun 2025 19:38:27 +0200
Subject: [PATCH 46/57] python3Packages.numba: relax numpy constraint

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

diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix
index 322c00746e05..467f33626080 100644
--- a/pkgs/development/python-modules/numba/default.nix
+++ b/pkgs/development/python-modules/numba/default.nix
@@ -58,6 +58,11 @@ buildPythonPackage rec {
       --replace-fail \
         "dldir = [" \
         "dldir = [ '${addDriverRunpath.driverLink}/lib', "
+
+    substituteInPlace setup.py \
+      --replace-fail 'max_numpy_run_version = "2.3"' 'max_numpy_run_version = "2.4"'
+    substituteInPlace numba/__init__.py \
+      --replace-fail "numpy_version > (2, 2)" "numpy_version > (2, 3)"
   '';
 
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-I${lib.getInclude stdenv.cc.libcxx}/include/c++/v1";

From 51c8185f02751e5aaaf362a492a1b4a0fd0416cb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 15 Jun 2025 20:05:59 +0200
Subject: [PATCH 47/57] python3Packages.wagtail: relax django-tasks constraint

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

diff --git a/pkgs/development/python-modules/wagtail/default.nix b/pkgs/development/python-modules/wagtail/default.nix
index 450b9207c3bf..f36f7602a0bf 100644
--- a/pkgs/development/python-modules/wagtail/default.nix
+++ b/pkgs/development/python-modules/wagtail/default.nix
@@ -46,6 +46,8 @@ buildPythonPackage rec {
     setuptools
   ];
 
+  pythonRelaxDeps = [ "django-tasks" ];
+
   dependencies = [
     anyascii
     beautifulsoup4

From 0b32094e4537257f4593b9aa2c334813dbf2e7a8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 15 Jun 2025 20:06:14 +0200
Subject: [PATCH 48/57] python3Packages.django-stubs: relax setuptools
 constraint

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

diff --git a/pkgs/development/python-modules/django-stubs/default.nix b/pkgs/development/python-modules/django-stubs/default.nix
index 4ea355d8d7e5..fe7267097073 100644
--- a/pkgs/development/python-modules/django-stubs/default.nix
+++ b/pkgs/development/python-modules/django-stubs/default.nix
@@ -27,6 +27,11 @@ buildPythonPackage rec {
     hash = "sha256-B+JcLTy/9b5UAif/N3GcyJ8hXfqqpesDinWwG7+7JyI=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "setuptools<79.0.0" setuptools
+  '';
+
   build-system = [ setuptools ];
 
   dependencies = [

From 181ab63cec8fed3aaab1f851cd255fa10cca3d19 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Wed, 4 Jun 2025 22:42:08 -0400
Subject: [PATCH 49/57] ocamlPackages.prelude: init at 0.5

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 .../ocaml-modules/prelude/default.nix         | 29 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/prelude/default.nix

diff --git a/pkgs/development/ocaml-modules/prelude/default.nix b/pkgs/development/ocaml-modules/prelude/default.nix
new file mode 100644
index 000000000000..06424b840d1a
--- /dev/null
+++ b/pkgs/development/ocaml-modules/prelude/default.nix
@@ -0,0 +1,29 @@
+{
+  lib,
+  buildDunePackage,
+  fetchzip,
+}:
+
+buildDunePackage rec {
+  pname = "prelude";
+  version = "0.5";
+
+  minimalOCamlVersion = "4.13";
+
+  # upstream git repo is misconfigured and cannot be cloned
+  src = fetchzip {
+    url = "https://git.zapashcanon.fr/zapashcanon/prelude/archive/${version}.tar.gz";
+    hash = "sha256-lti+q1U/eEasAXo0O5YEu4iw7947V9bdvSHA0IEMS8M=";
+  };
+
+  doCheck = true;
+
+  meta = {
+    description = "Library to enforce good stdlib practices";
+    homepage = "https://ocaml.org/p/prelude/";
+    downloadPage = "https://git.zapashcanon.fr/zapashcanon/prelude";
+    changelog = "https://git.zapashcanon.fr/zapashcanon/prelude/src/tag/${version}/CHANGES.md";
+    license = lib.licenses.agpl3Plus;
+    maintainers = [ lib.maintainers.ethancedwards8 ];
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 9c4cb158b5b5..b0c593871bf9 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1768,6 +1768,8 @@ let
 
         pratter = callPackage ../development/ocaml-modules/pratter { };
 
+        prelude = callPackage ../development/ocaml-modules/prelude { };
+
         prettym = callPackage ../development/ocaml-modules/prettym { };
 
         printbox = callPackage ../development/ocaml-modules/printbox { };

From b4c885c88864447ccaa1e452939ff24c1a66a42f Mon Sep 17 00:00:00 2001
From: Savyasachee Jha <genghizkhan91@hawkradius.com>
Date: Sun, 15 Jun 2025 20:17:58 +0200
Subject: [PATCH 50/57] firefly-iii: fix version-regex so that ryantm can
 update package properly

---
 pkgs/by-name/fi/firefly-iii/package.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/fi/firefly-iii/package.nix b/pkgs/by-name/fi/firefly-iii/package.nix
index 21f8a88cd75b..005f8b172f2f 100644
--- a/pkgs/by-name/fi/firefly-iii/package.nix
+++ b/pkgs/by-name/fi/firefly-iii/package.nix
@@ -55,7 +55,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   passthru = {
     phpPackage = php84;
     tests = nixosTests.firefly-iii;
-    updateScript = nix-update-script { extraArgs = [ "--version-regex='v([0-9]+\.[0-9]+\.[0-9]+)'" ]; };
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--version-regex"
+        "v(\\d+\\.\\d+\\.\\d+)"
+      ];
+    };
   };
 
   postInstall = ''

From 800a6e09e1fcd9e0f2643add68060db9dbcdc95d Mon Sep 17 00:00:00 2001
From: Savyasachee Jha <genghizkhan91@hawkradius.com>
Date: Sun, 15 Jun 2025 20:18:11 +0200
Subject: [PATCH 51/57] firefly-iii-data-importer: fix version-regex so that
 ryantm can update package properly

---
 pkgs/by-name/fi/firefly-iii-data-importer/package.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix
index e80858c75720..3f5dbe669942 100644
--- a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix
+++ b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix
@@ -66,7 +66,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   passthru = {
     phpPackage = php84;
     tests = nixosTests.firefly-iii-data-importer;
-    updateScript = nix-update-script { extraArgs = [ "--version-regex='v([0-9]+\.[0-9]+\.[0-9]+)'" ]; };
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--version-regex"
+        "v(\\d+\\.\\d+\\.\\d+)"
+      ];
+    };
   };
 
   postInstall = ''

From 5f695ca3c6bc45d5471e79fbbf9fe9f88af9a592 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 15 Jun 2025 18:48:38 +0000
Subject: [PATCH 52/57] tauno-monitor: 0.1.27 -> 0.1.28

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

diff --git a/pkgs/by-name/ta/tauno-monitor/package.nix b/pkgs/by-name/ta/tauno-monitor/package.nix
index 28be4982bffa..f3dd3945357b 100644
--- a/pkgs/by-name/ta/tauno-monitor/package.nix
+++ b/pkgs/by-name/ta/tauno-monitor/package.nix
@@ -13,14 +13,14 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "tauno-monitor";
-  version = "0.1.27";
+  version = "0.1.28";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "taunoe";
     repo = "tauno-monitor";
     tag = "v${version}";
-    hash = "sha256-QxapBgKKXuZxMIvZ8Z91cYhjE2/qxe9fC/eEaPpJWFg=";
+    hash = "sha256-DxWB69bkDAe35ci/e18Dji0EpZvbz7Y5y+32ZchV/m8=";
   };
 
   nativeBuildInputs = [

From 07f764e4b9089f9456c812514b3df03a6a816164 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Na=C3=AFm=20Camille=20Favier?= <n@monade.li>
Date: Sun, 15 Jun 2025 22:02:45 +0200
Subject: [PATCH 53/57] ibus-engines.typing-booster: remove ncfavier as
 maintainer

---
 .../inputmethods/ibus-engines/ibus-typing-booster/default.nix   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
index 0454a3915e33..8e3bf06ff62f 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3Plus;
     description = "Completion input method for faster typing";
     mainProgram = "emoji-picker";
-    maintainers = with maintainers; [ ncfavier ];
+    maintainers = with maintainers; [ ];
     platforms = platforms.linux;
     isIbusEngine = true;
   };

From 87c8d5f873fc90b68a4bb7399d0de0baee9ed985 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Sun, 15 Jun 2025 22:48:42 +0200
Subject: [PATCH 54/57] departure-mono: 1.422 -> 1.500

Diff: https://github.com/rektdeckard/departure-mono/compare/v1.422...v1.500

Changelog: https://github.com/rektdeckard/departure-mono/releases/tag/v1.500
---
 pkgs/by-name/de/departure-mono/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/de/departure-mono/package.nix b/pkgs/by-name/de/departure-mono/package.nix
index 4da0fb495d77..84b4381e9f53 100644
--- a/pkgs/by-name/de/departure-mono/package.nix
+++ b/pkgs/by-name/de/departure-mono/package.nix
@@ -6,20 +6,20 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "departure-mono";
-  version = "1.422";
+  version = "1.500";
 
   src = fetchzip {
     url = "https://github.com/rektdeckard/departure-mono/releases/download/v${finalAttrs.version}/DepartureMono-${finalAttrs.version}.zip";
     stripRoot = false;
-    hash = "sha256-9CcXd7PLxkzQt0oT/asZO9mowtXtjPBfuKphfGgM/y8=";
+    hash = "sha256-XYL76L266MKqClxfbPn/C6+x/vcs7AD56DtiDmQam2A=";
   };
 
   installPhase = ''
     runHook preInstall
 
-    install -D -m 444 *.otf -t $out/share/fonts/otf
-    install -D -m 444 *.woff -t $out/share/fonts/woff
-    install -D -m 444 *.woff2 -t $out/share/fonts/woff2
+    install -D -m 444 DepartureMono-1.500/*.otf -t $out/share/fonts/otf
+    install -D -m 444 DepartureMono-1.500/*.woff -t $out/share/fonts/woff
+    install -D -m 444 DepartureMono-1.500/*.woff2 -t $out/share/fonts/woff2
 
     runHook postInstall
   '';

From 0a6e4565ca3a5ce227f9152f35924fa869314803 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 15 Jun 2025 21:10:07 +0000
Subject: [PATCH 55/57] python3Packages.test2ref: 0.8.2 -> 1.1.0

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

diff --git a/pkgs/development/python-modules/test2ref/default.nix b/pkgs/development/python-modules/test2ref/default.nix
index 4b85ef83314b..355372aac8bc 100644
--- a/pkgs/development/python-modules/test2ref/default.nix
+++ b/pkgs/development/python-modules/test2ref/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "test2ref";
-  version = "0.8.2";
+  version = "1.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "nbiotcloud";
     repo = "test2ref";
     tag = "v${version}";
-    hash = "sha256-Rgm7qZc1pFY/9gwzHjnI305Ch9enXzzWRsPZ7CQjzpQ=";
+    hash = "sha256-m95undMr1W2GRcSELv7s9kpuXyu+HnGo+huc0Uh9rQI=";
   };
 
   build-system = [
@@ -38,7 +38,7 @@ buildPythonPackage rec {
   meta = {
     description = "Testing Against Learned Reference Data";
     homepage = "https://github.com/nbiotcloud/test2ref";
-    changelog = "https://github.com/nbiotcloud/test2ref/releases/tag/v${version}";
+    changelog = "https://github.com/nbiotcloud/test2ref/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ GaetanLepage ];
   };

From 40a116fcae5cc49720e108e13733f20882087538 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 6 Jun 2025 00:39:25 +0200
Subject: [PATCH 56/57] nixos/gitea: add support for minio secrets

---
 nixos/modules/services/misc/gitea.nix | 30 +++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix
index a393abf8aa08..568a301232f9 100644
--- a/nixos/modules/services/misc/gitea.nix
+++ b/nixos/modules/services/misc/gitea.nix
@@ -373,6 +373,20 @@ in
         description = "Path to a file containing the metrics authentication token.";
       };
 
+      minioAccessKeyId = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        example = "/var/lib/secrets/gitea/minio_access_key_id";
+        description = "Path to a file containing the Minio access key id.";
+      };
+
+      minioSecretAccessKey = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        example = "/var/lib/secrets/gitea/minio_secret_access_key";
+        description = "Path to a file containing the Minio secret access key.";
+      };
+
       settings = mkOption {
         default = { };
         description = ''
@@ -655,6 +669,15 @@ in
         };
 
         packages.CHUNKED_UPLOAD_PATH = "${cfg.stateDir}/tmp/package-upload";
+
+        storage = mkMerge [
+          (mkIf (cfg.minioAccessKeyId != null) {
+            MINIO_ACCESS_KEY_ID = "#minioaccesskeyid#";
+          })
+          (mkIf (cfg.minioSecretAccessKey != null) {
+            MINIO_SECRET_ACCESS_KEY = "#miniosecretaccesskey#";
+          })
+        ];
       };
 
     services.postgresql = optionalAttrs (usePostgresql && cfg.database.createDatabase) {
@@ -797,6 +820,13 @@ in
               ${replaceSecretBin} '#metricstoken#' '${cfg.metricsTokenFile}' '${runConfig}'
             ''}
 
+            ${lib.optionalString (cfg.minioAccessKeyId != null) ''
+              ${replaceSecretBin} '#minioaccesskeyid#' '${cfg.minioAccessKeyId}' '${runConfig}'
+            ''}
+            ${lib.optionalString (cfg.minioSecretAccessKey != null) ''
+              ${replaceSecretBin} '#miniosecretaccesskey#' '${cfg.minioSecretAccessKey}' '${runConfig}'
+            ''}
+
             ${lib.optionalString (cfg.captcha.secretFile != null) ''
               ${replaceSecretBin} '#captchasecret#' '${cfg.captcha.secretFile}' '${runConfig}'
             ''}

From 5f33d95144f8a41401609c6956486d4025d24817 Mon Sep 17 00:00:00 2001
From: Jacob Birkett <jacob@birkett.dev>
Date: Fri, 4 Apr 2025 02:57:44 -0700
Subject: [PATCH 57/57] services: openvpn: servers: authUserPass: allow to be a
 path

This allows using an agenix file.
---
 nixos/modules/services/networking/openvpn.nix | 46 +++++++++++--------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/nixos/modules/services/networking/openvpn.nix b/nixos/modules/services/networking/openvpn.nix
index 0231e434477a..bdedfd9900d5 100644
--- a/nixos/modules/services/networking/openvpn.nix
+++ b/nixos/modules/services/networking/openvpn.nix
@@ -53,12 +53,15 @@ let
         ${optionalString (
           cfg.down != "" || cfg.updateResolvConf
         ) "down ${pkgs.writeShellScript "openvpn-${name}-down" downScript}"}
-        ${optionalString (cfg.authUserPass != null)
-          "auth-user-pass ${pkgs.writeText "openvpn-credentials-${name}" ''
-            ${cfg.authUserPass.username}
-            ${cfg.authUserPass.password}
-          ''}"
-        }
+        ${optionalString (cfg.authUserPass != null) (
+          if isAttrs cfg.authUserPass then
+            "auth-user-pass ${pkgs.writeText "openvpn-credentials-${name}" ''
+              ${cfg.authUserPass.username}
+              ${cfg.authUserPass.password}
+            ''}"
+          else
+            "auth-user-pass ${cfg.authUserPass}"
+        )}
       '';
 
     in
@@ -202,23 +205,28 @@ in
                 This option can be used to store the username / password credentials
                 with the "auth-user-pass" authentication method.
 
-                WARNING: Using this option will put the credentials WORLD-READABLE in the Nix store!
+                You can either provide an attribute set of `username` and `password`,
+                or the path to a file containing the credentials on two lines.
+
+                WARNING: If you use an attribute set, this option will put the credentials WORLD-READABLE into the Nix store!
               '';
               type = types.nullOr (
-                types.submodule {
+                types.oneOf [
+                  types.singleLineStr
+                  (types.submodule {
+                    options = {
+                      username = mkOption {
+                        description = "The username to store inside the credentials file.";
+                        type = types.str;
+                      };
 
-                  options = {
-                    username = mkOption {
-                      description = "The username to store inside the credentials file.";
-                      type = types.str;
+                      password = mkOption {
+                        description = "The password to store inside the credentials file.";
+                        type = types.str;
+                      };
                     };
-
-                    password = mkOption {
-                      description = "The password to store inside the credentials file.";
-                      type = types.str;
-                    };
-                  };
-                }
+                  })
+                ]
               );
             };
           };