From e33448f6f37d1813a526b4cd250bb9883fb2a96e Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Wed, 29 Apr 2026 00:43:08 +0200
Subject: [PATCH 01/31] pnpm: switch to nodejs-slim

(cherry picked from commit 36b6c90e6b2a4189806cc4859ce9756a522cfbed)

Fixed conflicts with taler-wallet-core and openclaw.
---
 .../javascript.section.md                     |  2 +-
 .../node/fetch-pnpm-deps/default.nix          | 16 ++++++++++++++--
 pkgs/by-name/op/openclaw/package.nix          |  6 +++---
 pkgs/by-name/po/podman-desktop/package.nix    |  9 +++++----
 pkgs/by-name/po/porn-vault/package.nix        | 12 ++++++------
 pkgs/by-name/se/seerr/package.nix             | 12 ++++++------
 pkgs/by-name/sh/sharkey/package.nix           | 10 +++++-----
 pkgs/by-name/sh/shopify-cli/package.nix       | 10 +++++-----
 pkgs/by-name/ta/taler-wallet-core/package.nix | 13 ++++++++-----
 pkgs/by-name/ts/tsx/package.nix               |  8 ++++----
 pkgs/by-name/vt/vtsls/package.nix             |  8 ++++----
 pkgs/by-name/zi/zipline/package.nix           |  2 +-
 .../python-modules/gradio/default.nix         |  7 +++----
 pkgs/development/tools/pnpm/default.nix       |  8 +++++++-
 pkgs/development/tools/pnpm/generic.nix       | 19 +++++++++++++++----
 pkgs/test/pnpm/pnpm_11_v3/default.nix         |  6 +++---
 pkgs/test/pnpm/pnpm_11_v4/default.nix         |  6 +++---
 17 files changed, 93 insertions(+), 61 deletions(-)

diff --git a/doc/languages-frameworks/javascript.section.md b/doc/languages-frameworks/javascript.section.md
index a9f151372508..4e031f7f5f34 100644
--- a/doc/languages-frameworks/javascript.section.md
+++ b/doc/languages-frameworks/javascript.section.md
@@ -364,7 +364,7 @@ It is highly recommended to use a pinned version of pnpm (i.e., `pnpm_9` or `pnp
 +let
 +  # Optionally override pnpm to use a custom nodejs version
 +  # Make sure that the same nodejs version is referenced in nativeBuildInputs
-+  # pnpm = pnpm_10.override { nodejs = nodejs-slim_22; };
++  # pnpm = pnpm_10.override { nodejs-slim = nodejs-slim_22; };
 +in
  stdenv.mkDerivation (finalAttrs: {
    pname = "foo";
diff --git a/pkgs/build-support/node/fetch-pnpm-deps/default.nix b/pkgs/build-support/node/fetch-pnpm-deps/default.nix
index b6472839465d..5986d482a499 100644
--- a/pkgs/build-support/node/fetch-pnpm-deps/default.nix
+++ b/pkgs/build-support/node/fetch-pnpm-deps/default.nix
@@ -52,9 +52,21 @@ in
       filterFlags = lib.map (package: "--filter=${package}") pnpmWorkspaces;
 
       pnpm-fixup-state-db' =
-        if pnpm.nodejs or null != null then
+        if pnpm.nodejs-slim or null != null then
           pnpm-fixup-state-db.override {
-            inherit (pnpm) nodejs;
+            # FIXME: make npm-config-hook accept nodejs-slim
+            nodejs =
+              let
+                inherit (pnpm) nodejs-slim;
+              in
+              if nodejs-slim ? paths && builtins.isList nodejs-slim.paths then
+                # If nodejs-slim has a list `paths` attribute, it's likely a simlinkJoin
+                nodejs-slim
+              else
+                # Otherwise we need to recreate one by overriding the default one
+                pnpm-fixup-state-db.nodejs.override {
+                  inherit nodejs-slim;
+                };
           }
         else
           pnpm-fixup-state-db;
diff --git a/pkgs/by-name/op/openclaw/package.nix b/pkgs/by-name/op/openclaw/package.nix
index 6f99a452cf40..a5da18702373 100644
--- a/pkgs/by-name/op/openclaw/package.nix
+++ b/pkgs/by-name/op/openclaw/package.nix
@@ -6,7 +6,7 @@
   fetchPnpmDeps,
   pnpmConfigHook,
   pnpm_10,
-  nodejs_22,
+  nodejs-slim_22,
   makeWrapper,
   versionCheckHook,
   rolldown,
@@ -38,7 +38,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     pnpmConfigHook
     pnpm_10
-    nodejs_22
+    nodejs-slim_22
     makeWrapper
     installShellFiles
   ];
@@ -83,7 +83,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     # Remove symlinks pointing back to the build sandbox
     find $libdir/dist/extensions -type l -lname "$NIX_BUILD_TOP/*" -delete
 
-    makeWrapper ${lib.getExe nodejs_22} $out/bin/openclaw \
+    makeWrapper ${lib.getExe nodejs-slim_22} $out/bin/openclaw \
       --add-flags "$libdir/dist/index.js" \
       --set NODE_PATH "$libdir/node_modules"
     ln -s $out/bin/openclaw $out/bin/moltbot
diff --git a/pkgs/by-name/po/podman-desktop/package.nix b/pkgs/by-name/po/podman-desktop/package.nix
index f96534cab492..9b3d0a55e9f2 100644
--- a/pkgs/by-name/po/podman-desktop/package.nix
+++ b/pkgs/by-name/po/podman-desktop/package.nix
@@ -5,7 +5,7 @@
   makeBinaryWrapper,
   copyDesktopItems,
   electron_41,
-  nodejs_24,
+  nodejs-slim_24,
   pnpm_10_29_2,
   fetchPnpmDeps,
   pnpmConfigHook,
@@ -21,8 +21,8 @@
 }:
 
 let
-  nodejs = nodejs_24;
-  pnpm = pnpm_10_29_2.override { inherit nodejs; };
+  nodejs-slim = nodejs-slim_24;
+  pnpm = pnpm_10_29_2.override { inherit nodejs-slim; };
   electron = electron_41;
   appName = "Podman Desktop";
 in
@@ -91,7 +91,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     makeBinaryWrapper
-    nodejs
+    nodejs-slim
+    nodejs-slim.npm
     pnpm
     pnpmConfigHook
   ]
diff --git a/pkgs/by-name/po/porn-vault/package.nix b/pkgs/by-name/po/porn-vault/package.nix
index 7359cdc07e7a..f988949b587c 100644
--- a/pkgs/by-name/po/porn-vault/package.nix
+++ b/pkgs/by-name/po/porn-vault/package.nix
@@ -6,7 +6,7 @@
   fetchPnpmDeps,
   pnpmConfigHook,
   stdenvNoCC,
-  nodejs_22,
+  nodejs-slim_22,
   ffmpeg,
   imagemagick,
   makeWrapper,
@@ -37,8 +37,8 @@ let
       mainProgram = "izzy";
     };
   };
-  nodejs = nodejs_22;
-  pnpm' = pnpm_9.override { nodejs = nodejs_22; };
+  nodejs-slim = nodejs-slim_22;
+  pnpm' = pnpm_9.override { inherit nodejs-slim; };
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "porn-vault";
@@ -59,7 +59,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   };
 
   nativeBuildInputs = [
-    nodejs
+    nodejs-slim
     pnpmConfigHook
     pnpm'
     makeWrapper
@@ -92,7 +92,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   '';
 
   preFixup = ''
-    makeWrapper "${lib.getExe nodejs}" "$out/bin/porn-vault" \
+    makeWrapper "${lib.getExe nodejs-slim}" "$out/bin/porn-vault" \
       --chdir "$out/share/porn-vault" \
       --add-flags "dist/index.js" \
       --set-default IZZY_PATH "${lib.getExe izzy}" \
@@ -110,7 +110,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     homepage = "https://gitlab.com/porn-vault/porn-vault";
     license = lib.licenses.gpl3Plus;
     maintainers = [ lib.maintainers.luNeder ];
-    inherit (nodejs.meta) platforms;
+    inherit (nodejs-slim.meta) platforms;
     mainProgram = "porn-vault";
   };
 })
diff --git a/pkgs/by-name/se/seerr/package.nix b/pkgs/by-name/se/seerr/package.nix
index 97faaafc3287..edb5067be3f1 100644
--- a/pkgs/by-name/se/seerr/package.nix
+++ b/pkgs/by-name/se/seerr/package.nix
@@ -6,7 +6,7 @@
   fetchFromGitHub,
   stdenv,
   makeWrapper,
-  nodejs_22,
+  nodejs-slim_22,
   python3,
   python3Packages,
   sqlite,
@@ -15,8 +15,8 @@
 }:
 
 let
-  nodejs = nodejs_22;
-  pnpm = pnpm_10.override { inherit nodejs; };
+  nodejs-slim = nodejs-slim_22;
+  pnpm = pnpm_10.override { inherit nodejs-slim; };
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "seerr";
@@ -41,14 +41,14 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     python3
     python3Packages.distutils
-    nodejs
+    nodejs-slim
     makeWrapper
     pnpmConfigHook
     pnpm
   ];
 
   preBuild = ''
-    export npm_config_nodedir=${nodejs}
+    export npm_config_nodedir=${nodejs-slim}
     pushd node_modules
     pnpm rebuild bcrypt sqlite3
     popd
@@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   postInstall = ''
     mkdir -p $out/bin
-    makeWrapper '${nodejs}/bin/node' "$out/bin/seerr" \
+    makeWrapper '${nodejs-slim}/bin/node' "$out/bin/seerr" \
       --add-flags "$out/share/dist/index.js" \
       --chdir "$out/share" \
       --set NODE_ENV production
diff --git a/pkgs/by-name/sh/sharkey/package.nix b/pkgs/by-name/sh/sharkey/package.nix
index f16090d19c7f..24bd745c8562 100644
--- a/pkgs/by-name/sh/sharkey/package.nix
+++ b/pkgs/by-name/sh/sharkey/package.nix
@@ -11,7 +11,7 @@
   jemalloc,
   makeWrapper,
   nix-update-script,
-  nodejs_22,
+  nodejs-slim_22,
   pango,
   pixman,
   pkg-config,
@@ -24,7 +24,7 @@
 }:
 
 let
-  pnpm = pnpm_10.override { nodejs = nodejs_22; };
+  pnpm = pnpm_10.override { nodejs-slim = nodejs-slim_22; };
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "sharkey";
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     makeWrapper
-    nodejs_22
+    nodejs-slim_22
     pkg-config
     pnpmConfigHook
     pnpm
@@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
     popd
 
     # rebuild some node modules that have native dependencies
-    export npm_config_nodedir=${nodejs_22}
+    export npm_config_nodedir=${nodejs-slim_22}
 
     pushd node_modules/.pnpm/node_modules/re2
     pnpm rebuild
@@ -105,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: {
     let
       binPath = lib.makeBinPath [
         bash
-        nodejs_22
+        nodejs-slim_22
         pnpm
       ];
       libPath = lib.makeLibraryPath [
diff --git a/pkgs/by-name/sh/shopify-cli/package.nix b/pkgs/by-name/sh/shopify-cli/package.nix
index 3bbfbfad441c..e6a2e4a3dc08 100644
--- a/pkgs/by-name/sh/shopify-cli/package.nix
+++ b/pkgs/by-name/sh/shopify-cli/package.nix
@@ -6,7 +6,7 @@
   pnpmConfigHook,
   pnpm_10,
   faketty,
-  nodejs_22,
+  nodejs-slim_22,
   versionCheckHook,
   makeBinaryWrapper,
   nix-update-script,
@@ -14,8 +14,8 @@
 let
   pnpm = pnpm_10;
 
-  nodejs = nodejs_22;
-  pnpm' = pnpm.override { inherit nodejs; };
+  nodejs-slim = nodejs-slim_22;
+  pnpm' = pnpm.override { inherit nodejs-slim; };
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "shopify";
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     faketty
-    nodejs
+    nodejs-slim
     pnpmConfigHook
     pnpm'
     makeBinaryWrapper
@@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
     pnpm install --offline --prod --ignore-scripts --frozen-lockfile
     mv node_modules $out/lib/node_modules/@shopify/cli/node_modules
 
-    makeWrapper ${lib.getExe nodejs} $out/bin/shopify \
+    makeWrapper ${lib.getExe nodejs-slim} $out/bin/shopify \
       --add-flags "$out/lib/node_modules/@shopify/cli/bin/run.js"
 
     runHook postInstall
diff --git a/pkgs/by-name/ta/taler-wallet-core/package.nix b/pkgs/by-name/ta/taler-wallet-core/package.nix
index a50d2cb354b1..7b38c18ffb3e 100644
--- a/pkgs/by-name/ta/taler-wallet-core/package.nix
+++ b/pkgs/by-name/ta/taler-wallet-core/package.nix
@@ -7,7 +7,7 @@
   fetchgit,
   srcOnly,
   removeReferencesTo,
-  nodejs_24,
+  nodejs-slim_24,
   pnpm_11,
   fetchPnpmDeps,
   pnpmConfigHook,
@@ -17,8 +17,10 @@
   zip,
 }:
 let
-  nodeSources = srcOnly nodejs_24;
-  pnpm' = pnpm_11.override { nodejs = nodejs_24; };
+  nodeSources = (srcOnly nodejs-slim_24).overrideAttrs {
+    outputChecks = { };
+  };
+  pnpm' = pnpm_11.override { nodejs-slim = nodejs-slim_24; };
   esbuild' = esbuild.override {
     buildGoModule =
       args:
@@ -61,7 +63,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     customPython
-    nodejs_24
+    nodejs-slim_24
+    nodejs-slim_24.npm
     pnpmConfigHook
     pnpm'
     gitMinimal
@@ -70,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    nodejs_24
+    nodejs-slim_24
   ];
 
   # Make a fake git repo with a commit.
diff --git a/pkgs/by-name/ts/tsx/package.nix b/pkgs/by-name/ts/tsx/package.nix
index 38379fd7ee34..85295a274b58 100644
--- a/pkgs/by-name/ts/tsx/package.nix
+++ b/pkgs/by-name/ts/tsx/package.nix
@@ -5,12 +5,12 @@
   pnpm_10,
   fetchPnpmDeps,
   pnpmConfigHook,
-  nodejs_22,
+  nodejs-slim_22,
   versionCheckHook,
   nix-update-script,
 }:
 let
-  pnpm' = pnpm_10.override { nodejs = nodejs_22; };
+  pnpm' = pnpm_10.override { nodejs-slim = nodejs-slim_22; };
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "tsx";
@@ -35,13 +35,13 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   nativeBuildInputs = [
-    nodejs_22
+    nodejs-slim_22
     pnpmConfigHook
     pnpm'
   ];
 
   buildInputs = [
-    nodejs_22
+    nodejs-slim_22
   ];
 
   patchPhase = ''
diff --git a/pkgs/by-name/vt/vtsls/package.nix b/pkgs/by-name/vt/vtsls/package.nix
index c4c71278a15d..7cd84da104b5 100644
--- a/pkgs/by-name/vt/vtsls/package.nix
+++ b/pkgs/by-name/vt/vtsls/package.nix
@@ -2,7 +2,7 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  nodejs_22,
+  nodejs-slim_22,
   gitMinimal,
   gitSetupHook,
   pnpm_8,
@@ -11,7 +11,7 @@
   nix-update-script,
 }:
 let
-  pnpm' = pnpm_8.override { nodejs = nodejs_22; };
+  pnpm' = pnpm_8.override { nodejs-slim = nodejs-slim_22; };
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "vtsls";
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   nativeBuildInputs = [
-    nodejs_22
+    nodejs-slim_22
     # patches are applied with git during build
     gitMinimal
     gitSetupHook
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
     pnpm'
   ];
 
-  buildInputs = [ nodejs_22 ];
+  buildInputs = [ nodejs-slim_22 ];
 
   pnpmWorkspaces = [ "@vtsls/language-server" ];
 
diff --git a/pkgs/by-name/zi/zipline/package.nix b/pkgs/by-name/zi/zipline/package.nix
index 343a6d94ac94..a0e2ccff02de 100644
--- a/pkgs/by-name/zi/zipline/package.nix
+++ b/pkgs/by-name/zi/zipline/package.nix
@@ -31,7 +31,7 @@ let
     PRISMA_FMT_BINARY = lib.getExe' prisma-engines_6 "prisma-fmt";
   };
 
-  pnpm' = pnpm_10.override { nodejs = nodejs_24; };
+  pnpm' = pnpm_10.override { nodejs-slim = nodejs_24; };
 in
 
 stdenv.mkDerivation (finalAttrs: {
diff --git a/pkgs/development/python-modules/gradio/default.nix b/pkgs/development/python-modules/gradio/default.nix
index 086361b7294b..b237ca09604c 100644
--- a/pkgs/development/python-modules/gradio/default.nix
+++ b/pkgs/development/python-modules/gradio/default.nix
@@ -15,7 +15,7 @@
 
   # web assets
   zip,
-  nodejs_24,
+  nodejs-slim,
   pnpm_10,
   fetchPnpmDeps,
   pnpmConfigHook,
@@ -77,8 +77,7 @@
   writableTmpDirAsHomeHook,
 }:
 let
-  nodejs = nodejs_24;
-  pnpm = pnpm_10.override { inherit nodejs; };
+  pnpm = pnpm_10;
 in
 buildPythonPackage (finalAttrs: {
   pname = "gradio";
@@ -109,7 +108,7 @@ buildPythonPackage (finalAttrs: {
 
   nativeBuildInputs = [
     zip
-    nodejs
+    nodejs-slim
     pnpm
     pnpmConfigHook
     writableTmpDirAsHomeHook
diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix
index 847a858c2fa0..b6b4010b0945 100644
--- a/pkgs/development/tools/pnpm/default.nix
+++ b/pkgs/development/tools/pnpm/default.nix
@@ -31,7 +31,13 @@ let
     };
   };
 
-  callPnpm = variant: callPackage ./generic.nix { inherit (variant) version hash; };
+  callPnpm =
+    variant:
+    callPackage ./generic.nix {
+      inherit (variant) version hash;
+      #FIXME: remove this hack in a future version.
+      nodejs = null; # Passing null to detect out-of-tree overrides
+    };
 
   mkPnpm = versionSuffix: variant: nameValuePair "pnpm_${versionSuffix}" (callPnpm variant);
 in
diff --git a/pkgs/development/tools/pnpm/generic.nix b/pkgs/development/tools/pnpm/generic.nix
index aa50a4fd3a52..2e2a6ddffcb0 100644
--- a/pkgs/development/tools/pnpm/generic.nix
+++ b/pkgs/development/tools/pnpm/generic.nix
@@ -6,7 +6,9 @@
   pnpmConfigHook,
   fetchurl,
   installShellFiles,
-  nodejs,
+  #FIXME: remove this arg in a future version.
+  nodejs, # Should be null, unless overridden.
+  nodejs-slim,
   testers,
   buildPackages,
   bashNonInteractive,
@@ -18,6 +20,12 @@
 }:
 let
   majorVersion = lib.versions.major version;
+  nodejs-slim' =
+    #FIXME: remove this hack in a future version.
+    if nodejs == null then
+      nodejs-slim
+    else
+      lib.warn "pnpm: Override nodejs-slim instead of nodejs" nodejs;
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "pnpm";
@@ -30,13 +38,13 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     installShellFiles
-    nodejs
+    nodejs-slim'
   ];
 
   buildInputs = [
     bashNonInteractive # needed for node-gyp wrapper script
   ]
-  ++ lib.optionals withNode [ nodejs ];
+  ++ lib.optionals withNode [ nodejs-slim' ];
 
   # Remove binary files from src, we don't need them, and this way we make sure
   # our distribution is free of binaryNativeCode
@@ -109,7 +117,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
               ];
             })
           );
-      inherit nodejs majorVersion;
+      nodejs-slim = nodejs-slim';
+      #FIXME: remove this in a future version.
+      nodejs = lib.warn "pnpm.nodejs: Use pnpm.nodejs-slim instead of pnpm.nodejs" nodejs-slim';
+      inherit majorVersion;
 
       tests = {
         inherit (tests) pnpm;
diff --git a/pkgs/test/pnpm/pnpm_11_v3/default.nix b/pkgs/test/pnpm/pnpm_11_v3/default.nix
index fed05255ff0b..fb07efe96667 100644
--- a/pkgs/test/pnpm/pnpm_11_v3/default.nix
+++ b/pkgs/test/pnpm/pnpm_11_v3/default.nix
@@ -2,7 +2,7 @@
   fetchPnpmDeps,
   lib,
   makeShellWrapper,
-  nodejs,
+  nodejs-slim,
   pnpmConfigHook,
   pnpm_11,
   stdenv,
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     makeShellWrapper
-    nodejs
+    nodejs-slim
     pnpm
     pnpmConfigHook
   ];
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
 
     install -Dm644 -t $out/lib/pnpm-11-test dist/index.js
 
-    makeWrapper ${lib.getExe nodejs} $out/bin/pnpm-11-test \
+    makeWrapper ${lib.getExe nodejs-slim} $out/bin/pnpm-11-test \
       --add-flags "$out/lib/pnpm-11-test"
 
     runHook postInstall
diff --git a/pkgs/test/pnpm/pnpm_11_v4/default.nix b/pkgs/test/pnpm/pnpm_11_v4/default.nix
index d34c6239f1f9..91c8173c1b8d 100644
--- a/pkgs/test/pnpm/pnpm_11_v4/default.nix
+++ b/pkgs/test/pnpm/pnpm_11_v4/default.nix
@@ -2,7 +2,7 @@
   fetchPnpmDeps,
   lib,
   makeShellWrapper,
-  nodejs,
+  nodejs-slim,
   pnpmConfigHook,
   pnpm_11,
   stdenv,
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     makeShellWrapper
-    nodejs
+    nodejs-slim
     pnpm
     pnpmConfigHook
   ];
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
 
     install -Dm644 -t $out/lib/pnpm-11-test dist/index.js
 
-    makeWrapper ${lib.getExe nodejs} $out/bin/pnpm-11-test \
+    makeWrapper ${lib.getExe nodejs-slim} $out/bin/pnpm-11-test \
       --add-flags "$out/lib/pnpm-11-test"
 
     runHook postInstall

From 5df708044eb7dd0e1b458cd68b4962cde3723967 Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Sun, 7 Jun 2026 16:13:19 +0200
Subject: [PATCH 02/31] srcOnly: disable `outputChecks`

(cherry picked from commit eaad2d4d3c0835d8e2838455bcf51645bbfabb11)
---
 pkgs/build-support/src-only/default.nix | 59 ++++++++++++++-----------
 1 file changed, 33 insertions(+), 26 deletions(-)

diff --git a/pkgs/build-support/src-only/default.nix b/pkgs/build-support/src-only/default.nix
index f44e41a62eef..bb91c6b4bba9 100644
--- a/pkgs/build-support/src-only/default.nix
+++ b/pkgs/build-support/src-only/default.nix
@@ -37,37 +37,44 @@
 
 attrs:
 let
-  argsToOverride = args: {
-    name = "${args.name or "${args.pname}-${args.version}"}-source";
+  argsToOverride =
+    args:
+    {
+      name = "${args.name or "${args.pname}-${args.version}"}-source";
 
-    outputs = [ "out" ];
+      outputs = [ "out" ];
 
-    phases = [
-      "unpackPhase"
-      "patchPhase"
-      "installPhase"
-    ];
-    separateDebugInfo = false;
+      phases = [
+        "unpackPhase"
+        "patchPhase"
+        "installPhase"
+      ];
+      separateDebugInfo = false;
 
-    dontUnpack = lib.warnIf (args.dontUnpack or false
-    ) "srcOnly: derivation has dontUnpack set, overriding" false;
+      dontUnpack = lib.warnIf (args.dontUnpack or false
+      ) "srcOnly: derivation has dontUnpack set, overriding" false;
 
-    dontInstall = false;
-    installPhase = "cp -pr --reflink=auto -- . $out";
+      dontInstall = false;
+      installPhase = "cp -pr --reflink=auto -- . $out";
 
-    # the original derivation might've set something like outputDev = "lib", but "lib" isn't an output anymore
-    # some things get confused and error if one of these is set to an output that doesn't exist
-    # ex: pkgs/build-support/setup-hooks/multiple-outputs.sh
-    outputDev = "out";
-    outputBin = "out";
-    outputInclude = "out";
-    outputLib = "out";
-    outputDoc = "out";
-    outputDevdoc = "out";
-    outputMan = "out";
-    outputDevman = "out";
-    outputInfo = "out";
-  };
+      # the original derivation might've set something like outputDev = "lib", but "lib" isn't an output anymore
+      # some things get confused and error if one of these is set to an output that doesn't exist
+      # ex: pkgs/build-support/setup-hooks/multiple-outputs.sh
+      outputDev = "out";
+      outputBin = "out";
+      outputInclude = "out";
+      outputLib = "out";
+      outputDoc = "out";
+      outputDevdoc = "out";
+      outputMan = "out";
+      outputDevman = "out";
+      outputInfo = "out";
+
+    }
+    // lib.optionalAttrs (lib.isAttrs args.outputChecks or null) {
+      # If the original derivation includes outputChecks for output we are removing, we need to reset it to an empty check.
+      outputChecks = { };
+    };
 in
 
 # If we are passed a derivation (based on stdenv*), we can use overrideAttrs to

From 42214e85ea3e65b70473f7fc7b1652b3f2c31f50 Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Sun, 7 Jun 2026 16:24:28 +0200
Subject: [PATCH 03/31] nodejs: remove `npm` and `corepack` passthru

The passthru has been added to give a migration path, but those outputs
were not present on the 25.11's `nodejs` derivation. Removing those
is helpful to use them to discriminate between the slim and non-slim
variants for derivations that accept one or the other.

(cherry picked from commit 3c9cf6210c625513e2b0f45cfe2e1b8bfd3bf1f2)
---
 pkgs/development/web/nodejs/symlink.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/web/nodejs/symlink.nix b/pkgs/development/web/nodejs/symlink.nix
index 538ac2311946..defbb3f088e8 100644
--- a/pkgs/development/web/nodejs/symlink.nix
+++ b/pkgs/development/web/nodejs/symlink.nix
@@ -44,6 +44,10 @@
                 "man"
                 "out"
                 "static"
+
+                # Filter out outputs that didn't exist on 25.11
+                "npm"
+                "corepack"
               ])
               && !(builtins.hasAttr name nodejs)
             ) (builtins.attrNames nodejs-slim)

From 762761c420a7094816089c796ea5425779ef182c Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Sun, 7 Jun 2026 16:24:50 +0200
Subject: [PATCH 04/31] pnpm-fixup-state-db: make it depend on `nodejs-slim`

(cherry picked from commit 3f318e99f1b9f86173692ec18a24e13bdbab85df)
---
 .../build-support/node/fetch-pnpm-deps/default.nix | 14 +-------------
 pkgs/by-name/pn/pnpm-fixup-state-db/package.nix    |  7 ++++---
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/pkgs/build-support/node/fetch-pnpm-deps/default.nix b/pkgs/build-support/node/fetch-pnpm-deps/default.nix
index 5986d482a499..b99404fd3cdd 100644
--- a/pkgs/build-support/node/fetch-pnpm-deps/default.nix
+++ b/pkgs/build-support/node/fetch-pnpm-deps/default.nix
@@ -54,19 +54,7 @@ in
       pnpm-fixup-state-db' =
         if pnpm.nodejs-slim or null != null then
           pnpm-fixup-state-db.override {
-            # FIXME: make npm-config-hook accept nodejs-slim
-            nodejs =
-              let
-                inherit (pnpm) nodejs-slim;
-              in
-              if nodejs-slim ? paths && builtins.isList nodejs-slim.paths then
-                # If nodejs-slim has a list `paths` attribute, it's likely a simlinkJoin
-                nodejs-slim
-              else
-                # Otherwise we need to recreate one by overriding the default one
-                pnpm-fixup-state-db.nodejs.override {
-                  inherit nodejs-slim;
-                };
+            inherit (pnpm) nodejs-slim;
           }
         else
           pnpm-fixup-state-db;
diff --git a/pkgs/by-name/pn/pnpm-fixup-state-db/package.nix b/pkgs/by-name/pn/pnpm-fixup-state-db/package.nix
index 66c5da928e16..2bfc32c31d73 100644
--- a/pkgs/by-name/pn/pnpm-fixup-state-db/package.nix
+++ b/pkgs/by-name/pn/pnpm-fixup-state-db/package.nix
@@ -1,7 +1,7 @@
 {
   buildNpmPackage,
   lib,
-  nodejs,
+  nodejs-slim,
   pnpm,
   tests,
 }:
@@ -11,12 +11,13 @@ buildNpmPackage {
 
   src = ./src;
 
-  inherit nodejs;
+  nodejs = nodejs-slim;
+  nativeBuildInputs = lib.optional (builtins.hasAttr "npm" nodejs-slim) nodejs-slim.npm;
 
   npmDepsHash = "sha256-um6a4pEtPtdxHBRq9g5ZW20wIQAMjWJ3qF96XuxJg8o=";
 
   postInstall = ''
-    makeWrapper ${lib.getExe nodejs} $out/bin/pnpm-fixup-state-db \
+    makeWrapper ${lib.getExe nodejs-slim} $out/bin/pnpm-fixup-state-db \
       --add-flags "$out/lib/node_modules/pnpm-fixup-state-db"
   '';
 

From ac7ded930367f88c104959a59439c98db1ba5fa5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 20 Jun 2026 08:03:43 +0000
Subject: [PATCH 05/31] finamp: 0.9.23-beta -> 0.9.24-beta

(cherry picked from commit 0e2f65ed927fc328c7a73e9d4585c693a157db49)
---
 pkgs/by-name/fi/finamp/git-hashes.json   |   7 +-
 pkgs/by-name/fi/finamp/package.nix       |   4 +-
 pkgs/by-name/fi/finamp/pubspec.lock.json | 417 +++++++++++++++--------
 3 files changed, 274 insertions(+), 154 deletions(-)

diff --git a/pkgs/by-name/fi/finamp/git-hashes.json b/pkgs/by-name/fi/finamp/git-hashes.json
index 6f0c48bd26a5..92a0e823d671 100644
--- a/pkgs/by-name/fi/finamp/git-hashes.json
+++ b/pkgs/by-name/fi/finamp/git-hashes.json
@@ -1,13 +1,14 @@
 {
   "balanced_text": "sha256-U+gtC9AaUFp3gVkUzYMWAUSuUV7kYB8ZE2BsclnxwkA=",
+  "flutter_carplay": "sha256-0lewLQFVx+0rW2aAxWSePz/9bhNmb/mWt4RBJ++BCuM=",
   "flutter_user_certificates_android": "sha256-HL1Qd0D3CLYJysWLX2jqWt1FJRGm/BE8EjVFPztOIPo=",
   "isar": "sha256-Wg1m/HM7UnK+aC1DOyY41Bo4HuLrEaAxCtQw12ZrnN0=",
-  "isar_flutter_libs": "sha256-Z5IdfiaZ7348XwYSQb81z0YZEoIHWmsSZr6mYqqz4Oo=",
+  "isar_flutter_libs": "sha256-abfMKRRVJgrG5orGvXJbIJNTx8Fx0XTlvZZ9W+LcsP0=",
   "isar_generator": "sha256-fM8ygT6il7TdjmeTdmk8o4exc3Z/F1tYF878eoDK37E=",
   "just_audio": "sha256-I+HTDx3IpaQw3VBVO7KGzl0vDcFrNZhN5455i7TNxxs=",
-  "just_audio_media_kit": "sha256-dSlZETFqNQs7jxNN+8MWQzval31zA7zCs+7WiPPPZMw=",
+  "just_audio_media_kit": "sha256-ZdSX86xeqXZZrdHpdg8W240qtSnUTfZLN9XrM05rVTI=",
   "media_kit_libs_windows_audio": "sha256-XAObjn7wcN4qA7MW+hKqjNZv/L2Ec8t/cTF+d2ZoZ+k=",
   "palette_generator": "sha256-mnRJf3asu1mm9HYU8U0di+qRk3SpNFwN3S5QxChpIA0=",
   "smtc_windows": "sha256-ESR6qw8ciJvo1YG3wNK7Uy/N0zzl6OX6q40Dmgsvx6A=",
   "split_view": "sha256-unTJQDXUUPVDudlk0ReOPNYrsyEpbd/UMg1tHZsmg+k="
-}
\ No newline at end of file
+}
diff --git a/pkgs/by-name/fi/finamp/package.nix b/pkgs/by-name/fi/finamp/package.nix
index 4e2a80b5b16d..12c011f06952 100644
--- a/pkgs/by-name/fi/finamp/package.nix
+++ b/pkgs/by-name/fi/finamp/package.nix
@@ -15,7 +15,7 @@
   dart,
 }:
 let
-  version = "0.9.23-beta";
+  version = "0.9.24-beta";
 in
 flutter341.buildFlutterApplication {
   inherit version;
@@ -24,7 +24,7 @@ flutter341.buildFlutterApplication {
     owner = "UnicornsOnLSD";
     repo = "finamp";
     rev = version;
-    hash = "sha256-N1+6rB16geFMYMbfiF7eppnXfXC/pqv90I9aY/57lKI=";
+    hash = "sha256-o7q7Yr47maTrt4CG3PiV9Fdhy77ToboVdd8olZFfFts=";
   };
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;
diff --git a/pkgs/by-name/fi/finamp/pubspec.lock.json b/pkgs/by-name/fi/finamp/pubspec.lock.json
index 1a20e4851435..2c51383c3bf6 100644
--- a/pkgs/by-name/fi/finamp/pubspec.lock.json
+++ b/pkgs/by-name/fi/finamp/pubspec.lock.json
@@ -84,21 +84,21 @@
       "dependency": "direct main",
       "description": {
         "name": "app_set_id",
-        "sha256": "bdc50b3da4b3db791e7a24bfca46f7f791dda318c096a3b62481ea2110a24847",
+        "sha256": "fe20e185b907e75f9c06f42423db816d3bec64973f10be0034d5bc6703e015cc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.0"
+      "version": "1.4.0"
     },
     "archive": {
-      "dependency": "transitive",
+      "dependency": "direct main",
       "description": {
         "name": "archive",
-        "sha256": "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd",
+        "sha256": "a96e8b390886ee8abb49b7bd3ac8df6f451c621619f52a26e815fdcf568959ff",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.0.7"
+      "version": "4.0.9"
     },
     "args": {
       "dependency": "transitive",
@@ -114,11 +114,11 @@
       "dependency": "transitive",
       "description": {
         "name": "async",
-        "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb",
+        "sha256": "e2eb0491ba5ddb6177742d2da23904574082139b07c1e33b8503b9f46f3e1a37",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.13.0"
+      "version": "2.13.1"
     },
     "audio_service": {
       "dependency": "direct main",
@@ -134,11 +134,11 @@
       "dependency": "direct main",
       "description": {
         "name": "audio_service_mpris",
-        "sha256": "fdab1ae1f659c6db36d5cc396e46e4ee9663caefa6153f8453fcd01d57567c08",
+        "sha256": "8cb2ff2237f4cd2fd27f16451ed35b3aedc12df8a384435327c67a9f4d557ef4",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.0"
+      "version": "0.2.1"
     },
     "audio_service_platform_interface": {
       "dependency": "direct main",
@@ -164,11 +164,11 @@
       "dependency": "direct main",
       "description": {
         "name": "audio_session",
-        "sha256": "8f96a7fecbb718cb093070f868b4cdcb8a9b1053dce342ff8ab2fde10eb9afb7",
+        "sha256": "7217b229db57cc4dc577a8abb56b7429a5a212b978517a5be578704bfe5e568b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.2"
+      "version": "0.2.3"
     },
     "auto_size_text": {
       "dependency": "direct main",
@@ -184,11 +184,11 @@
       "dependency": "direct main",
       "description": {
         "name": "background_downloader",
-        "sha256": "a3b340e42bc45598918944e378dc6a05877e587fcd0e1b8d2ea26339de87bdf9",
+        "sha256": "aceacec2b2a72ec3a8862ab5895fcbbc71ab33765f3619d57963f3110dd268e3",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.4.0"
+      "version": "9.5.5"
     },
     "balanced_text": {
       "dependency": "direct main",
@@ -325,11 +325,11 @@
       "dependency": "transitive",
       "description": {
         "name": "built_value",
-        "sha256": "426cf75afdb23aa74bd4e471704de3f9393f3c7b04c1e2d9c6f1073ae0b8b139",
+        "sha256": "34e4067d30ce212937df995f03b69992eea683539ceeac7f679a1f1eba055b56",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.12.1"
+      "version": "8.12.6"
     },
     "characters": {
       "dependency": "transitive",
@@ -355,11 +355,11 @@
       "dependency": "direct main",
       "description": {
         "name": "chopper",
-        "sha256": "fb6106cd29553e34c811874efd8e8ee051ad7b9546e0d8c79394d2b6c9621b45",
+        "sha256": "2e7535c174752c6b051e18baa6f9a7dcaa13fc2159f77b755ab58b5537a8545c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.4.0"
+      "version": "8.6.0"
     },
     "chopper_generator": {
       "dependency": "direct dev",
@@ -411,15 +411,25 @@
       "source": "hosted",
       "version": "1.1.2"
     },
+    "code_assets": {
+      "dependency": "transitive",
+      "description": {
+        "name": "code_assets",
+        "sha256": "bf394f466ba9205f1812a0433b392d6af280f155f56651eda7c18cc32ed493b8",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.2.1"
+    },
     "code_builder": {
       "dependency": "transitive",
       "description": {
         "name": "code_builder",
-        "sha256": "11654819532ba94c34de52ff5feb52bd81cba1de00ef2ed622fd50295f9d4243",
+        "sha256": "6a6cab2ba4680d6423f34a9b972a4c9a94ebe1b62ecec4e1a1f2cba91fd1319d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.11.0"
+      "version": "4.11.1"
     },
     "collection": {
       "dependency": "direct main",
@@ -445,21 +455,21 @@
       "dependency": "direct main",
       "description": {
         "name": "connectivity_plus",
-        "sha256": "33bae12a398f841c6cda09d1064212957265869104c478e5ad51e2fb26c3973c",
+        "sha256": "62ffa266d9a23b79fb3fcbc206afc00bb979417ba57b1324c546b5aab95ba057",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.0.0"
+      "version": "7.1.1"
     },
     "connectivity_plus_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "connectivity_plus_platform_interface",
-        "sha256": "42657c1715d48b167930d5f34d00222ac100475f73d10162ddf43e714932f204",
+        "sha256": "3c09627c536d22fd24691a905cdd8b14520de69da52c7a97499c8be5284a32ed",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.1"
+      "version": "2.1.0"
     },
     "console": {
       "dependency": "transitive",
@@ -485,11 +495,11 @@
       "dependency": "transitive",
       "description": {
         "name": "cross_file",
-        "sha256": "701dcfc06da0882883a2657c445103380e53e647060ad8d9dfb710c100996608",
+        "sha256": "28bb3ae56f117b5aec029d702a90f57d285cd975c3c5c281eaca38dbc47c5937",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.3.5+1"
+      "version": "0.3.5+2"
     },
     "crypto": {
       "dependency": "transitive",
@@ -575,21 +585,21 @@
       "dependency": "direct main",
       "description": {
         "name": "dbus",
-        "sha256": "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c",
+        "sha256": "d0c98dcd4f5169878b6cf8f6e0a52403a9dff371a3e2f019697accbf6f44a270",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.11"
+      "version": "0.7.12"
     },
     "device_info_plus": {
       "dependency": "direct main",
       "description": {
         "name": "device_info_plus",
-        "sha256": "4df8babf73058181227e18b08e6ea3520cf5fc5d796888d33b7cb0f33f984b7c",
+        "sha256": "b4fed1b2835da9d670d7bed7db79ae2a94b0f5ad6312268158a9b5479abbacdd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "12.3.0"
+      "version": "12.4.0"
     },
     "device_info_plus_platform_interface": {
       "dependency": "transitive",
@@ -601,6 +611,16 @@
       "source": "hosted",
       "version": "7.0.3"
     },
+    "diacritic": {
+      "dependency": "direct main",
+      "description": {
+        "name": "diacritic",
+        "sha256": "12981945ec38931748836cd76f2b38773118d0baef3c68404bdfde9566147876",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.1.6"
+    },
     "dynamic_color": {
       "dependency": "direct main",
       "description": {
@@ -615,11 +635,11 @@
       "dependency": "transitive",
       "description": {
         "name": "equatable",
-        "sha256": "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7",
+        "sha256": "3e0141505477fd8ad55d6eb4e7776d3fe8430be8e497ccb1521370c3f21a3e2b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.7"
+      "version": "2.0.8"
     },
     "fading_edge_scrollview": {
       "dependency": "transitive",
@@ -645,11 +665,11 @@
       "dependency": "transitive",
       "description": {
         "name": "ffi",
-        "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418",
+        "sha256": "6d7fd89431262d8f3125e81b50d3847a091d846eafcd4fdb88dd06f36d705a45",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.4"
+      "version": "2.2.0"
     },
     "file": {
       "dependency": "direct main",
@@ -665,11 +685,11 @@
       "dependency": "direct main",
       "description": {
         "name": "file_picker",
-        "sha256": "7872545770c277236fd32b022767576c562ba28366204ff1a5628853cf8f2200",
+        "sha256": "f13a03000d942e476bc1ff0a736d2e9de711d2f89a95cd4c1d88f861c3348387",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.3.7"
+      "version": "11.0.2"
     },
     "file_sizes": {
       "dependency": "direct main",
@@ -695,21 +715,21 @@
       "dependency": "direct main",
       "description": {
         "name": "flex_color_picker",
-        "sha256": "f5b0b53d4ae0d59b1e28dfc21d5398e5028cf8e764518e491a52fd050aa23881",
+        "sha256": "a0979dd61f21b634717b98eb4ceaed2bfe009fe020ce8597aaf164b9eeb57aaa",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.7.2"
+      "version": "3.8.0"
     },
     "flex_seed_scheme": {
       "dependency": "transitive",
       "description": {
         "name": "flex_seed_scheme",
-        "sha256": "828291a5a4d4283590541519d8b57821946660ac61d2e07d955f81cfcab22e5d",
+        "sha256": "a3183753bbcfc3af106224bff3ab3e1844b73f58062136b7499919f49f3667e7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.6.1"
+      "version": "4.0.1"
     },
     "flutter": {
       "dependency": "direct main",
@@ -737,6 +757,17 @@
       "source": "hosted",
       "version": "3.4.1"
     },
+    "flutter_carplay": {
+      "dependency": "direct main",
+      "description": {
+        "path": ".",
+        "ref": "017ce2e",
+        "resolved-ref": "017ce2e19711d3e043ed86ade25f941f96ebb7ba",
+        "url": "https://github.com/oguzhnatly/flutter_carplay.git"
+      },
+      "source": "git",
+      "version": "1.2.11"
+    },
     "flutter_discord_rpc": {
       "dependency": "direct main",
       "description": {
@@ -747,25 +778,31 @@
       "source": "hosted",
       "version": "1.1.0"
     },
+    "flutter_driver": {
+      "dependency": "transitive",
+      "description": "flutter",
+      "source": "sdk",
+      "version": "0.0.0"
+    },
     "flutter_gen_core": {
       "dependency": "transitive",
       "description": {
         "name": "flutter_gen_core",
-        "sha256": "b6bafbbd981da2f964eb45bcb8b8a7676a281084f8922c0c75de4cfbaa849311",
+        "sha256": "22b3198a4cb1255841a3662b41adad35d36d9037fcd9d129858240030417e0b1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.12.0"
+      "version": "5.13.0+1"
     },
     "flutter_gen_runner": {
       "dependency": "direct dev",
       "description": {
         "name": "flutter_gen_runner",
-        "sha256": "c99b10af9d404e3f46fd1927e7d90099779e935e86022674c4c2a9e6c2a93b29",
+        "sha256": "83fd55f5472a955725c5912819847e9770c4f295cd0ae4bdd26d99853f8a6546",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.12.0"
+      "version": "5.13.0+1"
     },
     "flutter_launcher_icons": {
       "dependency": "direct dev",
@@ -807,11 +844,11 @@
       "dependency": "transitive",
       "description": {
         "name": "flutter_plugin_android_lifecycle",
-        "sha256": "ee8068e0e1cd16c4a82714119918efdeed33b3ba7772c54b5d094ab53f9b7fd1",
+        "sha256": "3854fe5e3bff0b113c658f260b90c95dea17c92db0f2addeac2e343dd9969785",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.33"
+      "version": "2.0.35"
     },
     "flutter_riverpod": {
       "dependency": "direct main",
@@ -824,7 +861,7 @@
       "version": "2.6.1"
     },
     "flutter_rust_bridge": {
-      "dependency": "transitive",
+      "dependency": "direct main",
       "description": {
         "name": "flutter_rust_bridge",
         "sha256": "37ef40bc6f863652e865f0b2563ea07f0d3c58d8efad803cc01933a4b2ee067e",
@@ -857,11 +894,11 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_svg",
-        "sha256": "87fbd7c534435b6c5d9d98b01e1fd527812b82e68ddd8bd35fc45ed0fa8f0a95",
+        "sha256": "35882981abcbfb8c15b286f0cd690ff25bac12d95eff3e25ee207f37d4c42e7f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.3"
+      "version": "2.3.0"
     },
     "flutter_tabler_icons": {
       "dependency": "direct main",
@@ -936,15 +973,21 @@
       "source": "hosted",
       "version": "4.0.0"
     },
+    "fuchsia_remote_debug_protocol": {
+      "dependency": "transitive",
+      "description": "flutter",
+      "source": "sdk",
+      "version": "0.0.0"
+    },
     "gaimon": {
       "dependency": "direct main",
       "description": {
         "name": "gaimon",
-        "sha256": "fca9d9bef76604a4d3ad5d212a349406c68f78ed01172f40bebcbd5b4f55087a",
+        "sha256": "2024da7b9642dc295ad7bcc69ff0be4ba4b0c9ab4134338ae95c3bd58dd16fb0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.4.1"
+      "version": "1.4.3"
     },
     "get_it": {
       "dependency": "direct main",
@@ -980,11 +1023,11 @@
       "dependency": "transitive",
       "description": {
         "name": "gtk",
-        "sha256": "e8ce9ca4b1df106e4d72dad201d345ea1a036cc12c360f1a7d5a758f78ffa42c",
+        "sha256": "4ff85b2a16724029dd9e5bbb5a94b6918f9973f74ba571c949d2002801879cf5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.0"
+      "version": "2.2.0"
     },
     "hashcodes": {
       "dependency": "transitive",
@@ -1000,21 +1043,21 @@
       "dependency": "direct main",
       "description": {
         "name": "hive_ce",
-        "sha256": "81d39a03c4c0ba5938260a8c3547d2e71af59defecea21793d57fc3551f0d230",
+        "sha256": "8e9980e68643afb1e765d3af32b47996552a64e190d03faf622cea07c1294418",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.15.1"
+      "version": "2.19.3"
     },
     "hive_ce_flutter": {
       "dependency": "direct main",
       "description": {
         "name": "hive_ce_flutter",
-        "sha256": "26d656c9e8974f0732f1d09020e2d7b08ba841b8961a02dbfb6caf01474b0e9a",
+        "sha256": "2677e95a333ff15af43ccd06af7eb7abbf1a4f154ea071997f3de4346cae913a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.3"
+      "version": "2.3.4"
     },
     "hive_ce_generator": {
       "dependency": "direct dev",
@@ -1026,15 +1069,25 @@
       "source": "hosted",
       "version": "1.9.2"
     },
+    "hooks": {
+      "dependency": "transitive",
+      "description": {
+        "name": "hooks",
+        "sha256": "9a62a50b50b769a737bc0a8ff381f333529df3ab746b2f6b02e83760231455ba",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.2"
+    },
     "hotreloader": {
       "dependency": "transitive",
       "description": {
         "name": "hotreloader",
-        "sha256": "bc167a1163807b03bada490bfe2df25b0d744df359227880220a5cbd04e5734b",
+        "sha256": "66871df468fc24eee81f1a0a7cb98acc104716f9b7376d355437b48d633c4ebf",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.3.0"
+      "version": "4.4.0"
     },
     "html": {
       "dependency": "transitive",
@@ -1080,11 +1133,11 @@
       "dependency": "transitive",
       "description": {
         "name": "image",
-        "sha256": "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928",
+        "sha256": "f9881ff4998044947ec38d098bc7c8316ae1186fa786eddffdb867b9bc94dfce",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.5.4"
+      "version": "4.8.0"
     },
     "image_size_getter": {
       "dependency": "transitive",
@@ -1100,11 +1153,17 @@
       "dependency": "direct main",
       "description": {
         "name": "infinite_scroll_pagination",
-        "sha256": "4047eb8191e8b33573690922a9e995af64c3949dc87efc844f936b039ea279df",
+        "sha256": "b0d28e37cd8f62490ff6aef63f9db93d4c78b7f11b7c6b26f33c69d8476fda78",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.1.0"
+      "version": "5.1.1"
+    },
+    "integration_test": {
+      "dependency": "direct dev",
+      "description": "flutter",
+      "source": "sdk",
+      "version": "0.0.0"
     },
     "intl": {
       "dependency": "direct main",
@@ -1141,9 +1200,9 @@
       "dependency": "direct main",
       "description": {
         "path": ".",
-        "ref": "59103190aa2ac03041d61ad6d127b540be079ec8",
-        "resolved-ref": "59103190aa2ac03041d61ad6d127b540be079ec8",
-        "url": "https://github.com/MrLittleWhite/isar_flutter_libs.git"
+        "ref": "21c20862e94bb33fca9e9c14b5ca72fc41307f4b",
+        "resolved-ref": "21c20862e94bb33fca9e9c14b5ca72fc41307f4b",
+        "url": "https://github.com/Komodo5197/isar_flutter_libs.git"
       },
       "source": "git",
       "version": "3.1.0+1"
@@ -1163,11 +1222,31 @@
       "dependency": "transitive",
       "description": {
         "name": "isolate_channel",
-        "sha256": "f3d36f783b301e6b312c3450eeb2656b0e7d1db81331af2a151d9083a3f6b18d",
+        "sha256": "a9d3d620695bc984244dafae00b95e4319d6974b2d77f4b9e1eb4f2efe099094",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.2+1"
+      "version": "0.6.1"
+    },
+    "jni": {
+      "dependency": "transitive",
+      "description": {
+        "name": "jni",
+        "sha256": "c2230682d5bc2362c1c9e8d3c7f406d9cbba23ab3f2e203a025dd47e0fb2e68f",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.0"
+    },
+    "jni_flutter": {
+      "dependency": "transitive",
+      "description": {
+        "name": "jni_flutter",
+        "sha256": "8b59e590786050b1cd866677dddaf76b1ade5e7bc751abe04b86e84d379d3ba6",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.1"
     },
     "js": {
       "dependency": "transitive",
@@ -1215,7 +1294,7 @@
       "description": {
         "path": ".",
         "ref": "feat/queue-shuffle",
-        "resolved-ref": "f5237393a63da702426e4e20c6800b706a0b159f",
+        "resolved-ref": "5af56479c5a34d9ad9fcf2d94cc4e00b7f4ddace",
         "url": "https://github.com/Komodo5197/just_audio_media_kit.git"
       },
       "source": "git",
@@ -1275,11 +1354,11 @@
       "dependency": "transitive",
       "description": {
         "name": "lints",
-        "sha256": "a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0",
+        "sha256": "12f842a479589fea194fe5c5a3095abc7be0c1f2ddfa9a0e76aed1dbd26a87df",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.0.0"
+      "version": "6.1.0"
     },
     "locale_names": {
       "dependency": "direct main",
@@ -1325,11 +1404,11 @@
       "dependency": "transitive",
       "description": {
         "name": "matcher",
-        "sha256": "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6",
+        "sha256": "dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.12.18"
+      "version": "0.12.19"
     },
     "material_color_utilities": {
       "dependency": "transitive",
@@ -1376,11 +1455,11 @@
       "dependency": "direct main",
       "description": {
         "name": "meta",
-        "sha256": "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394",
+        "sha256": "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.17.0"
+      "version": "1.18.0"
     },
     "mime": {
       "dependency": "transitive",
@@ -1422,6 +1501,16 @@
       "source": "hosted",
       "version": "0.5.0"
     },
+    "objective_c": {
+      "dependency": "transitive",
+      "description": {
+        "name": "objective_c",
+        "sha256": "6cb691c686fa2838c6deb34980d426145c2a5d537491cb83d463c33cdbc726ed",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "9.4.1"
+    },
     "octo_image": {
       "dependency": "direct main",
       "description": {
@@ -1446,11 +1535,11 @@
       "dependency": "direct main",
       "description": {
         "name": "package_info_plus",
-        "sha256": "f69da0d3189a4b4ceaeb1a3defb0f329b3b352517f52bed4290f83d4f06bc08d",
+        "sha256": "468c26b4254ab01979fa5e4a98cb343ea3631b9acee6f21028997419a80e1a20",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.0.0"
+      "version": "9.0.1"
     },
     "package_info_plus_platform_interface": {
       "dependency": "transitive",
@@ -1507,21 +1596,21 @@
       "dependency": "transitive",
       "description": {
         "name": "path_provider_android",
-        "sha256": "f2c65e21139ce2c3dad46922be8272bb5963516045659e71bb16e151c93b580e",
+        "sha256": "69cbd515a62b94d32a7944f086b2f82b4ac40a1d45bebfc00813a430ab2dabcd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.22"
+      "version": "2.3.1"
     },
     "path_provider_foundation": {
       "dependency": "transitive",
       "description": {
         "name": "path_provider_foundation",
-        "sha256": "6d13aece7b3f5c5a9731eaf553ff9dcbc2eff41087fd2df587fd0fed9a3eb0c4",
+        "sha256": "2a376b7d6392d80cd3705782d2caa734ca4727776db0b6ec36ef3f1855197699",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.1"
+      "version": "2.6.0"
     },
     "path_provider_linux": {
       "dependency": "transitive",
@@ -1534,7 +1623,7 @@
       "version": "2.2.1"
     },
     "path_provider_platform_interface": {
-      "dependency": "transitive",
+      "dependency": "direct main",
       "description": {
         "name": "path_provider_platform_interface",
         "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334",
@@ -1557,11 +1646,11 @@
       "dependency": "direct main",
       "description": {
         "name": "permission_handler",
-        "sha256": "bc917da36261b00137bbc8896bf1482169cd76f866282368948f032c8c1caae1",
+        "sha256": "fe54465bcc62a4564c6e4db337bbaded6c0c0fa6e10487414436d163114784f6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "12.0.1"
+      "version": "12.0.3"
     },
     "permission_handler_android": {
       "dependency": "transitive",
@@ -1577,11 +1666,11 @@
       "dependency": "transitive",
       "description": {
         "name": "permission_handler_apple",
-        "sha256": "f000131e755c54cf4d84a5d8bd6e4149e262cc31c5a8b1d698de1ac85fa41023",
+        "sha256": "e20daf680eef1ca62ffe8c8c526b778cc386d50137c77ac71c8ec9c88c13fb9d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.4.7"
+      "version": "9.4.9"
     },
     "permission_handler_html": {
       "dependency": "transitive",
@@ -1617,11 +1706,11 @@
       "dependency": "transitive",
       "description": {
         "name": "petitparser",
-        "sha256": "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1",
+        "sha256": "91bd59303e9f769f108f8df05e371341b15d59e995e6806aefab827b58336675",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.0.1"
+      "version": "7.0.2"
     },
     "platform": {
       "dependency": "transitive",
@@ -1657,11 +1746,21 @@
       "dependency": "transitive",
       "description": {
         "name": "posix",
-        "sha256": "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61",
+        "sha256": "185ef7606574f789b40f289c233efa52e96dead518aed988e040a10737febb07",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.0.3"
+      "version": "6.5.0"
+    },
+    "process": {
+      "dependency": "transitive",
+      "description": {
+        "name": "process",
+        "sha256": "c6248e4526673988586e8c00bb22a49210c258dc91df5227d5da9748ecf79744",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "5.0.5"
     },
     "progress_border": {
       "dependency": "direct main",
@@ -1707,11 +1806,21 @@
       "dependency": "transitive",
       "description": {
         "name": "qs_dart",
-        "sha256": "27da57e8b394163f96b74bccb6eb6115bfd2585de4b9ad6241bdf1a9797ab54f",
+        "sha256": "2758b3012c92fa1335b3867d89f5debaf33c71fa5fd086ab67e625f674ef0d10",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.6.0"
+      "version": "1.7.5"
+    },
+    "record_use": {
+      "dependency": "transitive",
+      "description": {
+        "name": "record_use",
+        "sha256": "2551bd8eecfe95d14ae75f6021ad0248be5c27f138c2ec12fcb52b500b3ba1ed",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.6.0"
     },
     "riverpod": {
       "dependency": "transitive",
@@ -1777,11 +1886,11 @@
       "dependency": "transitive",
       "description": {
         "name": "safe_local_storage",
-        "sha256": "e9a21b6fec7a8aa62cc2585ff4c1b127df42f3185adbd2aca66b47abe2e80236",
+        "sha256": "287ea1f667c0b93cdc127dccc707158e2d81ee59fba0459c31a0c7da4d09c755",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.1"
+      "version": "2.0.3"
     },
     "screen_retriever": {
       "dependency": "transitive",
@@ -1847,11 +1956,11 @@
       "dependency": "direct main",
       "description": {
         "name": "share_plus",
-        "sha256": "14c8860d4de93d3a7e53af51bff479598c4e999605290756bbbe45cf65b37840",
+        "sha256": "223873d106614442ea6f20db5a038685cc5b32a2fba81cdecaefbbae0523f7fa",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "12.0.1"
+      "version": "12.0.2"
     },
     "share_plus_platform_interface": {
       "dependency": "transitive",
@@ -1867,21 +1976,21 @@
       "dependency": "direct main",
       "description": {
         "name": "shared_preferences",
-        "sha256": "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5",
+        "sha256": "c3025c5534b01739267eb7d76959bbc25a6d10f6988e1c2a3036940133dd10bf",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.3"
+      "version": "2.5.5"
     },
     "shared_preferences_android": {
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_android",
-        "sha256": "83af5c682796c0f7719c2bbf74792d113e40ae97981b8f266fa84574573556bc",
+        "sha256": "e8d4762b1e2e8578fc4d0fd548cebf24afd24f49719c08974df92834565e2c53",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.18"
+      "version": "2.4.23"
     },
     "shared_preferences_foundation": {
       "dependency": "transitive",
@@ -1907,11 +2016,11 @@
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_platform_interface",
-        "sha256": "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80",
+        "sha256": "649dc798a33931919ea356c4305c2d1f81619ea6e92244070b520187b5140ef9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.1"
+      "version": "2.4.2"
     },
     "shared_preferences_web": {
       "dependency": "transitive",
@@ -2014,11 +2123,11 @@
       "dependency": "transitive",
       "description": {
         "name": "source_span",
-        "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c",
+        "sha256": "56a02f1f4cd1a2d96303c0144c93bd6d909eea6bee6bf5a0e0b685edbd4c47ab",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.10.1"
+      "version": "1.10.2"
     },
     "split_view": {
       "dependency": "direct main",
@@ -2035,31 +2144,31 @@
       "dependency": "transitive",
       "description": {
         "name": "sqflite",
-        "sha256": "e2297b1da52f127bc7a3da11439985d9b536f75070f3325e62ada69a5c585d03",
+        "sha256": "564cfed0746fe53140c23b70b308e045c3b31f17778f2f326ccb7d804ea0250a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.2"
+      "version": "2.4.2+1"
     },
     "sqflite_android": {
       "dependency": "transitive",
       "description": {
         "name": "sqflite_android",
-        "sha256": "ecd684501ebc2ae9a83536e8b15731642b9570dc8623e0073d227d0ee2bfea88",
+        "sha256": "881e28efdcc9950fd8e9bb42713dcf1103e62a2e7168f23c9338d82db13dec40",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.2+2"
+      "version": "2.4.2+3"
     },
     "sqflite_common": {
       "dependency": "transitive",
       "description": {
         "name": "sqflite_common",
-        "sha256": "6ef422a4525ecc601db6c0a2233ff448c731307906e92cabc9ba292afaae16a6",
+        "sha256": "1581ffbf7a0e333b380d6a30737d78516b826cb35beb7fb0bf8a3ea0c678b465",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.6"
+      "version": "2.5.8"
     },
     "sqflite_darwin": {
       "dependency": "transitive",
@@ -2131,15 +2240,25 @@
       "source": "hosted",
       "version": "1.4.1"
     },
+    "sync_http": {
+      "dependency": "transitive",
+      "description": {
+        "name": "sync_http",
+        "sha256": "7f0cd72eca000d2e026bcd6f990b81d0ca06022ef4e32fb257b30d3d1014a961",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.3.1"
+    },
     "synchronized": {
       "dependency": "transitive",
       "description": {
         "name": "synchronized",
-        "sha256": "c254ade258ec8282947a0acbbc90b9575b4f19673533ee46f2f6e9b3aeefd7c0",
+        "sha256": "63896c27e81b28f8cb4e69ead0d3e8f03f1d1e5fc531a3e579cabed6a2c7c9e5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.4.0"
+      "version": "3.4.0+1"
     },
     "term_glyph": {
       "dependency": "transitive",
@@ -2155,31 +2274,31 @@
       "dependency": "transitive",
       "description": {
         "name": "test_api",
-        "sha256": "93167629bfc610f71560ab9312acdda4959de4df6fac7492c89ff0d3886f6636",
+        "sha256": "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.9"
+      "version": "0.7.11"
     },
     "threshold": {
       "dependency": "transitive",
       "description": {
         "name": "threshold",
-        "sha256": "0a1585947eb84bfbe7ca6a6598c9075d3d71fe969e81668cd6d2122be664fd39",
+        "sha256": "33bdf79425c89d65f1dc32bec10328de8e89451946611c1e04b08ed28d647b85",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.5"
+      "version": "1.0.6"
     },
     "time": {
       "dependency": "transitive",
       "description": {
         "name": "time",
-        "sha256": "370572cf5d1e58adcb3e354c47515da3f7469dac3a95b447117e728e7be6f461",
+        "sha256": "46187cf30bffdab28c56be9a63861b36e4ab7347bf403297595d6a97e10c789f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.5"
+      "version": "2.1.6"
     },
     "timing": {
       "dependency": "transitive",
@@ -2255,21 +2374,21 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_android",
-        "sha256": "767344bf3063897b5cf0db830e94f904528e6dd50a6dfaf839f0abf509009611",
+        "sha256": "17bc677f0b301615530dd1d67e0a9828cafa2d0b6b6eae4cd3679b7eac4a273c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.28"
+      "version": "6.3.30"
     },
     "url_launcher_ios": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_ios",
-        "sha256": "cfde38aa257dae62ffe79c87fab20165dfdf6988c1d31b58ebf59b9106062aad",
+        "sha256": "580fe5dfb51671ae38191d316e027f6b76272b026370708c2d898799750a02b0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.6"
+      "version": "6.4.1"
     },
     "url_launcher_linux": {
       "dependency": "transitive",
@@ -2305,11 +2424,11 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_web",
-        "sha256": "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2",
+        "sha256": "85c81589622fbc87c1c683aaea164d3604a7777495a79d91e39ffcdec39ddb34",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.1"
+      "version": "2.4.3"
     },
     "url_launcher_windows": {
       "dependency": "transitive",
@@ -2325,11 +2444,11 @@
       "dependency": "direct main",
       "description": {
         "name": "uuid",
-        "sha256": "a11b666489b1954e01d992f3d601b1804a33937b5a8fe677bd26b8a9f96f96e8",
+        "sha256": "1fef9e8e11e2991bb773070d4656b7bd5d850967a2456cfc83cf47925ba79489",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.5.2"
+      "version": "4.5.3"
     },
     "value_layout_builder": {
       "dependency": "transitive",
@@ -2345,11 +2464,11 @@
       "dependency": "transitive",
       "description": {
         "name": "vector_graphics",
-        "sha256": "a4f059dc26fc8295b5921376600a194c4ec7d55e72f2fe4c7d2831e103d461e6",
+        "sha256": "2306c03da2ba81724afeb589c351ebbc0aa7d86005925be8f8735856dbe5e42d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.19"
+      "version": "1.2.2"
     },
     "vector_graphics_codec": {
       "dependency": "transitive",
@@ -2365,11 +2484,11 @@
       "dependency": "transitive",
       "description": {
         "name": "vector_graphics_compiler",
-        "sha256": "d354a7ec6931e6047785f4db12a1f61ec3d43b207fc0790f863818543f8ff0dc",
+        "sha256": "7ee12e6dffe0fc8e755179d6d91b3b34f5924223fc104d85572ef9180d73d172",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.19"
+      "version": "1.2.5"
     },
     "vector_math": {
       "dependency": "transitive",
@@ -2395,51 +2514,41 @@
       "dependency": "transitive",
       "description": {
         "name": "vm_service",
-        "sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60",
+        "sha256": "0016aef94fc66495ac78af5859181e3f3bf2026bd8eecc72b9565601e19ab360",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "15.0.2"
+      "version": "15.2.0"
     },
     "wakelock_plus": {
       "dependency": "direct main",
       "description": {
         "name": "wakelock_plus",
-        "sha256": "9296d40c9adbedaba95d1e704f4e0b434be446e2792948d0e4aa977048104228",
+        "sha256": "ddf3db70eaa10c37558ff817519b85d527dbd21034fd5d8e1c2e85f31588f1c1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.4.0"
+      "version": "1.5.2"
     },
     "wakelock_plus_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "wakelock_plus_platform_interface",
-        "sha256": "036deb14cd62f558ca3b73006d52ce049fabcdcb2eddfe0bf0fe4e8a943b5cf2",
+        "sha256": "b13f99e992e7ae6a152e16c5559d3c07ff445b13330192662494e614ca3e7d7b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.0"
+      "version": "1.5.1"
     },
     "watcher": {
       "dependency": "transitive",
       "description": {
         "name": "watcher",
-        "sha256": "592ab6e2892f67760543fb712ff0177f4ec76c031f02f5b4ff8d3fc5eb9fb61a",
+        "sha256": "1398c9f081a753f9226febe8900fce8f7d0a67163334e1c94a2438339d79d635",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.4"
-    },
-    "weak_map": {
-      "dependency": "transitive",
-      "description": {
-        "name": "weak_map",
-        "sha256": "5f8e5d5ce57dc624db5fae814dd689ccae1f17f92b426e52f0a7cbe7f6f4ab97",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.0.1"
+      "version": "1.2.1"
     },
     "web": {
       "dependency": "transitive",
@@ -2471,6 +2580,16 @@
       "source": "hosted",
       "version": "3.0.3"
     },
+    "webdriver": {
+      "dependency": "transitive",
+      "description": {
+        "name": "webdriver",
+        "sha256": "2f3a14ca026957870cfd9c635b83507e0e51d8091568e90129fbf805aba7cade",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.1.0"
+    },
     "win32": {
       "dependency": "transitive",
       "description": {
@@ -2553,7 +2672,7 @@
     }
   },
   "sdks": {
-    "dart": ">=3.9.0 <4.0.0",
-    "flutter": ">=3.35.0"
+    "dart": ">=3.11.0 <4.0.0",
+    "flutter": ">=3.41.0"
   }
 }

From 46d3d8cb0af3922270836b17800da38654583e46 Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Fri, 19 Jun 2026 21:27:49 +0530
Subject: [PATCH 06/31] reaction: 2.4.1 -> 2.5.1

https://framagit.org/ppom/reaction/-/releases/v2.4.2
https://framagit.org/ppom/reaction/-/releases/v2.5.0
https://framagit.org/ppom/reaction/-/releases/v2.5.1

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
(cherry picked from commit 440b9ec49ba4bf540bc06ce1767b2ad687cc4022)
---
 pkgs/by-name/re/reaction/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/re/reaction/package.nix b/pkgs/by-name/re/reaction/package.nix
index 63a9af69be40..2ac26aeb3a47 100644
--- a/pkgs/by-name/re/reaction/package.nix
+++ b/pkgs/by-name/re/reaction/package.nix
@@ -13,17 +13,17 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "reaction";
-  version = "2.4.1";
+  version = "2.5.1";
 
   src = fetchFromGitLab {
     domain = "framagit.org";
     owner = "ppom";
     repo = "reaction";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1+kliU3TfXhAz/vRh/UamTdcv8UIXrcF1q+Qy1jsjD4=";
+    hash = "sha256-a1ioQ+1CvC22tUeyVG8A7hciP+bXvX/UcRi0++To5Ik=";
   };
 
-  cargoHash = "sha256-FQCYCSKk8SLO2ddM6hklUuTvSK7+4dElaNQ3ZNnci3M=";
+  cargoHash = "sha256-qbhNswQW6ExkMQ+KiAr50EOLiDScwm9hILiiN9GxGWU=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 5f8b974b4a163ff7af8d7b8ac1fb6b6a1b7ca9be Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Sat, 20 Jun 2026 15:57:53 +0000
Subject: [PATCH 07/31] nezha-agent: 2.2.2 -> 2.2.3

(cherry picked from commit 962d8bd7d2b81719f39009794ac48694e8142585)
---
 pkgs/by-name/ne/nezha-agent/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ne/nezha-agent/package.nix b/pkgs/by-name/ne/nezha-agent/package.nix
index 2b27bf85d0c6..58537283a5d5 100644
--- a/pkgs/by-name/ne/nezha-agent/package.nix
+++ b/pkgs/by-name/ne/nezha-agent/package.nix
@@ -8,16 +8,16 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "nezha-agent";
-  version = "2.2.2";
+  version = "2.2.3";
 
   src = fetchFromGitHub {
     owner = "nezhahq";
     repo = "agent";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KaONvjQY204VUppt2h78IE92LP+YJQ128BCuHGgMsBk=";
+    hash = "sha256-DDmxeWEIEJweqDbCDDTzK99cP28tz5bQpotyDMCTVuk=";
   };
 
-  vendorHash = "sha256-/pygqSThb3YQ188Ro0vjP4yDN/yfPNRJQWP5FQ7sJ8c=";
+  vendorHash = "sha256-kYw1XgtlzRSQ0k8XK0lCJ0s2UaevVdmPunb9e7hoc70=";
 
   ldflags = [
     "-s"

From 84bcfa41da3f7a337be3e840e797be08e1cc1b36 Mon Sep 17 00:00:00 2001
From: Luca Ruperto <lukelr2000@gmail.com>
Date: Wed, 17 Jun 2026 10:53:17 +0200
Subject: [PATCH 08/31] octave.pkgs.optim: 1.6.2 -> 1.6.3, unbreak

It was marked broken in 1dc27975d1c106ccefcce2b9d7f3f75f16c3970f (May
2025).
But the bug was fixed in October 2025 with:
https://sourceforge.net/p/octave/optim/ci/d8c28ab3f3f37d439bc2d961d79f4a8caa9830d1/

Since there were new commits, but no release. I asked the upstream
maintainer to push the 1.6.3 tag.

I tested it works by importing the library:
nix-shell -p "octave.withPackages (ps: [ ps.optim ])" --run 'octave
--eval "pkg load optim; disp(\"Success!\")"'

(cherry picked from commit cbbc21f9f84099f5c00b4e1e67a64ade87ec7083)
---
 pkgs/development/octave-modules/optim/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/octave-modules/optim/default.nix b/pkgs/development/octave-modules/optim/default.nix
index e0f9c98db2d9..f9f587df1a75 100644
--- a/pkgs/development/octave-modules/optim/default.nix
+++ b/pkgs/development/octave-modules/optim/default.nix
@@ -10,11 +10,11 @@
 
 buildOctavePackage rec {
   pname = "optim";
-  version = "1.6.2";
+  version = "1.6.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "sha256-VUqOGLtxla6GH1BZwU8aVXhEJlwa3bW/vzq5iFUkeH4=";
+    sha256 = "sha256-Wfs3caLSojE0R1MsWaLgAKanu3pnfz74GD+6qrVJOhQ=";
   };
 
   buildInputs = [
@@ -34,9 +34,10 @@ buildOctavePackage rec {
       publicDomain
     ];
     # Modified BSD code seems removed
-    maintainers = with lib.maintainers; [ ravenjoad ];
+    maintainers = with lib.maintainers; [
+      ravenjoad
+      lnk3
+    ];
     description = "Non-linear optimization toolkit";
-    # Hasn't been updated since 2022, and fails to build with octave >= 10.1.0
-    broken = true;
   };
 }

From 2370847e2dcb17f7dad7d7f710c2651026bb7a68 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 3 Jun 2026 13:12:40 +0200
Subject: [PATCH 09/31] nocturne: 1.2.1 -> 1.2.2

Diff: https://github.com/Jeffser/Nocturne/compare/1.2.1...1.2.2

Changelog: https://github.com/Jeffser/Nocturne/releases
(cherry picked from commit 607961ef2c9603f06438102670dde64c6c531081)
---
 pkgs/by-name/no/nocturne/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/no/nocturne/package.nix b/pkgs/by-name/no/nocturne/package.nix
index b61300697859..b4e28a603185 100644
--- a/pkgs/by-name/no/nocturne/package.nix
+++ b/pkgs/by-name/no/nocturne/package.nix
@@ -25,13 +25,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nocturne";
-  version = "1.2.1";
+  version = "1.2.2";
 
   src = fetchFromGitHub {
     owner = "Jeffser";
     repo = "Nocturne";
     tag = finalAttrs.version;
-    hash = "sha256-CfrPmpkjcmKMB66kdFL4HqVukaIWAkIzOkwtBqZ65k4=";
+    hash = "sha256-2UtlOdxXFdWoGeEwb89qI5Xp8FES2I3Eno8DIbhkBhI=";
   };
 
   __structuredAttrs = true;

From ea043f1ce4a2c6d0f179684c9543a206420a4406 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 5 Jun 2026 17:36:49 +0200
Subject: [PATCH 10/31] nocturne: add a gdk-pixbuf module

(cherry picked from commit 94bf14f66474dbb50ea4534e7a7a363f5495ed77)
---
 pkgs/by-name/no/nocturne/package.nix | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/pkgs/by-name/no/nocturne/package.nix b/pkgs/by-name/no/nocturne/package.nix
index b4e28a603185..5bb0c476b0e1 100644
--- a/pkgs/by-name/no/nocturne/package.nix
+++ b/pkgs/by-name/no/nocturne/package.nix
@@ -21,6 +21,11 @@
   libsecret,
   gst_all_1,
   xdg-user-dirs,
+  gnome,
+  librsvg,
+  webp-pixbuf-loader,
+  libavif,
+  libheif,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -78,6 +83,19 @@ stdenv.mkDerivation (finalAttrs: {
     python3Packages.pillow
   ];
 
+  preInstall = ''
+    export GDK_PIXBUF_MODULE_FILE="${
+      gnome._gdkPixbufCacheBuilder_DO_NOT_USE {
+        extraLoaders = [
+          librsvg
+          webp-pixbuf-loader
+          libavif
+          libheif.lib
+        ];
+      }
+    }"
+  '';
+
   preFixup = ''
     gappsWrapperArgs+=(
       --prefix PATH : ${lib.makeBinPath [ xdg-user-dirs ]}

From 3fd910f9dafcdeaa5ee19e850a60bb83a898829b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 19 Jun 2026 02:23:11 +0000
Subject: [PATCH 11/31] nocturne: 1.2.2 -> 1.3.0

(cherry picked from commit 187f1439f795f284db84a2a796c268b66544b67e)
---
 pkgs/by-name/no/nocturne/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/no/nocturne/package.nix b/pkgs/by-name/no/nocturne/package.nix
index 5bb0c476b0e1..da8977cebee9 100644
--- a/pkgs/by-name/no/nocturne/package.nix
+++ b/pkgs/by-name/no/nocturne/package.nix
@@ -30,13 +30,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nocturne";
-  version = "1.2.2";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "Jeffser";
     repo = "Nocturne";
     tag = finalAttrs.version;
-    hash = "sha256-2UtlOdxXFdWoGeEwb89qI5Xp8FES2I3Eno8DIbhkBhI=";
+    hash = "sha256-z7E4PVSp7HDarnJeQFrJ/HznxUT+b6xTF0QTm5ffvTQ=";
   };
 
   __structuredAttrs = true;

From 3e2e2497a9c97ac4750243371fab9cd4fca4d90d Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Thu, 18 Jun 2026 22:13:16 +0200
Subject: [PATCH 12/31] squid: 7.5 -> 7.6

Fixes CVE-2026-47729

https://github.com/squid-cache/squid/releases/tag/SQUID_7_6
(cherry picked from commit 374ed9f147c28604396a8d98687bd31ea89ad71a)
---
 pkgs/by-name/sq/squid/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sq/squid/package.nix b/pkgs/by-name/sq/squid/package.nix
index 25c457e2152a..f46b3efb88c9 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.5";
+  version = "7.6";
 
   src = fetchurl {
     url = "https://github.com/squid-cache/squid/releases/download/SQUID_${
       builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version
     }/squid-${finalAttrs.version}.tar.xz";
-    hash = "sha256-9gWJB9sBUNL10ihIK1qeVniSDPNorgzLzszrL/TDUQY=";
+    hash = "sha256-hSF4/cN8WweGqTT8mQx9L//IKs8ZsihL4gm5ZDHSWZI=";
   };
 
   nativeBuildInputs = [ pkg-config ];

From bec43db02ce1490a6642ccbb860c5af3f0ce9201 Mon Sep 17 00:00:00 2001
From: sarin <me@s4r.in>
Date: Sun, 21 Jun 2026 20:19:04 +0800
Subject: [PATCH 13/31] realm: 2.8.0 -> 2.9.4

(cherry picked from commit 3a8eb19051d11e5401206aafa063e5f9325ea19d)
---
 pkgs/by-name/re/realm/package.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/re/realm/package.nix b/pkgs/by-name/re/realm/package.nix
index 68ae0088e60a..d3049faa4da3 100644
--- a/pkgs/by-name/re/realm/package.nix
+++ b/pkgs/by-name/re/realm/package.nix
@@ -1,4 +1,5 @@
 {
+  cmake,
   lib,
   rustPlatform,
   fetchFromGitHub,
@@ -8,16 +9,21 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "realm";
-  version = "2.8.0";
+  version = "2.9.4";
 
   src = fetchFromGitHub {
     owner = "zhboner";
     repo = "realm";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-7hOy+bqWoVyI2xGJ0eY7GvyIYykr6VP8d3ZYtY/jGPI=";
+    hash = "sha256-gnsFqWhJOMKUaSWfRmHBksw3uWFP0smRhEbPLriEmlk=";
   };
 
-  cargoHash = "sha256-yR+ayseoUYpK9lUFRP0OLrp1+LUrtPnxiPRvjDFSNgo=";
+  cargoHash = "sha256-b/cG6fGoAdhvmZXSQv/QkY3QKiMT7YcfEGohZSbk0q8=";
+
+  nativeBuildInputs = [
+    cmake
+    rustPlatform.bindgenHook
+  ];
 
   env.RUSTC_BOOTSTRAP = 1;
 

From 0c8249f7ecc32ff91c3b9dbfd2240de24b07c1b5 Mon Sep 17 00:00:00 2001
From: Benoit de Chezelles <benoit.dechezelles@gmail.com>
Date: Thu, 18 Jun 2026 11:55:47 +0200
Subject: [PATCH 14/31] pyrefly: 1.0.0 -> 1.1.1

(cherry picked from commit 60d19609848bac2c150701d1c5e4eab99ea4c005)
---
 pkgs/by-name/py/pyrefly/fix-cargo-lock.patch | 12 ------------
 pkgs/by-name/py/pyrefly/package.nix          | 13 +++----------
 2 files changed, 3 insertions(+), 22 deletions(-)
 delete mode 100644 pkgs/by-name/py/pyrefly/fix-cargo-lock.patch

diff --git a/pkgs/by-name/py/pyrefly/fix-cargo-lock.patch b/pkgs/by-name/py/pyrefly/fix-cargo-lock.patch
deleted file mode 100644
index 4f02e23011f3..000000000000
--- a/pkgs/by-name/py/pyrefly/fix-cargo-lock.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index c8c39e9617888199b86fa7c0273c0edebc85df2f..ea5e7b7e633a2de582a7b013a32a6eb6b166e2db 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -2866,6 +2866,7 @@ dependencies = [
- name = "rustversion"
- version = "1.0.22"
- source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
- 
- [[package]]
- name = "ryu"
diff --git a/pkgs/by-name/py/pyrefly/package.nix b/pkgs/by-name/py/pyrefly/package.nix
index 3997c0ec9577..a6466acfa2a1 100644
--- a/pkgs/by-name/py/pyrefly/package.nix
+++ b/pkgs/by-name/py/pyrefly/package.nix
@@ -10,22 +10,18 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "pyrefly";
-  version = "1.0.0";
+  version = "1.1.1";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "pyrefly";
     tag = finalAttrs.version;
-    hash = "sha256-S3phcTwZlG9VBHdYzcbsLzj0uqBUDy4Xfy/tlp3AQZg=";
+    hash = "sha256-GHH+oG3oUEmGNEmtrmra321UIgRD04Eq1Ct0H7VsjxU=";
   };
 
   buildAndTestSubdir = "pyrefly";
 
-  cargoPatches = [
-    # https://github.com/facebook/pyrefly/issues/3383
-    ./fix-cargo-lock.patch
-  ];
-  cargoHash = "sha256-OfbPPANsAhrp2MbzDEHGRLWWmUkbMMGKR5B4R6lXdE4=";
+  cargoHash = "sha256-vOHcmYVKlsxueWjvCCDWwSfJt+2/71b5+NdQyW3jYH4=";
 
   buildInputs = [ rust-jemalloc-sys ];
 
@@ -42,9 +38,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     export TMPDIR=$(mktemp -d)
   '';
 
-  # requires unstable rust features
-  env.RUSTC_BOOTSTRAP = 1;
-
   passthru.updateScript = nix-update-script { };
 
   meta = {

From 3f17a9749bbe092e4757017771d5f85f6e49b04a Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Tue, 9 Jun 2026 13:46:58 -0400
Subject: [PATCH 15/31] halloy: 2026.7.1 -> 2026.7.2

Changelog: https://github.com/squidowl/halloy/blob/2026.7.2/CHANGELOG.md
(cherry picked from commit 1e48be37a045651d3e2e06ed63534490c7ea8e3d)
---
 pkgs/by-name/ha/halloy/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ha/halloy/package.nix b/pkgs/by-name/ha/halloy/package.nix
index 3ac327c34c34..801d6b1cf473 100644
--- a/pkgs/by-name/ha/halloy/package.nix
+++ b/pkgs/by-name/ha/halloy/package.nix
@@ -21,16 +21,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "halloy";
-  version = "2026.7.1";
+  version = "2026.7.2";
 
   src = fetchFromGitHub {
     owner = "squidowl";
     repo = "halloy";
     tag = finalAttrs.version;
-    hash = "sha256-AFDx4gmYWUMcvpJi+/2xd0s4gAygwss2XrmCFsd6uKs=";
+    hash = "sha256-+qFHwlwRxVN4W9DG+gY5N6um+JARD+3EiLlsD7R9Tpc=";
   };
 
-  cargoHash = "sha256-hrYWF5WNhLqKMFJJlir7tumxNZqgGm+gK+RI1iDPatM=";
+  cargoHash = "sha256-/nFtOJXpusIlc7orGv013qzad8fdfQr32c8DAlccHIA=";
 
   nativeBuildInputs = [
     copyDesktopItems

From 5ac3bef36623ebb51850d0a6419579f5ddbfd067 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Dele=C5=84kec?= <lotte@chir.rs>
Date: Mon, 15 Jun 2026 08:08:44 +0100
Subject: [PATCH 16/31] bcachefs-tools: mark as working on kernel 7.1

Upstream supported kernel 7.1 since 1.38.1:

https://github.com/koverstreet/bcachefs-tools/blob/daebabcc2e42877a2b59ab9d0c786aec679b93ca/Changelog.mdwn?plain=1#L152-L162
(cherry picked from commit b0c8003671a05e45f0d7e5cda8b11c4cf0d8f07b)
---
 pkgs/by-name/bc/bcachefs-tools/kernel-module.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/bc/bcachefs-tools/kernel-module.nix b/pkgs/by-name/bc/bcachefs-tools/kernel-module.nix
index 5516097c33e8..614410a039aa 100644
--- a/pkgs/by-name/bc/bcachefs-tools/kernel-module.nix
+++ b/pkgs/by-name/bc/bcachefs-tools/kernel-module.nix
@@ -50,6 +50,6 @@ stdenv.mkDerivation {
       platforms
       ;
 
-    broken = !(lib.versionAtLeast kernel.version "6.16" && lib.versionOlder kernel.version "7.1");
+    broken = !(lib.versionAtLeast kernel.version "6.16" && lib.versionOlder kernel.version "7.2");
   };
 }

From f6526ce18135eb0afa2e84d60bd2ccc908d77949 Mon Sep 17 00:00:00 2001
From: XYenon <i@xyenon.bid>
Date: Mon, 22 Jun 2026 11:12:52 +0800
Subject: [PATCH 17/31] kvrocks: 2.15.0 -> 2.16.0

(cherry picked from commit ed5704a9aca3a245a3954f4a70138bc872fd8f68)
---
 pkgs/by-name/kv/kvrocks/package.nix | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/kv/kvrocks/package.nix b/pkgs/by-name/kv/kvrocks/package.nix
index b4d28bdd6b63..39bad91529f8 100644
--- a/pkgs/by-name/kv/kvrocks/package.nix
+++ b/pkgs/by-name/kv/kvrocks/package.nix
@@ -12,6 +12,7 @@
 
   # keep-sorted start
   cpptrace,
+  fast-float,
   fmt,
   gtest,
   hat-trie,
@@ -83,8 +84,8 @@ let
   luajit-src = fetchFromGitHub {
     owner = "RocksLabs";
     repo = "LuaJIT";
-    rev = "c0a8e68325ec261a77bde1c8eabad398168ffe74";
-    hash = "sha256-Wjh14d0JR5ecAwdYVBjQYIHb2vJ1I61oR0N0LMmtq4E=";
+    rev = "02dfcc34e93e57ac96e566d123c66ee01e650299";
+    hash = "sha256-HINP9nahXHTManDMAAJBOUlSSxv5JZhlHs96HHkE7qE=";
   };
 
   zlib-ng' = zlib-ng.override { withZlibCompat = true; };
@@ -107,13 +108,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "kvrocks";
-  version = "2.15.0";
+  version = "2.16.0";
 
   src = fetchFromGitHub {
     owner = "apache";
     repo = "kvrocks";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-s4saKuezPYvcmKSqVBVDbPJcQXr6pVfIWjff7Txg8tY=";
+    hash = "sha256-CAbhOX7dmyXgl0STNjzALseXUzrpTPNy9tjoPACe0Os=";
   };
 
   __structuredAttrs = true;
@@ -151,6 +152,15 @@ stdenv.mkDerivation (finalAttrs: {
       ];
     }}
     ${mkCmakeFile "fmt" { findPackage = "fmt"; }}
+    ${mkCmakeFile "fast_float" {
+      findPackage = "FastFloat";
+      libraries = [
+        {
+          name = "fast_float";
+          target = "FastFloat::fast_float";
+        }
+      ];
+    }}
     ${mkCmakeFile "spdlog" { findPackage = "spdlog"; }}
     ${mkCmakeFile "snappy" {
       pkgConfig = {
@@ -273,6 +283,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     # keep-sorted start
     cpptrace
+    fast-float
     fmt
     gtest
     hat-trie

From 4ec8fa78d9d68c85d88f931e24c24cd36f3c19aa Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Sun, 21 Jun 2026 12:46:02 +0200
Subject: [PATCH 18/31] youtrack: 2026.1.13570 -> 2026.1.13757

fixes:
- CVE-2026-56141
- CVE-2026-56142
- CVE-2026-50242
- CVE-2026-50242

https://youtrack.jetbrains.com/releaseNotes?q=%23JT%20%23Resolved%20Released%20in%20build:%202026.1.13757&title=YouTrack%202026.1.13757%20Release%20Notes
(cherry picked from commit 69d96e5ae0b3bb58580191840f81c3e092ae0da8)
---
 pkgs/by-name/yo/youtrack/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/yo/youtrack/package.nix b/pkgs/by-name/yo/youtrack/package.nix
index 66eb4eba027a..93e2aa0b451a 100644
--- a/pkgs/by-name/yo/youtrack/package.nix
+++ b/pkgs/by-name/yo/youtrack/package.nix
@@ -10,15 +10,15 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "youtrack";
-  version = "2026.1.13570";
+  version = "2026.1.13757";
 
   src = dockerTools.exportImage {
     diskSize = 8192;
     fromImage = dockerTools.pullImage {
       imageName = "jetbrains/youtrack";
       arch = "amd64";
-      imageDigest = "sha256:2ea82348ed037f91f847dd99f196e632769dbd44a00d5659ee7a50cf9774149a";
-      hash = "sha256-+GVDh4ptBQggtZDWI56pEvkPonL9QG9126amtwZS0T8=";
+      imageDigest = "sha256:56c4d6b6cb3781e21a369857943a366931b69f22dee76c16b2173de0fd56a0a9";
+      hash = "sha256-vWNe/1PTLX1rNR66iOZizubH2YVda8GTfXrQikWTML0=";
     };
   };
   unpackPhase = ''

From b9db3d1af6855198a4e995cd8505b35c7b36e6fd Mon Sep 17 00:00:00 2001
From: Leon Schoorl <leon@qbaylogic.com>
Date: Mon, 22 Jun 2026 00:43:00 +0200
Subject: [PATCH 19/31] pulsar: fix crash reporter

(cherry picked from commit 378022ee108b416354e03254065fb9a397e0c3e3)
---
 pkgs/by-name/pu/pulsar/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/pu/pulsar/package.nix b/pkgs/by-name/pu/pulsar/package.nix
index aae58f5cd2ad..63455c752aa4 100644
--- a/pkgs/by-name/pu/pulsar/package.nix
+++ b/pkgs/by-name/pu/pulsar/package.nix
@@ -166,6 +166,8 @@ stdenv.mkDerivation (finalAttrs: {
       $opt/resources/app/ppm/bin/node
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
       $opt/resources/app.asar.unpacked/node_modules/symbol-provider-ctags/vendor/ctags-linux
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+      $opt/chrome_crashpad_handler
 
     # Replace the bundled git with the one from nixpkgs
     dugite=$opt/resources/app.asar.unpacked/node_modules/dugite

From 44de0d0deaf7f04ab8ced78d0976800529a47e53 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Fri, 5 Jun 2026 10:59:57 +0200
Subject: [PATCH 20/31] Revert "doc: don't use sha256 and non-sri hashes in
 user docs"

This reverts commit 309d5c169b871f8b0584ab93132d02067a682b42.

The instructions don't work on NixOS 25.11: Nix 2.31 doesn't suport SRI
hashes in builtins.fetchTarball. Moreover the NixOS manual shouldn't
recomment using experimental commands.

(cherry picked from commit e0a630cb363c69a22b7a54e30ad790ad3e4faad0)
---
 nixos/doc/manual/release-notes/rl-2605.section.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md
index 72adfb5c298b..30ed07c24604 100644
--- a/nixos/doc/manual/release-notes/rl-2605.section.md
+++ b/nixos/doc/manual/release-notes/rl-2605.section.md
@@ -24,11 +24,11 @@
     # Pinned Nixpkgs archive
     #
     # Use `curl -I https://channels.nixos.org/nixos-26.05` to get the
-    # latest commit of the stable channel and `nix --extra-experimental-features nix-command store prefetch-file --unpack`
-    # to compute its hash.
+    # latest commit of the stable channel and `nix-prefetch-url --unpack`
+    # to compute its sha256 hash.
     nixpkgs = builtins.fetchTarball {
       url = "https://github.com/NixOS/nixpkgs/archive/c217913993d6.tar.gz";
-      hash = "sha256-D1PA3xQv/s4W3lnR9yJFSld8UOLr0a/cBWMQMXS+1Qg=";
+      sha256 = "026mprs324330pfazlgbw987qmsa8ligglarvqbcxzig2kgw0lqg";
     };
   in
   import "${nixpkgs}/nixos" {

From f1091a72dcbe6c0cc521287f2f97e5369538dee3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 22 Jun 2026 02:12:54 +0200
Subject: [PATCH 21/31] nixosTests: remove deprecated config attribute access

```
sed -i 's/\(nodes\.[^.]*\)\.config/\1/g' nixos/tests/**.nix
````

(cherry picked from commit 63c45636049ead9d0d06325716923a503e2e3dc6)
---
 nixos/tests/alps.nix                       |  6 +++---
 nixos/tests/cage.nix                       |  2 +-
 nixos/tests/cagebreak.nix                  |  2 +-
 nixos/tests/containers-ip.nix              |  4 ++--
 nixos/tests/docker-rootless.nix            |  2 +-
 nixos/tests/enlightenment.nix              |  2 +-
 nixos/tests/iscsi-multipath-root.nix       |  2 +-
 nixos/tests/iscsi-root.nix                 |  2 +-
 nixos/tests/kerberos/heimdal.nix           |  4 ++--
 nixos/tests/knot.nix                       |  8 ++++----
 nixos/tests/libuiohook.nix                 |  4 ++--
 nixos/tests/lightdm.nix                    |  2 +-
 nixos/tests/nsd.nix                        |  4 ++--
 nixos/tests/parsedmarc/default.nix         | 12 ++++++------
 nixos/tests/pass-secret-service.nix        |  2 +-
 nixos/tests/proxy.nix                      |  4 ++--
 nixos/tests/service-runner.nix             |  2 +-
 nixos/tests/signal-desktop.nix             |  2 +-
 nixos/tests/sway.nix                       |  2 +-
 nixos/tests/thanos.nix                     |  2 +-
 nixos/tests/txredisapi.nix                 |  2 +-
 nixos/tests/xrdp-with-audio-pulseaudio.nix |  2 +-
 22 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/nixos/tests/alps.nix b/nixos/tests/alps.nix
index ced254b1819c..3e5d516271bc 100644
--- a/nixos/tests/alps.nix
+++ b/nixos/tests/alps.nix
@@ -61,7 +61,7 @@ in
           certs.ca.cert
         ];
         networking.extraHosts = ''
-          ${nodes.server.config.networking.primaryIPAddress} ${domain}
+          ${nodes.server.networking.primaryIPAddress} ${domain}
         '';
         services.alps = {
           enable = true;
@@ -83,7 +83,7 @@ in
 
             baseurl = "http://localhost:${toString config.services.alps.port}"
             username = "alice"
-            password = "${nodes.server.config.users.users.alice.password}"
+            password = "${nodes.server.users.users.alice.password}"
             cookiejar = CookieJar()
             cookieprocessor = HTTPCookieProcessor(cookiejar)
             opener = build_opener(cookieprocessor)
@@ -125,7 +125,7 @@ in
 
       client.start()
       client.wait_for_unit("alps.service")
-      client.wait_for_open_port(${toString nodes.client.config.services.alps.port})
+      client.wait_for_open_port(${toString nodes.client.services.alps.port})
       client.succeed("test-alps-login")
     '';
 }
diff --git a/nixos/tests/cage.nix b/nixos/tests/cage.nix
index 10fe997a71d7..fa0c8125862d 100644
--- a/nixos/tests/cage.nix
+++ b/nixos/tests/cage.nix
@@ -29,7 +29,7 @@
   testScript =
     { nodes, ... }:
     let
-      user = nodes.machine.config.users.users.alice;
+      user = nodes.machine.users.users.alice;
     in
     ''
       with subtest("Wait for cage to boot up"):
diff --git a/nixos/tests/cagebreak.nix b/nixos/tests/cagebreak.nix
index 13012281a151..7a2c0a381836 100644
--- a/nixos/tests/cagebreak.nix
+++ b/nixos/tests/cagebreak.nix
@@ -47,7 +47,7 @@ in
   testScript =
     { nodes, ... }:
     let
-      user = nodes.machine.config.users.users.alice;
+      user = nodes.machine.users.users.alice;
       XDG_RUNTIME_DIR = "/run/user/${toString user.uid}";
     in
     ''
diff --git a/nixos/tests/containers-ip.nix b/nixos/tests/containers-ip.nix
index 8dceda8db4c6..7465813775e0 100644
--- a/nixos/tests/containers-ip.nix
+++ b/nixos/tests/containers-ip.nix
@@ -47,9 +47,9 @@ in
           # need to distinguish because show-ip won't work for ipv6
           if container == "webserver4":
               ip = machine.succeed(f"nixos-container show-ip {container}").rstrip()
-              assert ip == "${nodes.machine.config.containers.webserver4.localAddress}"
+              assert ip == "${nodes.machine.containers.webserver4.localAddress}"
               return ip
-          return "${nodes.machine.config.containers.webserver6.localAddress}"
+          return "${nodes.machine.containers.webserver6.localAddress}"
 
 
       for container in "webserver4", "webserver6":
diff --git a/nixos/tests/docker-rootless.nix b/nixos/tests/docker-rootless.nix
index fcd33476ae45..17fec3e04f65 100644
--- a/nixos/tests/docker-rootless.nix
+++ b/nixos/tests/docker-rootless.nix
@@ -22,7 +22,7 @@
   testScript =
     { nodes, ... }:
     let
-      user = nodes.machine.config.users.users.alice;
+      user = nodes.machine.users.users.alice;
       sudo = lib.concatStringsSep " " [
         "XDG_RUNTIME_DIR=/run/user/${toString user.uid}"
         "DOCKER_HOST=unix:///run/user/${toString user.uid}/docker.sock"
diff --git a/nixos/tests/enlightenment.nix b/nixos/tests/enlightenment.nix
index 41dfc754e7fe..e5e6589976f6 100644
--- a/nixos/tests/enlightenment.nix
+++ b/nixos/tests/enlightenment.nix
@@ -33,7 +33,7 @@
   testScript =
     { nodes, ... }:
     let
-      user = nodes.machine.config.users.users.alice;
+      user = nodes.machine.users.users.alice;
     in
     ''
       with subtest("Ensure x starts"):
diff --git a/nixos/tests/iscsi-multipath-root.nix b/nixos/tests/iscsi-multipath-root.nix
index 90723bdbb604..08cd0c0f3f30 100644
--- a/nixos/tests/iscsi-multipath-root.nix
+++ b/nixos/tests/iscsi-multipath-root.nix
@@ -126,7 +126,7 @@ in
         ];
 
         environment.etc."initiator-root-disk-closure".source =
-          nodes.initiatorRootDisk.config.system.build.toplevel;
+          nodes.initiatorRootDisk.system.build.toplevel;
 
         nix.settings = {
           substituters = lib.mkForce [ ];
diff --git a/nixos/tests/iscsi-root.nix b/nixos/tests/iscsi-root.nix
index 571dbecad244..6872dfbda94c 100644
--- a/nixos/tests/iscsi-root.nix
+++ b/nixos/tests/iscsi-root.nix
@@ -169,7 +169,7 @@ in
       initiatorAuto.succeed("mkfs.xfs /dev/sda")
       initiatorAuto.succeed("mkdir /mnt && mount /dev/sda /mnt")
       initiatorAuto.succeed(
-          "nixos-install --no-bootloader --no-root-passwd --system ${nodes.initiatorRootDisk.config.system.build.toplevel}"
+          "nixos-install --no-bootloader --no-root-passwd --system ${nodes.initiatorRootDisk.system.build.toplevel}"
       )
       initiatorAuto.succeed("umount /mnt && rmdir /mnt")
       initiatorAuto.shutdown()
diff --git a/nixos/tests/kerberos/heimdal.nix b/nixos/tests/kerberos/heimdal.nix
index f12141d94627..e399bf0c3d67 100644
--- a/nixos/tests/kerberos/heimdal.nix
+++ b/nixos/tests/kerberos/heimdal.nix
@@ -169,7 +169,7 @@ import ../make-test-python.nix (
         with subtest("Server: initialize host principal with keytab"):
           server.send_chars("sudo ktutil get -p alice/admin host/server.foo.bar\n")
           server.wait_until_tty_matches("1", "password for alice:")
-          server.send_chars("${nodes.server.config.users.users.alice.password}\n")
+          server.send_chars("${nodes.server.users.users.alice.password}\n")
           server.wait_until_tty_matches("1", "alice/admin@FOO.BAR's Password:")
           server.send_chars(f'{alice_krb_admin_pw}\n')
           server.wait_for_file("/etc/krb5.keytab")
@@ -194,7 +194,7 @@ import ../make-test-python.nix (
 
           client.send_chars("sudo ktutil get -p alice/admin host/client.foo.bar\n")
           client.wait_until_tty_matches("1", "password for alice:")
-          client.send_chars("${nodes.client.config.users.users.alice.password}\n")
+          client.send_chars("${nodes.client.users.users.alice.password}\n")
           client.wait_until_tty_matches("1", "alice/admin@FOO.BAR's Password:")
           client.send_chars(f"{alice_krb_admin_pw}\n")
           client.wait_for_file("/etc/krb5.keytab")
diff --git a/nixos/tests/knot.nix b/nixos/tests/knot.nix
index 651fccc21949..3c6217195464 100644
--- a/nixos/tests/knot.nix
+++ b/nixos/tests/knot.nix
@@ -209,11 +209,11 @@ in
   testScript =
     { nodes, ... }:
     let
-      primary4 = (lib.head nodes.primary.config.networking.interfaces.eth1.ipv4.addresses).address;
-      primary6 = (lib.head nodes.primary.config.networking.interfaces.eth1.ipv6.addresses).address;
+      primary4 = (lib.head nodes.primary.networking.interfaces.eth1.ipv4.addresses).address;
+      primary6 = (lib.head nodes.primary.networking.interfaces.eth1.ipv6.addresses).address;
 
-      secondary4 = (lib.head nodes.secondary.config.networking.interfaces.eth1.ipv4.addresses).address;
-      secondary6 = (lib.head nodes.secondary.config.networking.interfaces.eth1.ipv6.addresses).address;
+      secondary4 = (lib.head nodes.secondary.networking.interfaces.eth1.ipv4.addresses).address;
+      secondary6 = (lib.head nodes.secondary.networking.interfaces.eth1.ipv6.addresses).address;
     in
     ''
       import re
diff --git a/nixos/tests/libuiohook.nix b/nixos/tests/libuiohook.nix
index 34a200bd0349..47114bcd8e88 100644
--- a/nixos/tests/libuiohook.nix
+++ b/nixos/tests/libuiohook.nix
@@ -8,7 +8,7 @@
   nodes.client =
     { nodes, ... }:
     let
-      user = nodes.client.config.users.users.alice;
+      user = nodes.client.users.users.alice;
     in
     {
       imports = [
@@ -24,7 +24,7 @@
   testScript =
     { nodes, ... }:
     let
-      user = nodes.client.config.users.users.alice;
+      user = nodes.client.users.users.alice;
     in
     ''
       client.wait_for_x()
diff --git a/nixos/tests/lightdm.nix b/nixos/tests/lightdm.nix
index 3d51924af8de..f561f89df221 100644
--- a/nixos/tests/lightdm.nix
+++ b/nixos/tests/lightdm.nix
@@ -20,7 +20,7 @@
   testScript =
     { nodes, ... }:
     let
-      user = nodes.machine.config.users.users.alice;
+      user = nodes.machine.users.users.alice;
     in
     ''
       start_all()
diff --git a/nixos/tests/nsd.nix b/nixos/tests/nsd.nix
index 747d691a87d6..04e9fd7f1ba4 100644
--- a/nixos/tests/nsd.nix
+++ b/nixos/tests/nsd.nix
@@ -21,7 +21,7 @@ in
       {
         imports = [ common ];
         networking.nameservers = lib.mkForce [
-          (lib.head nodes.server.config.networking.interfaces.eth1.ipv4.addresses).address
+          (lib.head nodes.server.networking.interfaces.eth1.ipv4.addresses).address
         ];
         networking.interfaces.eth1.ipv4.addresses = [
           {
@@ -36,7 +36,7 @@ in
       {
         imports = [ common ];
         networking.nameservers = lib.mkForce [
-          (lib.head nodes.server.config.networking.interfaces.eth1.ipv6.addresses).address
+          (lib.head nodes.server.networking.interfaces.eth1.ipv6.addresses).address
         ];
         networking.interfaces.eth1.ipv4.addresses = [
           {
diff --git a/nixos/tests/parsedmarc/default.nix b/nixos/tests/parsedmarc/default.nix
index 6018e2eef172..162d8b315a8b 100644
--- a/nixos/tests/parsedmarc/default.nix
+++ b/nixos/tests/parsedmarc/default.nix
@@ -93,8 +93,8 @@ in
     testScript =
       { nodes, ... }:
       let
-        esPort = toString nodes.parsedmarc.config.services.elasticsearch.port;
-        valueObject = lib.optionalString (lib.versionAtLeast nodes.parsedmarc.config.services.elasticsearch.package.version "7") ".value";
+        esPort = toString nodes.parsedmarc.services.elasticsearch.port;
+        valueObject = lib.optionalString (lib.versionAtLeast nodes.parsedmarc.services.elasticsearch.package.version "7") ".value";
       in
       ''
         parsedmarc.start()
@@ -143,7 +143,7 @@ in
 
             networking.extraHosts = ''
               127.0.0.1 ${parsedmarcDomain}
-              ${nodes.mail.config.networking.primaryIPAddress} ${mailDomain}
+              ${nodes.mail.networking.primaryIPAddress} ${mailDomain}
             '';
 
             services.parsedmarc = {
@@ -170,7 +170,7 @@ in
 
             networking.extraHosts = ''
               127.0.0.1 ${mailDomain}
-              ${nodes.parsedmarc.config.networking.primaryIPAddress} ${parsedmarcDomain}
+              ${nodes.parsedmarc.networking.primaryIPAddress} ${parsedmarcDomain}
             '';
 
             services.dovecot2 = {
@@ -204,8 +204,8 @@ in
       testScript =
         { nodes, ... }:
         let
-          esPort = toString nodes.parsedmarc.config.services.elasticsearch.port;
-          valueObject = lib.optionalString (lib.versionAtLeast nodes.parsedmarc.config.services.elasticsearch.package.version "7") ".value";
+          esPort = toString nodes.parsedmarc.services.elasticsearch.port;
+          valueObject = lib.optionalString (lib.versionAtLeast nodes.parsedmarc.services.elasticsearch.package.version "7") ".value";
         in
         ''
           mail.start()
diff --git a/nixos/tests/pass-secret-service.nix b/nixos/tests/pass-secret-service.nix
index 57c7ac8bdcbc..6ef896f78bf2 100644
--- a/nixos/tests/pass-secret-service.nix
+++ b/nixos/tests/pass-secret-service.nix
@@ -39,7 +39,7 @@
   testScript =
     { nodes, ... }:
     let
-      user = nodes.machine.config.users.users.alice;
+      user = nodes.machine.users.users.alice;
       gpg-uid = "alice@example.net";
       gpg-pw = "foobar9000";
       ready-file = "/tmp/secrets-dbus-init.done";
diff --git a/nixos/tests/proxy.nix b/nixos/tests/proxy.nix
index f051d429a508..1e76c7811c79 100644
--- a/nixos/tests/proxy.nix
+++ b/nixos/tests/proxy.nix
@@ -41,8 +41,8 @@ in
 
               <Proxy balancer://cluster>
                 Require all granted
-                BalancerMember http://${nodes.backend1.config.networking.hostName} retry=0
-                BalancerMember http://${nodes.backend2.config.networking.hostName} retry=0
+                BalancerMember http://${nodes.backend1.networking.hostName} retry=0
+                BalancerMember http://${nodes.backend2.networking.hostName} retry=0
               </Proxy>
 
               ProxyStatus       full
diff --git a/nixos/tests/service-runner.nix b/nixos/tests/service-runner.nix
index e7a552b9e536..ce7fecdb143b 100644
--- a/nixos/tests/service-runner.nix
+++ b/nixos/tests/service-runner.nix
@@ -29,7 +29,7 @@
           machine.succeed(
               """
               mkdir -p /run/nginx /var/log/nginx /var/cache/nginx
-              ${nodes.machine.config.systemd.services.nginx.runner} >&2 &
+              ${nodes.machine.systemd.services.nginx.runner} >&2 &
               echo $!>my-nginx.pid
               """
           )
diff --git a/nixos/tests/signal-desktop.nix b/nixos/tests/signal-desktop.nix
index 398f8603308c..a6c5d08c0d30 100644
--- a/nixos/tests/signal-desktop.nix
+++ b/nixos/tests/signal-desktop.nix
@@ -42,7 +42,7 @@ in
   testScript =
     { nodes, ... }:
     let
-      user = nodes.machine.config.users.users.alice;
+      user = nodes.machine.users.users.alice;
     in
     ''
       start_all()
diff --git a/nixos/tests/sway.nix b/nixos/tests/sway.nix
index 6de050418592..6427d688db7d 100644
--- a/nixos/tests/sway.nix
+++ b/nixos/tests/sway.nix
@@ -194,7 +194,7 @@
       swaymsg("exec swaylock")
       machine.wait_until_succeeds("pgrep -xf swaylock")
       machine.sleep(3)
-      machine.send_chars("${nodes.machine.config.users.users.alice.password}")
+      machine.send_chars("${nodes.machine.users.users.alice.password}")
       machine.send_key("ret")
       machine.wait_until_fails("pgrep -xf swaylock")
 
diff --git a/nixos/tests/thanos.nix b/nixos/tests/thanos.nix
index 5f0edd0ddfba..b4b58a8e60b9 100644
--- a/nixos/tests/thanos.nix
+++ b/nixos/tests/thanos.nix
@@ -322,7 +322,7 @@ in
       # and check if the blocks have the correct labels:
       store.succeed(
           "thanos tools bucket ls "
-          + "--objstore.config-file=${nodes.store.config.services.thanos.store.objstore.config-file} "
+          + "--objstore.config-file=${nodes.store.services.thanos.store.objstore.config-file} "
           + "--output=json | "
           + "jq .thanos.labels.some_label | "
           + "grep 'required by thanos'"
diff --git a/nixos/tests/txredisapi.nix b/nixos/tests/txredisapi.nix
index 171d3efee78f..57a32e624c24 100644
--- a/nixos/tests/txredisapi.nix
+++ b/nixos/tests/txredisapi.nix
@@ -25,7 +25,7 @@
   testScript =
     { nodes, ... }:
     let
-      inherit (nodes.machine.config.services) redis;
+      inherit (nodes.machine.services) redis;
     in
     ''
       start_all()
diff --git a/nixos/tests/xrdp-with-audio-pulseaudio.nix b/nixos/tests/xrdp-with-audio-pulseaudio.nix
index cc630143b990..813dc6193c05 100644
--- a/nixos/tests/xrdp-with-audio-pulseaudio.nix
+++ b/nixos/tests/xrdp-with-audio-pulseaudio.nix
@@ -73,7 +73,7 @@
   testScript =
     { nodes, ... }:
     let
-      user = nodes.client.config.users.users.alice;
+      user = nodes.client.users.users.alice;
     in
     ''
       start_all()

From c87158160b2186a48a9b8f749b1a982819d7a87a Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@determinate.systems>
Date: Sun, 21 Jun 2026 18:25:05 -0700
Subject: [PATCH 22/31] llvmPackages_git: 23.0.0-unstable-2026-06-14 ->
 23.0.0-unstable-2026-06-21

(cherry picked from commit c583625dd786b928038ffcea11e09dac701872aa)
---
 pkgs/development/compilers/llvm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index 88a0db6b77b9..9eb422081074 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -28,9 +28,9 @@ let
     "21.1.8".officialRelease.sha256 = "sha256-pgd8g9Yfvp7abjCCKSmIn1smAROjqtfZaJkaUkBSKW0=";
     "22.1.5".officialRelease.sha256 = "sha256-eunfMOH+HVpefZJ+CG7hXDoM+pi6iYvHpD3DoSAsjoE=";
     "23.0.0-git".gitRelease = {
-      rev = "625facd4375f6bfa5de501d0559bd262062e2dc3";
-      rev-version = "23.0.0-unstable-2026-06-14";
-      sha256 = "sha256-myNSe9+nBTd28BnEmq+Ysp0kiY6KtOJSmbnGjQgGxRI=";
+      rev = "d1744cf76fbea0c407c5e793a380ffca4e5829be";
+      rev-version = "23.0.0-unstable-2026-06-21";
+      sha256 = "sha256-gtfU3pO3xiZtxz/iRmkWnaEx/DEomkOi9r6jsCbLOgQ=";
     };
   }
   // llvmVersions;

From 3ac3fd2490db3017c028b04d608eda1a54f65438 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 18 Jun 2026 15:48:09 +0300
Subject: [PATCH 23/31] mesa: 26.1.2 -> 26.1.3

Diff: https://gitlab.freedesktop.org/mesa/mesa/-/compare/mesa-26.1.2...mesa-26.1.3

Changelog: https://docs.mesa3d.org/relnotes/26.1.3.html
(cherry picked from commit 37a1ccb86cc1dca46d22326114d13b530bd870dd)
---
 pkgs/development/libraries/mesa/common.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix
index 979a4c44a604..bd4040f6e184 100644
--- a/pkgs/development/libraries/mesa/common.nix
+++ b/pkgs/development/libraries/mesa/common.nix
@@ -5,14 +5,14 @@
 # nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa
 rec {
   pname = "mesa";
-  version = "26.1.2";
+  version = "26.1.3";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "mesa";
     repo = "mesa";
     rev = "mesa-${version}";
-    hash = "sha256-GqIU9BL57n+ihpeXug+K9kOtvHZ+LCUQg1wi/rrYWuc=";
+    hash = "sha256-W2Ud9wmiIuDYMnFj8sK2SGAI1WayMCtdj7/7od/1Ql4=";
   };
 
   meta = {

From 350f26db9724910940f0f75846b7997b0a10f0d4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 22 Jun 2026 14:06:21 +0200
Subject: [PATCH 24/31] python3Packages.slowapi: backport starlette 1.0 compat

(cherry picked from commit 3385604a842cf64eb946c2e4e224a26575865e47)
---
 .../python-modules/slowapi/default.nix        |   5 +
 .../slowapi/starlette-1.0-compat.patch        | 103 ++++++++++++++++++
 2 files changed, 108 insertions(+)
 create mode 100644 pkgs/development/python-modules/slowapi/starlette-1.0-compat.patch

diff --git a/pkgs/development/python-modules/slowapi/default.nix b/pkgs/development/python-modules/slowapi/default.nix
index bf4412ff471a..0abe1d9fd1d4 100644
--- a/pkgs/development/python-modules/slowapi/default.nix
+++ b/pkgs/development/python-modules/slowapi/default.nix
@@ -25,6 +25,11 @@ buildPythonPackage rec {
     hash = "sha256-R/Mr+Qv22AN7HCDGmAUVh4efU8z4gMIyhC0AuKmxgdE=";
   };
 
+  patches = [
+    # https://github.com/laurentS/slowapi/pull/279
+    ./starlette-1.0-compat.patch
+  ];
+
   nativeBuildInputs = [ poetry-core ];
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/slowapi/starlette-1.0-compat.patch b/pkgs/development/python-modules/slowapi/starlette-1.0-compat.patch
new file mode 100644
index 000000000000..b13d38936be9
--- /dev/null
+++ b/pkgs/development/python-modules/slowapi/starlette-1.0-compat.patch
@@ -0,0 +1,103 @@
+From 8c5f6165b7a66712f3e7e3ceab502069a5c5939a Mon Sep 17 00:00:00 2001
+From: Leonardo Rayner <raynercodes@gmail.com>
+Date: Wed, 10 Jun 2026 02:21:55 -0400
+Subject: [PATCH 1/3] fix: Replace deprecated @app.route with app.add_route for
+ Starlette 1.0 compatibility
+
+---
+ tests/test_starlette_extension.py | 25 ++++++++++++++++---------
+ 2 files changed, 26 insertions(+), 15 deletions(-)
+
+diff --git a/tests/test_starlette_extension.py b/tests/test_starlette_extension.py
+index 0e26baa..c086f75 100644
+--- a/tests/test_starlette_extension.py
++++ b/tests/test_starlette_extension.py
+@@ -175,15 +175,17 @@ def test_headers_no_breach(self, build_starlette_app):
+             headers_enabled=True, key_func=get_remote_address
+         )
+ 
+-        @app.route("/t1")
+         @limiter.limit("10/minute")
+         def t1(request: Request):
+             return PlainTextResponse("test")
++        
++        app.add_route("/t1", t1)
+ 
+-        @app.route("/t2")
+         @limiter.limit("2/second; 5 per minute; 10/hour")
+         def t2(request: Request):
+             return PlainTextResponse("test")
++        
++        app.add_route("/t2", t2)
+ 
+         with hiro.Timeline().freeze():
+             with TestClient(app) as cli:
+@@ -208,10 +210,11 @@ def test_headers_breach(self, build_starlette_app):
+             headers_enabled=True, key_func=get_remote_address
+         )
+ 
+-        @app.route("/t1")
+         @limiter.limit("2/second; 10 per minute; 20/hour")
+         def t(request: Request):
+             return PlainTextResponse("test")
++        
++        app.add_route("/t1", t)
+ 
+         with hiro.Timeline().freeze() as timeline:
+             with TestClient(app) as cli:
+@@ -233,10 +236,11 @@ def test_retry_after(self, build_starlette_app):
+             headers_enabled=True, key_func=get_remote_address
+         )
+ 
+-        @app.route("/t1")
+         @limiter.limit("1/minute")
+         def t(request: Request):
+             return PlainTextResponse("test")
++        
++        app.add_route("/t1", t)
+ 
+         with hiro.Timeline().freeze() as timeline:
+             with TestClient(app) as cli:
+@@ -254,9 +258,10 @@ def test_exempt_decorator(self, build_starlette_app):
+             default_limits=["1/minute"],
+         )
+ 
+-        @app.route("/t1")
+         def t1(request: Request):
+             return PlainTextResponse("test")
++        
++        app.add_route("/t1", t1)
+ 
+         with TestClient(app) as cli:
+             resp = cli.get("/t1", headers={"X_FORWARDED_FOR": "127.0.0.10"})
+@@ -264,11 +269,12 @@ def t1(request: Request):
+             resp2 = cli.get("/t1", headers={"X_FORWARDED_FOR": "127.0.0.10"})
+             assert resp2.status_code == 429
+ 
+-        @app.route("/t2")
+-        @limiter.exempt
+         def t2(request: Request):
+             """Exempt a sync route"""
+             return PlainTextResponse("test")
++        
++        limiter.exempt(t2)
++        app.add_route("/t2", t2)
+ 
+         with TestClient(app) as cli:
+             resp = cli.get("/t2", headers={"X_FORWARDED_FOR": "127.0.0.10"})
+@@ -276,11 +282,12 @@ def t2(request: Request):
+             resp2 = cli.get("/t2", headers={"X_FORWARDED_FOR": "127.0.0.10"})
+             assert resp2.status_code == 200
+ 
+-        @app.route("/t3")
+-        @limiter.exempt
+         async def t3(request: Request):
+             """Exempt an async route"""
+             return PlainTextResponse("test")
++        
++        limiter.exempt(t3)
++        app.add_route("/t3", t3)
+ 
+         with TestClient(app) as cli:
+             resp = cli.get("/t3", headers={"X_FORWARDED_FOR": "127.0.0.10"})
+

From bf763f0eed1fa78c5c348aa79c0cd42a187ec2d8 Mon Sep 17 00:00:00 2001
From: Pascal Dietrich <cameo007@mintux.de>
Date: Sun, 21 Jun 2026 09:48:51 +0200
Subject: [PATCH 25/31] mdns-scanner: 0.27.1 -> 0.27.2

(cherry picked from commit 535651229c38468a11fa045d5c503d346c400283)
---
 pkgs/by-name/md/mdns-scanner/package.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/md/mdns-scanner/package.nix b/pkgs/by-name/md/mdns-scanner/package.nix
index eb5165259143..886ee73438fe 100644
--- a/pkgs/by-name/md/mdns-scanner/package.nix
+++ b/pkgs/by-name/md/mdns-scanner/package.nix
@@ -7,16 +7,18 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mdns-scanner";
-  version = "0.27.1";
+  version = "0.27.2";
+
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "CramBL";
     repo = "mdns-scanner";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-90+VBCxb4bbmGCpBLmqzhUJ0/9GAH8Fnju61kq7sx+A=";
+    hash = "sha256-oqU7lpDD2umCBAcPYKjo+5kdsCu3gjBiP5MPNvH2fhs=";
   };
 
-  cargoHash = "sha256-LTL5nlT75Y/cALKVLVBWlMZZn9DewZfCbTAO1QsAfXI=";
+  cargoHash = "sha256-TqTN9qXnfvP067kh+bfdXlU1lKaZistIvq1qJsgmJ8o=";
 
   passthru.updateScript = nix-update-script { };
 

From 2b65d7539a0014f0d826e57fcbd5c0d1921efc53 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 22 Jun 2026 12:50:00 +0000
Subject: [PATCH 26/31] mailpit: 1.30.1 -> 1.30.2

(cherry picked from commit b898819b34252fbf48b0f4f7e8d89d3aaa0f4cd9)
---
 pkgs/by-name/ma/mailpit/source.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ma/mailpit/source.nix b/pkgs/by-name/ma/mailpit/source.nix
index d08c094b3283..163ac2f273cb 100644
--- a/pkgs/by-name/ma/mailpit/source.nix
+++ b/pkgs/by-name/ma/mailpit/source.nix
@@ -1,6 +1,6 @@
 {
-  version = "1.30.1";
-  hash = "sha256-Z/0Lh+2VLB3w4AHNf+imWRgHmarO1MMUmNqrcAVSQ2k=";
-  npmDepsHash = "sha256-eccYGPIbk98+BtNtBAq4G1z/ymj6HHwacuH6ZktuN0U=";
-  vendorHash = "sha256-FgwMdvND7DMrYWp9kB2IB+Gjyo1gm1LtLTeC9SfPw9U=";
+  version = "1.30.2";
+  hash = "sha256-37nJRJL1mxvUdD7L9/yO/Lzyjvn09Tu9xHTEt4pxu2s=";
+  npmDepsHash = "sha256-AApRrIIYC4NtKIFyGQ3lnKIOk7LZNDK8wvUUbSczTrA=";
+  vendorHash = "sha256-em0317Q1u5sl8gws4/qqM8e9H5F4vfBiM7tLCyufgEk=";
 }

From 3b20c8b6cdf3bc5e508caf3e8f85f8e2547a9052 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 21 Jun 2026 07:25:38 +0000
Subject: [PATCH 27/31] irpf: 2026-1.4 -> 2026-1.5

(cherry picked from commit db5e2c947147f06563e9e125db4bdb83853b0367)
---
 pkgs/by-name/ir/irpf/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ir/irpf/package.nix b/pkgs/by-name/ir/irpf/package.nix
index 39deddd2273a..a965cada07ee 100644
--- a/pkgs/by-name/ir/irpf/package.nix
+++ b/pkgs/by-name/ir/irpf/package.nix
@@ -17,7 +17,7 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "irpf";
-  version = "2026-1.4";
+  version = "2026-1.5";
 
   # https://www.gov.br/receitafederal/pt-br/centrais-de-conteudo/download/pgd/dirpf
   # Para outros sistemas operacionais -> Multi
@@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     in
     fetchzip {
       url = "https://downloadirpf.receita.fazenda.gov.br/irpf/${year}/irpf/arquivos/IRPF${finalAttrs.version}.zip";
-      hash = "sha256-tPIu1nt1FtGyjM1vnzAHenjlKeAKJfqPus+XsP2CH5g=";
+      hash = "sha256-/y0XE+i+Sug/2TfqQuPQesYaDVn41v3hkikU/hmxxNE=";
     };
 
   nativeBuildInputs = [

From bc5ad2a4165af9c05f714e6d967e1cdbf83b386e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 19 Jun 2026 22:16:00 -0700
Subject: [PATCH 28/31] authentik: 2025.12.5 -> 2025.12.6

Diff: https://github.com/goauthentik/authentik/compare/version/2025.12.5...version/2025.12.6

Changelog: https://github.com/goauthentik/authentik/releases/tag/version%2F2025.12.6
(cherry picked from commit 3f27227787106a335d5c3b21852ac12861963cd1)
---
 pkgs/by-name/au/authentik/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/au/authentik/package.nix b/pkgs/by-name/au/authentik/package.nix
index ac0f05e63f4a..ff63e72475e2 100644
--- a/pkgs/by-name/au/authentik/package.nix
+++ b/pkgs/by-name/au/authentik/package.nix
@@ -20,13 +20,13 @@
 let
   nodejs = nodejs_24;
 
-  version = "2025.12.5";
+  version = "2025.12.6";
 
   src = fetchFromGitHub {
     owner = "goauthentik";
     repo = "authentik";
     tag = "version/${version}";
-    hash = "sha256-LPGAhbtmuztDQ4CVhUXb+vBU5HjvNZ7JicI5r3lr1QQ=";
+    hash = "sha256-uIg47z4LaCawF/5ir4mKE6DpDnEpQ8DuObCNaq6TcYk=";
   };
 
   meta = {
@@ -137,8 +137,8 @@ let
 
     outputHash =
       {
-        "aarch64-linux" = "sha256-smm9x29z7gOI7Wq0NvP45KHtBbT6p1lH6IjEf9LRuGs=";
-        "x86_64-linux" = "sha256-K86wnn50svP+QG3i0mggH8RQgfoIqEmyQTouz35xzw8=";
+        "aarch64-linux" = "sha256-EbLneRDCyLLLBOZ2DUDpf2TbZoTL8QMXP4WlAZEzS90=";
+        "x86_64-linux" = "sha256-yDjwN/+lX2i9WYDXq4yWwf9o8nA4342iHDDQH4Jt7eQ=";
       }
       .${stdenvNoCC.hostPlatform.system} or (throw "authentik-website-deps: unsupported host platform");
 

From ffe04b394fedac1de9bf12037fddd623e0f02e95 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 05:24:40 +0000
Subject: [PATCH 29/31] .github/PULL_REQUEST_TEMPLATE: drop `x86_64-darwin`
 checkbox

(cherry picked from commit 6657df3e12f82590fb049f77710d350ca048f9ce)
---
 .github/PULL_REQUEST_TEMPLATE.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 8f2c6648efe4..6fd8fc786a8d 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -13,7 +13,6 @@ For new packages please briefly describe the package or provide a link to its ho
 - Built on platform:
   - [ ] x86_64-linux
   - [ ] aarch64-linux
-  - [ ] x86_64-darwin
   - [ ] aarch64-darwin
 - Tested, as applicable:
   - [ ] [NixOS tests] in [nixos/tests].

From 71ac1710ea54fa6afbc7575e75b54827e2701385 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 05:25:27 +0000
Subject: [PATCH 30/31] workflows/build: stop building for `x86_64-darwin`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This will apply to the stable release branches too, but that seems
unavoidable: we use `nixpkgs-unstable` in `ci/pinned.json`, which
means that the development shell for stable release branches is based
on the unstable branch. Once we drop support for a system on the
unstable branch, it can no longer be used for Nixpkgs development on
the next pin, even when targeting already‐released stable branches.

Since Nixpkgs contributors would generally be expected to be less
likely to be using deprecated platforms, and we usually operate with
a backport workflow where changes target the unstable branch first,
this is probably acceptable. A potential alternative would be to pin
the stable branch for CI instead.

(cherry picked from commit 8ccb319a2e493da48e7fca71c18dabbf155d7fb2)
---
 .github/workflows/build.yml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b5a9e5c05687..2ced78e8360b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -34,21 +34,18 @@ jobs:
       matrix:
         include:
           - runner: ubuntu-24.04
-            name: x86_64-linux
-            systems: x86_64-linux
+            system: x86_64-linux
             builds: [shell, manual-nixos, lib-tests, tarball]
             desc: shell, docs, lib, tarball
           - runner: ubuntu-24.04-arm
-            name: aarch64-linux
-            systems: aarch64-linux
+            system: aarch64-linux
             builds: [shell, manual-nixos, manual-nixpkgs]
             desc: shell, docs
           - runner: macos-14
-            name: darwin
-            systems: aarch64-darwin x86_64-darwin
+            system: aarch64-darwin
             builds: [shell]
             desc: shell
-    name: '${{ matrix.name }}: ${{ matrix.desc }}'
+    name: '${{ matrix.system }}: ${{ matrix.desc }}'
     runs-on: ${{ matrix.runner }}
     timeout-minutes: 60
     steps:
@@ -80,7 +77,9 @@ jobs:
 
       - name: Build shell
         if: contains(matrix.builds, 'shell')
-        run: echo "${{ matrix.systems }}" | xargs -n1 nix-build-uncached nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned -A shell --argstr system
+        env:
+          system: ${{ matrix.system }}
+        run: nix-build-uncached nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned -A shell --argstr system "$system"
 
       - name: Build NixOS manual
         if: |
@@ -108,5 +107,5 @@ jobs:
           contains(fromJSON(inputs.baseBranch).type, 'primary')
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
-          name: ${{ inputs.artifact-prefix }}nixos-manual-${{ matrix.name }}
+          name: ${{ inputs.artifact-prefix }}nixos-manual-${{ matrix.system }}
           path: nixos-manual

From 7ce82440002989af7f0d3f8c314978fe1fc1a959 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 22 Jun 2026 14:50:57 +0000
Subject: [PATCH 31/31] gitoxide: 0.54.0 -> 0.55.0

(cherry picked from commit 2f4bef8a7c94988ab9b518730beb5dfcca83ba5e)
---
 pkgs/by-name/gi/gitoxide/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gi/gitoxide/package.nix b/pkgs/by-name/gi/gitoxide/package.nix
index b857ac360b24..9de996c6ec18 100644
--- a/pkgs/by-name/gi/gitoxide/package.nix
+++ b/pkgs/by-name/gi/gitoxide/package.nix
@@ -18,16 +18,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "gitoxide";
-  version = "0.54.0";
+  version = "0.55.0";
 
   src = fetchFromGitHub {
     owner = "GitoxideLabs";
     repo = "gitoxide";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-MkOmxvACroJAB1nQZT1pcJ/Fn9gWNFwKiwVNb9iUlgY=";
+    hash = "sha256-UtdXlIvX82UUhc4RWZZTBV5kz4YqfOTd4D/pGhDUfSI=";
   };
 
-  cargoHash = "sha256-bYgGQa8Gym4dzkuTrOSu3NwUhYdZNtq7ACwVwhdKQRI=";
+  cargoHash = "sha256-Kv0NKA3OdHBn2M8DmcGyjcN2acGJYOdbczOb/nRsvDs=";
 
   nativeBuildInputs = [
     cmake