diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 7355e95286da..87ca92510536 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -13299,6 +13299,12 @@
     name = "Joshua Suskalo";
     githubId = 27734541;
   };
+  jtamagnan = {
+    email = "jtamagnan@gmail.com";
+    github = "jtamagnan";
+    githubId = 5892061;
+    name = "Jules Tamagnan";
+  };
   jtbx = {
     email = "jeremy@baxters.nz";
     name = "Jeremy Baxter";
diff --git a/nixos/modules/services/misc/gollum.nix b/nixos/modules/services/misc/gollum.nix
index 525333d80d11..7179273f07ae 100644
--- a/nixos/modules/services/misc/gollum.nix
+++ b/nixos/modules/services/misc/gollum.nix
@@ -145,10 +145,16 @@ in
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
       path = [ pkgs.git ];
-
       preStart = ''
-        # This is safe to be run on an existing repo
-        git init ${cfg.stateDir}
+        # Check if it's a bare repository.
+        IS_BARE=$(git -C "${cfg.stateDir}" rev-parse --is-bare-repository 2>/dev/null || echo "false")
+
+        if [ "$IS_BARE" = "true" ]; then
+          echo "Directory is a bare repository. Skipping initialization."
+        else
+          echo "Directory is not a bare repository. Initializing..."
+          git init "${cfg.stateDir}"
+        fi
       '';
 
       serviceConfig = {
diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index e01bbea8acf5..e56854ec3aa8 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -22902,6 +22902,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  vivify-vim = buildVimPlugin {
+    pname = "vivify.vim";
+    version = "0-unstable-2025-08-08";
+    src = fetchFromGitHub {
+      owner = "jannis-baum";
+      repo = "vivify.vim";
+      rev = "99a1539a440633ee7a164e094a736c04acc2335d";
+      hash = "sha256-tF77R2WHSc+YXltWkntNFC8mouaEYn640PqCfis0zW0=";
+    };
+    meta.homepage = "https://github.com/jannis-baum/vivify.vim/";
+    meta.hydraPlatforms = [ ];
+  };
+
   vs-tasks-nvim = buildVimPlugin {
     pname = "vs-tasks.nvim";
     version = "0-unstable-2025-10-27";
@@ -23344,19 +23357,6 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
-  yanky-nvim = buildVimPlugin {
-    pname = "yanky.nvim";
-    version = "2.0.0-unstable-2026-03-12";
-    src = fetchFromGitHub {
-      owner = "gbprod";
-      repo = "yanky.nvim";
-      rev = "784188e0a7363e762e53140f39124d786aec0832";
-      hash = "sha256-oGiXbSXo48NbaImzIKquEvplPCotLeIs4scvbhO6wyA=";
-    };
-    meta.homepage = "https://github.com/gbprod/yanky.nvim/";
-    meta.hydraPlatforms = [ ];
-  };
-
   yank-path-nvim = buildVimPlugin {
     pname = "yank-path.nvim";
     version = "0-unstable-2025-12-11";
@@ -23370,6 +23370,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  yanky-nvim = buildVimPlugin {
+    pname = "yanky.nvim";
+    version = "2.0.0-unstable-2026-03-12";
+    src = fetchFromGitHub {
+      owner = "gbprod";
+      repo = "yanky.nvim";
+      rev = "784188e0a7363e762e53140f39124d786aec0832";
+      hash = "sha256-oGiXbSXo48NbaImzIKquEvplPCotLeIs4scvbhO6wyA=";
+    };
+    meta.homepage = "https://github.com/gbprod/yanky.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
   yats-vim = buildVimPlugin {
     pname = "yats.vim";
     version = "0-unstable-2025-12-09";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 15da18f94e6d..263991c981a8 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -1759,6 +1759,7 @@ https://github.com/vim-scripts/vis/,,
 https://github.com/navicore/vissort.vim/,,
 https://github.com/liuchengxu/vista.vim/,,
 https://github.com/mcauley-penney/visual-whitespace.nvim/,HEAD,
+https://github.com/jannis-baum/vivify.vim/,HEAD,
 https://github.com/EthanJWright/vs-tasks.nvim/,HEAD,
 https://github.com/Mofiqul/vscode.nvim/,,
 https://github.com/dylanaraps/wal.vim/,,
@@ -1793,8 +1794,8 @@ https://github.com/guns/xterm-color-table.vim/,,
 https://github.com/y9san9/y9nika.nvim/,HEAD,
 https://github.com/someone-stole-my-name/yaml-companion.nvim/,HEAD,
 https://github.com/cwrau/yaml-schema-detect.nvim/,HEAD,
-https://github.com/gbprod/yanky.nvim/,HEAD,
 https://github.com/ywpkwon/yank-path.nvim/,HEAD,
+https://github.com/gbprod/yanky.nvim/,HEAD,
 https://github.com/HerringtonDarkholme/yats.vim/,,
 https://github.com/mikavilpas/yazi.nvim/,HEAD,
 https://github.com/lucasew/yescapsquit.vim/,HEAD,
diff --git a/pkgs/applications/emulators/libretro/cores/beetle-wswan.nix b/pkgs/applications/emulators/libretro/cores/beetle-wswan.nix
index ba88ac5735c9..5c971144454e 100644
--- a/pkgs/applications/emulators/libretro/cores/beetle-wswan.nix
+++ b/pkgs/applications/emulators/libretro/cores/beetle-wswan.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "mednafen-wswan";
-  version = "0-unstable-2024-10-21";
+  version = "0-unstable-2026-03-31";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "beetle-wswan-libretro";
-    rev = "2aeb47d3a58bf0360c686f842d9bb5bd201306fe";
-    hash = "sha256-LrF9p5tPtUamVLC41bJxcYDKvHmhVfwMieyIAdHaGmU=";
+    rev = "392db084316475411f3f24bd1ea54dba72ecbe51";
+    hash = "sha256-GbjE2PqfZGrP9tp4TgyIzdyyC1PatGiQRSscsmcIbPQ=";
   };
 
   makefile = "Makefile";
diff --git a/pkgs/applications/emulators/libretro/cores/fceumm.nix b/pkgs/applications/emulators/libretro/cores/fceumm.nix
index ad8a8f041292..6fa3f34743a3 100644
--- a/pkgs/applications/emulators/libretro/cores/fceumm.nix
+++ b/pkgs/applications/emulators/libretro/cores/fceumm.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "fceumm";
-  version = "0-unstable-2025-09-13";
+  version = "0-unstable-2026-03-31";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "libretro-fceumm";
-    rev = "5cd4a43e16a7f3cd35628d481c347a0a98cfdfa2";
-    hash = "sha256-/FvXQlp20QMFg1uPmj2HSJFXhzBunygOmGEtGNGJyxk=";
+    rev = "dbf1f2eb83ebde54a32fbe4f906b5ad89a863c0b";
+    hash = "sha256-UGssF6x/H5met7f2hC6str2urvCZRj/Oqp2R0rv2RUw=";
   };
 
   meta = {
diff --git a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix
index de3c2cde38eb..97b28bbcdbc0 100644
--- a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix
+++ b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "genesis-plus-gx";
-  version = "0-unstable-2026-03-06";
+  version = "0-unstable-2026-03-31";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "Genesis-Plus-GX";
-    rev = "d446078a385a5acae701f4b3b6b3fd58476d73d3";
-    hash = "sha256-jw8vj3fTHwBH6h+OelVJHNqy86DKFlohhIeQ9TLkGjc=";
+    rev = "ee71e47c8d4b3b73b596dea1d8a6bf8d2cac7662";
+    hash = "sha256-f7Ox204WmvPwwLce5/ztADr5P5Z5JhVOn04vt7Ww1Ns=";
   };
 
   meta = {
diff --git a/pkgs/applications/emulators/libretro/cores/mame2015.nix b/pkgs/applications/emulators/libretro/cores/mame2015.nix
index feb2523f512c..b181972e4111 100644
--- a/pkgs/applications/emulators/libretro/cores/mame2015.nix
+++ b/pkgs/applications/emulators/libretro/cores/mame2015.nix
@@ -7,13 +7,13 @@
 }:
 mkLibretroCore {
   core = "mame2015";
-  version = "0-unstable-2023-10-31";
+  version = "0-unstable-2026-03-31";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "mame2015-libretro";
-    rev = "316cd06349f2b34b4719f04f7c0d07569a74c764";
-    hash = "sha256-CBN04Jf26SIk8mKWlui5spQGokBvgFUCvFiC8NoBGw0=";
+    rev = "48fdf6532f31e3bb8b58b9ae10198b047cd8de42";
+    hash = "sha256-z/SjAx615RZUOytoDPFFXl89E5063cbc0OFIV2/HZBo=";
   };
 
   patches = [ ./patches/mame2015-python311.patch ];
diff --git a/pkgs/applications/emulators/libretro/cores/nxengine.nix b/pkgs/applications/emulators/libretro/cores/nxengine.nix
index c9712892daab..8067ac6f1f07 100644
--- a/pkgs/applications/emulators/libretro/cores/nxengine.nix
+++ b/pkgs/applications/emulators/libretro/cores/nxengine.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "nxengine";
-  version = "0-unstable-2024-10-21";
+  version = "0-unstable-2026-03-31";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "nxengine-libretro";
-    rev = "9adc032a5f6aa913d71d22042bb72cb11cf0f4a2";
-    hash = "sha256-8XjZp18lQU3xFNDjIuNsSHn7Mhba8Lze/IeRsy8/U1U=";
+    rev = "990bdaacd6ed9db735ea625c948252d0b8a2100a";
+    hash = "sha256-41f2iHQi3gwla1gM2/rFvzTKhSIrJqYLZN+5f9Ylu7A=";
   };
 
   makefile = "Makefile";
diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix
index ce4066fca52f..a14996998471 100644
--- a/pkgs/applications/emulators/wine/sources.nix
+++ b/pkgs/applications/emulators/wine/sources.nix
@@ -151,9 +151,9 @@ rec {
 
   unstable = fetchurl rec {
     # NOTE: Don't forget to change the hash for staging as well.
-    version = "11.1";
+    version = "11.5";
     url = "https://dl.winehq.org/wine/source/11.x/wine-${version}.tar.xz";
-    hash = "sha256-v0x8j7XYwfZW8wor6pOHDIXxP/gxGrL2Hd75AOsoy48=";
+    hash = "sha256-ETcLV+pdVIpU2Syc1l0LpjX08cPq2s4J7RxBn3BeGdE=";
 
     patches = [
       # Also look for root certificates at $NIX_SSL_CERT_FILE
@@ -163,7 +163,7 @@ rec {
     # see https://gitlab.winehq.org/wine/wine-staging
     staging = fetchFromGitLab {
       inherit version;
-      hash = "sha256-KBiESkLVEEWyUPzv1I7j8U9zjqfYdF+FL6wRCcIE290=";
+      hash = "sha256-tkx1LB/iZoFvarMvc9QofuQLrZwZyaoL0FUh3nsvYjs=";
       domain = "gitlab.winehq.org";
       owner = "wine";
       repo = "wine-staging";
@@ -186,9 +186,9 @@ rec {
 
     ## see http://wiki.winehq.org/Mono
     mono = fetchurl rec {
-      version = "10.3.0";
+      version = "11.0.0";
       url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi";
-      hash = "sha256-zs5cYxgAlN/98B0PvjYqS2BuUoC5jN/RuFaM35tXL5g=";
+      hash = "sha256-1+/t4Lm9z1ITT4zWztWdn+zpdvcLEaQAvbR7hkVpzSc=";
     };
 
     updateScript = writeShellScript "update-wine-unstable" ''
diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix
index fffd5ddd398d..9174d6452f70 100644
--- a/pkgs/applications/gis/qgis/default.nix
+++ b/pkgs/applications/gis/qgis/default.nix
@@ -1,4 +1,6 @@
 {
+  lib,
+  stdenv,
   makeWrapper,
   nixosTests,
   symlinkJoin,
@@ -40,7 +42,8 @@ symlinkJoin {
         --prefix PATH : $program_PATH \
         --set PYTHONPATH $program_PYTHONPATH
     done
-
+  ''
+  + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
     ln -s ${qgis-unwrapped.man} $man
   '';
 
diff --git a/pkgs/applications/gis/qgis/ltr.nix b/pkgs/applications/gis/qgis/ltr.nix
index 21d906debaa4..7e8ce827e874 100644
--- a/pkgs/applications/gis/qgis/ltr.nix
+++ b/pkgs/applications/gis/qgis/ltr.nix
@@ -1,4 +1,6 @@
 {
+  lib,
+  stdenv,
   makeWrapper,
   nixosTests,
   symlinkJoin,
@@ -14,15 +16,13 @@
 }:
 let
   qgis-ltr-unwrapped = libsForQt5.callPackage ./unwrapped-ltr.nix {
-    withGrass = withGrass;
-    withServer = withServer;
-    withWebKit = withWebKit;
+    inherit withGrass withServer withWebKit;
   };
 in
 
 symlinkJoin {
-  inherit (qgis-ltr-unwrapped) version src;
-  pname = "qgis";
+  inherit (qgis-ltr-unwrapped) version outputs src;
+  pname = "qgis-ltr";
 
   paths = [ qgis-ltr-unwrapped ];
 
@@ -43,6 +43,9 @@ symlinkJoin {
         --prefix PATH : $program_PATH \
         --set PYTHONPATH $program_PYTHONPATH
     done
+  ''
+  + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
+    ln -s ${qgis-ltr-unwrapped.man} $man
   '';
 
   passthru = {
diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix
index 6ca7116a458f..de9d44d09f37 100644
--- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix
+++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix
@@ -1,6 +1,8 @@
 {
   lib,
+  stdenv,
   fetchFromGitHub,
+  lndir,
   makeWrapper,
   mkDerivation,
   replaceVars,
@@ -11,6 +13,8 @@
   withServer,
   withWebKit,
 
+  darwin,
+  libtasn1,
   bison,
   cmake,
   draco,
@@ -40,6 +44,7 @@
   qtmultimedia,
   qtsensors,
   qtserialport,
+  qtsvg,
   qtwebkit,
   qtxmlpatterns,
   qwt,
@@ -68,6 +73,7 @@ let
     psycopg2
     pygments
     pyqt5
+    pyqt5-sip
     pyqt-builder
     python-dateutil
     pytz
@@ -83,6 +89,7 @@ in
 mkDerivation rec {
   version = "3.40.15";
   pname = "qgis-ltr-unwrapped";
+  outputs = [ "out" ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) "man";
 
   src = fetchFromGitHub {
     owner = "qgis";
@@ -105,6 +112,10 @@ mkDerivation rec {
     cmake
     flex
     ninja
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    darwin.autoSignDarwinBinariesHook
+    lndir
   ];
 
   buildInputs = [
@@ -131,6 +142,7 @@ mkDerivation rec {
     qtmultimedia
     qtsensors
     qtserialport
+    qtsvg
     qtxmlpatterns
     qwt
     sqlite
@@ -139,6 +151,7 @@ mkDerivation rec {
   ]
   ++ lib.optional withGrass grass
   ++ lib.optional withWebKit qtwebkit
+  ++ lib.optional stdenv.hostPlatform.isDarwin libtasn1
   ++ pythonBuildInputs;
 
   patches = [
@@ -168,6 +181,10 @@ mkDerivation rec {
     # See https://github.com/libspatialindex/libspatialindex/issues/276
     "-DWITH_INTERNAL_SPATIALINDEX=True"
   ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "-DQGIS_MACAPP_BUNDLE=0" # Don't copy Qt into bundle; we fix paths in postFixup
+    "-DSQLITE3_INCLUDE_DIR=${sqlite.dev}/include" # FindSqlite3.cmake incorrectly assumes framework
+  ]
   ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF"
   ++ lib.optional withServer [
     "-DWITH_SERVER=True"
@@ -186,18 +203,102 @@ mkDerivation rec {
   ];
 
   dontWrapGApps = true; # wrapper params passed below
+  dontWrapQtApps = stdenv.hostPlatform.isDarwin;
 
-  postFixup = lib.optionalString withGrass ''
-    # GRASS has to be availble on the command line even though we baked in
-    # the path at build time using GRASS_PREFIX.
-    # Using wrapGAppsHook also prevents file dialogs from crashing the program
-    # on non-NixOS.
-    for program in $out/bin/*; do
-      wrapProgram $program \
-        "''${gappsWrapperArgs[@]}" \
-        --prefix PATH : ${lib.makeBinPath [ grass ]}
-    done
-  '';
+  postFixup =
+    lib.optionalString (withGrass && stdenv.hostPlatform.isLinux) ''
+      # GRASS has to be available on the command line even though we baked in
+      # the path at build time using GRASS_PREFIX.
+      # Using wrapGAppsHook also prevents file dialogs from crashing the program
+      # on non-NixOS.
+      for program in $out/bin/*; do
+        wrapProgram $program \
+          "''${gappsWrapperArgs[@]}" \
+          --prefix PATH : ${lib.makeBinPath [ grass ]}
+      done
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+            mkdir -p $out/Applications $out/bin
+            mv $out/QGIS.app $out/Applications/
+            ln -s $out/Applications/QGIS.app/Contents/MacOS/QGIS $out/bin/qgis
+
+            SHORT_VERSION=$(echo "${version}" | cut -d. -f1,2)
+            BUNDLE="$out/Applications/QGIS.app"
+            FRAMEWORKS="$BUNDLE/Contents/Frameworks"
+
+            fix_binary() {
+              local f="$1"
+              [[ -f "$f" ]] || return 0
+              file "$f" | grep -q "Mach-O" || return 0
+
+              install_name_tool \
+                -change "@loader_path/../lib/libqscintilla2_qt5.dylib" "${qscintilla}/lib/libqscintilla2_qt5.dylib" \
+                -change "@loader_path/../lib/libqt5keychain.dylib" "${qtkeychain}/lib/libqt5keychain.dylib" \
+                -change "@loader_path/../lib/libqwt.dylib" "${qwt}/lib/libqwt.dylib" \
+                -change "@loader_path/../../Frameworks/qca-qt5.framework/qca-qt5" "${qca-qt5}/lib/qca-qt5.framework/qca-qt5" \
+                -change "@loader_path/../../../qca-qt5.framework/qca-qt5" "${qca-qt5}/lib/qca-qt5.framework/qca-qt5" \
+                -change "@loader_path/../../../../MacOS/lib/libqscintilla2_qt5.dylib" "${qscintilla}/lib/libqscintilla2_qt5.dylib" \
+                -change "@loader_path/../../../../MacOS/lib/libqt5keychain.dylib" "${qtkeychain}/lib/libqt5keychain.dylib" \
+                -change "@loader_path/../../../../MacOS/lib/libqwt.dylib" "${qwt}/lib/libqwt.dylib" \
+                -change "@executable_path/lib/libqwt.dylib" "${qwt}/lib/libqwt.dylib" \
+                -change "@executable_path/lib/libqscintilla2_qt5.dylib" "${qscintilla}/lib/libqscintilla2_qt5.dylib" \
+                -change "@executable_path/lib/libqt5keychain.dylib" "${qtkeychain}/lib/libqt5keychain.dylib" \
+                -change "@executable_path/../Frameworks/qca-qt5.framework/qca-qt5" "${qca-qt5}/lib/qca-qt5.framework/qca-qt5" \
+                -change "@loader_path/../../../qgis_core.framework/qgis_core" "$FRAMEWORKS/qgis_core.framework/Versions/$SHORT_VERSION/qgis_core" \
+                -change "@loader_path/../../../qgis_gui.framework/qgis_gui" "$FRAMEWORKS/qgis_gui.framework/Versions/$SHORT_VERSION/qgis_gui" \
+                -change "@loader_path/../../../qgis_analysis.framework/qgis_analysis" "$FRAMEWORKS/qgis_analysis.framework/Versions/$SHORT_VERSION/qgis_analysis" \
+                -change "@loader_path/../../../qgis_3d.framework/qgis_3d" "$FRAMEWORKS/qgis_3d.framework/Versions/$SHORT_VERSION/qgis_3d" \
+                -change "@loader_path/../../../qgis_native.framework/qgis_native" "$FRAMEWORKS/qgis_native.framework/Versions/$SHORT_VERSION/qgis_native" \
+                "$f" 2>/dev/null || true
+            }
+
+            fix_binary "$BUNDLE/Contents/MacOS/QGIS"
+            for lib in "$BUNDLE/Contents/MacOS/lib"/*.dylib; do fix_binary "$lib"; done
+            for fw in qgis_core qgis_gui qgis_analysis qgis_3d qgis_native; do
+              fix_binary "$FRAMEWORKS/$fw.framework/Versions/$SHORT_VERSION/$fw"
+              [[ -f "$FRAMEWORKS/$fw.framework/$fw" && ! -L "$FRAMEWORKS/$fw.framework/$fw" ]] && \
+                fix_binary "$FRAMEWORKS/$fw.framework/$fw"
+            done
+            for plugin in "$BUNDLE/Contents/PlugIns/qgis"/*.so; do fix_binary "$plugin"; done
+
+            ${lib.optionalString withGrass ''
+              fix_binary "$FRAMEWORKS/qgisgrass8.framework/Versions/$SHORT_VERSION/qgisgrass8"
+              install_name_tool \
+                -change "@loader_path/../../../qgisgrass8.framework/qgisgrass8" "$FRAMEWORKS/qgisgrass8.framework/Versions/$SHORT_VERSION/qgisgrass8" \
+                "$BUNDLE/Contents/MacOS/QGIS" 2>/dev/null || true
+              for lib in "$BUNDLE/Contents/MacOS/lib"/*.dylib; do
+                install_name_tool \
+                  -change "@loader_path/../../../qgisgrass8.framework/qgisgrass8" "$FRAMEWORKS/qgisgrass8.framework/Versions/$SHORT_VERSION/qgisgrass8" \
+                  "$lib" 2>/dev/null || true
+              done
+            ''}
+
+            ${lib.optionalString withServer ''
+              fix_binary "$BUNDLE/Contents/MacOS/lib/libqgis_server.${version}.dylib"
+            ''}
+
+            # Merge Python packages (lndir handles namespace packages correctly)
+            QGIS_PYTHON="$BUNDLE/Contents/Resources/python"
+            for pkg in ${
+              lib.concatMapStringsSep " " (p: "${p}/${py.pkgs.python.sitePackages}") (
+                py.pkgs.requiredPythonModules pythonBuildInputs
+              )
+            }; do
+              [[ -d "$pkg" ]] && lndir -silent "$pkg" "$QGIS_PYTHON"
+            done
+            # Remove broken symlinks
+            find "$QGIS_PYTHON" -type l ! -exec test -e {} \; -delete
+
+            # Create merged Qt plugins directory in the bundle (LSEnvironment is unreliable)
+            mkdir -p "$BUNDLE/Contents/PlugIns"
+            lndir -silent "${qtbase}/${qtbase.qtPluginPrefix}" "$BUNDLE/Contents/PlugIns"
+            lndir -silent "${qtsvg.bin}/${qtbase.qtPluginPrefix}" "$BUNDLE/Contents/PlugIns"
+
+            cat > "$BUNDLE/Contents/Resources/qt.conf" << 'EOF'
+      [Paths]
+      Plugins = PlugIns
+      EOF
+    '';
 
   # >9k objects, >3h build time on a normal build slot
   requiredSystemFeatures = [ "big-parallel" ];
@@ -207,6 +308,6 @@ mkDerivation rec {
     homepage = "https://www.qgis.org";
     license = lib.licenses.gpl2Plus;
     teams = [ lib.teams.geospatial ];
-    platforms = with lib.platforms; linux;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix
index 37f6a659b13d..b71c57880760 100644
--- a/pkgs/applications/gis/qgis/unwrapped.nix
+++ b/pkgs/applications/gis/qgis/unwrapped.nix
@@ -1,6 +1,8 @@
 {
   lib,
+  stdenv,
   fetchFromGitHub,
+  lndir,
   makeWrapper,
   mkDerivation,
   replaceVars,
@@ -11,6 +13,8 @@
   withServer,
   withWebKit,
 
+  darwin,
+  libtasn1,
   bison,
   cmake,
   draco,
@@ -40,6 +44,7 @@
   qtmultimedia,
   qtsensors,
   qtserialport,
+  qtsvg,
   qtwebkit,
   qtxmlpatterns,
   qwt,
@@ -68,6 +73,7 @@ let
     psycopg2
     pygments
     pyqt5
+    pyqt5-sip
     pyqt-builder
     python-dateutil
     pytz
@@ -83,10 +89,7 @@ in
 mkDerivation rec {
   version = "3.44.7";
   pname = "qgis-unwrapped";
-  outputs = [
-    "out"
-    "man"
-  ];
+  outputs = [ "out" ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) "man";
 
   src = fetchFromGitHub {
     owner = "qgis";
@@ -109,6 +112,10 @@ mkDerivation rec {
     cmake
     flex
     ninja
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    darwin.autoSignDarwinBinariesHook
+    lndir
   ];
 
   buildInputs = [
@@ -135,6 +142,7 @@ mkDerivation rec {
     qtmultimedia
     qtsensors
     qtserialport
+    qtsvg
     qtxmlpatterns
     qwt
     sqlite
@@ -143,6 +151,7 @@ mkDerivation rec {
   ]
   ++ lib.optional withGrass grass
   ++ lib.optional withWebKit qtwebkit
+  ++ lib.optional stdenv.hostPlatform.isDarwin libtasn1
   ++ pythonBuildInputs;
 
   patches = [
@@ -168,6 +177,10 @@ mkDerivation rec {
     # See https://github.com/libspatialindex/libspatialindex/issues/276
     "-DWITH_INTERNAL_SPATIALINDEX=True"
   ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "-DQGIS_MACAPP_BUNDLE=0" # Don't copy Qt into bundle; we fix paths in postFixup
+    "-DSQLITE3_INCLUDE_DIR=${sqlite.dev}/include" # FindSqlite3.cmake incorrectly assumes framework
+  ]
   ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF"
   ++ lib.optional withServer [
     "-DWITH_SERVER=True"
@@ -186,18 +199,102 @@ mkDerivation rec {
   ];
 
   dontWrapGApps = true; # wrapper params passed below
+  dontWrapQtApps = stdenv.hostPlatform.isDarwin;
 
-  postFixup = lib.optionalString withGrass ''
-    # GRASS has to be available on the command line even though we baked in
-    # the path at build time using GRASS_PREFIX.
-    # Using wrapGAppsHook also prevents file dialogs from crashing the program
-    # on non-NixOS.
-    for program in $out/bin/*; do
-      wrapProgram $program \
-        "''${gappsWrapperArgs[@]}" \
-        --prefix PATH : ${lib.makeBinPath [ grass ]}
-    done
-  '';
+  postFixup =
+    lib.optionalString (withGrass && stdenv.hostPlatform.isLinux) ''
+      # GRASS has to be available on the command line even though we baked in
+      # the path at build time using GRASS_PREFIX.
+      # Using wrapGAppsHook also prevents file dialogs from crashing the program
+      # on non-NixOS.
+      for program in $out/bin/*; do
+        wrapProgram $program \
+          "''${gappsWrapperArgs[@]}" \
+          --prefix PATH : ${lib.makeBinPath [ grass ]}
+      done
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+            mkdir -p $out/Applications $out/bin
+            mv $out/QGIS.app $out/Applications/
+            ln -s $out/Applications/QGIS.app/Contents/MacOS/QGIS $out/bin/qgis
+
+            SHORT_VERSION=$(echo "${version}" | cut -d. -f1,2)
+            BUNDLE="$out/Applications/QGIS.app"
+            FRAMEWORKS="$BUNDLE/Contents/Frameworks"
+
+            fix_binary() {
+              local f="$1"
+              [[ -f "$f" ]] || return 0
+              file "$f" | grep -q "Mach-O" || return 0
+
+              install_name_tool \
+                -change "@loader_path/../lib/libqscintilla2_qt5.dylib" "${qscintilla}/lib/libqscintilla2_qt5.dylib" \
+                -change "@loader_path/../lib/libqt5keychain.dylib" "${qtkeychain}/lib/libqt5keychain.dylib" \
+                -change "@loader_path/../lib/libqwt.dylib" "${qwt}/lib/libqwt.dylib" \
+                -change "@loader_path/../../Frameworks/qca-qt5.framework/qca-qt5" "${qca-qt5}/lib/qca-qt5.framework/qca-qt5" \
+                -change "@loader_path/../../../qca-qt5.framework/qca-qt5" "${qca-qt5}/lib/qca-qt5.framework/qca-qt5" \
+                -change "@loader_path/../../../../MacOS/lib/libqscintilla2_qt5.dylib" "${qscintilla}/lib/libqscintilla2_qt5.dylib" \
+                -change "@loader_path/../../../../MacOS/lib/libqt5keychain.dylib" "${qtkeychain}/lib/libqt5keychain.dylib" \
+                -change "@loader_path/../../../../MacOS/lib/libqwt.dylib" "${qwt}/lib/libqwt.dylib" \
+                -change "@executable_path/lib/libqwt.dylib" "${qwt}/lib/libqwt.dylib" \
+                -change "@executable_path/lib/libqscintilla2_qt5.dylib" "${qscintilla}/lib/libqscintilla2_qt5.dylib" \
+                -change "@executable_path/lib/libqt5keychain.dylib" "${qtkeychain}/lib/libqt5keychain.dylib" \
+                -change "@executable_path/../Frameworks/qca-qt5.framework/qca-qt5" "${qca-qt5}/lib/qca-qt5.framework/qca-qt5" \
+                -change "@loader_path/../../../qgis_core.framework/qgis_core" "$FRAMEWORKS/qgis_core.framework/Versions/$SHORT_VERSION/qgis_core" \
+                -change "@loader_path/../../../qgis_gui.framework/qgis_gui" "$FRAMEWORKS/qgis_gui.framework/Versions/$SHORT_VERSION/qgis_gui" \
+                -change "@loader_path/../../../qgis_analysis.framework/qgis_analysis" "$FRAMEWORKS/qgis_analysis.framework/Versions/$SHORT_VERSION/qgis_analysis" \
+                -change "@loader_path/../../../qgis_3d.framework/qgis_3d" "$FRAMEWORKS/qgis_3d.framework/Versions/$SHORT_VERSION/qgis_3d" \
+                -change "@loader_path/../../../qgis_native.framework/qgis_native" "$FRAMEWORKS/qgis_native.framework/Versions/$SHORT_VERSION/qgis_native" \
+                "$f" 2>/dev/null || true
+            }
+
+            fix_binary "$BUNDLE/Contents/MacOS/QGIS"
+            for lib in "$BUNDLE/Contents/MacOS/lib"/*.dylib; do fix_binary "$lib"; done
+            for fw in qgis_core qgis_gui qgis_analysis qgis_3d qgis_native; do
+              fix_binary "$FRAMEWORKS/$fw.framework/Versions/$SHORT_VERSION/$fw"
+              [[ -f "$FRAMEWORKS/$fw.framework/$fw" && ! -L "$FRAMEWORKS/$fw.framework/$fw" ]] && \
+                fix_binary "$FRAMEWORKS/$fw.framework/$fw"
+            done
+            for plugin in "$BUNDLE/Contents/PlugIns/qgis"/*.so; do fix_binary "$plugin"; done
+
+            ${lib.optionalString withGrass ''
+              fix_binary "$FRAMEWORKS/qgisgrass8.framework/Versions/$SHORT_VERSION/qgisgrass8"
+              install_name_tool \
+                -change "@loader_path/../../../qgisgrass8.framework/qgisgrass8" "$FRAMEWORKS/qgisgrass8.framework/Versions/$SHORT_VERSION/qgisgrass8" \
+                "$BUNDLE/Contents/MacOS/QGIS" 2>/dev/null || true
+              for lib in "$BUNDLE/Contents/MacOS/lib"/*.dylib; do
+                install_name_tool \
+                  -change "@loader_path/../../../qgisgrass8.framework/qgisgrass8" "$FRAMEWORKS/qgisgrass8.framework/Versions/$SHORT_VERSION/qgisgrass8" \
+                  "$lib" 2>/dev/null || true
+              done
+            ''}
+
+            ${lib.optionalString withServer ''
+              fix_binary "$BUNDLE/Contents/MacOS/lib/libqgis_server.${version}.dylib"
+            ''}
+
+            # Merge Python packages (lndir handles namespace packages correctly)
+            QGIS_PYTHON="$BUNDLE/Contents/Resources/python"
+            for pkg in ${
+              lib.concatMapStringsSep " " (p: "${p}/${py.pkgs.python.sitePackages}") (
+                py.pkgs.requiredPythonModules pythonBuildInputs
+              )
+            }; do
+              [[ -d "$pkg" ]] && lndir -silent "$pkg" "$QGIS_PYTHON"
+            done
+            # Remove broken symlinks
+            find "$QGIS_PYTHON" -type l ! -exec test -e {} \; -delete
+
+            # Create merged Qt plugins directory in the bundle (LSEnvironment is unreliable)
+            mkdir -p "$BUNDLE/Contents/PlugIns"
+            lndir -silent "${qtbase}/${qtbase.qtPluginPrefix}" "$BUNDLE/Contents/PlugIns"
+            lndir -silent "${qtsvg.bin}/${qtbase.qtPluginPrefix}" "$BUNDLE/Contents/PlugIns"
+
+            cat > "$BUNDLE/Contents/Resources/qt.conf" << 'EOF'
+      [Paths]
+      Plugins = PlugIns
+      EOF
+    '';
 
   # >9k objects, >3h build time on a normal build slot
   requiredSystemFeatures = [ "big-parallel" ];
@@ -207,6 +304,6 @@ mkDerivation rec {
     homepage = "https://www.qgis.org";
     license = lib.licenses.gpl2Plus;
     teams = [ lib.teams.geospatial ];
-    platforms = with lib.platforms; linux;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/applications/graphics/inkscape/extensions.nix b/pkgs/applications/graphics/inkscape/extensions.nix
index ec078caaf7cb..5c5a2f6273a1 100644
--- a/pkgs/applications/graphics/inkscape/extensions.nix
+++ b/pkgs/applications/graphics/inkscape/extensions.nix
@@ -5,7 +5,7 @@
   runCommand,
   inkcut,
   callPackage,
-  texlive,
+  texliveBasic,
 }:
 
 {
@@ -51,7 +51,7 @@
   inkstitch = callPackage ./extensions/inkstitch { };
   silhouette = callPackage ./extensions/silhouette { };
   textext = callPackage ./extensions/textext {
-    pdflatex = texlive.combined.scheme-basic;
-    lualatex = texlive.combined.scheme-basic;
+    pdflatex = texliveBasic;
+    lualatex = texliveBasic;
   };
 }
diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix
index c6c5f758dfc8..cd24ce5ba03c 100644
--- a/pkgs/applications/networking/cluster/k3s/builder.nix
+++ b/pkgs/applications/networking/cluster/k3s/builder.nix
@@ -393,6 +393,10 @@ buildGoModule (finalAttrs: {
       --replace-fail '"$LDFLAGS $STATIC" -o' \
                 '"$LDFLAGS" -o'
 
+    # Ensure the embedded tarball is reproducible: sort file order and clamp timestamps
+    substituteInPlace scripts/package-cli \
+      --replace-fail 'tar cvf' 'tar c --sort=name --mtime=@0 -vf'
+
     # Add the -e flag to process "errornous" packages. We need to modify this because the upstream
     # build-time version detection doesn't work with a vendor directory.
     substituteInPlace scripts/version.sh \
diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index 52c1bed61230..dc2cb1ec1f34 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -43,14 +43,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "gajim";
-  version = "2.4.4";
+  version = "2.4.5";
 
   src = fetchFromGitLab {
     domain = "dev.gajim.org";
     owner = "gajim";
     repo = "gajim";
     tag = version;
-    hash = "sha256-buHCwrG3S28AgzBqJN/a0uBDDq2IM8LdE51baGFGLwM=";
+    hash = "sha256-5daPMlC2Ejfi5UXsRLaLWwEZHHEC0szbfkqavIisoUQ=";
   };
 
   pyproject = true;
@@ -148,6 +148,7 @@ python3.pkgs.buildPythonApplication rec {
     maintainers = with lib.maintainers; [
       raskin
       hlad
+      vbgl
     ];
     downloadPage = "http://gajim.org/download/";
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/ap/apt/package.nix b/pkgs/by-name/ap/apt/package.nix
index 2b418f3d03f4..50e6dd8fc5ab 100644
--- a/pkgs/by-name/ap/apt/package.nix
+++ b/pkgs/by-name/ap/apt/package.nix
@@ -30,18 +30,19 @@
   zstd,
   withDocs ? true,
   withNLS ? true,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "apt";
-  version = "3.1.15";
+  version = "3.1.16";
 
   src = fetchFromGitLab {
     domain = "salsa.debian.org";
     owner = "apt-team";
     repo = "apt";
     rev = finalAttrs.version;
-    hash = "sha256-PnI7Ggqc/Go5p+eXf93d5qhG61TKO2/8ZSjML37pyzY=";
+    hash = "sha256-4n7QocfpAlDtJGpswV0LtwzWV1xtr7dLuLvAF5kBbAk=";
   };
 
   # cycle detection; lib can't be split
@@ -101,13 +102,15 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "WITH_DOC" withDocs)
   ];
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     homepage = "https://salsa.debian.org/apt-team/apt";
     description = "Command-line package management tools used on Debian-based systems";
     changelog = "https://salsa.debian.org/apt-team/apt/-/raw/${finalAttrs.version}/debian/changelog";
     license = with lib.licenses; [ gpl2Plus ];
     mainProgram = "apt";
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ VZstless ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/au/auto-multiple-choice/package.nix b/pkgs/by-name/au/auto-multiple-choice/package.nix
index 84bb01ed7a04..9c754efdfb61 100644
--- a/pkgs/by-name/au/auto-multiple-choice/package.nix
+++ b/pkgs/by-name/au/auto-multiple-choice/package.nix
@@ -63,6 +63,13 @@ stdenv.mkDerivation (finalAttrs: {
   # There's only the Makefile
   dontConfigure = true;
 
+  outputs = [
+    "out"
+    "man"
+    "tex"
+    "texdoc"
+  ];
+
   makeFlags = [
     "PERLPATH=${perlWithPackages}/bin/perl"
     # We *need* to set DESTDIR as empty and use absolute paths below,
@@ -74,8 +81,8 @@ stdenv.mkDerivation (finalAttrs: {
     "BINDIR=${placeholder "out"}/bin"
     "PERLDIR=${placeholder "out"}/share/perl5"
     "MODSDIR=${placeholder "out"}/lib"
-    "TEXDIR=${placeholder "out"}/tex/latex/" # what texlive.combine expects
-    "TEXDOCDIR=${placeholder "out"}/share/doc/texmf/" # TODO where to put this?
+    "TEXDIR=${placeholder "tex"}/tex/latex/auto-multiple-choice/" # what texlive.withPackages expects
+    "TEXDOCDIR=${placeholder "texdoc"}/doc/latex/auto-multiple-choice/"
     "MAN1DIR=${placeholder "out"}/share/man/man1"
     "DESKTOPDIR=${placeholder "out"}/share/applications"
     "METAINFODIR=${placeholder "out"}/share/metainfo"
@@ -109,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: {
         netpbm
       ]
     } \
-    --set TEXINPUTS ".:$out/tex/latex:"
+    --set TEXINPUTS ".:$tex/tex/latex:"
   '';
 
   nativeBuildInputs = [
@@ -161,10 +168,7 @@ stdenv.mkDerivation (finalAttrs: {
       …
       environment.systemPackages = with pkgs; [
         auto-multiple-choice
-        (texlive.combine {
-          inherit (pkgs.texlive) scheme-full;
-          inherit auto-multiple-choice;
-        })
+        (texliveFull.withPackages (_: [auto-multiple-choice.tex]))
       ];
       </screen>
 
diff --git a/pkgs/by-name/aw/awsebcli/package.nix b/pkgs/by-name/aw/awsebcli/package.nix
index ce900c3de6df..67fba53a1467 100644
--- a/pkgs/by-name/aw/awsebcli/package.nix
+++ b/pkgs/by-name/aw/awsebcli/package.nix
@@ -27,7 +27,7 @@ in
 
 python.pkgs.buildPythonApplication (finalAttrs: {
   pname = "awsebcli";
-  version = "3.27";
+  version = "3.27.1";
   pyproject = true;
   doInstallCheck = true;
 
@@ -35,7 +35,7 @@ python.pkgs.buildPythonApplication (finalAttrs: {
     owner = "aws";
     repo = "aws-elastic-beanstalk-cli";
     tag = finalAttrs.version;
-    hash = "sha256-bqGed3LCOAG5+bSwdaenxM3HtNXI6iRq191XS5Aau8c=";
+    hash = "sha256-5SmV+V+B3GYDnuOH8abh+NzGTZpMId41ZrJ7Fr6cXZo=";
   };
 
   pythonRelaxDeps = [
diff --git a/pkgs/by-name/bl/blobtools/package.nix b/pkgs/by-name/bl/blobtools/package.nix
index 8326de7b9dd6..a7bf7717d918 100644
--- a/pkgs/by-name/bl/blobtools/package.nix
+++ b/pkgs/by-name/bl/blobtools/package.nix
@@ -16,6 +16,11 @@ stdenv.mkDerivation {
 
   strictDeps = true;
 
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace-fail "CC=g++" "CC=c++"
+  '';
+
   installPhase = ''
     runHook preInstall
     install -Dm555 {blobpack,blobunpack} -t $out/bin
diff --git a/pkgs/by-name/ca/cargo-release/package.nix b/pkgs/by-name/ca/cargo-release/package.nix
index 6fa1d7602c82..cd45c51a4715 100644
--- a/pkgs/by-name/ca/cargo-release/package.nix
+++ b/pkgs/by-name/ca/cargo-release/package.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-release";
-  version = "1.1.1";
+  version = "1.1.2";
 
   src = fetchFromGitHub {
     owner = "crate-ci";
     repo = "cargo-release";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+whbVQs2zaPrckR8CZYS35DHqCOv/B/4bv+fffu+onw=";
+    hash = "sha256-xil5k+AyJHpDLVvSbtPJOuADRXvdLrHLlC7GRSE4z4s=";
   };
 
-  cargoHash = "sha256-jqs1b6edoR1OgileF0T9LNw1QtxALn3Nz+QUF3R8epg=";
+  cargoHash = "sha256-WLDRJQvzkL1FxD0eXsJmH5wh9QkReaQBBxe7ZFQMWUM=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/ch/check-jsonschema/package.nix b/pkgs/by-name/ch/check-jsonschema/package.nix
index eb4774b7d682..8586547228f7 100644
--- a/pkgs/by-name/ch/check-jsonschema/package.nix
+++ b/pkgs/by-name/ch/check-jsonschema/package.nix
@@ -6,14 +6,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "check-jsonschema";
-  version = "0.37.0";
+  version = "0.37.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "python-jsonschema";
     repo = "check-jsonschema";
     tag = finalAttrs.version;
-    hash = "sha256-hnsq4i4OXdQShe2fwYb9avtgoZ5efj0VtidJTyatW4E=";
+    hash = "sha256-DbEzK2G5Y/9eZF7oX2xIz7gtQ++Cwe+W26+ByaeHBiA=";
   };
 
   build-system = with python3Packages; [ setuptools ];
diff --git a/pkgs/by-name/ch/cherry-studio/missing-hashes.json b/pkgs/by-name/ch/cherry-studio/missing-hashes.json
deleted file mode 100644
index 160effdc4178..000000000000
--- a/pkgs/by-name/ch/cherry-studio/missing-hashes.json
+++ /dev/null
@@ -1,164 +0,0 @@
-{
-  "@biomejs/cli-darwin-arm64@npm:2.2.4": "5cd937e3a57ce9ba97e63e1062fd2b2cdfa1ba6506bee78e9b62a5e1499b8d9845e7a197e62de98a284012505a5abdd1b66a203613972166e46628ca02567e19",
-  "@biomejs/cli-darwin-x64@npm:2.2.4": "75cd8b221a7e4be8871650e0494016dc4116974fce8fff2e8f9cf085745abafcfa9e06a08c845f1d01f6a87d45fb5a5672972fbb51fbd891f35a49ec15cd2ce0",
-  "@biomejs/cli-linux-arm64-musl@npm:2.2.4": "5deb4f40d412442e81cbaf878d3e1adbf1fdae22cf5d178f5d56ce984bc6566962f99f162d7347201de0500a317ee3727ef32730b0ee6237a0814755f1ed7307",
-  "@biomejs/cli-linux-arm64@npm:2.2.4": "20c86551b3b71c342264e60cc9ceab2c16bfef935f318701d384dec26721e38757f94811a108cdabd3360b99309be44bb005388290d91f11b5869aba80d13a1d",
-  "@biomejs/cli-linux-x64-musl@npm:2.2.4": "6163fa95778bcee9b79aedb36117df9865f0f784bbb8bf55ba6df4544fd3b7fa5cf3e32eb77d863034d480c3c7c5014dadc5d137b8688e64e64e5093d5c1be1c",
-  "@biomejs/cli-linux-x64@npm:2.2.4": "84fbf9d4b681ad4426c5de492b4ab9200a15d4f61a71c69d4b6bfbe8f03f46e69bb951a93a85d71e0073bcf3ee1874530dad2eac3dbdd72c6084dfb59c83a1fd",
-  "@biomejs/cli-win32-arm64@npm:2.2.4": "39d4e2ac5a41b7c092bc9a3ef1889a557b47eb15f9057db823681c1483702ee6fe96a5b2e54a444ca6e867db5d41f2e9f6a1a6dd86d13fcb686dab5d19d02333",
-  "@biomejs/cli-win32-x64@npm:2.2.4": "741c77e74d4fcfbf74f3f5db2e29cb6bca90cd7b1c5e6af3b0cc8b5c3210b0b1f82019733e9849d18fa9fc4fe96fb4633974a2146447cc914249caf0636741e7",
-  "@esbuild/aix-ppc64@npm:0.25.10": "e1a113d75c27f15756d18dc2a9257f07068c7b37a00ed3848c0d903f3e66f2df23156993fca7523422cf5be10417747a1e4faa2e93196f011faab606938174e5",
-  "@esbuild/android-arm64@npm:0.25.10": "a2dd6b7ba7d3ab2b669bdc45dc7e306671ecbd89b251d3ad73191fc18fe07080525beadf0a9ead65f96d623d4e37172b2516dc1ce7ddc3c3224299926615b2a1",
-  "@esbuild/android-arm@npm:0.25.10": "0d7b4d970f4793252396ca9b737a2c5b485a5f051827ba1cbcce23a76e9bb7bc6f73be3b5ebed73a15aca915534917d13aeef0ce14d214026a36f0f334eadb14",
-  "@esbuild/android-x64@npm:0.25.10": "a2e49c045ea189ca6020a8c1baced2db4cf105848c1cc922931c8e3a11b26f1143078d3ee5c088bfbccab8e564039a5b6962513e45b41572614607dced92b03f",
-  "@esbuild/darwin-arm64@npm:0.25.10": "a96d0821aa97cd0ce2fa35b525896fc9d878b492832be8a0cd22bdbb081d11209574e48ef8ce29f51a88a9cea33c5f6a8b4409bd0801eddeac5ef4ad4db2d88a",
-  "@esbuild/darwin-x64@npm:0.25.10": "0f358404778b8f36a2676181f8840139d7e5723a76e54683f0ada3d72572d8c864bc76084e1d23dd5605896329857ad15b598dedd141d160b64669253bfaee82",
-  "@esbuild/freebsd-arm64@npm:0.25.10": "f82928e4a4beb95da3379b98c5088d017113c02e3f2ab54867e4f6974b21b25c68ed793cbb3e9a99a510fd58ad3c5dbc1f7ca5bd4ce6adc99627a25fc722178b",
-  "@esbuild/freebsd-x64@npm:0.25.10": "08c9d830e43a3be5fdb4525d940b0cd069bd7e7e1f4d53a5475411351c07891343b3c009f37d47e10ae3bafcb9ed52b4b5bd5e7dbd0505723add21a09c08dae6",
-  "@esbuild/linux-arm64@npm:0.25.10": "1b6f5a1ef9aef52210832f5dd4d55ddd0a880dfc0f832106374b56c5cd8fbb865d7d711bdd6ff7c94a0cc42a7c3e6cf91118bf5c4187cfbbe1eb4d1807afca37",
-  "@esbuild/linux-arm@npm:0.25.10": "023383ebb145fa2f93de674713c7e4725df2b3c910f43bc1b5488a3b1169005d46fcbcf84234aace04c799ee569ea7671f92205e42dda52bc9954e48b47d7a1d",
-  "@esbuild/linux-ia32@npm:0.25.10": "130136f141d0388ec249fa314848906fb8b45e554324b8a07c13b5bc2e7da94c6fc7ebd037af6b69655a542ec52515ea8f8bc3bfe6dfc0dab8bdf9954debfb0d",
-  "@esbuild/linux-loong64@npm:0.25.10": "0e076ba5ea9b2e6ad00c27b8ee530621ef4c356aba6d8c873f9f7c50fa2f54bd75f4bef57d209fc0af011c9748c64e9d5e281f13456fa9c8b71f79467bfc71ad",
-  "@esbuild/linux-mips64el@npm:0.25.10": "dc3ef7a524ef0d78030f088263735026c97e7be45f56a610c8849fca8c36b10969558bffb6c21b6d8a5819a33450e529e44c1a71a6fccb0ce69f23b01273bbc3",
-  "@esbuild/linux-ppc64@npm:0.25.10": "60088ee09f940e169e2073ee77972f22af78c9c1df9a8e7db45e3c3f9176d5ffd8006a4102f34783c7f3629e9c153797d9f493063e9bdedf6f676018cbe6445e",
-  "@esbuild/linux-riscv64@npm:0.25.10": "3f194dfe0f2725d9a41b0ab127238ef271d0689f31a05ecae25d6df3aa8275261d6ba073373236fac3c6c8af2a4556736a8025e80d8a719a049d22b23c99464c",
-  "@esbuild/linux-s390x@npm:0.25.10": "926a04be26ebf794dae6a6185e04f39d246b04f1b5cb40b41f5228228a87e3a785cfb6493f405a0dc7d9b6a96d9417453fdc291b7fb4bc4aaf785eaa44cf1806",
-  "@esbuild/linux-x64@npm:0.25.10": "ebe641e7b96af7dcefe629b4f34a4da9cd0b282e42e8efd0311c2ed631a40a143bb96eda5592b209c4eab295f45b2e3395c69412edb40d5689ffaa01aa276409",
-  "@esbuild/netbsd-arm64@npm:0.25.10": "11f85ed4ade5c38fe8f2f3e78ee5c302a4f90d48a6bf93cf8917b13d52b03671c7742294785165cc70611eb0b085a4e9aa5a0f487f8e15f80200ff450549e19e",
-  "@esbuild/netbsd-x64@npm:0.25.10": "322482debb21160769f7ee293c3e84e44293bb7c734082fac2857277038ab1087763a553697b8f20dc3a03b7a397936396cde8150c1cc6a0ad62941e7ee86845",
-  "@esbuild/openbsd-arm64@npm:0.25.10": "4c68206360952d04fbafe32d3f4cf420f15c0a150f914d398746f1cf8241073fe9422cc0cc0de8b0b98b8158879dc5fd322eb8454d936457eab3dc9ba131584d",
-  "@esbuild/openbsd-x64@npm:0.25.10": "70328d84e7954932d0fcd282bc2a16fdd31a899ef23f5214221e64bfebd80222b03a7629d9af55fea220df6a41cd51d0c068618f443dc37ad717dc6601a9445b",
-  "@esbuild/openharmony-arm64@npm:0.25.10": "ca11e8c30cddd7603235cf05185678f6aad7c40eccd8ef57a207325b8553e5481503cda7ae35d777eb5020b9426f2d13332aba147732a9abe0f5b3964a6c0d17",
-  "@esbuild/sunos-x64@npm:0.25.10": "46c205aa7a15d7b5d13553300f3d36593e7119a320672ac3c092f5a67db6cb91f9c59a235dfbe2947bd99f7653bb3be325a33c3474a00b90d39856ef9b05af48",
-  "@esbuild/win32-arm64@npm:0.25.10": "ca2d057a874607013788fd3a161e8e25fcfb777a7aa6edd68662cff3869d1566541d61caab9b11e16515e2192673bf70c00f5efc38f67d1305f76b55bbe8febd",
-  "@esbuild/win32-ia32@npm:0.25.10": "fa5efade9e9a1a01e65223f22304dd71a3d005a2b394309a652bb231bdbc14fe937ec7bf0ce1e117fed182731430e055828616d1c10abee2dfc80aee50fee13e",
-  "@esbuild/win32-x64@npm:0.25.10": "0f2cb29b001bf4a71035b37d42bcaeb48baef5a6b07be2c024593a18dcec87cd5829a0cc17acc7128cd251bd6232bdbd04d967d9c2bd7db9c1978effffe31671",
-  "@img/sharp-darwin-arm64@npm:0.34.3": "c5ed848f3cecaced50be6d1805cfb23586299f119a9917880c3f590b7ddd54b930e493c73480d13452503101168f92a0dc85ccc5b19b330470a5fe69e1fcf206",
-  "@img/sharp-darwin-x64@npm:0.34.3": "7e892ca052c8eb9002fb6e86e0a7893aff909e0f203f6ada7a67f4ca7e189631203189700a498ab3401280f5c042f5b08c3f7bc713192a97228864e9c4527743",
-  "@img/sharp-libvips-darwin-arm64@npm:1.2.0": "35d0d475da11fdfd7f5b5f7f1de4376ac04de6d6e0879833f71b2fa305b9d58c96ee464cf234060506ef9b1e2eabe5c09c302e818f8899b2ced1fcb7f85c01eb",
-  "@img/sharp-libvips-darwin-x64@npm:1.2.0": "e853f3b8a19d815af553b703e1d6d70abec525c61f3f19cc8a9d50d3749bc563b7f255307709b7c0836f76b110948489d3a9a3932d2fbc1775a083a56979bf56",
-  "@img/sharp-libvips-linux-arm64@npm:1.2.0": "ec53e3e62c9351e28ea0e4c26a1d8ab257ac003e8184b1757b79c2a240baecec2452e0dbca08c8227fd01c498801c428230261fdb86198e873e07347d741c3c7",
-  "@img/sharp-libvips-linux-arm@npm:1.2.0": "a2f9822cb2ac5b315f2a02c59ebdb235f6c45251207795f83f1a92db696a9deced882dc752bdddd1eab98da5d7d1d1e9968ae142313ff09960b7ae30b760ba07",
-  "@img/sharp-libvips-linux-ppc64@npm:1.2.0": "e90e1c46e6020f3a96562dd526549af2fabff46a1576f2e7af003be4b5efeb6fc8caa8e303e2eeb58129c938be31e0bf067736072479f2298152230cecd5fce4",
-  "@img/sharp-libvips-linux-s390x@npm:1.2.0": "2cf62c8b285effd3a3ec8854bc5fd78af162459294a6d9847af33d6bdeacfbad81cb0bec68b76889b148306a8a28492b4d44e6c96b778d0879349180191d758d",
-  "@img/sharp-libvips-linux-x64@npm:1.2.0": "ca342d07d1f0d22559f26bdcc0354f87a845ef19c69c22e37d9e23d71de15159f50d01183e8e7ea75e0ccfb6c7be9406741414a1f3534ec4aba10e51f0d7dffd",
-  "@img/sharp-libvips-linuxmusl-arm64@npm:1.0.4": "952819ca53ba8d9911e8803674fb71b5854d0f2bff8e947b04a45e84915ffce29f04241359d0ce3ddff874d5ab1a61b3efdac36a5c5245732ca43250e172ff60",
-  "@img/sharp-libvips-linuxmusl-arm64@npm:1.2.0": "aa248f0c8602b0a17fdb5c1b00ce7dbb09f05b94a45ee7f226eaebfa459d4ee3fd407c62244902e15699927943c511a7fe045b575185ecc9b585987b64ae6cb1",
-  "@img/sharp-libvips-linuxmusl-x64@npm:1.0.4": "74c5f218ff390c67d9a95bab314b6d0bb8f2217dd55cbe2bcee2474a5fee4be9772d7924672c5e4d9dc6589f569a1d27e1562c4bb6ec1cee50f02b4799a64849",
-  "@img/sharp-libvips-linuxmusl-x64@npm:1.2.0": "811071647c5129a1ead1e54b8f4672061bbbc1177d1d49127c755848e81f21bcbf5bf438c0e53118e731be5e000235904de3b5cf305053de015b56609a059371",
-  "@img/sharp-linux-arm64@npm:0.34.3": "3e8d53f54789b3d98dc14bf696917ff50f8c8c355aedc0dc90890ca764259bafec7390eabe262ce843eab8b74e0c128858128ce614e0b85dcba28d6b9ce3ea3f",
-  "@img/sharp-linux-arm@npm:0.34.3": "563c48ee129e5f3c6afed71ffba9c79a4369e7967e7b3a4a97d9b1e5aefa511873d3cd7a568ec42cd5968ea76f89ab93ee65c1363170af50559b620bfdb89d5b",
-  "@img/sharp-linux-ppc64@npm:0.34.3": "5973f8c522f33f826efff4052e253ec554882db54421a00f2636594e9ccc27e16dfb865f8de101678cb07b1a2d31b516ce4a88b65132ecc1101d07b6cc1bd571",
-  "@img/sharp-linux-s390x@npm:0.34.3": "284d2fcd9cc297b27ec135b0c63d5a6170cb17be378d92c75ec19b6034e7ed5801cab04ca17d445a80b073d67c4f9fe809334f5d4edf533c2d81d66d5d882ef3",
-  "@img/sharp-linux-x64@npm:0.34.3": "a370c04ca6d4145e6d6529d84b133d80e88d408e4483ba168e5993e5b4c0cbd2db57d4e53aca0bfa43320b571ff8bd70c22d8d7f5fadb5e5df1ded91393ae71d",
-  "@img/sharp-linuxmusl-arm64@npm:0.33.5": "1f4ef8055027962e3dcc8307e7b4ea070ae2f41ae9ef3442afd0d7515223bf66201bcbdf9097d353f4e64fd572c2ac26eec9e832597fb42da8f27fad6ec4a34d",
-  "@img/sharp-linuxmusl-arm64@npm:0.34.3": "c63d8afda1a7d4810bdc19473b6235313d923f8763a8dfc182465b63b8e4805769a9e92a8b2136f0235e07ae1b1ab63adfa904bb833d64f0495108dfc180a475",
-  "@img/sharp-linuxmusl-x64@npm:0.33.5": "c82dd5576f1836947c81a2b573e1953d7b4fcdccb532473e2073024c02a999f8eb17ddb9c2fc5b0fd77a9a7a38edb9720dcfc9358e43a60e8f8eb0ea3f763bae",
-  "@img/sharp-linuxmusl-x64@npm:0.34.3": "9500e8f5d0ab96395a8d522920f25d4376d928ec58e88b3a5dbce5249c26efec046d20845bee8e9233fbff5287cfa979cfc079bc608342d257a6827be6cc0322",
-  "@img/sharp-wasm32@npm:0.34.3": "840dd97d3151b2189c3d0ee0746c139cbdd0441d5d5dfc87d2dd9970fc2c5448a3815c3110c64009998d165ca6dc7b5d58811b98b2c1e4ab0a1eb5ad97275f1e",
-  "@img/sharp-win32-arm64@npm:0.34.3": "adc7d18a8334ca1fea09c877dc9493e75a9018f73dc63038c8ccef7535a272c0aa3c2a9867a49a223703747149fb1fe57ef8580dd6098f0f33c602a876a48e1b",
-  "@img/sharp-win32-ia32@npm:0.34.3": "eef220adf1240429f72d9a9aadc22ccb741889785fa025396cfed41603364990b5f3841cee4d60525b22e65f36c7416297581300c873268fe2b7bb67087ada73",
-  "@img/sharp-win32-x64@npm:0.34.3": "5a5d2624bea7a31393b5a89738ad22a2b020a67f5e5b9eb40063510b514e8516b0fb4e320ff9eb1d32fa2ee3b4c3a0387333d051da28d93957116cbbd63b5fe0",
-  "@libsql/darwin-arm64@npm:0.4.7": "161ac6b537e39e33c65a7f06c16152ccd5077129b8321b5d0082e008054c47dbc32563d39a47e223d09994457211582ff3760ffa5523f2dd3cfac1dd726a577a",
-  "@libsql/darwin-x64@npm:0.4.7": "45c85d00566507f19474f9ae4b6453fa8fff10994147751df2dd2177edf9961520af54156d2d41b23cdfaaf2b219ea4ebd4b44a868e890088fc2283c1224752b",
-  "@libsql/linux-arm64-gnu@npm:0.4.7": "c4126b0d717b45a8d1d66797bd7447fdaf53631277dac0250e0aa0267e279493b114b3823407e49da0e2928d6595d3a28370acb99c43424e8bc7e11434cae5f8",
-  "@libsql/linux-arm64-musl@npm:0.4.7": "13eef982caf2b73cebabde76b8e209ddea27d2ff0e6228a56704a50ad41975ff03a15d90bec6ccc908cb16355d685903719676f7a91c92d20a68eecff4a4f0b6",
-  "@libsql/linux-x64-gnu@npm:0.4.7": "524bf04f98f7a91e343b294262a627a965f626082b63b998c8019d105380caa2435e240f6085103751f87919ac2415aba97075696822915bf1a4e4492d9376f5",
-  "@libsql/linux-x64-musl@npm:0.4.7": "227cddb499cbbf677c1dfaeeb8bd787d4c6d4cbf50c94ac1632348f26b412d2f8bacdb0131050c507d1961f96f8bbff2d8b7949f26f1dcebb61e115da9253aa0",
-  "@napi-rs/system-ocr-darwin-arm64@npm:1.0.2": "a1a0ea7044baa9589f26e55c661b1491c4dfe8c5cced82c31d00e86d297dacc61bd76042438069d97dd810808f7d3dd78fc449b898c90653af19b298084cf0f5",
-  "@napi-rs/system-ocr-darwin-x64@npm:1.0.2": "92b68b7e6a4be82b24fcc952d2c820e07bf68fb625d3c69edbcbf13227be508302f87ba9b0ff50d415c76ac16493d11040b6cc55a5b25f4414f3af5c00ab4597",
-  "@napi-rs/system-ocr-win32-arm64-msvc@npm:1.0.2": "5c6945c5053380ee33df277df77ac813cc44763e9f305ea0b0990d3960269676ffe88bdd33038fa378d055c9986b7ecc31cbabc7f8fb51e077c59364a9ea29ec",
-  "@napi-rs/system-ocr-win32-x64-msvc@npm:1.0.2": "9d6ebdaa753cea6f6e2e5b1b01ba293a7cd79ffd265bf5144f96f09bd596df21612662d7f62973886dd75725a029971cc3f11451ab95933bca5441b02593f352",
-  "@oxlint-tsgolint/darwin-arm64@npm:0.2.0": "89b0844bb4be9406efbda457fcf9be852039f6c48dc24547135451417e98fe1cd5c0a13a66cd559cad1b70901fc6ee55532dc9975929384c09e071256e6cfb70",
-  "@oxlint-tsgolint/darwin-x64@npm:0.2.0": "307de5743240c6f01d7087c6c620b608b0c51d36431df7e345a6699939ea16129494c449b6dd8351277bc37c92ba1e92020cc1155a88efbe2a124f44fc78b5b1",
-  "@oxlint-tsgolint/linux-arm64@npm:0.2.0": "4292cc00a8f5b6d06eb83abd8bfb80b369eb5d7ede91b6e80716bf81a81df557b47a59690a3af7ab858008ce4d02b50c74bbe0fc7530eaadbcc12cd8f1ff0c4c",
-  "@oxlint-tsgolint/linux-x64@npm:0.2.0": "c73ebab4bc4c7891873043479ee89894a575ba93f91fc0793cfc2f38f68d58b8b09980c5c9ebd037c404687e38d2f15966e9bfeab9685b40522266ef909fb047",
-  "@oxlint-tsgolint/win32-arm64@npm:0.2.0": "6735f85196fc4c2aa5885cb7bf8b956b460f6b003589959bb83d0cab049a7fe8257a228e7bba403dba08e57b944c2a78c97087ded3e104edb340d964f604fd77",
-  "@oxlint-tsgolint/win32-x64@npm:0.2.0": "3621b288e32c42bc71ff33b083e5ae7c941a6b13654d10a1647ebe706fe3077ae581fc85cffc70ca6d956d610abeeb254fc19ecfc3d3ecb4dde2ce1ef3b5be03",
-  "@oxlint/darwin-arm64@npm:1.22.0": "6f3aa8e6ec1bf49a7bfd01bda40c46f73782e481058e0a66d17223d96cf4be92ac33be25342e5a670be45cf68642380a42d49f36658bda95672d9b359fe08863",
-  "@oxlint/darwin-x64@npm:1.22.0": "7ac2e9cc92773792e84e743cf5b42449d0f5daaa8161b7c838a739d3040b267fd8ff28f25c963a63ea024f2fd1d43b881b464b2da997cef2e775b696b2e5a990",
-  "@oxlint/linux-arm64-gnu@npm:1.22.0": "7615f0f4a81c43099da6c8bfcf4b4e8b411b8450ca63ee4cc8733534c256d20d643015278095ca638de2aeaa0854bdab3692607f5fdfaec563fc118ffa5f3520",
-  "@oxlint/linux-arm64-musl@npm:1.22.0": "2ee5eb08264dbbded1ee14e1c8d03c2a3ea6875559e3381b36d18e8152bc8859402fc957a2c5cefb4b5eeaf446a4e1e82b171f7a02dbd6d2b74a54370bdc8c97",
-  "@oxlint/linux-x64-gnu@npm:1.22.0": "6e266a457ce5f7e642309b20bcc0a883252f9cb69f40320a9ba6e0434e85da8c8af74b2fb23fd05a9b92820365b95154c2dd6e7e2405ab96afc577daf21adccf",
-  "@oxlint/linux-x64-musl@npm:1.22.0": "3cdd5e965f2d09eae04967aeb26cb11d10412a93b80fef4951cff2310154e592e21ce5605e0503eb7924adb59f6c65fb79ee4378e5518cfb258b4038efe0d34a",
-  "@oxlint/win32-arm64@npm:1.22.0": "0a08744d207894c30ec9a89e5225805e3270ed988b4b7fdba4a3ff1bb74a5121293bd2c8ea3d3e5a6e4899e0b8e166a8fceb6a2ad4a1ddbec7070d33303212a6",
-  "@oxlint/win32-x64@npm:1.22.0": "7bb9839d0272891372023a7e80a649e761a2246e6f6737859fe4897b36dcbcc22a95696ed024d80211da9aa39abf27fbd360f3cb2c883eaf092628abd95e9156",
-  "@rolldown/binding-android-arm64@npm:1.0.0-beta.53": "e2972fe9399066bb418f659c24e7589e87d8373a3b4ec7dd01c06f516c90cd04ea2dc801f2739f05e714f002bd4ef8d505dabbb9ab55437ed3d5f8395db91df5",
-  "@rolldown/binding-darwin-arm64@npm:1.0.0-beta.53": "79587c0686dc0ee54368e4eeb0b8e8cc6f5786c3d55c3b0acd2ccea067b6ba21faffe82140268e7de7126192c3e54fa33742346d82ceaebf5d4c33a94c3575fc",
-  "@rolldown/binding-darwin-arm64@npm:1.0.0-beta.9-commit.d91dfb5": "a4636b96d36bfaccc655f9de258cef17daedd025463309657ed213b63b4226aeb6901eaa05d00d577e486bfb4d4ef99ee1457d8d7a8b5170afe07c86d2a5c18d",
-  "@rolldown/binding-darwin-x64@npm:1.0.0-beta.53": "4b855c7208400453f29aac138c8c050fee3e3f08ff7d36afb3efd705abfc67b11e55bb12ead5d845ae9c464b9855c02380772592ed09e43434ade8dd4e32f703",
-  "@rolldown/binding-darwin-x64@npm:1.0.0-beta.9-commit.d91dfb5": "a7b89d92f33ad9a718de70c56452dc481962e5396b32d66cbc08e588f45fa090ed6e3b7d8fc2ec641acf3de2a550b6d05416b14179ed4fcc8d336fdbd697d40b",
-  "@rolldown/binding-freebsd-x64@npm:1.0.0-beta.53": "98672b2ececbcab5bf8732033b9e38553f75a37d0c8198762af5609ea57b9809bc8d9c8ec3e5cc6df7c9535c1a08d063d106b984fa1dfda066dc71ae6e70350d",
-  "@rolldown/binding-freebsd-x64@npm:1.0.0-beta.9-commit.d91dfb5": "7da382e43eeada73dec31bb63680432f129fa17efed7ed211da0c9915a89c9dfa2e8ec35aa7f07a4be99a36eb14df67059a375ac4bc5e6a5cdc16e02f7a9bd3c",
-  "@rolldown/binding-linux-arm-gnueabihf@npm:1.0.0-beta.53": "0760612704b1381580c337eef6b0ef096902b81dca1ff2b536a8a4f529335465d9739ea3c0883d3f7b1548089d237e18a485f0ee2e3d2d9191b0a788f95c81f9",
-  "@rolldown/binding-linux-arm-gnueabihf@npm:1.0.0-beta.9-commit.d91dfb5": "cb5a7635fc2c39049c1fba8376d3b23f58240dbe2cbdc127d0dc8f2b8900537298bb8b52abde5b6e941cf22d8f69466433048db573c683947bf797f92f28baee",
-  "@rolldown/binding-linux-arm64-gnu@npm:1.0.0-beta.53": "a4e4e59a5d316f72c691360027e4a843db4fad1ccf9ddac736890f4182f59612c5bcb4286420b88454658a0735ca63d0692fbba93c2fcc8009e15b3126e62266",
-  "@rolldown/binding-linux-arm64-gnu@npm:1.0.0-beta.9-commit.d91dfb5": "8ff267e66b1f59e9317d5b9d89e00a3e11172ae5b5cca17985e92cd52672ef59cd2d6292263700ff8edb02b53420865f655e6ed7f4b4ad8680e4ee0d99dcf5a7",
-  "@rolldown/binding-linux-arm64-musl@npm:1.0.0-beta.53": "4f465651c516cc78513fa2b6685667acf248b076a19809252063644512ad7949faf46a64738024c266a39c411cb4be15142aa4a352dcd01e1c65486f9f623578",
-  "@rolldown/binding-linux-arm64-musl@npm:1.0.0-beta.9-commit.d91dfb5": "7b320fbdc870cb7f2f75e89058ac50a675c05236df12739b98ce287ad07cce53474699bf19b729577c3de62d80c2fbd988cbbb8bc29e06c88fc42a8ece176b19",
-  "@rolldown/binding-linux-x64-gnu@npm:1.0.0-beta.53": "702a095a2c4b59a48da26be306172585ee01d284900984c56e663cd15b82748e90b7fa96c0d894651d98ca456ac59fe3e70ff88680a636b6c23353919a04d762",
-  "@rolldown/binding-linux-x64-gnu@npm:1.0.0-beta.9-commit.d91dfb5": "99679e1c7e290c7d747d6deb420357522fb0fab1fd022cf79f84534243af2eac15988c8ef5d1b50c679fdc915788360bf744c4e0c9e47952aa0985f23ee58e80",
-  "@rolldown/binding-linux-x64-musl@npm:1.0.0-beta.53": "b410d862c88ec59e8e8a31934ab78ed81b31ed00ed69057038a232d44ee9b7942d1f29ee48991e3a0b2fbcbec889d7819166f77679c907271e7f9a381414d1db",
-  "@rolldown/binding-linux-x64-musl@npm:1.0.0-beta.9-commit.d91dfb5": "2ce172ea44980ca6b86636a13cce7d70104e25f75caaa0c4d6d9199721825a896a74b11bc32fecbc2756aa829d7e10f4701b2f3544b77cfa4da3c2cea0d72e1c",
-  "@rolldown/binding-openharmony-arm64@npm:1.0.0-beta.53": "3dd98fa2c676472bfcf825ee561ac3e8046d48d87d4beab5cc312c871be65387e5b527977b9ac7e2c2d4c8f0e7249d2d536c7cd5124b5550e37bf295cb91729d",
-  "@rolldown/binding-wasm32-wasi@npm:1.0.0-beta.53": "3645fc9eac2f4e8b6f5f1552154a8ae1ed5c1975a37f0da22bb4ec9d8dcd4b8d346feb013a927e9254c33bea7b2b4fc2ff5cfebe3c791f215663ac983bf03306",
-  "@rolldown/binding-wasm32-wasi@npm:1.0.0-beta.9-commit.d91dfb5": "3516b21ab1982990435d550a23c153393ce1a2c9308b6df6614438c14ef1206d50c5e7dd214c403a42c9f4e695b574122abc8009df5171ebb79e685da14e7562",
-  "@rolldown/binding-win32-arm64-msvc@npm:1.0.0-beta.53": "d0ecd1a1fe4388ae11d7bacace91694ad0135cf25a0200f7b7ae3ce9fac637ff079c5140a680288d3f7fc35eea0100d1a176ed43db4d88c86429804cb6a800e1",
-  "@rolldown/binding-win32-arm64-msvc@npm:1.0.0-beta.9-commit.d91dfb5": "17086030865bbfb6668d04f882926035fc1f72db81c3415a8f81e6196b9f849eabd6f2a62066e83f87255fcec106fe274353c8f5ff9c782417b6eddc664a129c",
-  "@rolldown/binding-win32-ia32-msvc@npm:1.0.0-beta.9-commit.d91dfb5": "ecd226ec05f9f863d97de98ca4d7cb9026bcb0cd2fff12e325209664eaca1fa131744ad72d1352b522567adfe4967ca73e50987f96ab475b50e9b96456dd50cf",
-  "@rolldown/binding-win32-x64-msvc@npm:1.0.0-beta.53": "bbc80dbfb97a1780f0666ffd111f1fbe2b6b2cc1d60102cf41bb0fd03788e020552c94a5e82f95dc75b3696fe0f986a1a362fc7c62bcd899892986a4391fc63a",
-  "@rolldown/binding-win32-x64-msvc@npm:1.0.0-beta.9-commit.d91dfb5": "9e50f65fb7ad451a6eb4f9305650605e7a4efdd6873ad9412520edb8fd4c7f0bb67aa9922dbf1bad055c01a0de677eace73abf4285409cb9defae93956a83b24",
-  "@rollup/rollup-linux-x64-gnu@npm:4.45.1": "baf9081b367a5f557cfcd17ae60b196c00a933e87c5b16045efa312cb142518c91706ae3e6a4be1d09f7fbf2b133d386fc4ff3f6dd2d5b7149ac139af4a63391",
-  "@swc/core-darwin-arm64@npm:1.13.3": "f3cdf75ccc7b66d8c4b2bb7a5664542a904821bd7f08f91e3e399112dcb4436ee9a7df306a80e58a80a31b20b9b69f830a2dca91d74e62bbe6c72cde84c75d66",
-  "@swc/core-darwin-x64@npm:1.13.3": "c3515f878f50eb6730da948c10aec867b16f64fefbbc72fdfd9bde385ce84cfc606e87534dd77fbc817fc08bb144a2ea61e1c3e5fffd6b2e9a68b71eebb49a77",
-  "@swc/core-linux-arm-gnueabihf@npm:1.13.3": "8ec4f056982f779e55ad7d52f4f5ee4928ee48620977b2c4d3f47232d5cea119f47adaad9ca7bb7b1f261535ce5c19c0b2506c41da76e90c7fc7fc3a0e505d06",
-  "@swc/core-linux-arm64-gnu@npm:1.13.3": "d2804f542f5f78681ad4cc643dd32c7c948d94b7d2878fadcc465d0cbc4480147ed99298b4eed8f3c5d9cceba8bd1b1cc0f79e1754f23d6af5ccdcb6616b37b6",
-  "@swc/core-linux-arm64-musl@npm:1.13.3": "5d62f789505e5d72a08add9c35a12d85c23c18068dc627fb97deaea8be6d4910e2fd7afb63c03bbcefdf95a45ab4bf0c8534edf12d177c7facd2571d1c0ec2a5",
-  "@swc/core-linux-x64-gnu@npm:1.13.3": "a3d17ea9fb821fbced3d251fb03558bc25d29d5c289f96d87001f2ce17838c6de4e31365da9b95d21ed68b1dcfb6790c34457d7e0ce5c8a38dac7c0ed51937db",
-  "@swc/core-linux-x64-musl@npm:1.13.3": "fc7f7197f7fac7c068fd408d454ad62ff91f956db603d17b6133db7f28f606899fcd31075ca206970e9fce6a69a9e18dc33a82e1094ec142fc906b02be3a5d19",
-  "@swc/core-win32-arm64-msvc@npm:1.13.3": "bb4b197e4ffbf02dd5d3714af345fd41f7b6d6606d08f88f164be468ddade90c2e9912964b7da18863246ebe5b368dfd6a6f52fae4ffa517ab52f73d3cd9b8b3",
-  "@swc/core-win32-ia32-msvc@npm:1.13.3": "c244aa591eb71dac4316b2062e19217710f76fa217c84517e3c64c5cbbfa6a74ccab3322a92f183d47f34fff371bc1ddce93ad2c88c2f72a0265a6d009b0dbeb",
-  "@swc/core-win32-x64-msvc@npm:1.13.3": "b1ab6ee1ce12249259995c2997586e289225eb12066c95d14f829152a48a389eb5a3f99312f7953e4f62a1e0468c61900d59e3583be53b64d7854df2a4716b80",
-  "@tailwindcss/oxide-android-arm64@npm:4.1.13": "fbdff27e98b9781cd54b1e959b8ab5dc60ef7a9dd9cb0b01b947441f0e88c9b0e25b66a72de37c8a099e09e444f38e134f33be13490af6d35070c6f9375a55b0",
-  "@tailwindcss/oxide-darwin-arm64@npm:4.1.13": "1814b1f5773b1e5f70f86bcb533733bc64ffe9b01200d999981052dbfac2c05c92e3a79c08aa42a78725dadaa04b67652b4466738494a94135dce5d2996ae4be",
-  "@tailwindcss/oxide-darwin-x64@npm:4.1.13": "bfb11311a1d76631543dcfdbba1fa9a96464bd4730d51c8b6694745de62f08f93d07f5763aaea5895e3f35998d185be44373605a8d6da95b2df4a2db9a450d55",
-  "@tailwindcss/oxide-freebsd-x64@npm:4.1.13": "e7ed50f10e35bbc3ef46a0bf8b12a478ec09de8fb4d2054605106b2f9402eda8a2c0e2521a85cb740ad0407ff4c9aa367021b1577e5cd75fac91a365cbf55804",
-  "@tailwindcss/oxide-linux-arm-gnueabihf@npm:4.1.13": "bd882a8a8c34e6d6f6318fd4e717995e811a0eee322e2de37a9abd6e488bc2771fd0ba14bbca237e3e544a2d9fc9c1cf33620a77eb45cf1848d03ee27b17baef",
-  "@tailwindcss/oxide-linux-arm64-gnu@npm:4.1.13": "9d575d7e6b7fae40e363c8de6f7d8db06e057c9b1cec12279e2e794e07af22d1866de0f2e7d7387d6de505e03efd042385b862303b89438cb903458ffd351fd3",
-  "@tailwindcss/oxide-linux-arm64-musl@npm:4.1.13": "9a43e73d911da442b9014f90c5dada89fa58d114f92509c8a706cd26fe17630abf3de8ae1cb32e651389ca2349ce42f99b8d4837eafc399cfef65e9894e61013",
-  "@tailwindcss/oxide-linux-x64-gnu@npm:4.1.13": "15ba6fea2bd318e0053497e73638bffae4501762536796483442ef8dd6600d9085cb29916573286acab15533fe10139853e11f4c1fc59ba4da3192c0b0915b56",
-  "@tailwindcss/oxide-linux-x64-musl@npm:4.1.13": "364d9299460d703c0ef4d8fbe413f30288233e2aee81f1a77984a8c7831e4e997a4c49bfe0f16d0495b7102444db6abc82b75bac99babe4b78929fd906a5136e",
-  "@tailwindcss/oxide-wasm32-wasi@npm:4.1.13": "39f07aca836ff9c24c498af84d504fd1e28e21d7eb9202156217ae9ce519274532d5dfa6056c5ae62d175753e2cf74d6f0d6077f28c3c0b75dca468573eed9f0",
-  "@tailwindcss/oxide-win32-arm64-msvc@npm:4.1.13": "99c2cbdcb0144164f84ba2a31241232a7bb2cf68201e8f0c22da57be47a92a2b5302ec3c1f822fe48cb49ba4e1dc587374b07f004360c3de724c3ad5f9ba4b0f",
-  "@tailwindcss/oxide-win32-x64-msvc@npm:4.1.13": "ce35239ff4439e717aec9c31f5315ece74b47e444eccb288ee195ac63d84699d4116397e87698e717f7dd1b8b27be1049f3605e04fb7a78b720d25cde5b82340",
-  "@typescript/native-preview-darwin-arm64@npm:7.0.0-dev.20250915.1": "9aaa1e3b19f80dd19df4e0aeeba682ab8df25855a0673dc8e4fa9a60fdf5c330f66776c7fac0ed0d4308792e115f75dc6e6fa9c0557647715b4d35c4fd440927",
-  "@typescript/native-preview-darwin-x64@npm:7.0.0-dev.20250915.1": "44b68a689879364b150b38d9075814d5d502fae9188b7b73b630c5812e0a4f2c3fe07b854f5df6ddc87802a5bbc566b9240f187c78de855d647654980d5508e0",
-  "@typescript/native-preview-linux-arm64@npm:7.0.0-dev.20250915.1": "9f7b57723ffba13e32e535f5de7cd98e8b607b3609c8cc830b97c09415e1a0a93b09555da12d9994efbbfdcbdfb1e2724b9ee4fa272490757241493f3e15934b",
-  "@typescript/native-preview-linux-arm@npm:7.0.0-dev.20250915.1": "b39223bc14371d963bc6614c8b0e0215c81a2a39cbed686e0848a47511c379e23491a8b086d2b44df7f519994ef2314039153b1101d6ad188c61f0fadad2f1e8",
-  "@typescript/native-preview-linux-x64@npm:7.0.0-dev.20250915.1": "c4efcb6cd0ca92eb12f31f6032d2025d3771a9e6ef98f5fe22de97cc6bc4b09e8793fd5e3bf3136a6bf5999534db299794a5d7f59a7ba42dcf4b49ffa538783d",
-  "@typescript/native-preview-win32-arm64@npm:7.0.0-dev.20250915.1": "e32b96a6fff599b138965903c50c546290ea257f812f6c5ad85d84d9c2550039d314f1eb801f00728aecbe757f39a7361f890dcc39798277c2c662c7c3caff84",
-  "@typescript/native-preview-win32-x64@npm:7.0.0-dev.20250915.1": "6df4add8a206102964baf252953444ef21861d89eeba7936311e8bd4ac2c37b01e3a870fcb1fe6bed6b2b402ed80cc229bdf11e4c13bf32b6fe942e4f11abf10",
-  "dmg-license@npm:1.0.11": "feef35cfb45270a72daadcca9584be5cb840f924448b9d4e543fcd61f1b6d471151049f277c91de1d8b003fad6203d0176066a5f427a01df5fb073402cb8c8b7",
-  "iconv-corefoundation@npm:1.1.7": "bc6f08ac421e5e92ed20f3825f123fd705e036612b2b6aa687958de753c06f32e54f0203ef55540869e3ee189eaea15e43a2757f3a90e555c4dd512c9422da43",
-  "lightningcss-android-arm64@npm:1.30.2": "7b8a62c7aa787251381e9e082fc19991e8bca696f17be4dad0a5c3a31483d1452e6f8b04713b9c9221ef8d9b011510ee10d69c34005294be92ba2e57ad075a90",
-  "lightningcss-darwin-arm64@npm:1.30.1": "bbdce4ee14b3952699e6d07c539cf4bd678853bfd974e3107742198dac38dfa6d40c6ea80163a7026aff662dd7d3a462a2bee9a18448c75c788659ceebe2746a",
-  "lightningcss-darwin-arm64@npm:1.30.2": "fe4f6eb4af66f95a0f83a9b4970f863417ae9ac394b5c963a20cda24ae08ae0ce6ebdc6f8e664d8b53717afb936242b9a73394584b55ecf2978babab50364e93",
-  "lightningcss-darwin-x64@npm:1.30.1": "6b88c182be0de82858983ec374093c2cb13cd58139456e25be215fc55a7a8cbfcd6f7487bee1507fc024988a1f324d7cb26b3f195893d5a69ccaf252dc9094eb",
-  "lightningcss-darwin-x64@npm:1.30.2": "b2d82add63e88d77dbd08508a32c1c28a12de826d4dd70f6ec17ffae9d3c5bf1be7a7c35f154bf98bca4164b7390ba515202884e4cabaa83ed7f1727baaa08fa",
-  "lightningcss-freebsd-x64@npm:1.30.1": "731a96282db6afff3f57e8cbb73f51d06455231868b3b311a772ee11ead9c57538fc217d0956df4f177dbb805fa4fc761734440f6d2bb8965963b21f06bf63c1",
-  "lightningcss-freebsd-x64@npm:1.30.2": "cea6113555ed6fd69e10c67a8616d3b4c743eacd817e93d290b7d85d1c2eb29386466e55f61890f4aee87cafe062ef037b92824160418dd1c299bb7d15796cec",
-  "lightningcss-linux-arm-gnueabihf@npm:1.30.1": "fcf07f54c4d7d056f9b57d39e6df1c6f60c02ef4ebd51eda76056d35d89b1307af8737e44076d2b1f85348d2b1b9c61bf2220c5347389a6d40ad8bb12f34b5cf",
-  "lightningcss-linux-arm-gnueabihf@npm:1.30.2": "93119a9476759aff2a1a3fe35dfdfd39b0eab320b76725b36bddfc11f258f80140831169ed10f5528349863f7c6497358ec73d3c13054e6dc72ef5b26a22bd26",
-  "lightningcss-linux-arm64-gnu@npm:1.30.1": "bc82ce2e96ffab4b0ba1f9adacf63f461c3f6221bcbc955104c05e6e8c2c6ed8863421663e0e4148a682b143868d07190c38e9f990915a80ce9692f963132320",
-  "lightningcss-linux-arm64-gnu@npm:1.30.2": "c52236dd9777f150b849e0ed4ec1a4d17dc2bbe1ffa802286483d9c71e868eef16b54e348e410d44921262beb4474d2b4c90c268aa2c1109e55899d7cf8294c8",
-  "lightningcss-linux-arm64-musl@npm:1.30.1": "2ae25a764b8ed9fcc1977dc1786011e68db23bf3343168fa2d4a9a4bcbb73c7aae258cdcb879d68a3a28e22343705ee435517d3f045e49b15fbb65816d74a91d",
-  "lightningcss-linux-arm64-musl@npm:1.30.2": "85b54252172367c9b15be312c55f982d0541063b0626faa370c26d5eb8bedc36e036b6081374aba35f68d9e82c729239fb7af52f997004df715b09a6f7c5d453",
-  "lightningcss-linux-x64-gnu@npm:1.30.1": "190ac9ba1b9a4bf658a9e5b3c5702546ec779a7a5ccf5a4e06e5d46012ce6cad1842a9b1e717498bc759e103ba7390f42c9b8ba3e67157adec8e7162225633b4",
-  "lightningcss-linux-x64-gnu@npm:1.30.2": "658f54482728885541331184a5fefc3df76e1f4d691ad28d70b559dc391d552837bc95676449e48cbdcda8d63165f0f56c921a09ec2c6fc591b427c566e0b9ed",
-  "lightningcss-linux-x64-musl@npm:1.30.1": "fab6ed75d747024fcf46212b9edc7d1daccfbe4e7a06dcd0f9e841c6a023e61e716751747f9e8aecba18495adc9ef6bc20b24616d5c15c87f5dc1ff9ce1fd859",
-  "lightningcss-linux-x64-musl@npm:1.30.2": "6b046d57dab2237729953f1350a922844fafd16bdbae3a9ee17b04abdc2e2d2392ccd61932e7210276bf18938165d900517d2079ec57d866fd288b8bba28dbd4",
-  "lightningcss-win32-arm64-msvc@npm:1.30.1": "2cc285e89f66323ecae5ec41a6b1a57500d74a549fb392829c99708d5a5254d709c0ccd2d8fef4f6c1fc9a55c5bd51eca633fa1f2228563f884545668adc1b17",
-  "lightningcss-win32-arm64-msvc@npm:1.30.2": "f8383d06fe81494ba34b9bd7eb713ad91dbd84d4f321526b5190d7908e95591e462159acf71f6d3a0c33ea1251d5e80c012d255d94e9aa4187a476a810a249bc",
-  "lightningcss-win32-x64-msvc@npm:1.30.1": "60bd930e71fab0fbf0250406d4791bf27f0b9c8daf095c8d5fce9f3e120d24753e309eb6fed956043fc6a6cbb6d1da30fb0862acb54fa046b5f9a2e69908b6f9",
-  "lightningcss-win32-x64-msvc@npm:1.30.2": "ab86748b46ca851d29c387cb349cd35ca9da6fc73082b759ef84d358ec08ece6491e0eb137ea8b30b85419c20075c59f44620ab026d9a0aa0e86d3e0a610a960"
-}
diff --git a/pkgs/by-name/ch/cherry-studio/package.nix b/pkgs/by-name/ch/cherry-studio/package.nix
index 17e876d9c427..0d9c30858ca1 100644
--- a/pkgs/by-name/ch/cherry-studio/package.nix
+++ b/pkgs/by-name/ch/cherry-studio/package.nix
@@ -2,31 +2,42 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  yarn-berry_4,
+  fetchPnpmDeps,
+  electron_40,
   nodejs,
-  electron_38,
-  cctools,
-  autoPatchelfHook,
+  pnpm_10_29_2,
+  pnpmConfigHook,
   makeWrapper,
   writableTmpDirAsHomeHook,
-  makeDesktopItem,
   copyDesktopItems,
+  cctools,
+  autoPatchelfHook,
+  pkg-config,
+  makeDesktopItem,
+  nix-update-script,
+  alsa-lib,
+  libevdev,
+  libx11,
+  libxi,
+  libxfixes,
+  libxtst,
+  wayland,
   commandLineArgs ? "",
 }:
 
 let
-  electron = electron_38;
-  yarn-berry = yarn-berry_4;
+  electron = electron_40;
+  pnpm = pnpm_10_29_2;
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "cherry-studio";
-  version = "1.7.9";
+  version = "1.8.4";
 
   src = fetchFromGitHub {
     owner = "CherryHQ";
     repo = "cherry-studio";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-q/heW5o2IWFjsDed/SaMv5Xfm5kAP14RD1hALkipu+Q=";
+    hash = "sha256-TLV4N9WYuTD24UY+2lYmxRLO2jtdvuXyIOeH5mXb1V0=";
   };
 
   postPatch = ''
@@ -39,32 +50,48 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail "isAutoUpdate)" "false)"
   '';
 
-  missingHashes = ./missing-hashes.json;
-
-  offlineCache = yarn-berry.fetchYarnBerryDeps {
-    inherit (finalAttrs) src missingHashes;
-    hash = "sha256-AYKgGe9iTcXJqS019D064TRb5aY/XTS8u847LcYisa4=";
+  pnpmDeps = fetchPnpmDeps {
+    inherit (finalAttrs) pname version src;
+    inherit pnpm;
+    fetcherVersion = 3;
+    hash = "sha256-qryToH1tytLSwPORkLBCCn3m/Xsl+vift9WF3Pn8oGg=";
   };
 
   nativeBuildInputs = [
-    yarn-berry.yarnBerryConfigHook
-    yarn-berry
+    nodejs
+    (nodejs.python.withPackages (ps: with ps; [ setuptools ]))
+    pnpm
+    pnpmConfigHook
     makeWrapper
     writableTmpDirAsHomeHook
     copyDesktopItems
-    nodejs
-    (nodejs.python.withPackages (ps: with ps; [ setuptools ]))
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools.libtool ]
-  ++ lib.optionals stdenv.hostPlatform.isElf [ autoPatchelfHook ];
+  ++ lib.optionals stdenv.hostPlatform.isElf [
+    autoPatchelfHook
+    pkg-config
+  ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isElf [ stdenv.cc.cc.lib ];
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
+    stdenv.cc.cc.lib
+    alsa-lib
+    libevdev
+    libx11
+    libxi
+    libxtst
+    libxfixes
+    wayland
+  ];
+
+  autoPatchelfIgnoreMissingDeps = [
+    "libc.musl-*.so.*"
+  ];
 
   strictDeps = true;
 
   env = {
-    YARN_ENABLE_SCRIPTS = "false";
     ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
+    NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isLinux "-I${lib.getDev libevdev}/include/libevdev-1.0";
   };
 
   buildPhase = ''
@@ -73,8 +100,8 @@ stdenv.mkDerivation (finalAttrs: {
     cp -r "${electron.dist}" $HOME/.electron-dist
     chmod -R u+w $HOME/.electron-dist
 
-    yarn run electron-vite build
-    yarn run electron-builder --dir \
+    node_modules/.bin/electron-vite build
+    npm_config_nodedir=${electron.headers} npm_config_build_from_source=true node_modules/.bin/electron-builder --dir \
       --config=electron-builder.yml \
       --config.mac.identity=null \
       --config.electronDist="$HOME/.electron-dist" \
@@ -123,7 +150,7 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  passthru.updateScript = ./update.sh;
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     description = "Desktop client that supports for multiple LLM providers";
diff --git a/pkgs/by-name/ch/cherry-studio/update.sh b/pkgs/by-name/ch/cherry-studio/update.sh
deleted file mode 100755
index ed7554177e66..000000000000
--- a/pkgs/by-name/ch/cherry-studio/update.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl gnused jq nix bash coreutils nix-update yarn-berry.yarn-berry-fetcher
-
-set -eou pipefail
-
-PACKAGE_DIR=$(realpath $(dirname $0))
-
-latestTag=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/CherryHQ/cherry-studio/releases/latest | jq --raw-output .tag_name)
-latestVersion=$(echo "$latestTag" | sed 's/^v//')
-
-currentVersion=$(nix-instantiate --eval -E "with import ./. {}; cherry-studio.version or (lib.getVersion cherry-studio)" | tr -d '"')
-
-if [[ "$currentVersion" == "$latestVersion" ]]; then
-    echo "package is up-to-date: $currentVersion"
-    exit 0
-fi
-
-nix-update cherry-studio --version "$latestVersion" || true
-
-export HOME=$(mktemp -d)
-src=$(nix-build --no-link $PWD -A cherry-studio.src)
-WORKDIR=$(mktemp -d)
-cp --recursive --no-preserve=mode $src/* $WORKDIR
-pushd $WORKDIR
-yarn-berry-fetcher missing-hashes yarn.lock >$PACKAGE_DIR/missing-hashes.json
-popd
-
-nix-update cherry-studio --version skip || true
diff --git a/pkgs/by-name/cl/clouddrive2/package.nix b/pkgs/by-name/cl/clouddrive2/package.nix
index cf5f7140ea9b..a5380fa4b95e 100644
--- a/pkgs/by-name/cl/clouddrive2/package.nix
+++ b/pkgs/by-name/cl/clouddrive2/package.nix
@@ -11,16 +11,16 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "clouddrive2";
-  version = "0.9.24";
+  version = "1.0.3";
 
   src = fetchurl {
     url = "https://github.com/cloud-fs/cloud-fs.github.io/releases/download/v${finalAttrs.version}/clouddrive-2-${os}-${arch}-${finalAttrs.version}.tgz";
     hash =
       {
-        x86_64-linux = "sha256-fgdc2RjELrg0RCeehZ9RnJOUdAPFsI5Ev8sCsnWEVMw=";
-        aarch64-linux = "sha256-F0f7iZihZCnTGTH7zP7jZGWtpkRkdGLdx/4+wji4T2A=";
-        x86_64-darwin = "sha256-NXsc5vFGNWOHf1Y7zYR19Tcqi0frZ3PDyCPbR7UWk2c=";
-        aarch64-darwin = "sha256-IV/lSSsN88uiI/AoySZub9b6Xdj+r0Nx1uMrE+wyvOU=";
+        x86_64-linux = "sha256-Y7KC7gS0YsuyR0Icf6wOSocWMV/BhCOo5A3CivsEcFE=";
+        aarch64-linux = "sha256-sAGrW4x9iFxb65z4FFeNBtI9Fw6HnMG7qtWC/4WBmHI=";
+        x86_64-darwin = "sha256-9VX/zZFNWbr4aRLdg970f0d5aUuSjU0SU2DWIn/25TY=";
+        aarch64-darwin = "sha256-Obff5qaMiUiec53/pVBk+IRci9zaUfRpWPDmP8Oufeo=";
       }
       .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
   };
diff --git a/pkgs/by-name/ex/extractpdfmark/package.nix b/pkgs/by-name/ex/extractpdfmark/package.nix
index ffda241e9ef6..4fbf47da5f27 100644
--- a/pkgs/by-name/ex/extractpdfmark/package.nix
+++ b/pkgs/by-name/ex/extractpdfmark/package.nix
@@ -6,7 +6,7 @@
   pkg-config,
   poppler,
   stdenv,
-  texlive,
+  texliveMinimal,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeCheckInputs = [
     ghostscript
-    texlive.combined.scheme-minimal
+    texliveMinimal
   ];
 
   meta = {
diff --git a/pkgs/by-name/fm/fmd-server/package.nix b/pkgs/by-name/fm/fmd-server/package.nix
index 824e4bf40cda..5ffd26968563 100644
--- a/pkgs/by-name/fm/fmd-server/package.nix
+++ b/pkgs/by-name/fm/fmd-server/package.nix
@@ -2,37 +2,93 @@
   lib,
   buildGoModule,
   fetchFromGitLab,
+  fetchPnpmDeps,
   nix-update-script,
+  nodejs,
+  pnpm,
+  pnpmConfigHook,
+  stdenv,
   versionCheckHook,
 }:
-let
-  version = "0.13.0";
-in
-buildGoModule {
-  pname = "fmd-server";
-  inherit version;
-  src = fetchFromGitLab {
-    owner = "fmd-foss";
-    repo = "fmd-server";
-    tag = "v${version}";
-    hash = "sha256-pIVsdoen45YWG/V8qW/DE/yet4o+8MqpVHgHh70Fty8=";
-  };
+buildGoModule (
+  finalAttrs:
+  let
+    inherit (finalAttrs.finalPackage.passthru) ui;
+  in
+  {
+    pname = "fmd-server";
+    version = "0.14.1";
+    src = fetchFromGitLab {
+      owner = "fmd-foss";
+      repo = "fmd-server";
+      tag = "v${finalAttrs.version}";
+      hash = "sha256-UmiYtriLC9qztv7nW+1tFpYv9I0NAOsApAJWP72OINg=";
+    };
 
-  vendorHash = "sha256-d8QP6k7vEX0jBcpIMZymgOFYyKqGhND4Xa+mANg172s=";
+    pnpmDeps = fetchPnpmDeps {
+      inherit (ui) pname;
+      inherit pnpm;
+      sourceRoot = "${finalAttrs.src.name}/${ui.pnpmRoot}";
+      fetcherVersion = 3;
+      hash = "sha256-fgqNaFQ4+uJxXzDJJq+D0+EFaLaYR+WUzi5kGq5ezjs=";
+    };
 
-  nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "version";
+    vendorHash = "sha256-cFIg9mOSQbrYHW4kg4aTeTaF+gy1jNpAlg8qepb81Jc=";
 
-  doInstallCheck = true;
-  passthru.updateScript = nix-update-script { };
+    nativeInstallCheckInputs = [ versionCheckHook ];
+    versionCheckProgramArg = "version";
 
-  meta = {
-    description = "Server to communicate with the FindMyDevice app and save the latest (encrypted) location";
-    homepage = "https://fmd-foss.org/";
-    downloadPage = "https://gitlab.com/fmd-foss/fmd-server";
-    license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ j0hax ];
-    teams = [ lib.teams.ngi ];
-    mainProgram = "fmd-server";
-  };
-}
+    doInstallCheck = true;
+    passthru.updateScript = nix-update-script { };
+
+    passthru.ui = stdenv.mkDerivation {
+      inherit (finalAttrs) version src pnpmDeps;
+      pname = "${finalAttrs.pname}-web-ui";
+
+      pnpmRoot = "web";
+      distRoot = "dist";
+
+      nativeBuildInputs = [
+        nodejs
+        pnpmConfigHook
+        pnpm
+      ];
+
+      buildPhase = ''
+        runHook preBuild
+
+        pushd web
+        pnpm build
+        popd
+
+        runHook postBuild
+      '';
+
+      installPhase = ''
+        runHook preInstall
+
+        mkdir -p "$out"
+        cp -r '${ui.pnpmRoot}/${ui.distRoot}' "$out"
+
+        runHook postInstall
+      '';
+    };
+
+    postUnpack = ''
+      cp -r ${ui}/${ui.distRoot} /build/source/web/
+    '';
+
+    meta = {
+      description = "Server to communicate with the FindMyDevice app and save the latest (encrypted) location";
+      homepage = "https://fmd-foss.org/";
+      downloadPage = "https://gitlab.com/fmd-foss/fmd-server";
+      license = lib.licenses.gpl3Plus;
+      maintainers = with lib.maintainers; [
+        j0hax
+        jthulhu
+      ];
+      teams = [ lib.teams.ngi ];
+      mainProgram = "fmd-server";
+    };
+  }
+)
diff --git a/pkgs/by-name/li/libqalculate/package.nix b/pkgs/by-name/li/libqalculate/package.nix
index 0b70df361a2c..323bb2243bd4 100644
--- a/pkgs/by-name/li/libqalculate/package.nix
+++ b/pkgs/by-name/li/libqalculate/package.nix
@@ -26,13 +26,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libqalculate";
-  version = "5.9.0";
+  version = "5.10.0";
 
   src = fetchFromGitHub {
     owner = "qalculate";
     repo = "libqalculate";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-BhpqNTFkghb+Qg/oEKfascvo5Q5BKXjzCOL8S7OE4Kc=";
+    hash = "sha256-s5K0VPpfx0/3lGgEKJDFXdPelidpqVTNpsDolEAmKvM=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/lk/lk-jwt-service/package.nix b/pkgs/by-name/lk/lk-jwt-service/package.nix
index d18cc930f148..48bb6edd3bba 100644
--- a/pkgs/by-name/lk/lk-jwt-service/package.nix
+++ b/pkgs/by-name/lk/lk-jwt-service/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "lk-jwt-service";
-  version = "0.4.1";
+  version = "0.4.2";
 
   src = fetchFromGitHub {
     owner = "element-hq";
     repo = "lk-jwt-service";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-x3QYq+PT0MFcRR50CG4NpCxv5KkoCLWzUEkPSdQnZX0=";
+    hash = "sha256-xL+fqWzaIP01gnJLQ+DRY7ak6DwsOnLqLM3DUGAqsVY=";
   };
 
-  vendorHash = "sha256-GJKSvdv41rRSCGVAgUDxHdXoxRj/h+eDktjRJ3O5QFE=";
+  vendorHash = "sha256-DdZg2UHta/ivGmIPO0jK9Gz758kEK7nm4FOv1qx/AUk=";
 
   passthru.tests = nixosTests.lk-jwt-service;
 
diff --git a/pkgs/by-name/ma/matlab-language-server/package.nix b/pkgs/by-name/ma/matlab-language-server/package.nix
index 8a8b47900c58..37de8f543b19 100644
--- a/pkgs/by-name/ma/matlab-language-server/package.nix
+++ b/pkgs/by-name/ma/matlab-language-server/package.nix
@@ -2,39 +2,29 @@
   lib,
   buildNpmPackage,
   fetchFromGitHub,
-  fetchpatch,
 }:
 
-buildNpmPackage {
+buildNpmPackage (finalAttrs: {
   pname = "matlab-language-server";
-  version = "1.1.6";
+  version = "1.3.9";
 
   src = fetchFromGitHub {
     owner = "mathworks";
     repo = "matlab-language-server";
-    # Upstream doesn't tag commits unfortunately, but lists versions and dates
-    # in README... See complaint at:
-    # https://github.com/mathworks/MATLAB-language-server/issues/24
-    rev = "c8c901956e3bbfbd6eab440a1b60c3fe016cf567";
-    hash = "sha256-D03gXyrvPYOMkJI2YuHfPAnWdXTz5baemykQ5j9L0rs=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-V4CW7mC3F4L7yqpB4AhpLNtOAaEGIWT8AMWCJkTHepI=";
   };
-  patches = [
-    # https://github.com/mathworks/MATLAB-language-server/pull/23
-    (fetchpatch {
-      url = "https://github.com/mathworks/MATLAB-language-server/commit/56374de620b4855529c4136539f52ab6030e2c92.patch";
-      hash = "sha256-F38ATP+eap0SnxQoib1JwIvNCFfB7g8EtXI9+iK5+HA=";
-    })
-  ];
 
-  npmDepsHash = "sha256-P3MSrwk6FVt4lK58pjwy0YOg2UZI0TG8uXjqCPudgTE=";
+  npmDepsHash = "sha256-eN6Z/UhzovwJh8EoCTuDnhsYyOxY9/fxOkPf0TqIg3k=";
 
   npmBuildScript = "package";
 
   meta = {
     description = "Language Server for MATLAB® code";
     homepage = "https://github.com/mathworks/MATLAB-language-server";
+    changelog = "https://github.com/mathworks/MATLAB-language-server/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ doronbehar ];
     mainProgram = "matlab-language-server";
   };
-}
+})
diff --git a/pkgs/by-name/me/meilisearch/package.nix b/pkgs/by-name/me/meilisearch/package.nix
index 90a22e67a401..08579f053a4c 100644
--- a/pkgs/by-name/me/meilisearch/package.nix
+++ b/pkgs/by-name/me/meilisearch/package.nix
@@ -8,18 +8,18 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "meilisearch";
-  version = "1.39.0";
+  version = "1.41.0";
 
   src = fetchFromGitHub {
     owner = "meilisearch";
     repo = "meilisearch";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-bgW/++VAnKzmUYm7A6JCzIBzXKlAgSMgxAseMfApce8=";
+    hash = "sha256-UbrRrtzTf6YWrU21wm1j8wMpPWBHon1JsXh+4LdawIs=";
   };
 
   cargoBuildFlags = [ "--package=meilisearch" ];
 
-  cargoHash = "sha256-IsrYJD/S5Or9AOa6+KtafRRCrCmFLdt68ysVIQQhJkE=";
+  cargoHash = "sha256-o7JXbnA+fYiJRaOyJLoEPNaJKEB5zVPhXt2h1fblxNk=";
 
   # Default features include mini dashboard which downloads something from the internet.
   buildNoDefaultFeatures = true;
diff --git a/pkgs/by-name/mi/microsoft-edge/update.py b/pkgs/by-name/mi/microsoft-edge/update.py
index e6c8b344d37b..d2298c382e6f 100755
--- a/pkgs/by-name/mi/microsoft-edge/update.py
+++ b/pkgs/by-name/mi/microsoft-edge/update.py
@@ -40,6 +40,7 @@ def write_expression():
         "upstream_version"
     )
     os.system(f'update-source-version microsoft-edge "{version}"')
+    os.system(f'update-source-version msedgedriver "{version}"')
 
 
 write_expression()
diff --git a/pkgs/by-name/mi/mise/package.nix b/pkgs/by-name/mi/mise/package.nix
index 659d4b761423..e3e6f1ab5091 100644
--- a/pkgs/by-name/mi/mise/package.nix
+++ b/pkgs/by-name/mi/mise/package.nix
@@ -22,16 +22,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mise";
-  version = "2026.3.10";
+  version = "2026.3.17";
 
   src = fetchFromGitHub {
     owner = "jdx";
     repo = "mise";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-NNJJIaphHfIUPl844cGuXwmAl/LBoy9Y8n8tn79HtAM=";
+    hash = "sha256-RVRKvhzjIHFGanBO8Ukat310IQT0HZA73WMFUCvVY84=";
   };
 
-  cargoHash = "sha256-6wB5/jXofj+Yeq6fA7zisnivr/BKw5pzWfQKWHnvTZ4=";
+  cargoHash = "sha256-YoEVPfKeABvL5zAbLvQdcuf5Exnm8wwgylSoMd8Q7rs=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/ms/msedgedriver/package.nix b/pkgs/by-name/ms/msedgedriver/package.nix
index d576d98ecea3..9a8804b97bf3 100644
--- a/pkgs/by-name/ms/msedgedriver/package.nix
+++ b/pkgs/by-name/ms/msedgedriver/package.nix
@@ -11,33 +11,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "msedgedriver";
-  # finding a version that has all 4 builds is a pain
-  # https://msedgewebdriverstorage.z22.web.core.windows.net/?form=MA13LH
-  version = "130.0.2849.1";
+  version = "146.0.3856.84";
 
-  src =
-    let
-      inherit (stdenvNoCC.hostPlatform) system;
-      selectSystem = attrs: attrs.${system} or (throw "Unsupported system: ${system}");
-      suffix = selectSystem {
-        x86_64-linux = "linux64";
-        aarch64-linux = "arm64";
-        x86_64-darwin = "mac64";
-        aarch64-darwin = "mac64_m1";
-      };
-
-      hash = selectSystem {
-        x86_64-linux = "sha256-U6YGD2PAhVUa7f+R5pmKLazGLOBbf3bRqzlwIJewA+w=";
-        aarch64-linux = "sha256-QJ1jRw8kkWbT8US5qI8DMZI/7Q8yJWpFXrfzGdxDWKE=";
-        x86_64-darwin = "sha256-Ejcv1DtuEiLJvTsv48AwoCQlFO3xM9PkM3HvZG65AC4=";
-        aarch64-darwin = "sha256-ykn4bYREE6xmJY02WiCRGsGnyWjnmnZM8FemK4XZqhc=";
-      };
-    in
-    fetchzip {
-      url = "https://msedgedriver.azureedge.net/${finalAttrs.version}/edgedriver_${suffix}.zip";
-      inherit hash;
-      stripRoot = false;
-    };
+  src = fetchzip {
+    url = "https://msedgedriver.microsoft.com/${finalAttrs.version}/edgedriver_linux64.zip";
+    hash = "sha256-WMfJQYfs8Y7fllPTy1UZ/mQmz+L/xb8neqhj457pTuE=";
+    stripRoot = false;
+  };
 
   buildInputs = [
     glib
@@ -46,7 +26,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     nss
   ];
 
-  nativeBuildInputs = lib.optionals (!stdenvNoCC.hostPlatform.isDarwin) [ autoPatchelfHook ];
+  nativeBuildInputs = [ autoPatchelfHook ];
 
   installPhase =
     if stdenvNoCC.hostPlatform.isDarwin then
@@ -75,9 +55,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [ cholli ];
     platforms = [
       "x86_64-linux"
-      "aarch64-linux"
-      "x86_64-darwin"
-      "aarch64-darwin"
     ];
     mainProgram = "msedgedriver";
   };
diff --git a/pkgs/by-name/op/openmpi/package.nix b/pkgs/by-name/op/openmpi/package.nix
index 20fc9b74502f..67a0d62ef13b 100644
--- a/pkgs/by-name/op/openmpi/package.nix
+++ b/pkgs/by-name/op/openmpi/package.nix
@@ -199,6 +199,10 @@ stdenv.mkDerivation (finalAttrs: {
     ''
       find $out/lib/ -name "*.la" -exec rm -f \{} \;
 
+      # Fortran .mod files end up in bin output.
+      # Force all headers into the dev output .
+      moveToOutput "include/" "''${!outputDev}"
+
       # The main wrapper that all the rest of the commonly used binaries are
       # symlinked to
       moveToOutput "bin/opal_wrapper" "''${!outputDev}"
diff --git a/pkgs/by-name/pa/paratest/composer.lock b/pkgs/by-name/pa/paratest/composer.lock
index 3748c77c8f77..e336d61dc8ad 100644
--- a/pkgs/by-name/pa/paratest/composer.lock
+++ b/pkgs/by-name/pa/paratest/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "9bb8c3ee26336dcc03e24ad2fb6922e8",
+    "content-hash": "10677300f4fe39e0eeaed10a098f8f1f",
     "packages": [
         {
             "name": "fidry/cpu-core-counter",
@@ -1216,16 +1216,16 @@
         },
         {
             "name": "sebastian/environment",
-            "version": "9.0.0",
+            "version": "9.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "bb64d08145b021b67d5f253308a498b73ab0461e"
+                "reference": "c4a2dc54b1a24e13ef1839cbb5947b967cbae853"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/bb64d08145b021b67d5f253308a498b73ab0461e",
-                "reference": "bb64d08145b021b67d5f253308a498b73ab0461e",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/c4a2dc54b1a24e13ef1839cbb5947b967cbae853",
+                "reference": "c4a2dc54b1a24e13ef1839cbb5947b967cbae853",
                 "shasum": ""
             },
             "require": {
@@ -1240,7 +1240,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "9.0-dev"
+                    "dev-main": "9.1-dev"
                 }
             },
             "autoload": {
@@ -1268,7 +1268,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/environment/issues",
                 "security": "https://github.com/sebastianbergmann/environment/security/policy",
-                "source": "https://github.com/sebastianbergmann/environment/tree/9.0.0"
+                "source": "https://github.com/sebastianbergmann/environment/tree/9.1.0"
             },
             "funding": [
                 {
@@ -1288,7 +1288,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-02-06T04:43:29+00:00"
+            "time": "2026-03-22T06:31:50+00:00"
         },
         {
             "name": "sebastian/exporter",
@@ -2912,11 +2912,11 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "2.1.40",
+            "version": "2.1.45",
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/9b2c7aeb83a75d8680ea5e7c9b7fca88052b766b",
-                "reference": "9b2c7aeb83a75d8680ea5e7c9b7fca88052b766b",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/f8cdfd9421b7edb7686a2d150a234870464eac70",
+                "reference": "f8cdfd9421b7edb7686a2d150a234870464eac70",
                 "shasum": ""
             },
             "require": {
@@ -2961,7 +2961,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2026-02-23T15:04:35+00:00"
+            "time": "2026-03-30T13:22:02+00:00"
         },
         {
             "name": "phpstan/phpstan-deprecation-rules",
@@ -3122,16 +3122,16 @@
         },
         {
             "name": "slevomat/coding-standard",
-            "version": "8.28.0",
+            "version": "8.28.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/slevomat/coding-standard.git",
-                "reference": "0cd4b30cc1037eca54091c188d260d570e61770c"
+                "reference": "66151cfbd25b50e8becd9f809fb704f01fd4d6f2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/0cd4b30cc1037eca54091c188d260d570e61770c",
-                "reference": "0cd4b30cc1037eca54091c188d260d570e61770c",
+                "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/66151cfbd25b50e8becd9f809fb704f01fd4d6f2",
+                "reference": "66151cfbd25b50e8becd9f809fb704f01fd4d6f2",
                 "shasum": ""
             },
             "require": {
@@ -3143,7 +3143,7 @@
             "require-dev": {
                 "phing/phing": "3.0.1|3.1.2",
                 "php-parallel-lint/php-parallel-lint": "1.4.0",
-                "phpstan/phpstan": "2.1.40",
+                "phpstan/phpstan": "2.1.42",
                 "phpstan/phpstan-deprecation-rules": "2.0.4",
                 "phpstan/phpstan-phpunit": "2.0.16",
                 "phpstan/phpstan-strict-rules": "2.0.10",
@@ -3171,7 +3171,7 @@
             ],
             "support": {
                 "issues": "https://github.com/slevomat/coding-standard/issues",
-                "source": "https://github.com/slevomat/coding-standard/tree/8.28.0"
+                "source": "https://github.com/slevomat/coding-standard/tree/8.28.1"
             },
             "funding": [
                 {
@@ -3183,7 +3183,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-02-23T21:35:24+00:00"
+            "time": "2026-03-22T17:22:38+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",
diff --git a/pkgs/by-name/pa/paratest/package.nix b/pkgs/by-name/pa/paratest/package.nix
index 7c4bdc19a4ed..78f420bf7b25 100644
--- a/pkgs/by-name/pa/paratest/package.nix
+++ b/pkgs/by-name/pa/paratest/package.nix
@@ -8,17 +8,17 @@
 (php.withExtensions ({ enabled, all }: enabled ++ [ all.pcov ])).buildComposerProject2
   (finalAttrs: {
     pname = "paratest";
-    version = "7.19.2";
+    version = "7.20.0";
 
     src = fetchFromGitHub {
       owner = "paratestphp";
       repo = "paratest";
       tag = "v${finalAttrs.version}";
-      hash = "sha256-LZZUqtCnZTH3UC6KqhTt3QOcwErowCxQO2uXXmizroc=";
+      hash = "sha256-ruv6bC6WCW/N6Tlhz8OabO8++/NKeGyLlNkatNp/7+4=";
     };
 
     composerLock = ./composer.lock;
-    vendorHash = "sha256-pvd/2bxcmQGa4H2XBqbhb9l30sQ9+AXDP2EqKrtP5Pk=";
+    vendorHash = "sha256-8hi6rgRA1hRq2STQsOfKq/wyztxMej1DBCe2c5+DDsE=";
 
     passthru.updateScript = ./update.sh;
 
diff --git a/pkgs/by-name/qa/qalculate-gtk/package.nix b/pkgs/by-name/qa/qalculate-gtk/package.nix
index a1a08dcc692c..cbbe1ae1cfd8 100644
--- a/pkgs/by-name/qa/qalculate-gtk/package.nix
+++ b/pkgs/by-name/qa/qalculate-gtk/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qalculate-gtk";
-  version = "5.9.0";
+  version = "5.10.0";
 
   src = fetchFromGitHub {
     owner = "qalculate";
     repo = "qalculate-gtk";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5rldVskEoCJi6SvBn4xbGUB9wb6lObToi8gN3e8FvHY=";
+    hash = "sha256-JZfolSRLRLtv529f25lEPYOlz+y+EdRqKA0Y5d1dK3s=";
   };
 
   hardeningDisable = [ "format" ];
diff --git a/pkgs/by-name/qa/qalculate-qt/package.nix b/pkgs/by-name/qa/qalculate-qt/package.nix
index 86f16fc348ce..7297a744ac99 100644
--- a/pkgs/by-name/qa/qalculate-qt/package.nix
+++ b/pkgs/by-name/qa/qalculate-qt/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qalculate-qt";
-  version = "5.9.0.1";
+  version = "5.10.0";
 
   src = fetchFromGitHub {
     owner = "qalculate";
     repo = "qalculate-qt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Y/hAbdU/h5fRLmGESvgam2CeBInhD9ekZ1tiOFMbaZE=";
+    hash = "sha256-OxcwEydEerYhFnJAeXbGW6SpjdEIAi7UOQu8958qQFs=";
   };
 
   nativeBuildInputs = with qt6; [
diff --git a/pkgs/by-name/re/render-cli/package.nix b/pkgs/by-name/re/render-cli/package.nix
new file mode 100644
index 000000000000..4a83a34d0664
--- /dev/null
+++ b/pkgs/by-name/re/render-cli/package.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildGoModule,
+}:
+
+buildGoModule rec {
+  pname = "render-cli";
+  version = "2.5.0";
+
+  src = fetchFromGitHub {
+    owner = "render-oss";
+    repo = "cli";
+    rev = "v${version}";
+    hash = "sha256-nOcgDTFngeO7xKB7e9oLtAGD/ZpQqw++CGjvJRu+PUI=";
+  };
+
+  vendorHash = "sha256-Kd4qbBwk4U/LIkfwQopMqN5DqKHN5BMCMYWSR+OSKN0=";
+
+  # Tests require network access
+  doCheck = false;
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X github.com/render-oss/cli/pkg/cfg.Version=${version}"
+  ];
+
+  postInstall = ''
+    mv $out/bin/cli $out/bin/render
+  '';
+
+  meta = {
+    description = "Official command-line interface for Render cloud hosting platform";
+    homepage = "https://github.com/render-oss/cli";
+    changelog = "https://github.com/render-oss/cli/releases/tag/v${version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ jtamagnan ];
+    mainProgram = "render";
+  };
+}
diff --git a/pkgs/by-name/sa/sandbox-runtime/package.nix b/pkgs/by-name/sa/sandbox-runtime/package.nix
index c3c69312fa17..db0480f2b5aa 100644
--- a/pkgs/by-name/sa/sandbox-runtime/package.nix
+++ b/pkgs/by-name/sa/sandbox-runtime/package.nix
@@ -17,13 +17,13 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "sandbox-runtime";
-  version = "0.0.43";
+  version = "0.0.44";
 
   src = fetchFromGitHub {
     owner = "anthropic-experimental";
     repo = "sandbox-runtime";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-DzsIWR4IreGkSUtaJ2v5kTrI2hbG9O2bozQkJYYZ8LM=";
+    hash = "sha256-2yso4x2bsjMD4ij8Lp23dm61zQp+cdDMvsrMjiGKxo8=";
   };
 
   postPatch =
@@ -35,7 +35,7 @@ buildNpmPackage (finalAttrs: {
 
   strictDeps = true;
 
-  npmDepsHash = "sha256-UUxkaGF1kUhq7XShxAq33oQoLG/aM5p/4rpXIH4I+yE=";
+  npmDepsHash = "sha256-7vZYKkIknGaVSDiFikDLzpd9aNdRLnaiq8GT0chOhUk=";
 
   postFixup =
     let
diff --git a/pkgs/by-name/si/sirial/package.nix b/pkgs/by-name/si/sirial/package.nix
new file mode 100644
index 000000000000..ec2f6325c5c4
--- /dev/null
+++ b/pkgs/by-name/si/sirial/package.nix
@@ -0,0 +1,108 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  alsa-lib,
+  fontconfig,
+  freetype,
+  libx11,
+  libxcomposite,
+  libxcursor,
+  libxdmcp,
+  libxext,
+  libxinerama,
+  libxrandr,
+  libxtst,
+  writableTmpDirAsHomeHook,
+
+  buildVST3 ? true,
+  buildLV2 ? stdenv.isLinux,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "sirial";
+  version = "1.1.1";
+
+  src = fetchFromGitHub {
+    owner = "tiagolr";
+    repo = "sirial";
+    tag = "v${finalAttrs.version}";
+    fetchSubmodules = true;
+    hash = "sha256-Mx+DzNaj+oS9piQvBgMVMJl3+ZVg8NjJkh/WU/fMZ74=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    writableTmpDirAsHomeHook # fontconfig cache
+  ];
+
+  buildInputs = [
+    fontconfig
+    freetype
+  ]
+  ++ lib.optionals stdenv.isLinux [
+    alsa-lib
+    libx11
+    libxcomposite
+    libxcursor
+    libxdmcp
+    libxext
+    libxinerama
+    libxrandr
+    libxtst
+  ];
+
+  enableParallelBuilding = true;
+
+  cmakeFlags = [
+    (lib.cmakeBool "COPY_PLUGIN_AFTER_BUILD" false)
+    (lib.cmakeBool "BUILD_STANDALONE" false)
+    (lib.cmakeBool "BUILD_VST3" buildVST3)
+    (lib.cmakeBool "BUILD_LV2" buildLV2)
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "-DCMAKE_OSX_ARCHITECTURES=${stdenv.hostPlatform.darwinArch}"
+  ];
+
+  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isLinux (toString [
+    # juce, compiled in this build as part of a Git submodule, uses `-flto` as
+    # a Link Time Optimization flag, and instructs the plugin compiled here to
+    # use this flag to. This breaks the build for us. Using _fat_ LTO allows
+    # successful linking while still providing LTO benefits. If our build of
+    # `juce` was used as a dependency, we could have patched that `-flto` line
+    # in our juce's source, but that is not possible because it is used as a
+    # Git Submodule.
+    "-ffat-lto-objects"
+  ]);
+
+  installPhase = ''
+    runHook preInstall
+
+    pushd Sirial_artefacts/Release
+      ${lib.optionalString buildVST3 ''
+        mkdir -p $out/lib/vst3
+        cp -r VST3/Sirial.vst3 $out/lib/vst3
+      ''}
+      ${lib.optionalString buildLV2 ''
+        mkdir -p $out/lib/lv2
+        cp -r LV2/Sirial.lv2 $out/lib/lv2
+      ''}
+    popd
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Rhythmic delay with 16 serial delay lines for intricate patterns";
+    homepage = "https://github.com/tiagolr/sirial";
+    changelog = "https://github.com/tiagolr/sirial/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
+      magnetophon
+    ];
+    platforms = lib.platforms.all;
+  };
+})
diff --git a/pkgs/by-name/sq/squid/package.nix b/pkgs/by-name/sq/squid/package.nix
index a7385481f787..25c457e2152a 100644
--- a/pkgs/by-name/sq/squid/package.nix
+++ b/pkgs/by-name/sq/squid/package.nix
@@ -19,13 +19,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "squid";
-  version = "7.4";
+  version = "7.5";
 
   src = fetchurl {
     url = "https://github.com/squid-cache/squid/releases/download/SQUID_${
       builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version
     }/squid-${finalAttrs.version}.tar.xz";
-    hash = "sha256-4xl27ddVwpW9WEKjScnH2tFqaD0GYzfMCQM8EwK0/tQ=";
+    hash = "sha256-9gWJB9sBUNL10ihIK1qeVniSDPNorgzLzszrL/TDUQY=";
   };
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ti/tinygo/package.nix b/pkgs/by-name/ti/tinygo/package.nix
index 134fd6017fe6..31a33629858e 100644
--- a/pkgs/by-name/ti/tinygo/package.nix
+++ b/pkgs/by-name/ti/tinygo/package.nix
@@ -1,11 +1,11 @@
 {
   stdenv,
   lib,
-  buildGoModule,
+  buildGo125Module,
   fetchFromGitHub,
   makeWrapper,
   llvmPackages_20,
-  go,
+  go_1_25,
   xar,
   binaryen,
   avrdude,
@@ -16,8 +16,10 @@
 }:
 
 let
-  # nixpkgs typically updates default llvm version faster than tinygo releases
-  # which ends up breaking this build. Use fixed version for each release.
+  # nixpkgs typically updates default llvm and go versions faster than tinygo releases
+  # which ends up breaking this build. Use fixed versions for each release.
+  buildGoModule = buildGo125Module;
+  go = go_1_25;
   llvmMajor = lib.versions.major llvm.version;
   inherit (llvmPackages_20)
     llvm
@@ -34,14 +36,14 @@ let
   '';
 in
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "tinygo";
   version = "0.40.1";
 
   src = fetchFromGitHub {
     owner = "tinygo-org";
     repo = "tinygo";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-+dLdQdq47M+HKjiMQI1/NJZqiRFuR8rnv/osCbFTpQE=";
     fetchSubmodules = true;
     # The public hydra server on `hydra.nixos.org` is configured with
@@ -134,7 +136,7 @@ buildGoModule rec {
     make build/release USE_SYSTEM_BINARYEN=1
 
     wrapProgram $out/bin/tinygo \
-      --prefix PATH : ${lib.makeBinPath runtimeDeps}
+      --prefix PATH : ${lib.makeBinPath finalAttrs.runtimeDeps}
 
     runHook postInstall
   '';
@@ -147,4 +149,4 @@ buildGoModule rec {
       muscaln
     ];
   };
-}
+})
diff --git a/pkgs/by-name/to/toml-sort/package.nix b/pkgs/by-name/to/toml-sort/package.nix
index 4c2dddd908cc..0ecbb6ddfc94 100644
--- a/pkgs/by-name/to/toml-sort/package.nix
+++ b/pkgs/by-name/to/toml-sort/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
 }:
 let
-  version = "0.24.3";
+  version = "0.24.4";
 in
 python3Packages.buildPythonApplication {
   pname = "toml-sort";
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication {
     owner = "pappasam";
     repo = "toml-sort";
     tag = "v${version}";
-    hash = "sha256-QlKksxwgdN37Z6nU1CloUT+G+mRNnkVnbI2++J3R+AY=";
+    hash = "sha256-3xuCnzZ6SKUclvyyWRxHUJy0xF1rnJYwWPZD0OKWFxQ=";
   };
 
   build-system = [ python3Packages.poetry-core ];
diff --git a/pkgs/by-name/tu/turingdb/package.nix b/pkgs/by-name/tu/turingdb/package.nix
index a9f0aca8fe3a..c9a99e362a85 100644
--- a/pkgs/by-name/tu/turingdb/package.nix
+++ b/pkgs/by-name/tu/turingdb/package.nix
@@ -26,13 +26,13 @@ let
 in
 turingstdenv.mkDerivation (finalAttrs: {
   pname = "turingdb";
-  version = "1.23";
+  version = "1.26";
 
   src = fetchFromGitHub {
     owner = "turing-db";
     repo = "turingdb";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-v9uZqgC4UT2EnBJ+SRr96TiWAPIy1v39GEa2vF9hLf4=";
+    hash = "sha256-8Jqd6sJwHMg1DTcFeCPEjaNdE0UBAX+ULp+9V4h2/1Y=";
 
     fetchSubmodules = true;
 
diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json
index 4fc0433d5cf0..1affbddbbeac 100644
--- a/pkgs/by-name/wa/warp-terminal/versions.json
+++ b/pkgs/by-name/wa/warp-terminal/versions.json
@@ -1,14 +1,14 @@
 {
   "darwin": {
-    "hash": "sha256-/c0uVS3bclXQuriHaxJK9cjqdiz036OkzbXxLWrFkMI=",
-    "version": "0.2026.03.04.08.20.stable_04"
+    "hash": "sha256-GNDoWxD0Xqph+JyUj64YcMaIJu5y3mlLAhYcVrprDUc=",
+    "version": "0.2026.03.25.08.24.stable_05"
   },
   "linux_x86_64": {
-    "hash": "sha256-WldEfTHEAGKo2QaTi7bvZsw14RU+xoKqQaVQfy4KGHg=",
-    "version": "0.2026.03.04.08.20.stable_04"
+    "hash": "sha256-rUKSVE6cCZT1M1cTZ4S1C2ox3T9yacBpnl23J4CvKz8=",
+    "version": "0.2026.03.25.08.24.stable_05"
   },
   "linux_aarch64": {
-    "hash": "sha256-Kb85V9OLdIxEHbUBUkrpI5Y/hjJCjkDuBJkgztiPy7Y=",
-    "version": "0.2026.03.04.08.20.stable_04"
+    "hash": "sha256-ADTNNsRq7DmYlxrl2xLxBZkHlDHxbM08ywZPJDla0lk=",
+    "version": "0.2026.03.25.08.24.stable_05"
   }
 }
diff --git a/pkgs/by-name/wa/wayscriber/package.nix b/pkgs/by-name/wa/wayscriber/package.nix
index 061a99b1eadd..49c890f234e2 100644
--- a/pkgs/by-name/wa/wayscriber/package.nix
+++ b/pkgs/by-name/wa/wayscriber/package.nix
@@ -10,20 +10,20 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wayscriber";
-  version = "0.9.11";
+  version = "0.9.13";
 
   src = fetchFromGitHub {
     owner = "devmobasa";
     repo = "wayscriber";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-HoIa1uVk5Z+kmDxpFJl3Yjek1BVJvWrSdA4L3rJEv6o=";
+    hash = "sha256-5e+Qqy8SwRz3qOqcgwZtoVQ7j+nYski0Q8yj1PtDn14=";
   };
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     pango
     libxkbcommon
   ];
-  cargoHash = "sha256-vpJeFO363fFyoHcF0JYru4nhC5um2jmZscdTC/S/egQ=";
+  cargoHash = "sha256-YRNUZ82U8MTx1GFRT4mLvWcFatrbSsIkHp2NKtw6RbA=";
   passthru.updateScript = nix-update-script { };
 
   meta = {
diff --git a/pkgs/by-name/xd/xdg-desktop-portal-termfilechooser/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-termfilechooser/package.nix
index 7bfc8e9e4753..31d83754a04d 100644
--- a/pkgs/by-name/xd/xdg-desktop-portal-termfilechooser/package.nix
+++ b/pkgs/by-name/xd/xdg-desktop-portal-termfilechooser/package.nix
@@ -13,13 +13,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "xdg-desktop-portal-termfilechooser";
-  version = "1.3.0";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "hunkyburrito";
     repo = "xdg-desktop-portal-termfilechooser";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-7fbQ0iraT3UQFgpb9Jlfo0myS72IiH5+vyU7dAzldfM=";
+    hash = "sha256-GZi05OsyhLsiY/bTFLGd5KeJaD5CQNJInN0wCkXaOoU=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/foundrytools/default.nix b/pkgs/development/python-modules/foundrytools/default.nix
new file mode 100644
index 000000000000..4966e9a45dba
--- /dev/null
+++ b/pkgs/development/python-modules/foundrytools/default.nix
@@ -0,0 +1,60 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  afdko,
+  cffsubr,
+  defcon,
+  dehinter,
+  fonttools,
+  ttfautohint-py,
+  ufo2ft,
+  ufolib2,
+  ufo-extractor,
+}:
+buildPythonPackage (finalAttrs: {
+  pname = "foundrytools";
+  version = "0.1.5";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "ftCLI";
+    repo = "FoundryTools";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-dmMu9FTr754ax6dSfz1cn/CgmMVbEECQgyZaW+66UrU=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    afdko
+    cffsubr
+    defcon
+    dehinter
+    fonttools
+    ttfautohint-py
+    ufo-extractor
+    ufo2ft
+    ufolib2
+  ];
+
+  # No tests
+  doCheck = false;
+
+  meta = {
+    description = "Library for working with fonts in Python";
+    homepage = "https://github.com/ftCLI/FoundryTools";
+    changelog = "https://github.com/ftCLI/FoundryTools/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      qb114514
+    ];
+  };
+})
diff --git a/pkgs/development/python-modules/onnx-asr/default.nix b/pkgs/development/python-modules/onnx-asr/default.nix
index 2cfa1dc15f07..a73f4879a6ff 100644
--- a/pkgs/development/python-modules/onnx-asr/default.nix
+++ b/pkgs/development/python-modules/onnx-asr/default.nix
@@ -10,11 +10,9 @@
 
   # build-time deps for the custom hatch build hook that generates
   # ONNX preprocessor models (listed in pyproject.toml [dependency-groups] build)
+  ml-dtypes,
   numpy,
-  onnx,
   onnxscript,
-  torch,
-  torchaudio,
 
   # dependencies
   onnxruntime,
@@ -25,26 +23,22 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "onnx-asr";
-  version = "0.10.2";
+  version = "0.11.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "istupakov";
     repo = "onnx-asr";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KumdelY9oNMAEBSGVdvbBH6SYi93n2cA/eEqaE8MmIU=";
+    hash = "sha256-gi5U56ZPSo0bJ0Fmi8nebvIXENZWwX4lofk5vKV8gag=";
   };
 
   build-system = [
-    hatchling
     hatch-vcs
-    # The custom hatch build hook (hatch_build.py) generates ONNX preprocessor
-    # models at build time using these dependencies.
+    hatchling
+    ml-dtypes
     numpy
-    onnx
     onnxscript
-    torch
-    torchaudio
   ];
 
   dependencies = [
diff --git a/pkgs/development/python-modules/pylatex/default.nix b/pkgs/development/python-modules/pylatex/default.nix
index 1b2cf10a00d9..e2b57b9c5c9c 100644
--- a/pkgs/development/python-modules/pylatex/default.nix
+++ b/pkgs/development/python-modules/pylatex/default.nix
@@ -7,7 +7,7 @@
   pytestCheckHook,
   matplotlib,
   quantities,
-  texlive,
+  texliveSmall,
 }:
 
 buildPythonPackage rec {
@@ -35,7 +35,12 @@ buildPythonPackage rec {
     pytestCheckHook
     matplotlib
     quantities
-    (texlive.combine { inherit (texlive) scheme-small lastpage collection-fontsrecommended; })
+    (texliveSmall.withPackages (
+      ps: with ps; [
+        lastpage
+        collection-fontsrecommended
+      ]
+    ))
   ];
 
   meta = {
diff --git a/pkgs/development/python-modules/pytikz-allefeld/default.nix b/pkgs/development/python-modules/pytikz-allefeld/default.nix
index 47a153c7af9d..c6b193d3e786 100644
--- a/pkgs/development/python-modules/pytikz-allefeld/default.nix
+++ b/pkgs/development/python-modules/pytikz-allefeld/default.nix
@@ -6,7 +6,7 @@
   pymupdf,
   numpy,
   ipython,
-  texlive,
+  texliveSmall,
 }:
 
 buildPythonPackage {
@@ -31,7 +31,7 @@ buildPythonPackage {
 
   pythonImportsCheck = [ "tikz" ];
 
-  nativeCheckInputs = [ texlive.combined.scheme-small ];
+  nativeCheckInputs = [ texliveSmall ];
   checkPhase = ''
     runHook preCheck
     python -c 'if 1:
diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index af1b7dcb6848..935aa1915007 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -365,8 +365,8 @@ rec {
   # https://docs.gradle.org/current/userguide/compatibility.html
 
   gradle_9 = mkGradle {
-    version = "9.4.0";
-    hash = "sha256-YOpyM1bYEmPoAC/sD8+eKw7uDAhQx6PXqwpj8szGAfM=";
+    version = "9.4.1";
+    hash = "sha256-KrKVjyoeURIMMmytbzhRU7sR7pOzwhbF/M6/37t+xss=";
     defaultJava = jdk21;
     updateScriptMajorVersion = "9";
   };
diff --git a/pkgs/development/tools/build-managers/gradle/update-deps.nix b/pkgs/development/tools/build-managers/gradle/update-deps.nix
index 10db28f0fdcb..fdce0cfeec40 100644
--- a/pkgs/development/tools/build-managers/gradle/update-deps.nix
+++ b/pkgs/development/tools/build-managers/gradle/update-deps.nix
@@ -101,6 +101,12 @@ lib.makeOverridable (
           "${dirOf pkg.meta.position}/${data}"
       }"
 
+      # Check that the parent directory exists before running more costly tasks
+      if [ ! -d $(dirname "$outPath") ]; then
+        echo "Directory \"$(dirname "$outPath")\" does not exist, aborting as the next steps would fail anyway"
+        exit 1
+      fi
+
       pushd "$(mktemp -d)" >/dev/null
       MITM_CACHE_DIR="$PWD"
       trap "rm -rf '$MITM_CACHE_DIR'" SIGINT SIGTERM ERR EXIT
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix
index 882525f8aa03..7098d00718d2 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix
@@ -724,10 +724,10 @@
   };
 
   fsharp = {
-    version = "0.1.0-unstable-2025-07-05";
+    version = "0.2.2-unstable-2026-03-29";
     url = "github:ionide/tree-sitter-fsharp";
-    rev = "5141851c278a99958469eb1736c7afc4ec738e47";
-    hash = "sha256-cJpbO9PjGtJu4RCDsmQ0qjys765/z397y/wbfGxTY9Y=";
+    rev = "594c500ecace8618db32dd1144307897277db067";
+    hash = "sha256-e66aAsmNJWMcElqFIxSiHZgyQsq8NT7zU9y/fpbqJF4=";
     meta = {
       license = lib.licenses.mit;
       maintainers = with lib.maintainers; [
@@ -2859,10 +2859,10 @@
   };
 
   vhdl = {
-    version = "1.3.1-unstable-2026-02-21";
+    version = "1.4.0-unstable-2026-03-29";
     url = "github:jpt13653903/tree-sitter-vhdl";
-    rev = "7e0d014691c1b8c25e8fe8f30cc3ac4649df3f57";
-    hash = "sha256-r3fMnexbbIniZA75ZIJ+ay39/JCCb3b3J5F6bYMK4YY=";
+    rev = "497a47c441902030b916f8d5bc6f0f5291f135f3";
+    hash = "sha256-8rkklfXroaaJIFgkB1V82Bhx8QwJmMcGMz72i994ukA=";
     meta = {
       license = lib.licenses.mit;
       maintainers = with lib.maintainers; [
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b542fedcffef..0b4c5dd239b5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5880,6 +5880,8 @@ self: super: with self; {
     inherit (pkgs) foundationdb;
   };
 
+  foundrytools = callPackage ../development/python-modules/foundrytools { };
+
   fountains = callPackage ../development/python-modules/fountains { };
 
   foxdot = callPackage ../development/python-modules/foxdot { };