From c99339ea0f39abb0368e9f3f602c8c557704e5d8 Mon Sep 17 00:00:00 2001
From: Justinas Stankevicius <justinas@justinas.org>
Date: Sun, 28 Sep 2025 18:36:03 +0300
Subject: [PATCH 01/85] nixos/steam: add missing ports for
 remotePlay.openFirewall

---
 nixos/modules/programs/steam.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/programs/steam.nix b/nixos/modules/programs/steam.nix
index a8d1b7aefc70..5a791d0cea0f 100644
--- a/nixos/modules/programs/steam.nix
+++ b/nixos/modules/programs/steam.nix
@@ -256,7 +256,16 @@ in
       })
 
       (lib.mkIf cfg.remotePlay.openFirewall {
-        allowedTCPPorts = [ 27036 ];
+        # https://help.steampowered.com/en/faqs/view/3E3D-BE6B-787D-A5D2
+        # https://help.steampowered.com/en/faqs/view/2EA8-4D75-DA21-31EB
+        allowedTCPPorts = [
+          27036
+          27037
+        ];
+        allowedUDPPorts = [
+          10400
+          10401
+        ];
         allowedUDPPortRanges = [
           {
             from = 27031;

From 79d136ae82fc099a44bf158fddbd2dce12354e60 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 5 Oct 2025 09:05:52 +0200
Subject: [PATCH 02/85] x42-plugins: remove gtk2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

see: Tracking issue: Remove long end-of-life GTK 2 #410814
---
 pkgs/by-name/x4/x42-plugins/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/x4/x42-plugins/package.nix b/pkgs/by-name/x4/x42-plugins/package.nix
index f235f1babda8..f66107cd786b 100644
--- a/pkgs/by-name/x4/x42-plugins/package.nix
+++ b/pkgs/by-name/x4/x42-plugins/package.nix
@@ -11,7 +11,6 @@
   libjack2,
   libGLU,
   lv2,
-  gtk2,
   cairo,
   pango,
   fftwFloat,
@@ -37,7 +36,6 @@ stdenv.mkDerivation rec {
     libsndfile
     libsamplerate
     lv2
-    gtk2
     cairo
     pango
     fftwFloat

From d5ea371e34d90627edabcbf76feac7e44cd4f745 Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Wed, 8 Oct 2025 13:24:32 +0800
Subject: [PATCH 03/85] navicat-premium: 17.3.1 -> 17.3.3

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

diff --git a/pkgs/by-name/na/navicat-premium/package.nix b/pkgs/by-name/na/navicat-premium/package.nix
index cc42ed4057d7..22a419a60da1 100644
--- a/pkgs/by-name/na/navicat-premium/package.nix
+++ b/pkgs/by-name/na/navicat-premium/package.nix
@@ -3,35 +3,130 @@
   stdenv,
   fetchurl,
   appimageTools,
+  autoPatchelfHook,
+  qt6,
+  cjson,
+  curl,
+  e2fsprogs,
+  expat,
+  fontconfig,
+  freetype,
+  glib,
+  glibc,
+  harfbuzz,
+  libGL,
+  libX11,
+  libgpg-error,
+  libselinux,
+  libxcb,
+  libxcrypt,
+  libxcrypt-legacy,
+  libxkbcommon,
+  p11-kit,
+  pango,
 }:
-let
+
+stdenv.mkDerivation (finalAttrs: {
   pname = "navicat-premium";
-  version = "17.3.1";
+  version = "17.3.3";
 
-  src =
-    {
-      x86_64-linux = fetchurl {
-        url = "https://web.archive.org/web/20250904095427/https://dn.navicat.com/download/navicat17-premium-en-x86_64.AppImage";
-        hash = "sha256-5vGctpbAg3mVhalr+Yg3iFZNCyY+0+a98sldhUcHkm0=";
-      };
-      aarch64-linux = fetchurl {
-        url = "https://web.archive.org/web/20250904095643/https://dn.navicat.com/download/navicat17-premium-en-aarch64.AppImage";
-        hash = "sha256-r31u/b/3HO9PEQtIr9AZ/5NVrRcgJ+GACHPWCICZYec=";
-      };
-    }
-    .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
-
-  appimageContents = appimageTools.extractType2 {
-    inherit pname version src;
+  src = appimageTools.extractType2 {
+    inherit (finalAttrs) pname version;
+    src =
+      {
+        x86_64-linux = fetchurl {
+          url = "https://web.archive.org/web/20251008050849/https://dn.navicat.com/download/navicat17-premium-en-x86_64.AppImage";
+          hash = "sha256-gXXj2FXOw2OHUTaX5XYtd0/nL/E/hNmcmvc0TDaOCUQ=";
+        };
+        aarch64-linux = fetchurl {
+          url = "https://web.archive.org/web/20251008051000/https://dn.navicat.com/download/navicat17-premium-en-aarch64.AppImage";
+          hash = "sha256-18JbUJV8jAXRiVVerfYZLsjy+5K2DjwqAY+Hqjtlnfg=";
+        };
+      }
+      .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   };
-in
-appimageTools.wrapType2 {
-  inherit pname version src;
 
-  extraInstallCommands = ''
-    cp -r ${appimageContents}/usr/share $out/share
-    substituteInPlace $out/share/applications/navicat.desktop \
-      --replace-fail "Exec=navicat" "Exec=navicat-premium"
+  nativeBuildInputs = [
+    autoPatchelfHook
+    qt6.wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    cjson
+    curl
+    e2fsprogs
+    expat
+    fontconfig
+    freetype
+    glib
+    glibc
+    harfbuzz
+    libGL
+    libX11
+    libgpg-error
+    libselinux
+    libxcb
+    libxcrypt
+    libxcrypt-legacy
+    libxkbcommon
+    p11-kit
+    pango
+    qt6.qtbase
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    cp -r --no-preserve=mode usr $out
+    chmod +x $out/bin/navicat
+    mkdir -p $out/usr
+    ln -s $out/lib $out/usr/lib
+
+    runHook postInstall
+  '';
+
+  autoPatchelfIgnoreMissingDeps = lib.optionals stdenv.hostPlatform.isAarch64 [
+    "libgs_ktool.so"
+    "libkmc.so"
+  ];
+
+  dontWrapQtApps = true;
+
+  preFixup = ''
+    rm $out/lib/libselinux.so.1
+    ln -s ${libselinux.out}/lib/libselinux.so.1 $out/lib/libselinux.so.1
+    rm $out/lib/glib/libglib-2.0.so.0
+    ln -s ${glib.out}/lib/libglib-2.0.so.0 $out/lib/glib/libglib-2.0.so.0
+    patchelf --replace-needed libcrypt.so.1 \
+      ${libxcrypt}/lib/libcrypt.so.2 $out/lib/pq-g/libpq.so.5.5
+    patchelf --replace-needed libcrypt.so.1 \
+      ${libxcrypt}/lib/libcrypt.so.2 $out/lib/pq-g/libpq_ce.so.5.5
+    patchelf --replace-needed libselinux.so.1 \
+      ${libselinux.out}/lib/libselinux.so.1 $out/lib/pq-g/libpq.so.5.5
+    wrapQtApp $out/bin/navicat \
+      --prefix LD_LIBRARY_PATH : ${
+        lib.makeLibraryPath [
+          e2fsprogs
+          expat
+          fontconfig
+          freetype
+          glib
+          glibc
+          harfbuzz
+          libGL
+          libX11
+          libgpg-error
+          libselinux
+          libxcb
+          libxkbcommon
+          p11-kit
+          pango
+        ]
+      }:$out/lib \
+      --set QT_PLUGIN_PATH $out/plugins \
+      --set QT_QPA_PLATFORM xcb \
+      --set QT_STYLE_OVERRIDE Fusion \
+      --chdir $out
   '';
 
   meta = {
@@ -47,4 +142,4 @@ appimageTools.wrapType2 {
     ];
     mainProgram = "navicat-premium";
   };
-}
+})

From 250b2094fb9a4361dce9c392bbe642c7835801eb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Oct 2025 02:23:21 +0000
Subject: [PATCH 04/85] python3Packages.blake3: 1.0.7 -> 1.0.8

---
 .../python-modules/blake3/Cargo.lock           | 18 +++++++++---------
 .../python-modules/blake3/default.nix          |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/blake3/Cargo.lock b/pkgs/development/python-modules/blake3/Cargo.lock
index 51c44b074a00..2900a83a5108 100644
--- a/pkgs/development/python-modules/blake3/Cargo.lock
+++ b/pkgs/development/python-modules/blake3/Cargo.lock
@@ -22,7 +22,7 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
 name = "blake3"
-version = "1.0.7"
+version = "1.0.8"
 dependencies = [
  "blake3 1.8.2",
  "hex",
@@ -47,9 +47,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.39"
+version = "1.2.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1354349954c6fc9cb0deab020f27f783cf0b604e8bb754dc4658ecf0d29c35f"
+checksum = "ac9fe6cdbb24b6ade63616c0a0688e45bb56732262c158df3c0c4bea4ca47cb7"
 dependencies = [
  "find-msvc-tools",
  "shlex",
@@ -57,9 +57,9 @@ dependencies = [
 
 [[package]]
 name = "cfg-if"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 
 [[package]]
 name = "constant_time_eq"
@@ -100,9 +100,9 @@ checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
 
 [[package]]
 name = "find-msvc-tools"
-version = "0.1.2"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ced73b1dacfc750a6db6c0a0c3a3853c8b41997e2e2c563dc90804ae6867959"
+checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127"
 
 [[package]]
 name = "heck"
@@ -124,9 +124,9 @@ checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd"
 
 [[package]]
 name = "libc"
-version = "0.2.176"
+version = "0.2.177"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58f929b4d672ea937a23a1ab494143d968337a5f47e56d0815df1e0890ddf174"
+checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
 
 [[package]]
 name = "memmap2"
diff --git a/pkgs/development/python-modules/blake3/default.nix b/pkgs/development/python-modules/blake3/default.nix
index ff6dfe06ceb3..64e17f626b31 100644
--- a/pkgs/development/python-modules/blake3/default.nix
+++ b/pkgs/development/python-modules/blake3/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "blake3";
-  version = "1.0.7";
+  version = "1.0.8";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "oconnor663";
     repo = "blake3-py";
     tag = version;
-    hash = "sha256-km4vN/xKvjNd/bdHEIsUR9+Hmi0K5ju+wlQ2kuuDzzI=";
+    hash = "sha256-gwPGSah9qzApDwsBNABRLPZGrpaO3WArHoK6Jj6WJzo=";
   };
 
   postPatch = ''

From cfc9f8808746119226fefd0afdbffaa7e42eb2e9 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Thu, 16 Oct 2025 12:19:43 +0200
Subject: [PATCH 05/85] magnetophonDSP.Constant-Detune-Chorus: un-break

---
 .../audio/magnetophonDSP/ConstantDetuneChorus/default.nix       | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix b/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix
index b10cb501e12e..24dda36ca000 100644
--- a/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix
@@ -42,7 +42,5 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/magnetophon/constant-detune-chorus";
     license = lib.licenses.gpl3;
     maintainers = [ lib.maintainers.magnetophon ];
-    # ERROR3 : n is NaN in an Interval
-    broken = true;
   };
 }

From 20f67e0bd8500200909df307b59be09933fc5b20 Mon Sep 17 00:00:00 2001
From: Shawn8901 <shawn8901@googlemail.com>
Date: Sun, 19 Oct 2025 18:43:43 +0000
Subject: [PATCH 06/85] grafanaPlugins.victoriametrics-logs-datasource: 0.21.0
 -> 0.21.1

---
 .../plugins/victoriametrics-logs-datasource/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix
index a6e0f428b585..bf240083f806 100644
--- a/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "victoriametrics-logs-datasource";
-  version = "0.21.0";
-  zipHash = "sha256-KesSzORt243WS9sR+iinq+wRI6q+8MPn8o9Bj2ic6E0=";
+  version = "0.21.1";
+  zipHash = "sha256-mhGxUt+JWX4i/CYcJOAYpCszF4F2ieaosERVoFUg/mU=";
   meta = {
     description = "Grafana datasource for VictoriaLogs";
     license = lib.licenses.asl20;

From 4b0ac4b4f13b6d99476dd7d8cf3284c73bb94cc9 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Tue, 21 Oct 2025 09:59:23 -0300
Subject: [PATCH 07/85] hdf5-blosc: fix build with cmake4

---
 pkgs/by-name/hd/hdf5-blosc/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/hd/hdf5-blosc/package.nix b/pkgs/by-name/hd/hdf5-blosc/package.nix
index d0eb807a72a3..323a57698210 100644
--- a/pkgs/by-name/hd/hdf5-blosc/package.nix
+++ b/pkgs/by-name/hd/hdf5-blosc/package.nix
@@ -43,6 +43,11 @@ stdenv.mkDerivation rec {
     "-DBUILD_TESTS=ON"
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.10)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   postInstall = ''
     mkdir -p $out/lib/pkgconfig
     substituteAll ${./blosc_filter.pc.in} $out/lib/pkgconfig/blosc_filter.pc

From 7a1d881bafbb98c7d8d4469efe4c135bd0115dfe Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Tue, 21 Oct 2025 10:06:06 -0300
Subject: [PATCH 08/85] hh-suite: fix build with cmake4

---
 pkgs/applications/science/biology/hh-suite/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/applications/science/biology/hh-suite/default.nix b/pkgs/applications/science/biology/hh-suite/default.nix
index 51f12d9ae6ea..5cb62d1318df 100644
--- a/pkgs/applications/science/biology/hh-suite/default.nix
+++ b/pkgs/applications/science/biology/hh-suite/default.nix
@@ -41,6 +41,13 @@ stdenv.mkDerivation rec {
 
   buildInputs = lib.optional stdenv.cc.isClang openmp ++ lib.optional enableMpi mpi;
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.12)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace lib/ffindex/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "Remote protein homology detection suite";
     homepage = "https://github.com/soedinglab/hh-suite";

From 18ca25e57785081d17b12b7ace48353478b3a6de Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 5 Oct 2025 09:49:22 +0200
Subject: [PATCH 09/85] chow-kick: remove unneeded dependencies
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

see: Tracking issue: Remove long end-of-life GTK 2 #410814
---
 pkgs/by-name/ch/chow-kick/package.nix | 42 +++------------------------
 1 file changed, 4 insertions(+), 38 deletions(-)

diff --git a/pkgs/by-name/ch/chow-kick/package.nix b/pkgs/by-name/ch/chow-kick/package.nix
index cbb4ecce74be..b65941f8d089 100644
--- a/pkgs/by-name/ch/chow-kick/package.nix
+++ b/pkgs/by-name/ch/chow-kick/package.nix
@@ -1,38 +1,21 @@
 {
   alsa-lib,
-  at-spi2-core,
-  brotli,
   cmake,
   curl,
-  dbus,
   libepoxy,
   fetchFromGitHub,
-  libglut,
   freetype,
-  gtk2-x11,
   lib,
   libGL,
   libXcursor,
-  libXdmcp,
   libXext,
   libXinerama,
   libXrandr,
-  libXtst,
-  libdatrie,
   libjack2,
-  libpsl,
-  libselinux,
-  libsepol,
-  libsysprof-capture,
-  libthai,
   libxkbcommon,
   lv2,
-  pcre,
   pkg-config,
-  python3,
-  sqlite,
   stdenv,
-  util-linuxMinimal,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -53,34 +36,17 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   buildInputs = [
     alsa-lib
-    at-spi2-core
-    brotli
     curl
-    dbus
     libepoxy
-    libglut
     freetype
-    gtk2-x11
     libGL
     libXcursor
-    libXdmcp
     libXext
     libXinerama
     libXrandr
-    libXtst
-    libdatrie
     libjack2
-    libpsl
-    libselinux
-    libsepol
-    libsysprof-capture
-    libthai
     libxkbcommon
     lv2
-    pcre
-    python3
-    sqlite
-    util-linuxMinimal
   ];
 
   cmakeFlags = [
@@ -101,12 +67,12 @@ stdenv.mkDerivation (finalAttrs: {
     cp ChowKick_artefacts/Release/Standalone/ChowKick  $out/bin
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/Chowdhury-DSP/ChowKick";
     description = "Kick synthesizer based on old-school drum machine circuits";
-    license = with licenses; [ bsd3 ];
-    maintainers = with maintainers; [ magnetophon ];
-    platforms = platforms.linux;
+    license = [ lib.licenses.bsd3 ];
+    maintainers = [ lib.maintainers.magnetophon ];
+    platforms = lib.platforms.linux;
     mainProgram = "ChowKick";
   };
 })

From e68bdabd632ed15be007fc969b8073f65347550d Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Thu, 23 Oct 2025 20:43:27 -0300
Subject: [PATCH 10/85] podofo_0_9: fix build with cmake4

---
 pkgs/by-name/po/podofo_0_9/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/po/podofo_0_9/package.nix b/pkgs/by-name/po/podofo_0_9/package.nix
index 1d7bf196678c..68ffb35cac44 100644
--- a/pkgs/by-name/po/podofo_0_9/package.nix
+++ b/pkgs/by-name/po/podofo_0_9/package.nix
@@ -62,6 +62,9 @@ stdenv.mkDerivation rec {
         -e 's/LIBDIRNAME/CMAKE_INSTALL_LIBDIR/' -e "$failNoMatches"
     sed -ni src/podofo/libpodofo.pc.in \
         -e 's/^libdir=.*/libdir=@CMAKE_INSTALL_LIBDIR@/' -e "$failNoMatches"
+
+    substituteInPlace {src/podofo/,./}CMakeLists.txt \
+      --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   meta = {

From b9ae5776dbb01b1bcee11554cd4f32247da0d9a3 Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Fri, 24 Oct 2025 04:30:44 +0000
Subject: [PATCH 11/85] flutter335: 3.35.5 -> 3.35.7

---
 .../compilers/flutter/versions/3_35/data.json | 74 +++++++++----------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/pkgs/development/compilers/flutter/versions/3_35/data.json b/pkgs/development/compilers/flutter/versions/3_35/data.json
index f383afef4294..6d04fcf6b864 100644
--- a/pkgs/development/compilers/flutter/versions/3_35/data.json
+++ b/pkgs/development/compilers/flutter/versions/3_35/data.json
@@ -1,17 +1,17 @@
 {
-  "version": "3.35.5",
-  "engineVersion": "d3d45dcf251823c1769909cd43698d126db38deb",
+  "version": "3.35.7",
+  "engineVersion": "035316565ad77281a75305515e4682e6c4c6f7ca",
   "engineSwiftShaderHash": "sha256-ATVcuxqPHqHOWYyO7DoX9LdgUiO3INUi7m9Mc6ccc1M=",
   "engineSwiftShaderRev": "d040a5bab638bf7c226235c95787ba6288bb6416",
   "channel": "stable",
   "engineHashes": {
     "aarch64-linux": {
-      "aarch64-linux": "sha256-0g9ozn4aamUI85j11xEwW6Xv61APIpuLSmg6I0cHiiM=",
-      "x86_64-linux": "sha256-0g9ozn4aamUI85j11xEwW6Xv61APIpuLSmg6I0cHiiM="
+      "aarch64-linux": "sha256-v2L0MQRTXvWngb8fu/AR9iofq2CDq1HFedXE8cSzOws=",
+      "x86_64-linux": "sha256-v2L0MQRTXvWngb8fu/AR9iofq2CDq1HFedXE8cSzOws="
     },
     "x86_64-linux": {
-      "aarch64-linux": "sha256-tXUALuEJZUiUoVOV6vxfdjrSSUe4Mm4Nax+j9lvVCJM=",
-      "x86_64-linux": "sha256-tXUALuEJZUiUoVOV6vxfdjrSSUe4Mm4Nax+j9lvVCJM="
+      "aarch64-linux": "sha256-RKfKhFwlwVEguWqI6OinTqdCM3yNTP/5PwevREmS4Nk=",
+      "x86_64-linux": "sha256-RKfKhFwlwVEguWqI6OinTqdCM3yNTP/5PwevREmS4Nk="
     }
   },
   "dartVersion": "3.9.2",
@@ -21,53 +21,53 @@
     "x86_64-darwin": "sha256-mjWHCF5voWLKlqBKYhl2OKg2aDx0pyIQ1TlF6k4MQz0=",
     "aarch64-darwin": "sha256-1rAfqatlOdphdi6dZSfUfKywAbdwRn6ijo60isjV3Lw="
   },
-  "flutterHash": "sha256-EVJ/2Qk5r9CL/WObLsH3J/KW/ota6HgkAUYNgLYZwkw=",
+  "flutterHash": "sha256-0GI3P11vys6JU+H5MXKznHTItOXZwap7bxHzgj6umc4=",
   "artifactHashes": {
     "android": {
-      "aarch64-darwin": "sha256-XU2WMX8lYGZgERKcUXXRCG0i+v+NeJQt05ZcwVEPkwE=",
-      "aarch64-linux": "sha256-SDJXjztXecAQPwDgZlg3Lk04LRVmuVLhEoC1nPTlDw0=",
-      "x86_64-darwin": "sha256-XU2WMX8lYGZgERKcUXXRCG0i+v+NeJQt05ZcwVEPkwE=",
-      "x86_64-linux": "sha256-SDJXjztXecAQPwDgZlg3Lk04LRVmuVLhEoC1nPTlDw0="
+      "aarch64-darwin": "sha256-BbwfmKPmxZUPVoZEE687vudBCBPzVM/C9ehPEAPr6Jw=",
+      "aarch64-linux": "sha256-Pgc/ybLcRFJkbGUI2eY689yxOv2VyKdO/F5vGkTg/tM=",
+      "x86_64-darwin": "sha256-BbwfmKPmxZUPVoZEE687vudBCBPzVM/C9ehPEAPr6Jw=",
+      "x86_64-linux": "sha256-Pgc/ybLcRFJkbGUI2eY689yxOv2VyKdO/F5vGkTg/tM="
     },
     "fuchsia": {
-      "aarch64-darwin": "sha256-6XXdeFJJCPz4GXjtHODNUUlVxOC+wsxQHlk1utB1hro=",
-      "aarch64-linux": "sha256-6XXdeFJJCPz4GXjtHODNUUlVxOC+wsxQHlk1utB1hro=",
-      "x86_64-darwin": "sha256-6XXdeFJJCPz4GXjtHODNUUlVxOC+wsxQHlk1utB1hro=",
-      "x86_64-linux": "sha256-6XXdeFJJCPz4GXjtHODNUUlVxOC+wsxQHlk1utB1hro="
+      "aarch64-darwin": "sha256-qpHjEpuIK1hI6ga1qr0Q/t5S2Jjk8oUpnkeXsIeu7UM=",
+      "aarch64-linux": "sha256-qpHjEpuIK1hI6ga1qr0Q/t5S2Jjk8oUpnkeXsIeu7UM=",
+      "x86_64-darwin": "sha256-qpHjEpuIK1hI6ga1qr0Q/t5S2Jjk8oUpnkeXsIeu7UM=",
+      "x86_64-linux": "sha256-qpHjEpuIK1hI6ga1qr0Q/t5S2Jjk8oUpnkeXsIeu7UM="
     },
     "ios": {
-      "aarch64-darwin": "sha256-aWAK+2tSlp8UJ1kMjewIbxthGctiovXNgSjGEJVW/7w=",
-      "aarch64-linux": "sha256-aWAK+2tSlp8UJ1kMjewIbxthGctiovXNgSjGEJVW/7w=",
-      "x86_64-darwin": "sha256-aWAK+2tSlp8UJ1kMjewIbxthGctiovXNgSjGEJVW/7w=",
-      "x86_64-linux": "sha256-aWAK+2tSlp8UJ1kMjewIbxthGctiovXNgSjGEJVW/7w="
+      "aarch64-darwin": "sha256-ZjNJhDXqv9dg9Gn62TRYX1Vb4Qn0adS5nxxpYZOGsgY=",
+      "aarch64-linux": "sha256-ZjNJhDXqv9dg9Gn62TRYX1Vb4Qn0adS5nxxpYZOGsgY=",
+      "x86_64-darwin": "sha256-ZjNJhDXqv9dg9Gn62TRYX1Vb4Qn0adS5nxxpYZOGsgY=",
+      "x86_64-linux": "sha256-ZjNJhDXqv9dg9Gn62TRYX1Vb4Qn0adS5nxxpYZOGsgY="
     },
     "linux": {
-      "aarch64-darwin": "sha256-2ggkx/GSox34XxRfHJM3ipf9wqsR4rKYfn8Mzo4NmqI=",
-      "aarch64-linux": "sha256-2ggkx/GSox34XxRfHJM3ipf9wqsR4rKYfn8Mzo4NmqI=",
-      "x86_64-darwin": "sha256-uObm7ogCp1JEMJ7CFeIzcN/ore6VPGvmvhsEYiXroWY=",
-      "x86_64-linux": "sha256-uObm7ogCp1JEMJ7CFeIzcN/ore6VPGvmvhsEYiXroWY="
+      "aarch64-darwin": "sha256-TB9BOiV1Z1cKJKusNW4O0oJEJCt9XmWN+g4yCXtyepc=",
+      "aarch64-linux": "sha256-TB9BOiV1Z1cKJKusNW4O0oJEJCt9XmWN+g4yCXtyepc=",
+      "x86_64-darwin": "sha256-7BocNpo89xSXNy6yob+EESVfalm2olwR/knVfq9I1VA=",
+      "x86_64-linux": "sha256-7BocNpo89xSXNy6yob+EESVfalm2olwR/knVfq9I1VA="
     },
     "macos": {
-      "aarch64-darwin": "sha256-VBJntqCFoTAS+8FwxroCmSarfx9yqL5n4Q5oWz1JgII=",
-      "aarch64-linux": "sha256-VBJntqCFoTAS+8FwxroCmSarfx9yqL5n4Q5oWz1JgII=",
-      "x86_64-darwin": "sha256-VBJntqCFoTAS+8FwxroCmSarfx9yqL5n4Q5oWz1JgII=",
-      "x86_64-linux": "sha256-VBJntqCFoTAS+8FwxroCmSarfx9yqL5n4Q5oWz1JgII="
+      "aarch64-darwin": "sha256-vnV12shNi630OuyWTey/31vsmAcF7UMEgfdBZBXWc4c=",
+      "aarch64-linux": "sha256-vnV12shNi630OuyWTey/31vsmAcF7UMEgfdBZBXWc4c=",
+      "x86_64-darwin": "sha256-vnV12shNi630OuyWTey/31vsmAcF7UMEgfdBZBXWc4c=",
+      "x86_64-linux": "sha256-vnV12shNi630OuyWTey/31vsmAcF7UMEgfdBZBXWc4c="
     },
     "universal": {
-      "aarch64-darwin": "sha256-dXJmnOZunesXmUAGt32LE+hXB2b3KNhauSYeduPuK70=",
-      "aarch64-linux": "sha256-xWvFZH3RcTMuV2wn6bpEe4eiKdjGy7u/YlxZrqfOCQA=",
-      "x86_64-darwin": "sha256-9anTlYdSTIK1go8dxZ0TqfWQNz0YTCEGEESvXw+nTec=",
-      "x86_64-linux": "sha256-5DQ+4pPBtmc391cm446Ql6OtSGz3DLtO4pI3ueX0jUY="
+      "aarch64-darwin": "sha256-oPUDsJxKbbWEH1XgxOFoBnVYJAjgeCBKIrYtBafWtWU=",
+      "aarch64-linux": "sha256-ae6UH4K09lcl7UZzD/WKFxWUKEZQsLmizODs/RMKcis=",
+      "x86_64-darwin": "sha256-wxDWrT35CUIEQaKeIK0adr0oPfv6to60Z6R+8zrwhmU=",
+      "x86_64-linux": "sha256-CxvOlq8nxeY5esRanl2N7oO4RFgBTwQcRdS7Pp/5tt8="
     },
     "web": {
-      "aarch64-darwin": "sha256-duX+iGMFQ18nJIT49V1ZeyXTV+9Z8oDot0jgeonmVHA=",
-      "aarch64-linux": "sha256-duX+iGMFQ18nJIT49V1ZeyXTV+9Z8oDot0jgeonmVHA=",
-      "x86_64-darwin": "sha256-duX+iGMFQ18nJIT49V1ZeyXTV+9Z8oDot0jgeonmVHA=",
-      "x86_64-linux": "sha256-duX+iGMFQ18nJIT49V1ZeyXTV+9Z8oDot0jgeonmVHA="
+      "aarch64-darwin": "sha256-T+LR7Yo2hEy24u3aS+ehp9nyRBB+3dNDyF6jw1oOd1o=",
+      "aarch64-linux": "sha256-T+LR7Yo2hEy24u3aS+ehp9nyRBB+3dNDyF6jw1oOd1o=",
+      "x86_64-darwin": "sha256-T+LR7Yo2hEy24u3aS+ehp9nyRBB+3dNDyF6jw1oOd1o=",
+      "x86_64-linux": "sha256-T+LR7Yo2hEy24u3aS+ehp9nyRBB+3dNDyF6jw1oOd1o="
     },
     "windows": {
-      "x86_64-darwin": "sha256-aZ7owKiUsfuV6UqlO9I8aD1aWVjA55sOHdq+pgaLJGQ=",
-      "x86_64-linux": "sha256-aZ7owKiUsfuV6UqlO9I8aD1aWVjA55sOHdq+pgaLJGQ="
+      "x86_64-darwin": "sha256-xTWgw8JE/4R9UcdZmLEbMk+yL2V3zfAIXDRli9XYe5k=",
+      "x86_64-linux": "sha256-xTWgw8JE/4R9UcdZmLEbMk+yL2V3zfAIXDRli9XYe5k="
     }
   },
   "pubspecLock": {

From 67bf5838945fbe9ea2d8202c75d890ba053e1a38 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Fri, 24 Oct 2025 19:28:18 +0200
Subject: [PATCH 12/85] sdl-jstest: 2018-06-15 -> 0.2.2-unstable-2025-03-27

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/sd/sdl-jstest/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sd/sdl-jstest/package.nix b/pkgs/by-name/sd/sdl-jstest/package.nix
index 5292d012d0df..57e47ca9ef61 100644
--- a/pkgs/by-name/sd/sdl-jstest/package.nix
+++ b/pkgs/by-name/sd/sdl-jstest/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation {
   pname = "sdl-jstest";
-  version = "2018-06-15";
+  version = "0.2.2-unstable-2025-03-27";
 
   src = fetchFromGitHub {
     owner = "Grumbel";
     repo = "sdl-jstest";
-    rev = "aafbdb1ed3e687583037ba55ae88b1210d6ce98b";
-    hash = "sha256-Mw+ENOVZ0O8WercdDNLAAkNMPZ2NyxSa+nMtgNmXjFw=";
+    rev = "917d27b3b45a335137bd2c8597f8bcf2bac8a569";
+    hash = "sha256-lUHI72fcIEllbcieUrp9A/iKSjUHqmKOUXbzdXCV5jE=";
     fetchSubmodules = true;
   };
 

From d3c814cf8d509b5912f1a22069e6fbc2f1de82be Mon Sep 17 00:00:00 2001
From: iamanaws <78835633+Iamanaws@users.noreply.github.com>
Date: Sat, 25 Oct 2025 23:37:20 -0700
Subject: [PATCH 13/85] mongodb-atlas-cli: 1.49.0 -> 1.50.0

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

diff --git a/pkgs/by-name/mo/mongodb-atlas-cli/package.nix b/pkgs/by-name/mo/mongodb-atlas-cli/package.nix
index 8cbb211b2bae..954f55e351b8 100644
--- a/pkgs/by-name/mo/mongodb-atlas-cli/package.nix
+++ b/pkgs/by-name/mo/mongodb-atlas-cli/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule rec {
   pname = "mongodb-atlas-cli";
-  version = "1.49.0";
+  version = "1.50.0";
 
   src = fetchFromGitHub {
     owner = "mongodb";
     repo = "mongodb-atlas-cli";
     tag = "atlascli/v${version}";
-    hash = "sha256-thip1zWOQJOKrShf8O1erIUdYuqLg6VaMqMRV/a7/dg=";
+    hash = "sha256-vo2vfnGKp71S9mVGK5SVi8YqNLjedzfjJhh5uK/pb4E=";
   };
 
-  vendorHash = "sha256-HtdZ+wfibcqKoTf5BT5nNX4+m7bP/f2gvkvA+PnYb2s=";
+  vendorHash = "sha256-qcB8Hgp/4kVsEo32E6I4GMSBbRByPTyk3Oas2CpS4Xc=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From fe92a36417e813e93c4ff25e0d2b39f0f1382b30 Mon Sep 17 00:00:00 2001
From: iamanaws <78835633+Iamanaws@users.noreply.github.com>
Date: Sat, 25 Oct 2025 23:28:40 -0700
Subject: [PATCH 14/85] mongodb-compass: 1.47.1 -> 1.48.0

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

diff --git a/pkgs/by-name/mo/mongodb-compass/package.nix b/pkgs/by-name/mo/mongodb-compass/package.nix
index 2497a1809e75..d8f1dab7baea 100644
--- a/pkgs/by-name/mo/mongodb-compass/package.nix
+++ b/pkgs/by-name/mo/mongodb-compass/package.nix
@@ -40,7 +40,7 @@
 
 let
   pname = "mongodb-compass";
-  version = "1.47.1";
+  version = "1.48.0";
 
   selectSystem =
     attrs:
@@ -55,9 +55,9 @@ let
       }
     }";
     hash = selectSystem {
-      x86_64-linux = "sha256-L+IhvRqUllrFkntYeuE+3Ox59U60fu0P2VP6Zb/1ORA=";
-      x86_64-darwin = "sha256-NYgXtCdrny6pKACYmWDHvrlCOJupyP4GqobDr+13WqU=";
-      aarch64-darwin = "sha256-mZ6bLY6hnOhPb2pxPKpiVQpF3ffZlC265QvkIIjpM9A=";
+      x86_64-linux = "sha256-lmg+zfUUT4dAObJzEmGzBCmnHkc6rkPKk1XIfmZ6uJc=";
+      x86_64-darwin = "sha256-T7MF1TYBPbTg2VBWImA38xN+eCs1ZKT2e5TzHYi08KE=";
+      aarch64-darwin = "sha256-zKSmhU0p87+2SFzA7ZdMy/p/cw8K5JtYfC5np6HnjBg=";
     };
   };
 

From 872f3028e4d9e20118c45812cb6cc86d29619b03 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sun, 26 Oct 2025 05:33:43 -0300
Subject: [PATCH 15/85] opentx: fix build with cmake4

---
 pkgs/applications/misc/opentx/default.nix     | 10 +++++++
 .../fix-cmake-qt-linking-and-location.patch   | 27 +++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/applications/misc/opentx/fix-cmake-qt-linking-and-location.patch

diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix
index c3e100db084b..2d3389ff0faa 100644
--- a/pkgs/applications/misc/opentx/default.nix
+++ b/pkgs/applications/misc/opentx/default.nix
@@ -26,6 +26,10 @@ mkDerivation rec {
     sha256 = "sha256-F3zykJhKuIpLQSTjn7mcdjEmgRAlwCZpkTaKQR9ve3g=";
   };
 
+  patches = [
+    # fix error "The LOCATION property may not be read from target" and ensure proper linking of Qt modules so build don't fail
+    ./fix-cmake-qt-linking-and-location.patch
+  ];
   nativeBuildInputs = [
     cmake
     gcc-arm-embedded
@@ -44,6 +48,12 @@ mkDerivation rec {
     sed -i companion/src/burnconfigdialog.cpp \
       -e 's|/usr/.*bin/dfu-util|${dfu-util}/bin/dfu-util|' \
       -e 's|/usr/.*bin/avrdude|${avrdude}/bin/avrdude|'
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)" \
+      --replace-fail "cmake_policy(SET CMP0023 OLD)" "cmake_policy(SET CMP0023 NEW)"
+    substituteInPlace companion/src/thirdparty/maxlibqt/src/widgets/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.12)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   cmakeFlags = [
diff --git a/pkgs/applications/misc/opentx/fix-cmake-qt-linking-and-location.patch b/pkgs/applications/misc/opentx/fix-cmake-qt-linking-and-location.patch
new file mode 100644
index 000000000000..857fca37716c
--- /dev/null
+++ b/pkgs/applications/misc/opentx/fix-cmake-qt-linking-and-location.patch
@@ -0,0 +1,27 @@
+--- a/companion/src/CMakeLists.txt
++++ b/companion/src/CMakeLists.txt
+@@ -313,8 +313,8 @@
+ qt5_wrap_cpp(companion_SRCS ${companion_MOC_HDRS})
+ 
+ add_executable(${COMPANION_NAME} MACOSX_BUNDLE ${WIN_EXECUTABLE_TYPE} ${companion_SRCS} ${icon_RC})
+-target_link_libraries(${COMPANION_NAME} PRIVATE generaledit modeledit qcustomplot shared ${CPN_COMMON_LIB})
+-
++target_link_libraries(${COMPANION_NAME} PRIVATE generaledit modeledit qcustomplot shared ${CPN_COMMON_LIB}
++Qt5::Network Qt5::PrintSupport)
+ PrintTargetReport("${COMPANION_NAME}")
+ 
+ ############# Standalone simulator ###############
+@@ -371,11 +371,11 @@
+   string(TOLOWER ${PCB} FLAVOUR)
+ endif()
+ if(POLICY CMP0026)
+-  cmake_policy(SET CMP0026 OLD)  # https://cmake.org/cmake/help/v3.0/policy/CMP0026.html
++  cmake_policy(SET CMP0026 NEW)  # https://cmake.org/cmake/help/v3.0/policy/CMP0026.html
+ endif()
+ 
+ if(SIMU_TARGET)
+-  get_property(current_plugin TARGET opentx-${FLAVOUR}-simulator PROPERTY LOCATION)
++  set(current_plugin $<TARGET_FILE:opentx-${FLAVOUR}-simulator>)
+   list(APPEND simulator_plugins "${current_plugin}")
+ endif()
+ 

From 5874ae321174463312d8fcf43ae221cdb6ff1b05 Mon Sep 17 00:00:00 2001
From: C4 Patino <c4patino@gmail.com>
Date: Sun, 7 Sep 2025 17:45:37 -0500
Subject: [PATCH 16/85] spark_4_0: init at 4.0.1

---
 .../networking/cluster/spark/default.nix      | 19 +++++++++++++++++--
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix
index 2609c4fd0a2b..606f79ad3706 100644
--- a/pkgs/applications/networking/cluster/spark/default.nix
+++ b/pkgs/applications/networking/cluster/spark/default.nix
@@ -8,6 +8,8 @@
   RSupport ? true,
   R,
   nixosTests,
+  # needeed in situations where hadoop's jdk version is too old
+  jdk21_headless,
 }:
 
 let
@@ -28,7 +30,15 @@ let
         R
         pysparkPython
         ;
-      inherit (finalAttrs.hadoop) jdk;
+      jdk =
+        if
+          (
+            (lib.versionAtLeast finalAttrs.version "4") && (lib.versionOlder finalAttrs.hadoop.jdk.version "21")
+          )
+        then
+          jdk21_headless
+        else
+          finalAttrs.hadoop.jdk;
       src = fetchzip {
         url =
           with finalAttrs;
@@ -96,12 +106,17 @@ in
   # we strictly adhere to the EOL timeline, despite 3.3.4 being released one day before (2023-12-08).
   # A better policy is to keep these versions around, and clean up EOL versions just before
   # a new NixOS release.
+  spark_4_0 = spark {
+    pname = "spark";
+    version = "4.0.1";
+    hash = "sha256-AW+EQ83b4orJO3+dUPPDlTRAH/D94U7KQBKvKjguChY=";
+  };
   spark_3_5 = spark {
     pname = "spark";
     version = "3.5.5";
     hash = "sha256-vzcWgIfHPhN3nyrxdk3f0p4fW3MpQ+FuEPnWPw0xNPg=";
   };
-  spark_3_4 = spark rec {
+  spark_3_4 = spark {
     pname = "spark";
     version = "3.4.4";
     hash = "sha256-GItHmthLhG7y0XSF3QINCyE7wYFb0+lPZmYLUuMa4Ww=";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d73fc31da43e..329bca9896bb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6359,11 +6359,13 @@ with pkgs;
   samplebrain = libsForQt5.callPackage ../applications/audio/samplebrain { };
 
   inherit (callPackages ../applications/networking/cluster/spark { })
+    spark_4_0
     spark_3_5
     spark_3_4
     ;
   spark3 = spark_3_5;
   spark = spark3;
+  spark4 = spark_4_0;
 
   inherit
     ({

From 07969eeb4d65629e448854a6f3e02675a23845e1 Mon Sep 17 00:00:00 2001
From: C4 Patino <c4patino@gmail.com>
Date: Sun, 7 Sep 2025 17:45:59 -0500
Subject: [PATCH 17/85] spark: 3.5.5 -> 4.0.1

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 329bca9896bb..3bb9625bf467 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6364,8 +6364,8 @@ with pkgs;
     spark_3_4
     ;
   spark3 = spark_3_5;
-  spark = spark3;
   spark4 = spark_4_0;
+  spark = spark_4_0;
 
   inherit
     ({

From ac51d05cc78bd92c32622490576f494e216e3962 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 00:25:42 +0000
Subject: [PATCH 18/85] python3Packages.ansible-builder: 3.1.0 -> 3.1.1

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

diff --git a/pkgs/development/python-modules/ansible-builder/default.nix b/pkgs/development/python-modules/ansible-builder/default.nix
index ff20c5aef2c7..670c182f8efa 100644
--- a/pkgs/development/python-modules/ansible-builder/default.nix
+++ b/pkgs/development/python-modules/ansible-builder/default.nix
@@ -13,13 +13,13 @@
 
 buildPythonPackage rec {
   pname = "ansible-builder";
-  version = "3.1.0";
+  version = "3.1.1";
   pyproject = true;
 
   src = fetchPypi {
     pname = "ansible_builder";
     inherit version;
-    hash = "sha256-0txXPianvVCV6YrrN+6bALyfUAWr6nFH10IpwPNCb8s=";
+    hash = "sha256-nYi8FazH0xBW0MUZFKYQLayOWtc/ny01upg3jIlxTtI=";
   };
 
   patchPhase = ''

From 0a82932ad84b4446ccd60abb11d3526d7d6fd105 Mon Sep 17 00:00:00 2001
From: Ivy Pierlot <ivyp@outlook.com.au>
Date: Tue, 28 Oct 2025 16:28:04 +1100
Subject: [PATCH 19/85] karabiner-dk: 6.4.0 -> 6.5.0

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

diff --git a/pkgs/by-name/ka/karabiner-dk/package.nix b/pkgs/by-name/ka/karabiner-dk/package.nix
index 1b8d61238d32..731d7677a9a6 100644
--- a/pkgs/by-name/ka/karabiner-dk/package.nix
+++ b/pkgs/by-name/ka/karabiner-dk/package.nix
@@ -12,14 +12,14 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "karabiner-dk";
-  sourceVersion = "6.4.0";
+  sourceVersion = "6.5.0";
   version = lib.defaultTo finalAttrs.sourceVersion driver-version;
 
   src = fetchFromGitHub {
     owner = "pqrs-org";
     repo = "Karabiner-DriverKit-VirtualHIDDevice";
     tag = "v${finalAttrs.sourceVersion}";
-    hash = "sha256-NlzIb9srGVdYUOAOL8W9UJZVrf5IQOm6TVjm73epemM=";
+    hash = "sha256-/77FaQUiJXqS7szOb92n/czuBup+f29GwLjQ9OXPvC4=";
   };
 
   nativeBuildInputs = [

From 07d69e971f2b2704ce9f24b7611b070e24c280cc Mon Sep 17 00:00:00 2001
From: Ivy Pierlot <ivyp@outlook.com.au>
Date: Wed, 29 Oct 2025 00:19:13 +1100
Subject: [PATCH 20/85] karabiner-dk: add system to updateScript

---
 pkgs/by-name/ka/karabiner-dk/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ka/karabiner-dk/package.nix b/pkgs/by-name/ka/karabiner-dk/package.nix
index 731d7677a9a6..972cc1edf583 100644
--- a/pkgs/by-name/ka/karabiner-dk/package.nix
+++ b/pkgs/by-name/ka/karabiner-dk/package.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru.updateScript = writeShellScript "karabiner-dk" ''
     NEW_VERSION=$(${lib.getExe curl} --silent https://api.github.com/repos/pqrs-org/Karabiner-DriverKit-VirtualHIDDevice/releases/latest $${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} | ${lib.getExe jq} '.tag_name | ltrimstr("v")' --raw-output)
-    ${lib.getExe' common-updater-scripts "update-source-version"} "karabiner-dk" "$NEW_VERSION" --ignore-same-version --version-key="sourceVersion";
+    ${lib.getExe' common-updater-scripts "update-source-version"} "karabiner-dk" "$NEW_VERSION" --system=aarch64-darwin --ignore-same-version --version-key="sourceVersion";
   '';
 
   meta = {

From 1264ad752974ebd80a99eb8b367d0c6bdf219f21 Mon Sep 17 00:00:00 2001
From: Adam Dinwoodie <adam@dinwoodie.org>
Date: Tue, 28 Oct 2025 13:30:35 +0000
Subject: [PATCH 21/85] quodlibet: don't use Xine unnecessarily

In 50dc0203707d (quodlibet: makeover, 2022-08-05) / #185236, the
quodlibet library was refactored.  That commit appears to have
accidentally changed the default arguments for building quodlibet to
mean the Xine backend would always be included, rather than only as an
alternative to the Gstreamer backend.  This adds unnecessary
dependencies for the non-Xine quodlibet packages, so default to only
including Xine if Gstreamer is absent.
---
 pkgs/applications/audio/quodlibet/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix
index 8d6518a1e323..98047b81f28b 100644
--- a/pkgs/applications/audio/quodlibet/default.nix
+++ b/pkgs/applications/audio/quodlibet/default.nix
@@ -34,7 +34,7 @@
   withGstPlugins ? withGstreamerBackend,
   withGstreamerBackend ? true,
   gst_all_1,
-  withXineBackend ? true,
+  withXineBackend ? !withGstreamerBackend,
   xine-lib,
 
   # tests

From 568495bec2cbcb57bb2805983aa941997a31736d Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 25 Oct 2025 11:59:38 +0200
Subject: [PATCH 22/85] all-packages.nix: remove unused headers

---
 pkgs/top-level/all-packages.nix | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8bd88d03adfb..bf6fce27ce61 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8865,8 +8865,6 @@ with pkgs;
   );
   agda = agdaPackages.agda;
 
-  ### DEVELOPMENT / LIBRARIES / BASH
-
   ### DEVELOPMENT / LIBRARIES / JAVA
 
   saxonb = saxonb_8_8;
@@ -9867,8 +9865,6 @@ with pkgs;
 
   zabbix = zabbix60;
 
-  ### SERVERS / GEOSPATIAL
-
   ### OS-SPECIFIC
 
   alfred = callPackage ../os-specific/linux/batman-adv/alfred.nix { };
@@ -13614,10 +13610,6 @@ with pkgs;
     libxc = pkgs.libxc_7;
   };
 
-  ### SCIENCE/GEOMETRY
-
-  ### SCIENCE/BENCHMARK
-
   ### SCIENCE/BIOLOGY
 
   cd-hit = callPackage ../applications/science/biology/cd-hit {
@@ -13764,8 +13756,6 @@ with pkgs;
     }
   );
 
-  ### SCIENCE/MEDICINE
-
   ### SCIENCE/PHYSICS
 
   mcfm = callPackage ../applications/science/physics/MCFM {
@@ -13778,8 +13768,6 @@ with pkgs;
 
   xflr5 = libsForQt5.callPackage ../applications/science/physics/xflr5 { };
 
-  ### SCIENCE/PROGRAMMING
-
   ### SCIENCE/LOGIC
 
   abella = callPackage ../applications/science/logic/abella {
@@ -13918,8 +13906,6 @@ with pkgs;
     inherit (ocaml-ng.ocamlPackages_4_14_unsafe_string) ocaml;
   };
 
-  ### SCIENCE / ENGINEERING
-
   ### SCIENCE / ELECTRONICS
 
   simulide_0_4_15 = callPackage ../by-name/si/simulide/package.nix { versionNum = "0.4.15"; };

From 4949737a386f5d88d3525807384f87a5e3a26772 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 28 Oct 2025 15:21:49 +0100
Subject: [PATCH 23/85] systems/examples: remove x86_64-unknown-redox

relibc itself has been removed in 2024 already.
---
 lib/systems/examples.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index 47c3cf0c9558..d05c05910523 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -302,15 +302,6 @@ rec {
     libc = "newlib";
   };
 
-  #
-  # Redox
-  #
-
-  x86_64-unknown-redox = {
-    config = "x86_64-unknown-redox";
-    libc = "relibc";
-  };
-
   #
   # Darwin
   #

From 1d4ca026bcc5f191527c21ff90e3fcf913fe70b4 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 28 Oct 2025 15:22:36 +0100
Subject: [PATCH 24/85] uclibc: bring back alias

This was removed recently when cleaning up aliases, but it breaks
`pkgsCross.ben_nanonote`.
---
 pkgs/top-level/aliases.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index b4128ecc1422..22a2b2447996 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -254,6 +254,7 @@ mapAliases {
   elasticsearch7Plugins = elasticsearchPlugins; # preserve, reason: until v8
   fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H"; # preserve, reason: common typo
   fuse2fs = if stdenv.hostPlatform.isLinux then e2fsprogs.fuse2fs else null; # Added 2022-03-27 preserve, reason: convenience, arch has a package named fuse2fs too.
+  uclibc = uclibc-ng; # preserve, because uclibc-ng can't be used in config string
   wlroots = wlroots_0_19; # preserve, reason: wlroots is unstable, we must keep depending on 'wlroots_0_*', convert to package after a stable(1.x) release
   wormhole-rs = magic-wormhole-rs; # Added 2022-05-30. preserve, reason: Arch package name, main binary name
 
@@ -1507,7 +1508,6 @@ mapAliases {
   uade123 = throw "'uade123' has been renamed to/replaced by 'uade'"; # Converted to throw 2025-10-27
   uae = throw "'uae' has been removed due to lack of upstream maintenance. Consider using 'fsuae' instead."; # Added 2025-06-11
   ubuntu_font_family = throw "'ubuntu_font_family' has been renamed to/replaced by 'ubuntu-classic'"; # Converted to throw 2025-10-27
-  uclibc = throw "'uclibc' has been renamed to/replaced by 'uclibc-ng'"; # Converted to throw 2025-10-27
   unicap = throw "'unicap' has been removed because it is unmaintained"; # Added 2025-05-17
   unifi-poller = throw "'unifi-poller' has been renamed to/replaced by 'unpoller'"; # Converted to throw 2025-10-27
   unzoo = throw "'unzoo' has been removed since it is unmaintained upstream and doesn't compile with newer versions of GCC anymore"; # Removed 2025-05-24

From 2494e3664feeb1ff80dcc50e2ebb5a31e5a95609 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Thu, 17 Oct 2024 19:08:19 +0300
Subject: [PATCH 25/85] splice.nix: make `pkgs` `splicedPackages` when required
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This will make `pkgs` used in `callPackage`, and `pkgsCross.X.pkgs` have
packages with `__spliced`.

https://www.github.com/NixOS/nixpkgs/blob/3029741718f4c765fbc5ebf76bea3d6c8ff15fe5/pkgs/development/interpreters/python/passthrufun.nix#L37

https://www.github.com/NixOS/nixpkgs/blob/d2bd9a39dec88eddd5c192abee69939e67f43d12/pkgs/top-level/python-packages.nix#L10720

```
nix-repl>
pkgsCross.aarch64-multiplatform.python3Packages.protobuf4.protobuf.__spliced
error:
       … while evaluating the attribute
'aarch64-multiplatform.python3Packages.protobuf4.protobuf.__spliced'
         at
/home/artturin/nixgits/my-nixpkgs/.worktree/1/pkgs/development/python-modules/protobuf/4.nix:119:13:
          118|   passthru = {
          119|     inherit protobuf;
             |             ^
          120|   };

       error: attribute '__spliced' missing
       at «string»:1:1:
            1|
pkgsCross.aarch64-multiplatform.python3Packages.protobuf4.protobuf.__spliced
             | ^
```

to

```
nix-repl>
pkgsCross.aarch64-multiplatform.python3Packages.protobuf4.protobuf.__spliced
{
  buildBuild = «derivation
/nix/store/s7da5mfvx4h1n86j78knaj9cprglxqz6-protobuf-25.4.drv»;
  buildHost = «derivation
/nix/store/s7da5mfvx4h1n86j78knaj9cprglxqz6-protobuf-25.4.drv»;
  buildTarget = «repeated»;
  hostHost = «derivation
/nix/store/mszvybzs4zxh43awyrjnybsfcb265n9r-protobuf-aarch64-unknown-linux-gnu-25.4.drv»;
  hostTarget = «repeated»;
}
```

Co-authored-by: Wolfgang Walther <walther@technowledgy.de>
---
 pkgs/development/compilers/gcc/all.nix | 4 +++-
 pkgs/os-specific/windows/default.nix   | 4 ++--
 pkgs/top-level/all-packages.nix        | 2 +-
 pkgs/top-level/splice.nix              | 2 ++
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/gcc/all.nix b/pkgs/development/compilers/gcc/all.nix
index 1aba286411bd..8deba6c6f07c 100644
--- a/pkgs/development/compilers/gcc/all.nix
+++ b/pkgs/development/compilers/gcc/all.nix
@@ -2,6 +2,8 @@
   lib,
   stdenv,
   pkgs,
+  overrideCC,
+  buildPackages,
   targetPackages,
   callPackage,
   isl_0_20,
@@ -62,7 +64,7 @@ let
                 )
                 && stdenv.cc.isGNU
               then
-                pkgs."gcc${majorVersion}Stdenv"
+                overrideCC stdenv buildPackages."gcc${majorVersion}"
               else
                 stdenv;
           }
diff --git a/pkgs/os-specific/windows/default.nix b/pkgs/os-specific/windows/default.nix
index 137a948960b7..e0f7e5b5f79e 100644
--- a/pkgs/os-specific/windows/default.nix
+++ b/pkgs/os-specific/windows/default.nix
@@ -27,11 +27,11 @@ lib.makeScope newScope (
       else
         buildPackages.gccWithoutTargetLibc.override (old: {
           bintools = old.bintools.override {
-            libc = pkgs.libc;
+            libc = pkgs.pkgsHostTarget.libc;
             noLibc = pkgs.libc == null;
             nativeLibc = false;
           };
-          libc = pkgs.libc;
+          libc = pkgs.pkgsHostTarget.libc;
           noLibc = pkgs.libc == null;
           nativeLibc = false;
         })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bf6fce27ce61..7cfde09d7f0e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6320,7 +6320,7 @@ with pkgs;
       null;
   bintoolsNoLibc = wrapBintoolsWith {
     bintools = bintools-unwrapped;
-    libc = targetPackages.preLibcHeaders;
+    libc = targetPackages.preLibcHeaders or preLibcHeaders;
   };
   bintools = wrapBintoolsWith {
     bintools = bintools-unwrapped;
diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix
index fe4566bb175e..afbf3b12991a 100644
--- a/pkgs/top-level/splice.nix
+++ b/pkgs/top-level/splice.nix
@@ -173,6 +173,8 @@ in
 
   newScope = extra: lib.callPackageWith (pkgsForCall // extra);
 
+  pkgs = if actuallySplice then splicedPackages // { recurseForDerivations = false; } else pkgs;
+
   # prefill 2 fields of the function for convenience
   makeScopeWithSplicing = lib.makeScopeWithSplicing splicePackages pkgs.newScope;
   makeScopeWithSplicing' = lib.makeScopeWithSplicing' {

From 1f74d7a2bd47813ccae4ebc1f36176986d9a86d4 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Fri, 1 Nov 2024 20:21:38 +0200
Subject: [PATCH 26/85] treewide: remove `= __splicedPackages`

Now that `pkgs` is `__splicedPackages` on cross we can remove these
variables I set.

Assignments like `patchutils = pkgs.patchutils_0_3_3;` in
`all-packages.nix` cannot be removed because the `pkgs`
in `patchutils = pkgs.patchutils_0_3_3;` in `all-packages.nix` is coming from
this `pkgs:` https://www.github.com/NixOS/nixpkgs/blob/b6e486730fc875ec79a3dea0f1f46eaf9f6ffa9d/pkgs/top-level/all-packages.nix#L9
instead of the `pkgs` in `with pkgs;`
---
 pkgs/development/beam-modules/default.nix      |  3 +--
 pkgs/development/interpreters/perl/default.nix |  6 +-----
 pkgs/top-level/all-packages.nix                | 11 ++---------
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
index 15ddc31e9347..b2c6e263134a 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/pkgs/development/beam-modules/default.nix
@@ -1,11 +1,10 @@
 {
   lib,
-  __splicedPackages,
+  pkgs,
   erlang,
 }:
 
 let
-  pkgs = __splicedPackages;
   inherit (lib) makeExtensible;
 
   # FIXME: add support for overrideScope
diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index b0f3480c01ac..69d02530a90f 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -30,11 +30,7 @@ let
             }:
             let
               perlPackagesFun = callPackage ../../../top-level/perl-packages.nix {
-                # allow 'perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig; }; }' like in python3Packages
-                # most perl packages aren't called with callPackage so it's not possible to override their arguments individually
-                # the conditional is because the // above won't be applied to __splicedPackages and hopefully no one is doing that when cross-compiling
-                pkgs = if stdenv.buildPlatform != stdenv.hostPlatform then pkgs.__splicedPackages else pkgs;
-                inherit stdenv;
+                inherit stdenv pkgs;
                 perl = self;
               };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7cfde09d7f0e..0625c500cb1c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4089,11 +4089,7 @@ with pkgs;
 
   tldr-hs = haskellPackages.tldr;
 
-  tmuxPlugins = recurseIntoAttrs (
-    callPackage ../misc/tmux-plugins {
-      pkgs = pkgs.__splicedPackages;
-    }
-  );
+  tmuxPlugins = recurseIntoAttrs (callPackage ../misc/tmux-plugins { });
 
   tpm2-totp-with-plymouth = tpm2-totp.override {
     withPlymouth = true;
@@ -4311,9 +4307,7 @@ with pkgs;
   yarn-berry_4 = yarn-berry.override { berryVersion = 4; };
   yarn-berry_3 = yarn-berry.override { berryVersion = 3; };
 
-  yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea {
-    pkgs = pkgs.__splicedPackages;
-  };
+  yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea { };
 
   inherit (yarn2nix-moretea)
     yarn2nix
@@ -5015,7 +5009,6 @@ with pkgs;
   idrisPackages = recurseIntoAttrs (
     callPackage ../development/idris-modules {
       idris-no-deps = haskellPackages.idris;
-      pkgs = pkgs.__splicedPackages;
     }
   );
 

From 440aca879a17489bb83832498f8d77e527fe6d1d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 10:18:31 +0000
Subject: [PATCH 27/85] nagios: 4.5.9 -> 4.5.10

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

diff --git a/pkgs/by-name/na/nagios/package.nix b/pkgs/by-name/na/nagios/package.nix
index 6f7a1aed64ad..1321c2f02bbb 100644
--- a/pkgs/by-name/na/nagios/package.nix
+++ b/pkgs/by-name/na/nagios/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nagios";
-  version = "4.5.9";
+  version = "4.5.10";
 
   src = fetchFromGitHub {
     owner = "NagiosEnterprises";
     repo = "nagioscore";
     tag = "nagios-${finalAttrs.version}";
-    hash = "sha256-aOHdMZJCrGeJ3XA3+ed3JUb7X1FdfdGiT2ytzBDAT4c=";
+    hash = "sha256-NnGnatzu/iFKFaofg0O2gqDqkQwg/jrBLgSmrWqef5Q=";
   };
 
   patches = [ ./nagios.patch ];

From 7234d45eb6c6666e4a3ddb4ef161771b8adc2804 Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Wed, 29 Oct 2025 16:23:34 +0100
Subject: [PATCH 28/85] fastd-exporter: init at 0-unstable-2024-04-09

Signed-off-by: Felix Singer <felixsinger@posteo.net>
---
 pkgs/by-name/fa/fastd-exporter/package.nix | 35 ++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 pkgs/by-name/fa/fastd-exporter/package.nix

diff --git a/pkgs/by-name/fa/fastd-exporter/package.nix b/pkgs/by-name/fa/fastd-exporter/package.nix
new file mode 100644
index 000000000000..229bb7ee2caf
--- /dev/null
+++ b/pkgs/by-name/fa/fastd-exporter/package.nix
@@ -0,0 +1,35 @@
+{
+  buildGoModule,
+  fetchFromGitHub,
+  lib,
+}:
+
+buildGoModule {
+  pname = "fastd-exporter";
+  version = "0-unstable-2024-04-09";
+
+  src = fetchFromGitHub {
+    owner = "freifunk-darmstadt";
+    repo = "fastd-exporter";
+    rev = "374e4334af6661f4c91a3e83bf7ce071a2a72eca";
+    sha256 = "sha256-0oU4+9G19XP5qtGdcfMz08T04hjcoXX/O+FkaUPxzXE=";
+  };
+
+  vendorHash = "sha256-r0W64dct6XWa9sIrzy0UdyoMw+kAq73Qc/QchmsYZkY=";
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  meta = {
+    description = "Prometheus exporter for fastd";
+    homepage = "https://github.com/freifunk-darmstadt/fastd-exporter";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    mainProgram = "fastd-exporter";
+    maintainers = with lib.maintainers; [
+      felixsinger
+    ];
+  };
+}

From 1726819480f72f22ab14c9603079b0b55e150552 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 17:07:24 +0000
Subject: [PATCH 29/85] pocket-id: 1.14.1 -> 1.14.2

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

diff --git a/pkgs/by-name/po/pocket-id/package.nix b/pkgs/by-name/po/pocket-id/package.nix
index 4507f4b20cf0..6d4a3087ce73 100644
--- a/pkgs/by-name/po/pocket-id/package.nix
+++ b/pkgs/by-name/po/pocket-id/package.nix
@@ -11,13 +11,13 @@
 
 buildGo125Module (finalAttrs: {
   pname = "pocket-id";
-  version = "1.14.1";
+  version = "1.14.2";
 
   src = fetchFromGitHub {
     owner = "pocket-id";
     repo = "pocket-id";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-PnZKlJ6smwpgijqQM5xTcopyGJfO2pebiEJhEIdAOFk=";
+    hash = "sha256-0x80oykzMTEsuGUBtXXdKgWJld8mrDPUssYpAznqKnc=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/backend";

From 6112f3e8f6c75230d2bd76d519a4a23623eb4086 Mon Sep 17 00:00:00 2001
From: Rebecca Turner <rbt@sent.as>
Date: Tue, 28 Oct 2025 11:59:16 -0700
Subject: [PATCH 30/85] python3Packages.gst-python: use `mesonCheckPhase`

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

diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix
index 12e20e097e81..d2f700ecb0ef 100644
--- a/pkgs/development/python-modules/gst-python/default.nix
+++ b/pkgs/development/python-modules/gst-python/default.nix
@@ -82,9 +82,10 @@ buildPythonPackage rec {
     "-Dpython-exe=${python.pythonOnBuildForHost.interpreter}"
   ];
 
-  # TODO: Meson setup hook does not like buildPythonPackage
-  # https://github.com/NixOS/nixpkgs/issues/47390
-  installCheckPhase = "meson test --print-errorlogs";
+  # `buildPythonPackage` uses `installCheckPhase` and leaves `checkPhase`
+  # empty. It renames `doCheck` from its arguments, but not `checkPhase`.
+  # See: https://github.com/NixOS/nixpkgs/issues/47390
+  installCheckPhase = "mesonCheckPhase";
 
   preCheck = lib.optionalString stdenv.hostPlatform.isDarwin ''
     export DYLD_LIBRARY_PATH="${gst_all_1.gst-plugins-base}/lib"

From db781ef3e131c0a6be190110c186991615b70ec8 Mon Sep 17 00:00:00 2001
From: Rebecca Turner <rbt@sent.as>
Date: Tue, 28 Oct 2025 11:59:16 -0700
Subject: [PATCH 31/85] python3Packages.gst-python: disable tests on darwin

Closes #454955

These tests are very flaky on Darwin for whatever reason. Sometimes they
just mysteriously time out.

When setting `doCheck = !stdenv.hostPlatform.isDarwin`, I discovered
that the `checkInputs` entry `gst-rtsp-server` is in fact needed to
build the project, so this incorporates #451261 to fix that issue.
---
 .../python-modules/gst-python/default.nix     | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix
index d2f700ecb0ef..be3bbbc83125 100644
--- a/pkgs/development/python-modules/gst-python/default.nix
+++ b/pkgs/development/python-modules/gst-python/default.nix
@@ -6,6 +6,9 @@
   fetchpatch,
   meson,
   ninja,
+  # TODO: We can get rid of this once `buildPythonPackage` accepts `finalAttrs`.
+  # See: https://github.com/NixOS/nixpkgs/pull/271387
+  gst-python,
 
   pkg-config,
   python,
@@ -42,13 +45,6 @@ buildPythonPackage rec {
     })
   ];
 
-  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    # The analytics tests often timeout under load on Darwin (e.g. on Hydra), so remove them
-    substituteInPlace testsuite/meson.build --replace-fail \
-      "['Test analytics', 'test_analytics.py', ['gst-plugins-bad/gst-libs/gst/analytics', 'gst-plugins-base/gst-libs/gst/video']]," \
-      ""
-  '';
-
   # Python 2.x is not supported.
   disabled = !isPy3k;
 
@@ -80,8 +76,20 @@ buildPythonPackage rec {
     "-Dpygi-overrides-dir=${placeholder "out"}/${python.sitePackages}/gi/overrides"
     # Exec format error during configure
     "-Dpython-exe=${python.pythonOnBuildForHost.interpreter}"
+    # This is needed to prevent the project from looking for `gst-rtsp-server`
+    # from `checkInputs`.
+    #
+    # TODO: This should probably be moved at least partially into the Meson hook.
+    #
+    # NB: We need to use `doInstallCheck` here because `buildPythonPackage`
+    # renames `doCheck` to `doInstallCheck`.
+    (lib.mesonEnable "tests" gst-python.doInstallCheck)
   ];
 
+  # Tests are very flaky on Darwin.
+  # See: https://github.com/NixOS/nixpkgs/issues/454955
+  doCheck = !stdenv.hostPlatform.isDarwin;
+
   # `buildPythonPackage` uses `installCheckPhase` and leaves `checkPhase`
   # empty. It renames `doCheck` from its arguments, but not `checkPhase`.
   # See: https://github.com/NixOS/nixpkgs/issues/47390

From 2abed6dcaf73c191555e97924761ac499b4c8300 Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Mon, 27 Oct 2025 07:54:07 +0800
Subject: [PATCH 32/85] sly: use flutter335

---
 pkgs/by-name/sl/sly/package.nix       |   4 +-
 pkgs/by-name/sl/sly/pubspec.lock.json | 248 +++++++++++++-------------
 2 files changed, 126 insertions(+), 126 deletions(-)

diff --git a/pkgs/by-name/sl/sly/package.nix b/pkgs/by-name/sl/sly/package.nix
index 0a8b7aaaa8bd..1942accedd6f 100644
--- a/pkgs/by-name/sl/sly/package.nix
+++ b/pkgs/by-name/sl/sly/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   fetchFromGitHub,
-  flutter327,
+  flutter335,
   runCommand,
   yq,
   sly,
@@ -9,7 +9,7 @@
   gitUpdater,
 }:
 
-flutter327.buildFlutterApplication rec {
+flutter335.buildFlutterApplication rec {
   pname = "sly";
   version = "1.0.0";
 
diff --git a/pkgs/by-name/sl/sly/pubspec.lock.json b/pkgs/by-name/sl/sly/pubspec.lock.json
index 75cf3d4ac115..42f179ac1731 100644
--- a/pkgs/by-name/sl/sly/pubspec.lock.json
+++ b/pkgs/by-name/sl/sly/pubspec.lock.json
@@ -4,51 +4,51 @@
       "dependency": "transitive",
       "description": {
         "name": "archive",
-        "sha256": "08064924cbf0ab88280a0c3f60db9dd24fec693927e725ecb176f16c629d1cb8",
+        "sha256": "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.0.1"
+      "version": "4.0.7"
     },
     "args": {
       "dependency": "transitive",
       "description": {
         "name": "args",
-        "sha256": "bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6",
+        "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.6.0"
+      "version": "2.7.0"
     },
     "async": {
       "dependency": "transitive",
       "description": {
         "name": "async",
-        "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c",
+        "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.11.0"
+      "version": "2.13.0"
     },
     "boolean_selector": {
       "dependency": "transitive",
       "description": {
         "name": "boolean_selector",
-        "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66",
+        "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.1"
+      "version": "2.1.2"
     },
     "characters": {
       "dependency": "transitive",
       "description": {
         "name": "characters",
-        "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605",
+        "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.0"
+      "version": "1.4.0"
     },
     "cli_util": {
       "dependency": "transitive",
@@ -64,21 +64,21 @@
       "dependency": "transitive",
       "description": {
         "name": "clock",
-        "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf",
+        "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.1"
+      "version": "1.1.2"
     },
     "collection": {
       "dependency": "transitive",
       "description": {
         "name": "collection",
-        "sha256": "a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf",
+        "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.19.0"
+      "version": "1.19.1"
     },
     "console": {
       "dependency": "transitive",
@@ -94,11 +94,11 @@
       "dependency": "direct main",
       "description": {
         "name": "crop_image",
-        "sha256": "2e629cd141a360cb9060b5a0837fd49b0260d3d931244717213bf164f6813c82",
+        "sha256": "4fdebd00d0c7d1a6e3abeb1e3843efbc202204b867f3e377fcebcf77aaf69a17",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.15"
+      "version": "1.0.16"
     },
     "cross_file": {
       "dependency": "transitive",
@@ -134,21 +134,21 @@
       "dependency": "transitive",
       "description": {
         "name": "fake_async",
-        "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78",
+        "sha256": "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.1"
+      "version": "1.3.3"
     },
     "ffi": {
       "dependency": "transitive",
       "description": {
         "name": "ffi",
-        "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6",
+        "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.3"
+      "version": "2.1.4"
     },
     "file": {
       "dependency": "transitive",
@@ -164,31 +164,31 @@
       "dependency": "direct main",
       "description": {
         "name": "file_selector",
-        "sha256": "5019692b593455127794d5718304ff1ae15447dea286cdda9f0db2a796a1b828",
+        "sha256": "5f1d15a7f17115038f433d1b0ea57513cc9e29a9d5338d166cb0bef3fa90a7a0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.3"
+      "version": "1.0.4"
     },
     "file_selector_android": {
       "dependency": "transitive",
       "description": {
         "name": "file_selector_android",
-        "sha256": "98ac58e878b05ea2fdb204e7f4fc4978d90406c9881874f901428e01d3b18fbc",
+        "sha256": "2db9a2d05f66b49a3b45c4a7c2f040dd5fcd457ca30f39df7cdcf80b8cd7f2d4",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.5.1+12"
+      "version": "0.5.2+1"
     },
     "file_selector_ios": {
       "dependency": "transitive",
       "description": {
         "name": "file_selector_ios",
-        "sha256": "94b98ad950b8d40d96fee8fa88640c2e4bd8afcdd4817993bd04e20310f45420",
+        "sha256": "fc3c3fc567cd9bcae784dfeb98d37c46a8ded9e8757d37ea67e975c399bc14e0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.5.3+1"
+      "version": "0.5.3+3"
     },
     "file_selector_linux": {
       "dependency": "transitive",
@@ -204,11 +204,11 @@
       "dependency": "transitive",
       "description": {
         "name": "file_selector_macos",
-        "sha256": "271ab9986df0c135d45c3cdb6bd0faa5db6f4976d3e4b437cf7d0f258d941bfc",
+        "sha256": "88707a3bec4b988aaed3b4df5d7441ee4e987f20b286cddca5d6a8270cab23f2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.9.4+2"
+      "version": "0.9.4+5"
     },
     "file_selector_platform_interface": {
       "dependency": "transitive",
@@ -234,11 +234,11 @@
       "dependency": "transitive",
       "description": {
         "name": "file_selector_windows",
-        "sha256": "8f5d2f6590d51ecd9179ba39c64f722edc15226cc93dcc8698466ad36a4a85a4",
+        "sha256": "320fcfb6f33caa90f0b58380489fc5ac05d99ee94b61aa96ec2bff0ba81d3c2b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.9.3+3"
+      "version": "0.9.3+4"
     },
     "fl_chart": {
       "dependency": "direct main",
@@ -270,11 +270,11 @@
       "dependency": "transitive",
       "description": {
         "name": "flutter_plugin_android_lifecycle",
-        "sha256": "615a505aef59b151b46bbeef55b36ce2b6ed299d160c51d84281946f0aa0ce0e",
+        "sha256": "306f0596590e077338312f38837f595c04f28d6cdeeac392d3d74df2f0003687",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.24"
+      "version": "2.0.32"
     },
     "flutter_test": {
       "dependency": "direct dev",
@@ -292,21 +292,21 @@
       "dependency": "direct main",
       "description": {
         "name": "gal",
-        "sha256": "2771519c8b29f784d5e27f4efc2667667eef51c6c47cccaa0435a8fe8aa208e4",
+        "sha256": "969598f986789127fd407a750413249e1352116d4c2be66e81837ffeeaafdfee",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.1"
+      "version": "2.3.2"
     },
     "get_it": {
       "dependency": "transitive",
       "description": {
         "name": "get_it",
-        "sha256": "d85128a5dae4ea777324730dc65edd9c9f43155c109d5cc0a69cab74139fbac1",
+        "sha256": "a4292e7cf67193f8e7c1258203104eb2a51ec8b3a04baa14695f4064c144297b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.7.0"
+      "version": "8.2.0"
     },
     "handy_window": {
       "dependency": "direct main",
@@ -322,111 +322,111 @@
       "dependency": "transitive",
       "description": {
         "name": "http",
-        "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010",
+        "sha256": "bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.2"
+      "version": "1.5.0"
     },
     "http_parser": {
       "dependency": "transitive",
       "description": {
         "name": "http_parser",
-        "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b",
+        "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.0.2"
+      "version": "4.1.2"
     },
     "image": {
       "dependency": "direct main",
       "description": {
         "name": "image",
-        "sha256": "20842a5ad1555be624c314b0c0cc0566e8ece412f61e859a42efeb6d4101a26c",
+        "sha256": "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.5.0"
+      "version": "4.5.4"
     },
     "image_picker": {
       "dependency": "direct main",
       "description": {
         "name": "image_picker",
-        "sha256": "021834d9c0c3de46bf0fe40341fa07168407f694d9b2bb18d532dc1261867f7a",
+        "sha256": "736eb56a911cf24d1859315ad09ddec0b66104bc41a7f8c5b96b4e2620cf5041",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.2"
+      "version": "1.2.0"
     },
     "image_picker_android": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_android",
-        "sha256": "fa8141602fde3f7e2f81dbf043613eb44dfa325fa0bcf93c0f142c9f7a2c193e",
+        "sha256": "58a85e6f09fe9c4484d53d18a0bd6271b72c53fce1d05e6f745ae36d8c18efca",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.8.12+18"
+      "version": "0.8.13+5"
     },
     "image_picker_for_web": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_for_web",
-        "sha256": "717eb042ab08c40767684327be06a5d8dbb341fe791d514e4b92c7bbe1b7bb83",
+        "sha256": "40c2a6a0da15556dc0f8e38a3246064a971a9f512386c3339b89f76db87269b6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.6"
+      "version": "3.1.0"
     },
     "image_picker_ios": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_ios",
-        "sha256": "4f0568120c6fcc0aaa04511cb9f9f4d29fc3d0139884b1d06be88dcec7641d6b",
+        "sha256": "e675c22790bcc24e9abd455deead2b7a88de4b79f7327a281812f14de1a56f58",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.8.12+1"
+      "version": "0.8.13+1"
     },
     "image_picker_linux": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_linux",
-        "sha256": "4ed1d9bb36f7cd60aa6e6cd479779cc56a4cb4e4de8f49d487b1aaad831300fa",
+        "sha256": "1f81c5f2046b9ab724f85523e4af65be1d47b038160a8c8deed909762c308ed4",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.1+1"
+      "version": "0.2.2"
     },
     "image_picker_macos": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_macos",
-        "sha256": "3f5ad1e8112a9a6111c46d0b57a7be2286a9a07fc6e1976fdf5be2bd31d4ff62",
+        "sha256": "86f0f15a309de7e1a552c12df9ce5b59fe927e71385329355aec4776c6a8ec91",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.1+1"
+      "version": "0.2.2+1"
     },
     "image_picker_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_platform_interface",
-        "sha256": "9ec26d410ff46f483c5519c29c02ef0e02e13a543f882b152d4bfd2f06802f80",
+        "sha256": "567e056716333a1647c64bb6bd873cff7622233a5c3f694be28a583d4715690c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.10.0"
+      "version": "2.11.1"
     },
     "image_picker_windows": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_windows",
-        "sha256": "6ad07afc4eb1bc25f3a01084d28520496c4a3bb0cb13685435838167c9dcedeb",
+        "sha256": "d248c86554a72b5495a31c56f060cf73a41c7ff541689327b1a7dbccc33adfae",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.1+1"
+      "version": "0.2.2"
     },
     "json_annotation": {
       "dependency": "transitive",
@@ -442,31 +442,31 @@
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker",
-        "sha256": "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06",
+        "sha256": "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.0.7"
+      "version": "11.0.2"
     },
     "leak_tracker_flutter_testing": {
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker_flutter_testing",
-        "sha256": "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379",
+        "sha256": "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.8"
+      "version": "3.0.10"
     },
     "leak_tracker_testing": {
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker_testing",
-        "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3",
+        "sha256": "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.1"
+      "version": "3.0.2"
     },
     "lints": {
       "dependency": "transitive",
@@ -482,11 +482,11 @@
       "dependency": "transitive",
       "description": {
         "name": "matcher",
-        "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb",
+        "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.12.16+1"
+      "version": "0.12.17"
     },
     "material_color_utilities": {
       "dependency": "transitive",
@@ -502,11 +502,11 @@
       "dependency": "transitive",
       "description": {
         "name": "meta",
-        "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7",
+        "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.15.0"
+      "version": "1.16.0"
     },
     "mime": {
       "dependency": "transitive",
@@ -522,31 +522,31 @@
       "dependency": "direct dev",
       "description": {
         "name": "msix",
-        "sha256": "c50d6bd1aafe0d071a3c1e5a5ccb056404502935cb0a549e3178c4aae16caf33",
+        "sha256": "f88033fcb9e0dd8de5b18897cbebbd28ea30596810f4a7c86b12b0c03ace87e5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.16.8"
+      "version": "3.16.12"
     },
     "package_config": {
       "dependency": "transitive",
       "description": {
         "name": "package_config",
-        "sha256": "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67",
+        "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.1"
+      "version": "2.2.0"
     },
     "path": {
       "dependency": "transitive",
       "description": {
         "name": "path",
-        "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af",
+        "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.9.0"
+      "version": "1.9.1"
     },
     "path_provider_linux": {
       "dependency": "transitive",
@@ -582,11 +582,11 @@
       "dependency": "transitive",
       "description": {
         "name": "petitparser",
-        "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27",
+        "sha256": "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.0.2"
+      "version": "7.0.1"
     },
     "platform": {
       "dependency": "transitive",
@@ -612,21 +612,21 @@
       "dependency": "transitive",
       "description": {
         "name": "posix",
-        "sha256": "a0117dc2167805aa9125b82eee515cc891819bac2f538c83646d355b16f58b9a",
+        "sha256": "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.0.1"
+      "version": "6.0.3"
     },
     "pub_semver": {
       "dependency": "transitive",
       "description": {
         "name": "pub_semver",
-        "sha256": "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd",
+        "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.5"
+      "version": "2.2.0"
     },
     "screen_retriever": {
       "dependency": "transitive",
@@ -682,31 +682,31 @@
       "dependency": "direct main",
       "description": {
         "name": "shared_preferences",
-        "sha256": "3c7e73920c694a436afaf65ab60ce3453d91f84208d761fbd83fc21182134d93",
+        "sha256": "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.4"
+      "version": "2.5.3"
     },
     "shared_preferences_android": {
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_android",
-        "sha256": "02a7d8a9ef346c9af715811b01fbd8e27845ad2c41148eefd31321471b41863d",
+        "sha256": "34266009473bf71d748912da4bf62d439185226c03e01e2d9687bc65bbfcb713",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.0"
+      "version": "2.4.15"
     },
     "shared_preferences_foundation": {
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_foundation",
-        "sha256": "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03",
+        "sha256": "1c33a907142607c40a7542768ec9badfd16293bac51da3a4482623d15845f88b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.4"
+      "version": "2.5.5"
     },
     "shared_preferences_linux": {
       "dependency": "transitive",
@@ -732,11 +732,11 @@
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_web",
-        "sha256": "d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e",
+        "sha256": "c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.2"
+      "version": "2.4.3"
     },
     "shared_preferences_windows": {
       "dependency": "transitive",
@@ -758,61 +758,61 @@
       "dependency": "transitive",
       "description": {
         "name": "source_span",
-        "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c",
+        "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.10.0"
+      "version": "1.10.1"
     },
     "stack_trace": {
       "dependency": "transitive",
       "description": {
         "name": "stack_trace",
-        "sha256": "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377",
+        "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.12.0"
+      "version": "1.12.1"
     },
     "stream_channel": {
       "dependency": "transitive",
       "description": {
         "name": "stream_channel",
-        "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7",
+        "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.2"
+      "version": "2.1.4"
     },
     "string_scanner": {
       "dependency": "transitive",
       "description": {
         "name": "string_scanner",
-        "sha256": "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3",
+        "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.0"
+      "version": "1.4.1"
     },
     "term_glyph": {
       "dependency": "transitive",
       "description": {
         "name": "term_glyph",
-        "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84",
+        "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.1"
+      "version": "1.2.2"
     },
     "test_api": {
       "dependency": "transitive",
       "description": {
         "name": "test_api",
-        "sha256": "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c",
+        "sha256": "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.3"
+      "version": "0.7.6"
     },
     "typed_data": {
       "dependency": "transitive",
@@ -828,31 +828,31 @@
       "dependency": "direct main",
       "description": {
         "name": "url_launcher",
-        "sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603",
+        "sha256": "f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.1"
+      "version": "6.3.2"
     },
     "url_launcher_android": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_android",
-        "sha256": "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193",
+        "sha256": "5c8b6c2d89a78f5a1cca70a73d9d5f86c701b36b42f9c9dac7bad592113c28e9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.14"
+      "version": "6.3.24"
     },
     "url_launcher_ios": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_ios",
-        "sha256": "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626",
+        "sha256": "6b63f1441e4f653ae799166a72b50b1767321ecc263a57aadf825a7a2a5477d9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.2"
+      "version": "6.3.5"
     },
     "url_launcher_linux": {
       "dependency": "transitive",
@@ -868,11 +868,11 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_macos",
-        "sha256": "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2",
+        "sha256": "8262208506252a3ed4ff5c0dc1e973d2c0e0ef337d0a074d35634da5d44397c9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.2.2"
+      "version": "3.2.4"
     },
     "url_launcher_platform_interface": {
       "dependency": "transitive",
@@ -888,51 +888,51 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_web",
-        "sha256": "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e",
+        "sha256": "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.3"
+      "version": "2.4.1"
     },
     "url_launcher_windows": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_windows",
-        "sha256": "44cf3aabcedde30f2dba119a9dea3b0f2672fbe6fa96e85536251d678216b3c4",
+        "sha256": "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.3"
+      "version": "3.1.4"
     },
     "vector_math": {
       "dependency": "transitive",
       "description": {
         "name": "vector_math",
-        "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803",
+        "sha256": "d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.4"
+      "version": "2.2.0"
     },
     "vm_service": {
       "dependency": "transitive",
       "description": {
         "name": "vm_service",
-        "sha256": "f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b",
+        "sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "14.3.0"
+      "version": "15.0.2"
     },
     "web": {
       "dependency": "transitive",
       "description": {
         "name": "web",
-        "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb",
+        "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.0"
+      "version": "1.1.1"
     },
     "window_manager": {
       "dependency": "direct main",
@@ -958,25 +958,25 @@
       "dependency": "transitive",
       "description": {
         "name": "xml",
-        "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226",
+        "sha256": "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.5.0"
+      "version": "6.6.1"
     },
     "yaml": {
       "dependency": "transitive",
       "description": {
         "name": "yaml",
-        "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5",
+        "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.2"
+      "version": "3.1.3"
     }
   },
   "sdks": {
-    "dart": ">=3.5.0 <4.0.0",
-    "flutter": ">=3.24.0"
+    "dart": ">=3.9.0 <4.0.0",
+    "flutter": ">=3.35.0"
   }
 }

From 5f168f912863015a27fbec8cf51b93a85e2ec0a8 Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Mon, 27 Oct 2025 07:54:12 +0800
Subject: [PATCH 33/85] localsend: use flutter329

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

diff --git a/pkgs/by-name/lo/localsend/package.nix b/pkgs/by-name/lo/localsend/package.nix
index f07e589d9f37..6648bb188a06 100644
--- a/pkgs/by-name/lo/localsend/package.nix
+++ b/pkgs/by-name/lo/localsend/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchurl,
   fetchFromGitHub,
-  flutter327,
+  flutter329,
   makeDesktopItem,
   copyDesktopItems,
   nixosTests,
@@ -16,7 +16,7 @@ let
   pname = "localsend";
   version = "1.17.0";
 
-  linux = flutter327.buildFlutterApplication rec {
+  linux = flutter329.buildFlutterApplication rec {
     inherit pname version;
 
     src = fetchFromGitHub {

From 08bee0d36eb69e11821a599ab5a4993abd41de77 Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Mon, 27 Oct 2025 07:54:15 +0800
Subject: [PATCH 34/85] evolve-core: use flutter329

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

diff --git a/pkgs/by-name/ev/evolve-core/package.nix b/pkgs/by-name/ev/evolve-core/package.nix
index 4c94f52eaf3f..aa1600caf939 100644
--- a/pkgs/by-name/ev/evolve-core/package.nix
+++ b/pkgs/by-name/ev/evolve-core/package.nix
@@ -1,12 +1,12 @@
 {
   lib,
   fetchFromGitHub,
-  flutter327,
+  flutter329,
   makeDesktopItem,
   copyDesktopItems,
 }:
 
-flutter327.buildFlutterApplication rec {
+flutter329.buildFlutterApplication rec {
   pname = "evolve-core";
   version = "1.7";
 

From cec755ba1e4091798053278fd6959874b82fb672 Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Mon, 27 Oct 2025 07:54:18 +0800
Subject: [PATCH 35/85] pied: use flutter329

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

diff --git a/pkgs/by-name/pi/pied/package.nix b/pkgs/by-name/pi/pied/package.nix
index adb55f8e4562..b76499e7f527 100644
--- a/pkgs/by-name/pi/pied/package.nix
+++ b/pkgs/by-name/pi/pied/package.nix
@@ -1,11 +1,11 @@
 {
   lib,
   fetchFromGitHub,
-  flutter327,
+  flutter329,
   gst_all_1,
 }:
 
-flutter327.buildFlutterApplication rec {
+flutter329.buildFlutterApplication rec {
   pname = "pied";
   version = "0.3.1";
 

From 7758b7a10fbd413ca01d4cdde95ffedc7a518306 Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Mon, 27 Oct 2025 07:54:22 +0800
Subject: [PATCH 36/85] bluebubbles: use flutter329

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

diff --git a/pkgs/by-name/bl/bluebubbles/package.nix b/pkgs/by-name/bl/bluebubbles/package.nix
index da4665d51bc8..4e2f45c4f595 100644
--- a/pkgs/by-name/bl/bluebubbles/package.nix
+++ b/pkgs/by-name/bl/bluebubbles/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  flutter327,
+  flutter329,
   fetchFromGitHub,
   autoPatchelfHook,
   webkitgtk_4_1,
@@ -10,7 +10,7 @@
   mpv,
 }:
 
-flutter327.buildFlutterApplication rec {
+flutter329.buildFlutterApplication rec {
   pname = "bluebubbles";
   version = "1.15.4";
 

From ee21b31ef7a1c4cc5b792646df7bae001c749a05 Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Mon, 27 Oct 2025 07:54:25 +0800
Subject: [PATCH 37/85] flutter327: drop

---
 .../compilers/flutter/versions/3_27/data.json | 1056 -----------------
 ...deregister-pub-dependencies-artifact.patch |   19 -
 .../3_27/patches/disable-auto-update.patch    |   30 -
 .../fix-ios-build-xcode-backend-sh.patch      |   69 --
 .../gradle-flutter-tools-wrapper.patch        |   44 -
 pkgs/top-level/aliases.nix                    |    1 +
 pkgs/top-level/all-packages.nix               |    1 -
 7 files changed, 1 insertion(+), 1219 deletions(-)
 delete mode 100644 pkgs/development/compilers/flutter/versions/3_27/data.json
 delete mode 100644 pkgs/development/compilers/flutter/versions/3_27/patches/deregister-pub-dependencies-artifact.patch
 delete mode 100644 pkgs/development/compilers/flutter/versions/3_27/patches/disable-auto-update.patch
 delete mode 100644 pkgs/development/compilers/flutter/versions/3_27/patches/fix-ios-build-xcode-backend-sh.patch
 delete mode 100644 pkgs/development/compilers/flutter/versions/3_27/patches/gradle-flutter-tools-wrapper.patch

diff --git a/pkgs/development/compilers/flutter/versions/3_27/data.json b/pkgs/development/compilers/flutter/versions/3_27/data.json
deleted file mode 100644
index c6361eb21b06..000000000000
--- a/pkgs/development/compilers/flutter/versions/3_27/data.json
+++ /dev/null
@@ -1,1056 +0,0 @@
-{
-  "version": "3.27.4",
-  "engineVersion": "82bd5b7209295a5b7ff8cae0df96e7870171e3a5",
-  "engineSwiftShaderHash": "sha256-mRLCvhNkmHz7Rv6GzXkY7OB1opBSq+ATWZ466qZdgto=",
-  "engineSwiftShaderRev": "2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f",
-  "channel": "stable",
-  "engineHashes": {
-    "aarch64-linux": {
-      "aarch64-linux": "sha256-Av8G5i4g9s6SrOpLUIw9WOSJ4hMQO+ANIaTIVpTsP+Y=",
-      "x86_64-linux": "sha256-Av8G5i4g9s6SrOpLUIw9WOSJ4hMQO+ANIaTIVpTsP+Y="
-    },
-    "x86_64-linux": {
-      "aarch64-linux": "sha256-PDSA0B/6mZTLC5gRlR8F6+p8V5dKmM7OALjehrPlQ1g=",
-      "x86_64-linux": "sha256-PDSA0B/6mZTLC5gRlR8F6+p8V5dKmM7OALjehrPlQ1g="
-    }
-  },
-  "dartVersion": "3.6.2",
-  "dartHash": {
-    "x86_64-linux": "sha256-um3/S/XleAVGor8YVUIjhViDAXUiSKnJI7RchM9k1yc=",
-    "aarch64-linux": "sha256-PSGO/MVDO3fgvlrfzdXQizgtVI5+fDWwHk/DG3yH0X4=",
-    "x86_64-darwin": "sha256-QshSLyTOYZn7N+vE6AfqLZ5CFei4h3xlWJo//iyaVA4=",
-    "aarch64-darwin": "sha256-Js1Mk0M19+0eQwprtlDSryI1vDEO5wvx8gzklb5au0Y="
-  },
-  "flutterHash": "sha256-OvWmEvrkXrGGda3vVVuMo90pZeZcWOzJUztL5qW5Foc=",
-  "artifactHashes": {
-    "android": {
-      "aarch64-darwin": "sha256-yaw7wBcJx1rZLdZCMc7xJMKgU1KIiDFDSZ+O4mMOBY8=",
-      "aarch64-linux": "sha256-53Jxb+GcrpABdMkQ1J+xEaXO5+AQTqRmaPVDY77Vu2Q=",
-      "x86_64-darwin": "sha256-yaw7wBcJx1rZLdZCMc7xJMKgU1KIiDFDSZ+O4mMOBY8=",
-      "x86_64-linux": "sha256-53Jxb+GcrpABdMkQ1J+xEaXO5+AQTqRmaPVDY77Vu2Q="
-    },
-    "fuchsia": {
-      "aarch64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=",
-      "aarch64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=",
-      "x86_64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=",
-      "x86_64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk="
-    },
-    "ios": {
-      "aarch64-darwin": "sha256-h0HdJl3Ptu/zNVMkg6oM/dtGC++KBjiUXhieJwhUUZk=",
-      "aarch64-linux": "sha256-h0HdJl3Ptu/zNVMkg6oM/dtGC++KBjiUXhieJwhUUZk=",
-      "x86_64-darwin": "sha256-h0HdJl3Ptu/zNVMkg6oM/dtGC++KBjiUXhieJwhUUZk=",
-      "x86_64-linux": "sha256-h0HdJl3Ptu/zNVMkg6oM/dtGC++KBjiUXhieJwhUUZk="
-    },
-    "linux": {
-      "aarch64-darwin": "sha256-Mrj4+et2rr7ePrrMHk4jyQCR3YnyA5ltCeVLtp5ZlAk=",
-      "aarch64-linux": "sha256-Mrj4+et2rr7ePrrMHk4jyQCR3YnyA5ltCeVLtp5ZlAk=",
-      "x86_64-darwin": "sha256-us1EjjtmJ8Diy/uCqnzt8xVlIvS9uQnR8AqZCTqBXWg=",
-      "x86_64-linux": "sha256-us1EjjtmJ8Diy/uCqnzt8xVlIvS9uQnR8AqZCTqBXWg="
-    },
-    "macos": {
-      "aarch64-darwin": "sha256-rRqZ/gDOxGpeT6CEU972DzLBBH/gNaQvZVkOT/PNt5M=",
-      "aarch64-linux": "sha256-rRqZ/gDOxGpeT6CEU972DzLBBH/gNaQvZVkOT/PNt5M=",
-      "x86_64-darwin": "sha256-rRqZ/gDOxGpeT6CEU972DzLBBH/gNaQvZVkOT/PNt5M=",
-      "x86_64-linux": "sha256-rRqZ/gDOxGpeT6CEU972DzLBBH/gNaQvZVkOT/PNt5M="
-    },
-    "universal": {
-      "aarch64-darwin": "sha256-48EzEp20xrYt63fo7onlTkb74w0zipIkM3vBlV8x5DE=",
-      "aarch64-linux": "sha256-m1eTxvOef6V6Mo5nXd+Jr3NNrOhE8lq9QBz+93ipvS8=",
-      "x86_64-darwin": "sha256-05XSP1LcjchgwTNg4qTyFRQRLS04N1e13lNSdk5YaXQ=",
-      "x86_64-linux": "sha256-QwcKF6APpvTLGVRKHHwAJ0QYYaQPC7PeMggb+fn61ro="
-    },
-    "web": {
-      "aarch64-darwin": "sha256-hYRBoRRVKauvFaorijlEPcVvY3RtXQmCe+9XBHJABpc=",
-      "aarch64-linux": "sha256-hYRBoRRVKauvFaorijlEPcVvY3RtXQmCe+9XBHJABpc=",
-      "x86_64-darwin": "sha256-hYRBoRRVKauvFaorijlEPcVvY3RtXQmCe+9XBHJABpc=",
-      "x86_64-linux": "sha256-hYRBoRRVKauvFaorijlEPcVvY3RtXQmCe+9XBHJABpc="
-    },
-    "windows": {
-      "x86_64-darwin": "sha256-QIZm6Ro+47B1aPjit8mlVt/p3Fwg69AOdzDXF+Yodqg=",
-      "x86_64-linux": "sha256-QIZm6Ro+47B1aPjit8mlVt/p3Fwg69AOdzDXF+Yodqg="
-    }
-  },
-  "pubspecLock": {
-    "packages": {
-      "_fe_analyzer_shared": {
-        "dependency": "direct main",
-        "description": {
-          "name": "_fe_analyzer_shared",
-          "sha256": "f6dbf021f4b214d85c79822912c5fcd142a2c4869f01222ad371bc51f9f1c356",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "74.0.0"
-      },
-      "_macros": {
-        "dependency": "transitive",
-        "description": "dart",
-        "source": "sdk",
-        "version": "0.3.3"
-      },
-      "analyzer": {
-        "dependency": "direct main",
-        "description": {
-          "name": "analyzer",
-          "sha256": "f7e8caf82f2d3190881d81012606effdf8a38e6c1ab9e30947149733065f817c",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "6.9.0"
-      },
-      "archive": {
-        "dependency": "direct main",
-        "description": {
-          "name": "archive",
-          "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "3.6.1"
-      },
-      "args": {
-        "dependency": "direct main",
-        "description": {
-          "name": "args",
-          "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.5.0"
-      },
-      "async": {
-        "dependency": "direct main",
-        "description": {
-          "name": "async",
-          "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.11.0"
-      },
-      "boolean_selector": {
-        "dependency": "direct main",
-        "description": {
-          "name": "boolean_selector",
-          "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.1.1"
-      },
-      "browser_launcher": {
-        "dependency": "direct main",
-        "description": {
-          "name": "browser_launcher",
-          "sha256": "54a2da4d152c34760b87cbd4a9fe8a563379487e57bfcd1b387be394dfa91734",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.1.2"
-      },
-      "built_collection": {
-        "dependency": "direct main",
-        "description": {
-          "name": "built_collection",
-          "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "5.1.1"
-      },
-      "built_value": {
-        "dependency": "direct main",
-        "description": {
-          "name": "built_value",
-          "sha256": "c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "8.9.2"
-      },
-      "checked_yaml": {
-        "dependency": "direct dev",
-        "description": {
-          "name": "checked_yaml",
-          "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.0.3"
-      },
-      "cli_config": {
-        "dependency": "direct main",
-        "description": {
-          "name": "cli_config",
-          "sha256": "ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.2.0"
-      },
-      "clock": {
-        "dependency": "direct main",
-        "description": {
-          "name": "clock",
-          "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.1.1"
-      },
-      "collection": {
-        "dependency": "direct dev",
-        "description": {
-          "name": "collection",
-          "sha256": "a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.19.0"
-      },
-      "completion": {
-        "dependency": "direct main",
-        "description": {
-          "name": "completion",
-          "sha256": "f11b7a628e6c42b9edc9b0bc3aa490e2d930397546d2f794e8e1325909d11c60",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.0.1"
-      },
-      "convert": {
-        "dependency": "direct main",
-        "description": {
-          "name": "convert",
-          "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "3.1.1"
-      },
-      "coverage": {
-        "dependency": "direct main",
-        "description": {
-          "name": "coverage",
-          "sha256": "c1fb2dce3c0085f39dc72668e85f8e0210ec7de05345821ff58530567df345a5",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.9.2"
-      },
-      "crypto": {
-        "dependency": "direct main",
-        "description": {
-          "name": "crypto",
-          "sha256": "ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "3.0.5"
-      },
-      "csslib": {
-        "dependency": "direct main",
-        "description": {
-          "name": "csslib",
-          "sha256": "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.0.0"
-      },
-      "dap": {
-        "dependency": "direct main",
-        "description": {
-          "name": "dap",
-          "sha256": "c0e53b52c9529d901329045afc4c5acb04304a28acde4b54ab0a08a93da546aa",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.3.0"
-      },
-      "dds": {
-        "dependency": "direct main",
-        "description": {
-          "name": "dds",
-          "sha256": "c90723eb1f1402429c57f717550ce5af80288d74a27c45ccbe754a0e3e038f95",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "4.2.7"
-      },
-      "dds_service_extensions": {
-        "dependency": "direct main",
-        "description": {
-          "name": "dds_service_extensions",
-          "sha256": "390ae1d0128bb43ffe11f8e3c6cd3a481c1920492d1026883d379cee50bdf1a2",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.0.0"
-      },
-      "devtools_shared": {
-        "dependency": "direct main",
-        "description": {
-          "name": "devtools_shared",
-          "sha256": "72369878105eccd563547afbad97407a2431b96bd4c04a1d6da75cb068437f50",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "10.0.2"
-      },
-      "dtd": {
-        "dependency": "direct main",
-        "description": {
-          "name": "dtd",
-          "sha256": "6e4e508c0d03e12e2c96f21faa0e5acc191f9431ecd02adb8daee64dbfae6b86",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.3.0"
-      },
-      "dwds": {
-        "dependency": "direct main",
-        "description": {
-          "name": "dwds",
-          "sha256": "d0cf9d18511df6b397c40527f3fd8ddb47b7efcc501e703dd94f13cabaf82ffc",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "24.1.0"
-      },
-      "extension_discovery": {
-        "dependency": "direct main",
-        "description": {
-          "name": "extension_discovery",
-          "sha256": "de1fce715ab013cdfb00befc3bdf0914bea5e409c3a567b7f8f144bc061611a7",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.1.0"
-      },
-      "fake_async": {
-        "dependency": "direct main",
-        "description": {
-          "name": "fake_async",
-          "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.3.1"
-      },
-      "ffi": {
-        "dependency": "direct main",
-        "description": {
-          "name": "ffi",
-          "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.1.3"
-      },
-      "file": {
-        "dependency": "direct main",
-        "description": {
-          "name": "file",
-          "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "7.0.0"
-      },
-      "file_testing": {
-        "dependency": "direct dev",
-        "description": {
-          "name": "file_testing",
-          "sha256": "0aaadb4025bd350403f4308ad6c4cea953278d9407814b8342558e4946840fb5",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "3.0.0"
-      },
-      "fixnum": {
-        "dependency": "direct main",
-        "description": {
-          "name": "fixnum",
-          "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.1.0"
-      },
-      "flutter_template_images": {
-        "dependency": "direct main",
-        "description": {
-          "name": "flutter_template_images",
-          "sha256": "fd3e55af73c577b9e3f88d4080d3e366cb5c8ef3fbd50b94dfeca56bb0235df6",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "4.2.0"
-      },
-      "frontend_server_client": {
-        "dependency": "direct main",
-        "description": {
-          "name": "frontend_server_client",
-          "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "4.0.0"
-      },
-      "glob": {
-        "dependency": "direct main",
-        "description": {
-          "name": "glob",
-          "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.1.2"
-      },
-      "graphs": {
-        "dependency": "direct main",
-        "description": {
-          "name": "graphs",
-          "sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.3.2"
-      },
-      "html": {
-        "dependency": "direct main",
-        "description": {
-          "name": "html",
-          "sha256": "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.15.4"
-      },
-      "http": {
-        "dependency": "direct main",
-        "description": {
-          "name": "http",
-          "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.2.2"
-      },
-      "http_multi_server": {
-        "dependency": "direct main",
-        "description": {
-          "name": "http_multi_server",
-          "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "3.2.1"
-      },
-      "http_parser": {
-        "dependency": "direct main",
-        "description": {
-          "name": "http_parser",
-          "sha256": "40f592dd352890c3b60fec1b68e786cefb9603e05ff303dbc4dda49b304ecdf4",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "4.1.0"
-      },
-      "intl": {
-        "dependency": "direct main",
-        "description": {
-          "name": "intl",
-          "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.19.0"
-      },
-      "io": {
-        "dependency": "direct main",
-        "description": {
-          "name": "io",
-          "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.0.4"
-      },
-      "js": {
-        "dependency": "direct main",
-        "description": {
-          "name": "js",
-          "sha256": "c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.7.1"
-      },
-      "json_annotation": {
-        "dependency": "direct dev",
-        "description": {
-          "name": "json_annotation",
-          "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "4.9.0"
-      },
-      "json_rpc_2": {
-        "dependency": "direct main",
-        "description": {
-          "name": "json_rpc_2",
-          "sha256": "5e469bffa23899edacb7b22787780068d650b106a21c76db3c49218ab7ca447e",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "3.0.2"
-      },
-      "logging": {
-        "dependency": "direct main",
-        "description": {
-          "name": "logging",
-          "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.2.0"
-      },
-      "macros": {
-        "dependency": "transitive",
-        "description": {
-          "name": "macros",
-          "sha256": "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.1.3-main.0"
-      },
-      "matcher": {
-        "dependency": "direct main",
-        "description": {
-          "name": "matcher",
-          "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.12.16+1"
-      },
-      "meta": {
-        "dependency": "direct main",
-        "description": {
-          "name": "meta",
-          "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.15.0"
-      },
-      "mime": {
-        "dependency": "direct main",
-        "description": {
-          "name": "mime",
-          "sha256": "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.0.6"
-      },
-      "multicast_dns": {
-        "dependency": "direct main",
-        "description": {
-          "name": "multicast_dns",
-          "sha256": "982c4cc4cda5f98dd477bddfd623e8e4bd1014e7dbf9e7b05052e14a5b550b99",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.3.2+7"
-      },
-      "mustache_template": {
-        "dependency": "direct main",
-        "description": {
-          "name": "mustache_template",
-          "sha256": "a46e26f91445bfb0b60519be280555b06792460b27b19e2b19ad5b9740df5d1c",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.0.0"
-      },
-      "native_assets_builder": {
-        "dependency": "direct main",
-        "description": {
-          "name": "native_assets_builder",
-          "sha256": "ad76e66cc1ca7aa922d682651aee2663cd80e6ba483a346d13a8c40f604ebfd9",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.8.3"
-      },
-      "native_assets_cli": {
-        "dependency": "direct main",
-        "description": {
-          "name": "native_assets_cli",
-          "sha256": "db902509468ec2a6c6d11fa9ce02805ede280e8dbfb5f0014ef3de8483cadfce",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.8.0"
-      },
-      "native_stack_traces": {
-        "dependency": "direct main",
-        "description": {
-          "name": "native_stack_traces",
-          "sha256": "8ba566c10ea781491c203876b04b9bdcf19dfbe17b9e486869f20eaae0ee470f",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.6.0"
-      },
-      "node_preamble": {
-        "dependency": "direct main",
-        "description": {
-          "name": "node_preamble",
-          "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.0.2"
-      },
-      "package_config": {
-        "dependency": "direct main",
-        "description": {
-          "name": "package_config",
-          "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.1.0"
-      },
-      "path": {
-        "dependency": "direct main",
-        "description": {
-          "name": "path",
-          "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.9.0"
-      },
-      "petitparser": {
-        "dependency": "direct main",
-        "description": {
-          "name": "petitparser",
-          "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "6.0.2"
-      },
-      "platform": {
-        "dependency": "direct main",
-        "description": {
-          "name": "platform",
-          "sha256": "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "3.1.5"
-      },
-      "pool": {
-        "dependency": "direct main",
-        "description": {
-          "name": "pool",
-          "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.5.1"
-      },
-      "process": {
-        "dependency": "direct main",
-        "description": {
-          "name": "process",
-          "sha256": "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "5.0.2"
-      },
-      "pub_semver": {
-        "dependency": "direct main",
-        "description": {
-          "name": "pub_semver",
-          "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.1.4"
-      },
-      "pubspec_parse": {
-        "dependency": "direct dev",
-        "description": {
-          "name": "pubspec_parse",
-          "sha256": "c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.3.0"
-      },
-      "shelf": {
-        "dependency": "direct main",
-        "description": {
-          "name": "shelf",
-          "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.4.2"
-      },
-      "shelf_packages_handler": {
-        "dependency": "direct main",
-        "description": {
-          "name": "shelf_packages_handler",
-          "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "3.0.2"
-      },
-      "shelf_proxy": {
-        "dependency": "direct main",
-        "description": {
-          "name": "shelf_proxy",
-          "sha256": "a71d2307f4393211930c590c3d2c00630f6c5a7a77edc1ef6436dfd85a6a7ee3",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.0.4"
-      },
-      "shelf_static": {
-        "dependency": "direct main",
-        "description": {
-          "name": "shelf_static",
-          "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.1.3"
-      },
-      "shelf_web_socket": {
-        "dependency": "direct main",
-        "description": {
-          "name": "shelf_web_socket",
-          "sha256": "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.0.0"
-      },
-      "source_map_stack_trace": {
-        "dependency": "direct main",
-        "description": {
-          "name": "source_map_stack_trace",
-          "sha256": "c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.1.2"
-      },
-      "source_maps": {
-        "dependency": "direct main",
-        "description": {
-          "name": "source_maps",
-          "sha256": "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.10.12"
-      },
-      "source_span": {
-        "dependency": "direct main",
-        "description": {
-          "name": "source_span",
-          "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.10.0"
-      },
-      "sprintf": {
-        "dependency": "direct main",
-        "description": {
-          "name": "sprintf",
-          "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "7.0.0"
-      },
-      "sse": {
-        "dependency": "direct main",
-        "description": {
-          "name": "sse",
-          "sha256": "111a05843ea9035042975744fe61d5e8b95bc4d38656dbafc5532da77a0bb89a",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "4.1.6"
-      },
-      "stack_trace": {
-        "dependency": "direct main",
-        "description": {
-          "name": "stack_trace",
-          "sha256": "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.12.0"
-      },
-      "standard_message_codec": {
-        "dependency": "direct main",
-        "description": {
-          "name": "standard_message_codec",
-          "sha256": "fc7dd712d191b7e33196a0ecf354c4573492bb95995e7166cb6f73b047f9cae0",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.0.1+4"
-      },
-      "stream_channel": {
-        "dependency": "direct main",
-        "description": {
-          "name": "stream_channel",
-          "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.1.2"
-      },
-      "string_scanner": {
-        "dependency": "direct main",
-        "description": {
-          "name": "string_scanner",
-          "sha256": "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.3.0"
-      },
-      "sync_http": {
-        "dependency": "direct main",
-        "description": {
-          "name": "sync_http",
-          "sha256": "7f0cd72eca000d2e026bcd6f990b81d0ca06022ef4e32fb257b30d3d1014a961",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.3.1"
-      },
-      "term_glyph": {
-        "dependency": "direct main",
-        "description": {
-          "name": "term_glyph",
-          "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.2.1"
-      },
-      "test": {
-        "dependency": "direct main",
-        "description": {
-          "name": "test",
-          "sha256": "713a8789d62f3233c46b4a90b174737b2c04cb6ae4500f2aa8b1be8f03f5e67f",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.25.8"
-      },
-      "test_api": {
-        "dependency": "direct main",
-        "description": {
-          "name": "test_api",
-          "sha256": "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.7.3"
-      },
-      "test_core": {
-        "dependency": "direct main",
-        "description": {
-          "name": "test_core",
-          "sha256": "12391302411737c176b0b5d6491f466b0dd56d4763e347b6714efbaa74d7953d",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.6.5"
-      },
-      "typed_data": {
-        "dependency": "direct main",
-        "description": {
-          "name": "typed_data",
-          "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.3.2"
-      },
-      "unified_analytics": {
-        "dependency": "direct main",
-        "description": {
-          "name": "unified_analytics",
-          "sha256": "9f3c68cb30faa6d05b920498d2af79eace00fef0bae9beba9f3cda84fdbe46df",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "6.1.4"
-      },
-      "usage": {
-        "dependency": "direct main",
-        "description": {
-          "name": "usage",
-          "sha256": "0bdbde65a6e710343d02a56552eeaefd20b735e04bfb6b3ee025b6b22e8d0e15",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "4.1.1"
-      },
-      "uuid": {
-        "dependency": "direct main",
-        "description": {
-          "name": "uuid",
-          "sha256": "a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "4.5.1"
-      },
-      "vm_service": {
-        "dependency": "direct main",
-        "description": {
-          "name": "vm_service",
-          "sha256": "f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "14.3.0"
-      },
-      "vm_service_interface": {
-        "dependency": "direct main",
-        "description": {
-          "name": "vm_service_interface",
-          "sha256": "f827453d9a3f8ceae04e389810da26f9b67636bdd13aa2dd9405b110c4daf59c",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.1.0"
-      },
-      "vm_snapshot_analysis": {
-        "dependency": "direct main",
-        "description": {
-          "name": "vm_snapshot_analysis",
-          "sha256": "5a79b9fbb6be2555090f55b03b23907e75d44c3fd7bdd88da09848aa5a1914c8",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.7.6"
-      },
-      "watcher": {
-        "dependency": "direct main",
-        "description": {
-          "name": "watcher",
-          "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.1.0"
-      },
-      "web": {
-        "dependency": "direct main",
-        "description": {
-          "name": "web",
-          "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.1.0"
-      },
-      "web_socket": {
-        "dependency": "direct main",
-        "description": {
-          "name": "web_socket",
-          "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.1.6"
-      },
-      "web_socket_channel": {
-        "dependency": "direct main",
-        "description": {
-          "name": "web_socket_channel",
-          "sha256": "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "3.0.1"
-      },
-      "webdriver": {
-        "dependency": "direct main",
-        "description": {
-          "name": "webdriver",
-          "sha256": "3d773670966f02a646319410766d3b5e1037efb7f07cc68f844d5e06cd4d61c8",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "3.0.4"
-      },
-      "webkit_inspection_protocol": {
-        "dependency": "direct main",
-        "description": {
-          "name": "webkit_inspection_protocol",
-          "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.2.1"
-      },
-      "xml": {
-        "dependency": "direct main",
-        "description": {
-          "name": "xml",
-          "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "6.5.0"
-      },
-      "yaml": {
-        "dependency": "direct main",
-        "description": {
-          "name": "yaml",
-          "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "3.1.2"
-      },
-      "yaml_edit": {
-        "dependency": "direct main",
-        "description": {
-          "name": "yaml_edit",
-          "sha256": "e9c1a3543d2da0db3e90270dbb1e4eebc985ee5e3ffe468d83224472b2194a5f",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.2.1"
-      }
-    },
-    "sdks": {
-      "dart": ">=3.4.3 <4.0.0"
-    }
-  }
-}
diff --git a/pkgs/development/compilers/flutter/versions/3_27/patches/deregister-pub-dependencies-artifact.patch b/pkgs/development/compilers/flutter/versions/3_27/patches/deregister-pub-dependencies-artifact.patch
deleted file mode 100644
index 01e34c6d292c..000000000000
--- a/pkgs/development/compilers/flutter/versions/3_27/patches/deregister-pub-dependencies-artifact.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/packages/flutter_tools/lib/src/flutter_cache.dart b/packages/flutter_tools/lib/src/flutter_cache.dart
-index 252021cf78..e50ef0885d 100644
---- a/packages/flutter_tools/lib/src/flutter_cache.dart
-+++ b/packages/flutter_tools/lib/src/flutter_cache.dart
-@@ -51,14 +51,6 @@ class FlutterCache extends Cache {
-       registerArtifact(IosUsbArtifacts(artifactName, this, platform: platform));
-     }
-     registerArtifact(FontSubsetArtifacts(this, platform: platform));
--    registerArtifact(PubDependencies(
--      logger: logger,
--      // flutter root and pub must be lazily initialized to avoid accessing
--      // before the version is determined.
--      flutterRoot: () => Cache.flutterRoot!,
--      pub: () => pub,
--      projectFactory: projectFactory,
--    ));
-   }
- }
- 
\ No newline at end of file
diff --git a/pkgs/development/compilers/flutter/versions/3_27/patches/disable-auto-update.patch b/pkgs/development/compilers/flutter/versions/3_27/patches/disable-auto-update.patch
deleted file mode 100644
index 2ad292efd222..000000000000
--- a/pkgs/development/compilers/flutter/versions/3_27/patches/disable-auto-update.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart
-index e4e474ab6e..5548599802 100644
---- a/packages/flutter_tools/lib/src/runner/flutter_command.dart
-+++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart
-@@ -1693,7 +1693,7 @@ Run 'flutter -h' (or 'flutter <command> -h') for available flutter commands and
- 
-     // Populate the cache. We call this before pub get below so that the
-     // sky_engine package is available in the flutter cache for pub to find.
--    if (shouldUpdateCache) {
-+    if (false) {
-       // First always update universal artifacts, as some of these (e.g.
-       // ios-deploy on macOS) are required to determine `requiredArtifacts`.
-       final bool offline;
-diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
-index 50783f8435..db94062840 100644
---- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
-+++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
-@@ -377,11 +377,7 @@ class FlutterCommandRunner extends CommandRunner<void> {
-           globals.analytics.suppressTelemetry();
-         }
- 
--        globals.flutterVersion.ensureVersionFile();
-         final bool machineFlag = topLevelResults[FlutterGlobalOptions.kMachineFlag] as bool? ?? false;
--        if (await _shouldCheckForUpdates(topLevelResults, topLevelMachineFlag: machineFlag)) {
--          await globals.flutterVersion.checkFlutterVersionFreshness();
--        }
- 
-         // See if the user specified a specific device.
-         final String? specifiedDeviceId = topLevelResults[FlutterGlobalOptions.kDeviceIdOption] as String?;
-
diff --git a/pkgs/development/compilers/flutter/versions/3_27/patches/fix-ios-build-xcode-backend-sh.patch b/pkgs/development/compilers/flutter/versions/3_27/patches/fix-ios-build-xcode-backend-sh.patch
deleted file mode 100644
index 825d40fc6176..000000000000
--- a/pkgs/development/compilers/flutter/versions/3_27/patches/fix-ios-build-xcode-backend-sh.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 6df275df3b8694daf16302b407520e3b1dee6724 Mon Sep 17 00:00:00 2001
-From: Philip Hayes <philiphayes9@gmail.com>
-Date: Thu, 12 Sep 2024 13:23:00 -0700
-Subject: [PATCH] fix: cleanup xcode_backend.sh to fix iOS build w/
- `NixOS/nixpkgs` flutter
-
-This patch cleans up `xcode_backend.sh`. It now effectively just runs
-`exec $FLUTTER_ROOT/bin/dart ./xcode_backend.dart`.
-
-The previous `xcode_backend.sh` tries to discover `$FLUTTER_ROOT` from
-argv[0], even though its presence is already guaranteed (the wrapped
-`xcode_backend.dart` also relies on this env).
-
-When using nixpkgs flutter, the flutter SDK directory is composed of several
-layers, joined together using symlinks (called a `symlinkJoin`). Without this
-patch, the auto-discover traverses the symlinks into the wrong layer, and so it
-uses an "unwrapped" `dart` command instead of a "wrapped" dart that sets some
-important envs/flags (like `$FLUTTER_ROOT`).
-
-Using the "unwrapped" dart then manifests in this error when compiling, since
-it doesn't see the ios build-support artifacts:
-
-```
-$ flutter run -d iphone
-Running Xcode build...
-Xcode build done.                                            6.4s
-Failed to build iOS app
-Error (Xcode): Target debug_unpack_ios failed: Error: Flutter failed to create a directory at "/<nix-store>/XXXX-flutter-3.24.1-unwrapped/bin/cache/artifacts".
-```
----
- packages/flutter_tools/bin/xcode_backend.sh | 25 ++++-----------------
- 1 file changed, 4 insertions(+), 21 deletions(-)
-
-diff --git a/packages/flutter_tools/bin/xcode_backend.sh b/packages/flutter_tools/bin/xcode_backend.sh
-index 2889d7c8e4..48b9d06c6e 100755
---- a/packages/flutter_tools/bin/xcode_backend.sh
-+++ b/packages/flutter_tools/bin/xcode_backend.sh
-@@ -6,24 +6,7 @@
- # exit on error, or usage of unset var
- set -euo pipefail
- 
--# Needed because if it is set, cd may print the path it changed to.
--unset CDPATH
--
--function follow_links() (
--  cd -P "$(dirname -- "$1")"
--  file="$PWD/$(basename -- "$1")"
--  while [[ -h "$file" ]]; do
--    cd -P "$(dirname -- "$file")"
--    file="$(readlink -- "$file")"
--    cd -P "$(dirname -- "$file")"
--    file="$PWD/$(basename -- "$file")"
--  done
--  echo "$file"
--)
--
--PROG_NAME="$(follow_links "${BASH_SOURCE[0]}")"
--BIN_DIR="$(cd "${PROG_NAME%/*}" ; pwd -P)"
--FLUTTER_ROOT="$BIN_DIR/../../.."
--DART="$FLUTTER_ROOT/bin/dart"
--
--"$DART" "$BIN_DIR/xcode_backend.dart" "$@"
-+# Run `dart ./xcode_backend.dart` with the dart from $FLUTTER_ROOT.
-+dart="${FLUTTER_ROOT}/bin/dart"
-+xcode_backend_dart="${BASH_SOURCE[0]%.sh}.dart"
-+exec "${dart}" "${xcode_backend_dart}" "$@"
--- 
-2.46.0
-
diff --git a/pkgs/development/compilers/flutter/versions/3_27/patches/gradle-flutter-tools-wrapper.patch b/pkgs/development/compilers/flutter/versions/3_27/patches/gradle-flutter-tools-wrapper.patch
deleted file mode 100644
index de6080efbba8..000000000000
--- a/pkgs/development/compilers/flutter/versions/3_27/patches/gradle-flutter-tools-wrapper.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-This patch introduces an intermediate Gradle build step to alter the behavior
-of flutter_tools' Gradle project, specifically moving the creation of `build`
-and `.gradle` directories from within the Nix Store to somewhere in `$HOME/.cache/flutter/nix-flutter-tools-gradle/$engineShortRev`.
-
-Without this patch, flutter_tools' Gradle project tries to generate `build` and `.gradle`
-directories within the Nix Store. Resulting in read-only errors when trying to build a
-Flutter Android app at runtime.
-
-This patch takes advantage of the fact settings.gradle takes priority over settings.gradle.kts to build the intermediate Gradle project
-when a Flutter app runs `includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")`
-
-`rootProject.buildFileName = "/dev/null"` so that the intermediate project doesn't use `build.gradle.kts` that's in the same directory.
-
-The intermediate project makes a `settings.gradle` file in `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/` and `includeBuild`s it.
-This Gradle project will build the actual `packages/flutter_tools/gradle` project by setting
-`rootProject.projectDir = new File("$settingsDir")` and `apply from: new File("$settingsDir/settings.gradle.kts")`.
-
-Now the `.gradle` will be built in `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/`, but `build` doesn't.
-To move `build` to `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/` as well, we need to set `buildDirectory`.
-diff --git a/packages/flutter_tools/gradle/settings.gradle b/packages/flutter_tools/gradle/settings.gradle
-new file mode 100644
-index 0000000000..b2485c94b4
---- /dev/null
-+++ b/packages/flutter_tools/gradle/settings.gradle
-@@ -0,0 +1,19 @@
-+rootProject.buildFileName = "/dev/null"
-+
-+def engineShortRev = (new File("$settingsDir/../../../bin/internal/engine.version")).text.take(10)
-+def dir = new File("$System.env.HOME/.cache/flutter/nix-flutter-tools-gradle/$engineShortRev")
-+dir.mkdirs()
-+def file = new File(dir, "settings.gradle")
-+
-+file.text = """
-+rootProject.projectDir = new File("$settingsDir")
-+apply from: new File("$settingsDir/settings.gradle.kts")
-+
-+gradle.allprojects { project ->
-+  project.beforeEvaluate {
-+    project.layout.buildDirectory = new File("$dir/build")
-+  }
-+}
-+"""
-+
-+includeBuild(dir)
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 0bf044175aac..9dd0272f3894 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -565,6 +565,7 @@ mapAliases {
   flut-renamer = throw "flut-renamer is unmaintained and has been removed"; # Added 2025-08-26
   flutter324 = throw "flutter324 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2025-10-28
   flutter326 = throw "flutter326 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2025-06-08
+  flutter327 = throw "flutter327 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2025-10-28
   fmsynth = throw "'fmsynth' has been removed as it was broken and unmaintained both upstream and in nixpkgs."; # Added 2025-09-01
   follow = warnAlias "follow has been renamed to folo" folo; # Added 2025-05-18
   forceSystem = warnAlias "forceSystem is deprecated in favour of explicitly importing Nixpkgs" (
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f924889c22fa..bdcc1bc49b6e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4505,7 +4505,6 @@ with pkgs;
   flutter335 = flutterPackages.v3_35;
   flutter332 = flutterPackages.v3_32;
   flutter329 = flutterPackages.v3_29;
-  flutter327 = flutterPackages.v3_27;
 
   fpc = callPackage ../development/compilers/fpc { };
 

From 163c6858a9884338ebb58dec95f89c47624c9a8f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 00:31:39 +0000
Subject: [PATCH 38/85] mpi: 5.0.8 -> 5.0.9

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

diff --git a/pkgs/by-name/op/openmpi/package.nix b/pkgs/by-name/op/openmpi/package.nix
index 1ce33581b090..df150d6eb66d 100644
--- a/pkgs/by-name/op/openmpi/package.nix
+++ b/pkgs/by-name/op/openmpi/package.nix
@@ -40,11 +40,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "openmpi";
-  version = "5.0.8";
+  version = "5.0.9";
 
   src = fetchurl {
     url = "https://www.open-mpi.org/software/ompi/v${lib.versions.majorMinor finalAttrs.version}/downloads/openmpi-${finalAttrs.version}.tar.bz2";
-    sha256 = "sha256-UxMeGlfnJw9kVwf4sLZbpWBI9bWsP2j6q+0+sNcQ5Ek=";
+    sha256 = "sha256-37cnYlMRcIR68+Sg8h1317I8829nznzpAzZZJzZ32As=";
   };
 
   postPatch = ''

From c864ff8e662be87ebd3c2af1bd017eef59cae176 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 14:42:20 +0000
Subject: [PATCH 39/85] vscode-extensions.saoudrizwan.claude-dev: 3.33.1 ->
 3.35.0

---
 .../vscode/extensions/saoudrizwan.claude-dev/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix
index 9cfd6d964706..c241ce3317ce 100644
--- a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "claude-dev";
     publisher = "saoudrizwan";
-    version = "3.33.1";
-    hash = "sha256-DSLRfzAL4jqj32XZOmGGSb/BBGEfzJ9fbkiSLLpaYM4=";
+    version = "3.35.0";
+    hash = "sha256-fPoSrpWHfDEGLbawTVV65MAQAXWUy6WTb7ijhKaoLvc=";
   };
 
   meta = {

From 25a6f9bfc3b9cb60312b545490f4059ebfc6947d Mon Sep 17 00:00:00 2001
From: Johan Larsson <jolars@posteo.com>
Date: Fri, 31 Oct 2025 16:44:30 +0100
Subject: [PATCH 40/85] tomat: init at 2.3.0

Init tomat at 2.3.0 (https://github.com/jolars/tomat). This is a
server-client application that feeds information to status bars like
waybar and i3status-rust.
---
 pkgs/by-name/to/tomat/package.nix | 46 +++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 pkgs/by-name/to/tomat/package.nix

diff --git a/pkgs/by-name/to/tomat/package.nix b/pkgs/by-name/to/tomat/package.nix
new file mode 100644
index 000000000000..b08eed1802e9
--- /dev/null
+++ b/pkgs/by-name/to/tomat/package.nix
@@ -0,0 +1,46 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  alsa-lib,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "tomat";
+  version = "2.3.0";
+
+  src = fetchFromGitHub {
+    owner = "jolars";
+    repo = "tomat";
+    tag = "v${version}";
+    hash = "sha256-lkNBcTn7uXWifIVNoXmggPy+UjozL5YqVYorH9XAejo=";
+  };
+
+  cargoHash = "sha256-jBpZyNfsJKchJnKwWJQeVavj0Yog83QrCM8kOJFVugg=";
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    alsa-lib
+  ];
+
+  checkFlags = [
+    # Skip tests that require access to file system locations not available during Nix builds
+    "--skip=timer::tests::test_icon_path_creation"
+    "--skip=timer::tests::test_notification_icon_config"
+    "--skip=integration::"
+  ];
+
+  meta = {
+    description = "Pomodoro timer for status bars";
+    homepage = "https://github.com/jolars/tomat";
+    changelog = "https://github.com/jolars/tomat/blob/${src.rev}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ jolars ];
+    mainProgram = "tomat";
+    platforms = lib.platforms.linux;
+  };
+}

From dfb654dc61adfc821138c9fd3bc2c0eb23f951de Mon Sep 17 00:00:00 2001
From: Kiyotoko <karl.zschiebsch@gmail.com>
Date: Fri, 31 Oct 2025 20:21:24 +0100
Subject: [PATCH 41/85] vscode-extensions.oracle.oracle-java: fix broken hash

---
 .../editors/vscode/extensions/oracle.oracle-java/default.nix    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/vscode/extensions/oracle.oracle-java/default.nix b/pkgs/applications/editors/vscode/extensions/oracle.oracle-java/default.nix
index 5fc3cec8a9c9..0be0ff82b558 100644
--- a/pkgs/applications/editors/vscode/extensions/oracle.oracle-java/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/oracle.oracle-java/default.nix
@@ -8,7 +8,7 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
     name = "oracle-java";
     publisher = "oracle";
     version = "24.1.2";
-    hash = "sha256-sw+FJbpdkHABKgnRsA5tS6FYEjBD0/iVRCHHzf49Xx4=";
+    hash = "sha256-RX+Yq7fVmN797qlvSWV9hOqQV3lpWBzDjOMm/1sbv0k=";
   };
 
   meta = {

From f2640ee208003ca7102cbda97740b07871fa7635 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 25 Oct 2025 22:07:04 +0200
Subject: [PATCH 42/85] top-level: return __splicedPackages

---
 nixos/lib/testing/driver.nix             | 2 +-
 nixos/modules/misc/nixpkgs.nix           | 2 +-
 nixos/modules/misc/nixpkgs/read-only.nix | 2 +-
 pkgs/stdenv/booter.nix                   | 6 +++++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/nixos/lib/testing/driver.nix b/nixos/lib/testing/driver.nix
index 6abfac7b3191..9eb7f8b7e3e8 100644
--- a/nixos/lib/testing/driver.nix
+++ b/nixos/lib/testing/driver.nix
@@ -202,7 +202,7 @@ in
     _module.args = {
       hostPkgs =
         # Comment is in nixos/modules/misc/nixpkgs.nix
-        lib.mkOverride lib.modules.defaultOverridePriority config.hostPkgs.__splicedPackages;
+        lib.mkOverride lib.modules.defaultOverridePriority config.hostPkgs;
     };
 
     driver = withChecks driver;
diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix
index 07845a4ece8e..12b4a6453449 100644
--- a/nixos/modules/misc/nixpkgs.nix
+++ b/nixos/modules/misc/nixpkgs.nix
@@ -355,7 +355,7 @@ in
         # which is somewhat costly for Nixpkgs. With an explicit priority, we only
         # evaluate the wrapper to find out that the priority is lower, and then we
         # don't need to evaluate `finalPkgs`.
-        lib.mkOverride lib.modules.defaultOverridePriority finalPkgs.__splicedPackages;
+        lib.mkOverride lib.modules.defaultOverridePriority finalPkgs;
     };
 
     assertions =
diff --git a/nixos/modules/misc/nixpkgs/read-only.nix b/nixos/modules/misc/nixpkgs/read-only.nix
index db43615c12f0..fa372d13e545 100644
--- a/nixos/modules/misc/nixpkgs/read-only.nix
+++ b/nixos/modules/misc/nixpkgs/read-only.nix
@@ -63,7 +63,7 @@ in
       # find mistaken definitions
       builtins.seq cfg.config builtins.seq cfg.overlays builtins.seq cfg.hostPlatform builtins.seq
         cfg.buildPlatform
-        cfg.pkgs.__splicedPackages;
+        cfg.pkgs;
     nixpkgs.config = cfg.pkgs.config;
     nixpkgs.overlays = cfg.pkgs.overlays;
     nixpkgs.hostPlatform = cfg.pkgs.stdenv.hostPlatform;
diff --git a/pkgs/stdenv/booter.nix b/pkgs/stdenv/booter.nix
index 1954e861eae1..934e7b87d14d 100644
--- a/pkgs/stdenv/booter.nix
+++ b/pkgs/stdenv/booter.nix
@@ -162,5 +162,9 @@ let
         buildPackages.stdenv.cc;
   };
 
+  pkgs = dfold folder postStage (_: { }) withAllowCustomOverrides;
+
 in
-dfold folder postStage (_: { }) withAllowCustomOverrides
+# Return the spliced package set, so that consumers of the nixpkgs top-level
+# attributes, like NixOS, don't break when cross-compiling.
+pkgs.__splicedPackages

From 1605f07ce9404ef021e065d3b52aa3c1f876c713 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 19:43:28 +0000
Subject: [PATCH 43/85] grafanaPlugins.volkovlabs-variable-panel: 4.1.0 ->
 5.1.1

---
 .../grafana/plugins/volkovlabs-variable-panel/default.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix
index dbfb4c90a859..c018e0503c2b 100644
--- a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "volkovlabs-variable-panel";
-  version = "4.1.0";
-  zipHash = "sha256-3AkCebT9KcQdsi+T3+0XMhwZaEmqlOmY90RidcVqUb4=";
+  version = "5.1.1";
+  zipHash = "sha256-lLzOCgOh4a/Ee6QO5gJkJkHoPzylk9Y3vilXBtvn5G8=";
   meta = with lib; {
     description = "Variable panel allows you to have dashboard filters in a separate panel which you can place anywhere on the dashboard";
     license = licenses.asl20;

From de7682771511e9aa470968e5987d0aad5cf19673 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 22:35:32 +0000
Subject: [PATCH 44/85] hydralauncher: 3.6.8 -> 3.7.3

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

diff --git a/pkgs/by-name/hy/hydralauncher/package.nix b/pkgs/by-name/hy/hydralauncher/package.nix
index 0b837078abef..5153c04bd11f 100644
--- a/pkgs/by-name/hy/hydralauncher/package.nix
+++ b/pkgs/by-name/hy/hydralauncher/package.nix
@@ -6,10 +6,10 @@
 }:
 let
   pname = "hydralauncher";
-  version = "3.6.8";
+  version = "3.7.3";
   src = fetchurl {
     url = "https://github.com/hydralauncher/hydra/releases/download/v${version}/hydralauncher-${version}.AppImage";
-    hash = "sha256-wZszjO+4n1BaiWX9Dw+chZvL89hPmugHju5JlRfPYl4=";
+    hash = "sha256-prX/6cmWEz81nj/W28QbclyaJyNmGOug/ANXee3e0Cs=";
   };
 
   appimageContents = appimageTools.extractType2 { inherit pname src version; };

From c9c7c7ed3076ab74922de8d3fc3b7f25a9023e9d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 22:50:49 +0000
Subject: [PATCH 45/85] ovhcloud-cli: 0.7.1 -> 0.8.1

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

diff --git a/pkgs/by-name/ov/ovhcloud-cli/package.nix b/pkgs/by-name/ov/ovhcloud-cli/package.nix
index 5e6cd30d88ee..75881b5cc8f7 100644
--- a/pkgs/by-name/ov/ovhcloud-cli/package.nix
+++ b/pkgs/by-name/ov/ovhcloud-cli/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "ovhcloud-cli";
-  version = "0.7.1";
+  version = "0.8.1";
 
   src = fetchFromGitHub {
     owner = "ovh";
     repo = "ovhcloud-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-pps6PuaIJxZ0ewrBXgq4TnICOW3wjHJQDDmcQUfYDNg=";
+    hash = "sha256-Z5CMOZ1NJ0tcO/aKkFQetW/E0eURucv/CyT6KnoMCHQ=";
   };
 
   vendorHash = "sha256-WNONEceR/cDVloosQ/BMYjPTk9elQ1oTX89lgzENSAI=";

From 3e5b8617dee9fcd02acf90d05b44b46bf32f5fe9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 00:11:54 +0000
Subject: [PATCH 46/85] bottles-unwrapped: 51.24 -> 51.25

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

diff --git a/pkgs/by-name/bo/bottles-unwrapped/package.nix b/pkgs/by-name/bo/bottles-unwrapped/package.nix
index be62985a1590..49c8d15fcf77 100644
--- a/pkgs/by-name/bo/bottles-unwrapped/package.nix
+++ b/pkgs/by-name/bo/bottles-unwrapped/package.nix
@@ -32,13 +32,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "bottles-unwrapped";
-  version = "51.24";
+  version = "51.25";
 
   src = fetchFromGitHub {
     owner = "bottlesdevs";
     repo = "bottles";
     tag = version;
-    hash = "sha256-cKW2b8MVpVksDnthn9kPBtUoCiiCMTQ993KTJSJuZDE=";
+    hash = "sha256-W25MpdXLO+vcMvvCJmA87lB9WiBOJHsWp8D/LU0xjAY=";
   };
 
   patches = [

From cafc4d8754e92d9832593a253dd2723f7eb693f1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 03:10:24 +0000
Subject: [PATCH 47/85] steampipe: 2.2.0 -> 2.3.1

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

diff --git a/pkgs/by-name/st/steampipe/package.nix b/pkgs/by-name/st/steampipe/package.nix
index 45d9c558fd2d..3d67ca9ce95c 100644
--- a/pkgs/by-name/st/steampipe/package.nix
+++ b/pkgs/by-name/st/steampipe/package.nix
@@ -11,7 +11,7 @@
 
 buildGoModule rec {
   pname = "steampipe";
-  version = "2.2.0";
+  version = "2.3.1";
 
   env.CGO_ENABLED = 0;
 
@@ -19,10 +19,10 @@ buildGoModule rec {
     owner = "turbot";
     repo = "steampipe";
     tag = "v${version}";
-    hash = "sha256-bYnwtGeFOtUfYzlx0o0jtfuyeItXU9LiO0fJy8UGv6k=";
+    hash = "sha256-be9Q3X/XZ7OdJChRxVFQzglhMfpLzbzaCfSn7hUR5AA=";
   };
 
-  vendorHash = "sha256-VHAbMgBISWWGhZBRl5JA0gytRSSdaFMCJUzMxmoNtPc=";
+  vendorHash = "sha256-1o7ANCyz19WSIkYYoA0DpYzkY2qBXHHSfAGrAG2+k88=";
   proxyVendor = true;
 
   postPatch = ''

From ccd6e70fa357249eb7cb2b6131c4abb5e9124b54 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 04:07:04 +0000
Subject: [PATCH 48/85] zwave-js-ui: 11.5.2 -> 11.6.1

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

diff --git a/pkgs/by-name/zw/zwave-js-ui/package.nix b/pkgs/by-name/zw/zwave-js-ui/package.nix
index 2d9c065f454b..380fd85a7b01 100644
--- a/pkgs/by-name/zw/zwave-js-ui/package.nix
+++ b/pkgs/by-name/zw/zwave-js-ui/package.nix
@@ -7,15 +7,15 @@
 
 buildNpmPackage rec {
   pname = "zwave-js-ui";
-  version = "11.5.2";
+  version = "11.6.1";
 
   src = fetchFromGitHub {
     owner = "zwave-js";
     repo = "zwave-js-ui";
     tag = "v${version}";
-    hash = "sha256-G/ZHp5JmCpFCsjbgHyAS4+5eihyzqVtkcZT5vj6Pxos=";
+    hash = "sha256-SNxwZw4ebcngUD6EEI9GGAsxhcR6wQBs2sdnmuZycmw=";
   };
-  npmDepsHash = "sha256-amw6eVKWCIuF/XcY1dHb9/qMADGkUANT4WmQNx3O+NY=";
+  npmDepsHash = "sha256-Aec2IWCeeOTrHMfk1uqCHNL30Kbsa5uCf4NkZc+Q4rA=";
 
   passthru.tests.zwave-js-ui = nixosTests.zwave-js-ui;
 

From 0c340e12ced479724610f683faad71d87a056277 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 04:40:08 +0000
Subject: [PATCH 49/85] vscode-extensions.tsandall.opa: 0.19.0 -> 0.20.0

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 4f50d9fdef85..1d6950d04f86 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -4735,8 +4735,8 @@ let
         mktplcRef = {
           name = "opa";
           publisher = "tsandall";
-          version = "0.19.0";
-          hash = "sha256-jRwZD4TwLMdwBdV59HonMkF2ds4heXHPtpw1sxq1RsA=";
+          version = "0.20.0";
+          hash = "sha256-1o7v9lncnmYWr9FPEjQmamfNW/Lui9A0V+l7bCjn/hw=";
         };
         meta = {
           changelog = "https://github.com/open-policy-agent/vscode-opa/blob/master/CHANGELOG.md";

From 4ec373cf7711186fa2fbc508201e6a428a09ee6a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 05:51:36 +0000
Subject: [PATCH 50/85] llama-cpp: 6869 -> 6908

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

diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix
index 7de7a14e7b25..5aa3e6002e84 100644
--- a/pkgs/by-name/ll/llama-cpp/package.nix
+++ b/pkgs/by-name/ll/llama-cpp/package.nix
@@ -75,13 +75,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "llama-cpp";
-  version = "6869";
+  version = "6908";
 
   src = fetchFromGitHub {
     owner = "ggml-org";
     repo = "llama.cpp";
     tag = "b${finalAttrs.version}";
-    hash = "sha256-LZSeejn1IPybmfoRsOhg1YpTCFl0LrRJZyKT8ECbVjo=";
+    hash = "sha256-7zgeVK1dQLFy9rm6VsaVK9/vIadMst+RNry5Vf7yk+A=";
     leaveDotGit = true;
     postFetch = ''
       git -C "$out" rev-parse --short HEAD > $out/COMMIT

From b1193479351fa318d68bb28aaf3ea1e226383e68 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 06:26:46 +0000
Subject: [PATCH 51/85] ecspresso: 2.6.2 -> 2.6.3

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

diff --git a/pkgs/by-name/ec/ecspresso/package.nix b/pkgs/by-name/ec/ecspresso/package.nix
index 7928e5d1f210..c05d90e3f81b 100644
--- a/pkgs/by-name/ec/ecspresso/package.nix
+++ b/pkgs/by-name/ec/ecspresso/package.nix
@@ -7,20 +7,20 @@
 
 buildGoModule rec {
   pname = "ecspresso";
-  version = "2.6.2";
+  version = "2.6.3";
 
   src = fetchFromGitHub {
     owner = "kayac";
     repo = "ecspresso";
     tag = "v${version}";
-    hash = "sha256-9C/OJ1rnH77jcF3hDr2uyXcNViAkM84LjmkJsKmQkXo=";
+    hash = "sha256-ZruQx2Nm/1An9yGNhQ/2Kbah4eSFBD/pp3c6WZIBGXA=";
   };
 
   subPackages = [
     "cmd/ecspresso"
   ];
 
-  vendorHash = "sha256-tL/AjGU/Pi5ypcv9jqUukg6sGJqpPlHhwxzve7/KgDo=";
+  vendorHash = "sha256-oq2BOzSHwAq/gNBknwm1LXUKu+est/kjM1jlVBvQZbg=";
 
   ldflags = [
     "-s"

From 793cfe507e2a881efa2444ed9dd65e44b214ff8f Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 1 Nov 2025 14:54:54 +0800
Subject: [PATCH 52/85] pantheon.elementary-icon-theme: 8.1.0 -> 8.2.0

https://github.com/elementary/icons/compare/8.1.0...8.2.0
---
 .../pantheon/artwork/elementary-icon-theme/default.nix    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
index a75c7f4f9ca1..6bffd49239cb 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
@@ -5,6 +5,7 @@
   nix-update-script,
   meson,
   ninja,
+  adwaita-icon-theme,
   hicolor-icon-theme,
   gtk3,
   xcursorgen,
@@ -13,13 +14,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "elementary-icon-theme";
-  version = "8.1.0";
+  version = "8.2.0";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "icons";
-    rev = version;
-    sha256 = "sha256-WltMfWMcfUqpnfuGa6NzfxSeTais0MLsiu82ybaOcvs=";
+    tag = version;
+    hash = "sha256-ntv+efkyfB66HL3tWEkiOj+MFRGqhfMo1/FUO2fIqBM=";
   };
 
   nativeBuildInputs = [
@@ -31,6 +32,7 @@ stdenvNoCC.mkDerivation rec {
   ];
 
   propagatedBuildInputs = [
+    adwaita-icon-theme
     hicolor-icon-theme
   ];
 

From 4f59e2fa23e1a8be23f95e12c9ee14b1124da002 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 31 Oct 2025 21:35:45 +0000
Subject: [PATCH 53/85] whisper: built with `-no-pie` (prebuilt libraries)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Without the change the build fails as https://hydra.nixos.org/build/310775846:

    ld: libs/libz.a(deflate.o): relocation R_X86_64_32S against `.rodata' can not be used when making a PIE object; recompile with -fPIE
    ld: failed to set dynamic section sizes: bad value

It happens because `libs/libz.a` comes from a
"source" tarball. As some libraries are not packaged
in `nixpkgs` let's fall back to `-no-pie`.

Co-authored-by: Justin Bedő <cu@cua0.org>
---
 pkgs/by-name/wh/whisper/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/wh/whisper/package.nix b/pkgs/by-name/wh/whisper/package.nix
index 08aa9ffc4c0b..9ce1836b25d3 100644
--- a/pkgs/by-name/wh/whisper/package.nix
+++ b/pkgs/by-name/wh/whisper/package.nix
@@ -35,6 +35,12 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  # The package comes with prebuilt static
+  # libraries of bzip2, zlib, libdeflate and asmlib.
+  # They are not built with -fPIE and thus linking fails.
+  # As asmlib is not packages in nixpkgs let's disable PIE.
+  env.NIX_LDFLAGS = "-no-pie";
+
   installPhase = ''
     runHook preInstall
     install -Dt $out/bin whisper whisper-index
@@ -48,5 +54,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/refresh-bio/whisper";
     maintainers = with maintainers; [ jbedo ];
     platforms = platforms.x86_64;
+    sourceProvenance = [ sourceTypes.binaryNativeCode ];
   };
 }

From 9165040c91278e4b66e270f71ef8bb121e0a3e10 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 10:35:37 +0100
Subject: [PATCH 54/85] python313Packages.llama-cloud-services: 0.6.69 ->
 0.6.77

Changelog: https://github.com/run-llama/llama_cloud_services/releases/tag/llama-cloud-services-py%400.6.77
---
 .../python-modules/llama-cloud-services/default.nix         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/llama-cloud-services/default.nix b/pkgs/development/python-modules/llama-cloud-services/default.nix
index 8e89b1f83bb6..bc0c6206b330 100644
--- a/pkgs/development/python-modules/llama-cloud-services/default.nix
+++ b/pkgs/development/python-modules/llama-cloud-services/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "llama-cloud-services";
-  version = "0.6.69";
+  version = "0.6.77";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "run-llama";
     repo = "llama_cloud_services";
-    tag = "v${version}";
-    hash = "sha256-+90b/EwG8OfpjG/MJM5shvQHLsLpLe+TviufwoWI7mg=";
+    tag = "llama-cloud-services-py%40${version}";
+    hash = "sha256-Fl4rmKJ26yeXYjR2qhpusQrRa0sCe6TigWqEyfjA8lQ=";
   };
 
   sourceRoot = "${src.name}/py";

From 22f482a5bf5bf958186d6069fe3abd421b71ed4f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 10:38:28 +0100
Subject: [PATCH 55/85] python313Packages.llama-parse: 0.6.54 -> 0.6.77

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

diff --git a/pkgs/development/python-modules/llama-parse/default.nix b/pkgs/development/python-modules/llama-parse/default.nix
index 0038081e5f69..883223793a8f 100644
--- a/pkgs/development/python-modules/llama-parse/default.nix
+++ b/pkgs/development/python-modules/llama-parse/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "llama-parse";
-  version = "0.6.54";
+  version = "0.6.77";
   pyproject = true;
 
   src = fetchPypi {
     pname = "llama_parse";
     inherit version;
-    hash = "sha256-xwezEVIVXJuuhOMW+reQu8jIX02IJc5e44br632yWPE=";
+    hash = "sha256-cxjDJT/ADoPwDmN4Cg06AyQvJcasGZwmw6ctuHVNRLc=";
   };
 
   build-system = [ hatchling ];

From 496148e4db746157decd133081963edb5de19c9f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 09:50:11 +0000
Subject: [PATCH 56/85] sphinx-lint: 1.0.0 -> 1.0.1

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

diff --git a/pkgs/by-name/sp/sphinx-lint/package.nix b/pkgs/by-name/sp/sphinx-lint/package.nix
index ed3d8ca6cceb..3b2e3f999bad 100644
--- a/pkgs/by-name/sp/sphinx-lint/package.nix
+++ b/pkgs/by-name/sp/sphinx-lint/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "sphinx-lint";
-  version = "1.0.0";
+  version = "1.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sphinx-contrib";
     repo = "sphinx-lint";
     tag = "v${version}";
-    hash = "sha256-VM8PyUZVQQFdXLR14eN7+hPT/iGOVHG6s1bcac4MPo4=";
+    hash = "sha256-9xqGb/RdaySTys3gjIU0GJSqGOWXQQ/NeSRS8dmx5lg=";
   };
 
   build-system = [

From 1a78b4a94ee3dde2284a0a213c18fb5e17f9aa68 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 10:51:24 +0100
Subject: [PATCH 57/85] python313Packages.mitogen: 0.3.29 -> 0.3.30

Diff: https://github.com/mitogen-hq/mitogen/compare/v0.3.29...v0.3.30

Changelog: https://github.com/mitogen-hq/mitogen/blob/v0.3.30/docs/changelog.rst
---
 pkgs/development/python-modules/mitogen/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mitogen/default.nix b/pkgs/development/python-modules/mitogen/default.nix
index eee637d211fb..b11f0420ecfd 100644
--- a/pkgs/development/python-modules/mitogen/default.nix
+++ b/pkgs/development/python-modules/mitogen/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "mitogen";
-  version = "0.3.29";
+  version = "0.3.30";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "mitogen-hq";
     repo = "mitogen";
     tag = "v${version}";
-    hash = "sha256-j2VT46bYi9lmFKNNCHshs56b2HqqvfpEDBHnaHvfYgY=";
+    hash = "sha256-witxGRPi2TOwLOnsJcxOKLJdZ6ggapANXneFMJdHa98=";
   };
 
   build-system = [ setuptools ];

From 2088538ecc299c7c0eecbf7c9ebedb83515b7313 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 10:52:59 +0100
Subject: [PATCH 58/85] python313Packages.publicsuffixlist: 1.0.2.20251030 ->
 1.0.2.20251031

Changelog: https://github.com/ko-zu/psl/blob/v1.0.2.20251031-gha/CHANGES.md
---
 pkgs/development/python-modules/publicsuffixlist/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix
index f8a4cc2115b0..11a48fa548b6 100644
--- a/pkgs/development/python-modules/publicsuffixlist/default.nix
+++ b/pkgs/development/python-modules/publicsuffixlist/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "publicsuffixlist";
-  version = "1.0.2.20251030";
+  version = "1.0.2.20251031";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-vEQp18br81UIBQtfVW8XAsR3i9iMhTiPtDKQqyJhW9w=";
+    hash = "sha256-pMZj8al1ps6NMzOcBJK5eO3ckNnYX0dFYKQ/3stVmmQ=";
   };
 
   build-system = [ setuptools ];

From bd7df729e4edf926a1c8ee467a29bfe391bf219e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 10:54:28 +0100
Subject: [PATCH 59/85] python313Packages.iamdata: 0.1.202510301 ->
 0.1.202511011

Diff: https://github.com/cloud-copilot/iam-data-python/compare/v0.1.202510301...v0.1.202511011

Changelog: https://github.com/cloud-copilot/iam-data-python/releases/tag/v0.1.202511011
---
 pkgs/development/python-modules/iamdata/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix
index d7e62a3d31c3..d61cf2c0c4dc 100644
--- a/pkgs/development/python-modules/iamdata/default.nix
+++ b/pkgs/development/python-modules/iamdata/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "iamdata";
-  version = "0.1.202510301";
+  version = "0.1.202511011";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cloud-copilot";
     repo = "iam-data-python";
     tag = "v${version}";
-    hash = "sha256-83vicOeL/CufgkOO+oKLbydv0Hu08kMcPxVjrQGzn3c=";
+    hash = "sha256-uVZdWEFh9yLYl5gywj4Nwopwz9J0f/0nfaseK3mhTyA=";
   };
 
   __darwinAllowLocalNetworking = true;

From b5dce996dd91527b4e762b9197073f6c3e3f789b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 10:40:37 +0000
Subject: [PATCH 60/85] pluto: 5.22.5 -> 5.22.6

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

diff --git a/pkgs/by-name/pl/pluto/package.nix b/pkgs/by-name/pl/pluto/package.nix
index 828f7724e857..5874718b28b7 100644
--- a/pkgs/by-name/pl/pluto/package.nix
+++ b/pkgs/by-name/pl/pluto/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "pluto";
-  version = "5.22.5";
+  version = "5.22.6";
 
   src = fetchFromGitHub {
     owner = "FairwindsOps";
     repo = "pluto";
     rev = "v${version}";
-    hash = "sha256-MserKZcOkif56XeTLRzHDDk6HYeVhgKsnOjsfv0vPeQ=";
+    hash = "sha256-6Xi+EWQvFYtdiVywhSB4Lmzsc6Z1nE8UWO8vBteVOnE=";
   };
 
   vendorHash = "sha256-59mRVfQ2rduTvIJE1l/j3K+PY3OEMfNpjjYg3hqNUhs=";

From 532ba62c26e7f1d85bac9fd507574e438be519e4 Mon Sep 17 00:00:00 2001
From: Benedikt Hiemer <ben.email@posteo.de>
Date: Sat, 1 Nov 2025 11:41:41 +0100
Subject: [PATCH 61/85] nixos/journald-gateway: remove assertion making system
 and user args truly optional

---
 .../modules/system/boot/systemd/journald-gateway.nix | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/nixos/modules/system/boot/systemd/journald-gateway.nix b/nixos/modules/system/boot/systemd/journald-gateway.nix
index f0d80077e6d6..952177f85805 100644
--- a/nixos/modules/system/boot/systemd/journald-gateway.nix
+++ b/nixos/modules/system/boot/systemd/journald-gateway.nix
@@ -108,18 +108,6 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    assertions = [
-      {
-        # This prevents the weird case were disabling "system" and "user"
-        # actually enables both because the cli flags are not present.
-        assertion = cfg.system || cfg.user;
-        message = ''
-          systemd-journal-gatewayd cannot serve neither "system" nor "user"
-          journals.
-        '';
-      }
-    ];
-
     systemd.additionalUpstreamSystemUnits = [
       "systemd-journal-gatewayd.socket"
       "systemd-journal-gatewayd.service"

From 5db3262fc43e4fa29b11b5e142f60ca1d00a3e17 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sat, 1 Nov 2025 05:00:04 -0600
Subject: [PATCH 62/85] lazygit: 0.55.1 -> 0.56.0

https://github.com/jesseduffield/lazygit/releases/tag/v0.56.0
Diff: https://github.com/jesseduffield/lazygit/compare/v0.55.1...v0.56.0
---
 pkgs/by-name/la/lazygit/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/la/lazygit/package.nix b/pkgs/by-name/la/lazygit/package.nix
index 538e8a3ba683..8074bf20281d 100644
--- a/pkgs/by-name/la/lazygit/package.nix
+++ b/pkgs/by-name/la/lazygit/package.nix
@@ -8,13 +8,13 @@
 }:
 buildGoModule rec {
   pname = "lazygit";
-  version = "0.55.1";
+  version = "0.56.0";
 
   src = fetchFromGitHub {
     owner = "jesseduffield";
     repo = "lazygit";
     tag = "v${version}";
-    hash = "sha256-UofhgILZhVXnYiGpb25m4Ct4sbu5pRmjVgj3oEf5Uyk=";
+    hash = "sha256-oTj+9zDmbXD4rlFZ++hcd1WSfskSNI7ojI9gN8UcpT8=";
   };
 
   vendorHash = null;

From e6112d24d0fc9764ec1c4ff76246382a64ffe002 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 1 Nov 2025 12:31:56 +0100
Subject: [PATCH 63/85] emacsPackages: revert throw

We recently retired a lot of old aliases, but emacsPackages is still
exposed on search.nixos.org, so should not have been removed. I argued
previously, that this should not have been an alias in the first place:
If it's exposed on search.nixos.org, then it is expected to be used,
too.

We will also need that once we teach Eval to evaluate more packages than
hydra builds.
---
 pkgs/top-level/aliases.nix      | 1 -
 pkgs/top-level/all-packages.nix | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index b4a6e14d7d4e..34f3fa5abc80 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -520,7 +520,6 @@ mapAliases {
   elm-github-install = throw "'elm-github-install' has been removed as it is abandoned upstream and only supports Elm 0.18.0"; # Added 2025-08-25
   emacsMacport = throw "'emacsMacport' has been renamed to/replaced by 'emacs-macport'"; # Converted to throw 2025-10-27
   emacsNativeComp = throw "'emacsNativeComp' has been renamed to/replaced by 'emacs'"; # Converted to throw 2025-10-27
-  emacsPackages = throw "'emacsPackages' has been renamed to/replaced by 'emacs.pkgs'"; # Converted to throw 2025-10-27
   embree2 = throw "embree2 has been removed, as it is unmaintained upstream and depended on tbb_2020"; # Added 2025-09-14
   EmptyEpsilon = throw "'EmptyEpsilon' has been renamed to/replaced by 'empty-epsilon'"; # Converted to throw 2025-10-27
   emulationstation = throw "emulationstation was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 45ea67a634f3..7e69b55e6fcb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10937,6 +10937,10 @@ with pkgs;
       pkgs' = pkgs; # default pkgs used for bootstrapping the emacs package set
     };
 
+  # emacsPackages is exposed on search.nixos.org.
+  # Also see pkgs/top-level/packages-config.nix
+  emacsPackages = dontRecurseIntoAttrs emacs.pkgs;
+
   espeak-classic = callPackage ../applications/audio/espeak { };
 
   espeak = espeak-ng;

From 5f26deb6ffbcf1277ab56be7886ded3dbb833df6 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 2 Nov 2025 00:47:43 +1300
Subject: [PATCH 64/85] ci/OWNERS: Add adisbladis as owner for
 stdenv/check-meta & stdenv/meta-types

I want to monitor this for performance regressions & things like https://github.com/NixOS/nixpkgs/pull/421125.
---
 ci/OWNERS | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ci/OWNERS b/ci/OWNERS
index e03682addd23..cb45babf254b 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -58,7 +58,8 @@
 /pkgs/top-level/by-name-overlay.nix              @infinisil @philiptaron
 /pkgs/stdenv                                     @philiptaron @NixOS/stdenv
 /pkgs/stdenv/generic                             @Ericson2314 @NixOS/stdenv
-/pkgs/stdenv/generic/check-meta.nix              @Ericson2314 @NixOS/stdenv
+/pkgs/stdenv/generic/check-meta.nix              @Ericson2314 @adisbladis @NixOS/stdenv
+/pkgs/stdenv/generic/meta-types.nix              @adisbladis @NixOS/stdenv
 /pkgs/stdenv/cross                               @Ericson2314 @NixOS/stdenv
 /pkgs/build-support                              @philiptaron
 /pkgs/build-support/cc-wrapper                   @Ericson2314

From 0bfa880935d9b43aa12dbb155debb07412c56a08 Mon Sep 17 00:00:00 2001
From: Guillaume Girol <symphorien+git@xlumurb.eu>
Date: Sat, 1 Nov 2025 12:00:00 +0000
Subject: [PATCH 65/85] evolution: fix crash when opening attachments

https://gitlab.gnome.org/GNOME/evolution/-/issues/3124

it's fixed in a later released version of evolution that we should get
in https://github.com/NixOS/nixpkgs/pull/440720
---
 .../mailreaders/evolution/evolution/default.nix       | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
index 6213da291bd8..f02a9d700bf0 100644
--- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
+++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  fetchpatch,
   cmake,
   ninja,
   intltool,
@@ -53,6 +54,16 @@ stdenv.mkDerivation rec {
     hash = "sha256-ff3JrrLasybav9wfhXfE7MEjoS2gAS+MZKcmBlo8Cys=";
   };
 
+  patches = [
+    # fix crash when opening attachment with recent webkitgtk versions
+    # https://gitlab.gnome.org/GNOME/evolution/-/issues/3124
+    # remove when updating to 3.58.0
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/evolution/-/commit/811a6df1f990855e49ecc0ba7b1a7f7a5ec251e6.patch";
+      hash = "sha256-Aj8H7PnAblInX2zRPQH7n0HOdLNuhITNHunWRYCPBsI=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     intltool

From 067930047e9ea26e4a6e45e47d420d323914f06d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 12:31:27 +0000
Subject: [PATCH 66/85] python3Packages.langgraph-cli: 0.4.4 -> 0.4.5

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

diff --git a/pkgs/development/python-modules/langgraph-cli/default.nix b/pkgs/development/python-modules/langgraph-cli/default.nix
index 5015885a6864..8fde1a853412 100644
--- a/pkgs/development/python-modules/langgraph-cli/default.nix
+++ b/pkgs/development/python-modules/langgraph-cli/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "langgraph-cli";
-  version = "0.4.4";
+  version = "0.4.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langgraph";
     tag = "cli==${version}";
-    hash = "sha256-Ka/fm+lWxP6bpd4/Umgwfo1J1T05A6LHZb/ZeQ8HTSo=";
+    hash = "sha256-YGO1eq1IEKkxuH/9ZsaeaWpQ2vD97du32iopdXFqZf8=";
   };
 
   sourceRoot = "${src.name}/libs/cli";

From 13e06e2728e0221d0218df1e29804a88f0fb1106 Mon Sep 17 00:00:00 2001
From: ede1998 <online@erik-hennig.me>
Date: Thu, 30 Oct 2025 20:56:14 +0100
Subject: [PATCH 67/85] kgeotag: 1.8.0-unstable-2025-07-25 ->
 1.8.0-unstable-2025-11-01

This fixes a crash on startup because of missing `kgeotagui.rc`.
---
 pkgs/by-name/kg/kgeotag/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/kg/kgeotag/package.nix b/pkgs/by-name/kg/kgeotag/package.nix
index 9e29ba873586..ea6950ce7983 100644
--- a/pkgs/by-name/kg/kgeotag/package.nix
+++ b/pkgs/by-name/kg/kgeotag/package.nix
@@ -9,14 +9,14 @@
 
 stdenv.mkDerivation {
   pname = "kgeotag";
-  version = "1.8.0-unstable-2025-07-25";
+  version = "1.8.0-unstable-2025-11-01";
 
   src = fetchFromGitLab {
     domain = "invent.kde.org";
     repo = "kgeotag";
     owner = "graphics";
-    rev = "b2b140e8f72ab37bad3729bea527203324d12131";
-    hash = "sha256-jUcKm4IPQt2JiZUmIjMJ9EG0kDjzoPGjzBPMHZ6j9lM=";
+    rev = "879418eb57e96beb5be3e3a69d0bab2b666b7c7f";
+    hash = "sha256-RFC8UMrURn2vsTRjPFyLNlsep/PWRadkRkS7aFtTlKE=";
   };
 
   nativeBuildInputs = [

From d0b4678be791ba34ea9fc47233d651d0afdb17ae Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 13:24:04 +0000
Subject: [PATCH 68/85] php83: 8.3.26 -> 8.3.27

---
 pkgs/development/interpreters/php/8.3.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/8.3.nix b/pkgs/development/interpreters/php/8.3.nix
index fe25d10dc5de..d10414d7c7ff 100644
--- a/pkgs/development/interpreters/php/8.3.nix
+++ b/pkgs/development/interpreters/php/8.3.nix
@@ -4,8 +4,8 @@ let
   base = callPackage ./generic.nix (
     _args
     // {
-      version = "8.3.26";
-      hash = "sha256-chtj1TSfEx9Ql1N7O+a6aAHi2Ob6uh8fLqlbT9YudSU=";
+      version = "8.3.27";
+      hash = "sha256-od0rUbQ3wKYzfgGQBHeKjvJT206a/31I2IeYypG34qQ=";
     }
   );
 in

From d78de156279d3d132ab6446456357011f7c912fa Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 10 Oct 2025 16:35:00 +0200
Subject: [PATCH 69/85] workflows/bot: rename from labels

This workflow / script is already doing more than must labeling: it's
already auto-closing package request issues.

Since we're going to migrate the nixpkgs-merge-bot into this workflow,
we'll rename things to a more generic name.
---
 .github/labeler-development-branches.yml  |  2 +-
 .github/labeler-no-sync.yml               |  2 +-
 .github/labeler.yml                       |  2 +-
 .github/workflows/{labels.yml => bot.yml} | 10 +++++-----
 .github/workflows/pull-request-target.yml |  6 +++---
 .github/workflows/test.yml                |  2 +-
 ci/github-script/{labels.js => bot.js}    |  2 +-
 ci/github-script/run                      |  8 ++++----
 8 files changed, 17 insertions(+), 17 deletions(-)
 rename .github/workflows/{labels.yml => bot.yml} (94%)
 rename ci/github-script/{labels.js => bot.js} (99%)

diff --git a/.github/labeler-development-branches.yml b/.github/labeler-development-branches.yml
index 5ce799c2f8d4..bb1c47a23fa0 100644
--- a/.github/labeler-development-branches.yml
+++ b/.github/labeler-development-branches.yml
@@ -1,4 +1,4 @@
-# This file is used by .github/workflows/labels.yml
+# This file is used by .github/workflows/bot.yml
 # This version is only run for Pull Requests from development branches like staging-next, haskell-updates or python-updates.
 
 "4.workflow: package set update":
diff --git a/.github/labeler-no-sync.yml b/.github/labeler-no-sync.yml
index 69249f6ac27d..99d1b85c3c7b 100644
--- a/.github/labeler-no-sync.yml
+++ b/.github/labeler-no-sync.yml
@@ -1,4 +1,4 @@
-# This file is used by .github/workflows/labels.yml
+# This file is used by .github/workflows/bot.yml
 # This version uses `sync-labels: false`, meaning that a non-match will NOT remove the label
 
 # keep-sorted start case=no numeric=yes newline_separated=yes skip_lines=1
diff --git a/.github/labeler.yml b/.github/labeler.yml
index adfc49ef6ee2..abec7c37288c 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -1,4 +1,4 @@
-# This file is used by .github/workflows/labels.yml
+# This file is used by .github/workflows/bot.yml
 # This version uses `sync-labels: true`, meaning that a non-match will remove the label
 
 # keep-sorted start case=no numeric=yes newline_separated=yes skip_lines=1
diff --git a/.github/workflows/labels.yml b/.github/workflows/bot.yml
similarity index 94%
rename from .github/workflows/labels.yml
rename to .github/workflows/bot.yml
index e3dfe2642e50..1fbef1134f14 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/bot.yml
@@ -3,7 +3,7 @@
 # access to the GitHub API. This means that it should not evaluate user input in
 # a way that allows code injection.
 
-name: Labels
+name: Bot
 
 on:
   schedule:
@@ -21,7 +21,7 @@ on:
 concurrency:
   # This explicitly avoids using `run_id` for the concurrency key to make sure that only
   # *one* scheduled run can run at a time.
-  group: labels-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number }}
+  group: bot-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number }}
   # PR-triggered runs will be cancelled, but scheduled runs will be queued.
   cancel-in-progress: ${{ github.event_name != 'schedule' }}
 
@@ -36,7 +36,7 @@ defaults:
     shell: bash
 
 jobs:
-  update:
+  run:
     runs-on: ubuntu-24.04-arm
     if: github.event_name != 'schedule' || github.repository_owner == 'NixOS'
     steps:
@@ -64,13 +64,13 @@ jobs:
           GH_TOKEN: ${{ steps.app-token.outputs.token || github.token }}
         run: gh api /rate_limit | jq
 
-      - name: Labels from API data and Eval results
+      - name: Run bot
         uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         with:
           github-token: ${{ steps.app-token.outputs.token || github.token }}
           retries: 3
           script: |
-            require('./ci/github-script/labels.js')({
+            require('./ci/github-script/bot.js')({
               github,
               context,
               core,
diff --git a/.github/workflows/pull-request-target.yml b/.github/workflows/pull-request-target.yml
index 8a305a953933..d73f6fdc7e5c 100644
--- a/.github/workflows/pull-request-target.yml
+++ b/.github/workflows/pull-request-target.yml
@@ -100,10 +100,10 @@ jobs:
       systems: ${{ needs.prepare.outputs.systems }}
       testVersions: ${{ contains(fromJSON(needs.prepare.outputs.touched), 'pinned') && !contains(fromJSON(needs.prepare.outputs.headBranch).type, 'development') }}
 
-  labels:
-    name: Labels
+  bot:
+    name: Bot
     needs: [prepare, eval]
-    uses: ./.github/workflows/labels.yml
+    uses: ./.github/workflows/bot.yml
     permissions:
       issues: write
       pull-requests: write
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b26f7ee98998..f938ea5f64b1 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -58,10 +58,10 @@ jobs:
 
             if (files.some(file => [
               '.github/actions/checkout/action.yml',
+              '.github/workflows/bot.yml',
               '.github/workflows/build.yml',
               '.github/workflows/check.yml',
               '.github/workflows/eval.yml',
-              '.github/workflows/labels.yml',
               '.github/workflows/lint.yml',
               '.github/workflows/pull-request-target.yml',
               '.github/workflows/reviewers.yml',
diff --git a/ci/github-script/labels.js b/ci/github-script/bot.js
similarity index 99%
rename from ci/github-script/labels.js
rename to ci/github-script/bot.js
index bd6c81bd9d99..807b134843dc 100644
--- a/ci/github-script/labels.js
+++ b/ci/github-script/bot.js
@@ -484,7 +484,7 @@ module.exports = async ({ github, context, core, dry }) => {
       const lastRun = (
         await github.rest.actions.listWorkflowRuns({
           ...context.repo,
-          workflow_id: 'labels.yml',
+          workflow_id: 'bot.yml',
           event: 'schedule',
           status: 'success',
           exclude_pull_requests: true,
diff --git a/ci/github-script/run b/ci/github-script/run
index 782e3fa7db1f..8a2906606cac 100755
--- a/ci/github-script/run
+++ b/ci/github-script/run
@@ -65,19 +65,19 @@ program
   })
 
 program
-  .command('labels')
-  .description('Manage labels on pull requests.')
+  .command('bot')
+  .description('Run automation on pull requests and issues.')
   .argument('<owner>', 'Owner of the GitHub repository to label (Example: NixOS)')
   .argument('<repo>', 'Name of the GitHub repository to label (Example: nixpkgs)')
   .argument('[pr]', 'Number of the Pull Request to label')
   .option('--no-dry', 'Make actual modifications')
   .action(async (owner, repo, pr, options) => {
-    const labels = (await import('./labels.js')).default
+    const bot = (await import('./bot.js')).default
     const tmp = mkdtempSync(join(tmpdir(), 'github-script-'))
     try {
       process.env.GITHUB_WORKSPACE = tmp
       process.chdir(tmp)
-      await run(labels, owner, repo, pr, options)
+      await run(bot, owner, repo, pr, options)
     } finally {
       rmSync(tmp, { recursive: true })
     }

From f1640b71d81c06ce30378758c0ff5bb977105756 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 12 Oct 2025 13:16:10 +0200
Subject: [PATCH 70/85] workflows/{review,reviewed}: rename from
 dismissed-review and review-dismissed

This is just a separate commit for a better diff. This workflow will be
extended with the `submitted` type in the next commit, so needs a
different naming.

While at it, also remove the useless concurrency group: This workflow is
never run in a PR context, so will never be cancelled.
---
 .github/workflows/{dismissed-review.yml => review.yml}   | 8 ++------
 .github/workflows/{review-dismissed.yml => reviewed.yml} | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)
 rename .github/workflows/{dismissed-review.yml => review.yml} (91%)
 rename .github/workflows/{review-dismissed.yml => reviewed.yml} (91%)

diff --git a/.github/workflows/dismissed-review.yml b/.github/workflows/review.yml
similarity index 91%
rename from .github/workflows/dismissed-review.yml
rename to .github/workflows/review.yml
index db5799c80913..6679f6852766 100644
--- a/.github/workflows/dismissed-review.yml
+++ b/.github/workflows/review.yml
@@ -1,15 +1,11 @@
-name: Dismissed review
+name: Review
 
 on:
   workflow_run:
     workflows:
-      - Review dismissed
+      - Reviewed
     types: [completed]
 
-concurrency:
-  group: dismissed-review-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
-  cancel-in-progress: true
-
 permissions:
   pull-requests: write
 
diff --git a/.github/workflows/review-dismissed.yml b/.github/workflows/reviewed.yml
similarity index 91%
rename from .github/workflows/review-dismissed.yml
rename to .github/workflows/reviewed.yml
index 988b4a47df14..ab959d8c2117 100644
--- a/.github/workflows/review-dismissed.yml
+++ b/.github/workflows/reviewed.yml
@@ -1,4 +1,4 @@
-name: Review dismissed
+name: Reviewed
 
 on:
   pull_request_review:

From 99c233148dcf8ef5298a4619246bbd863ae8c968 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 14:27:57 +0000
Subject: [PATCH 71/85] python3Packages.os-service-types: 1.8.0 -> 1.8.1

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

diff --git a/pkgs/development/python-modules/os-service-types/default.nix b/pkgs/development/python-modules/os-service-types/default.nix
index 6368bedb27df..d23a814af3de 100644
--- a/pkgs/development/python-modules/os-service-types/default.nix
+++ b/pkgs/development/python-modules/os-service-types/default.nix
@@ -10,13 +10,13 @@
 
 buildPythonPackage rec {
   pname = "os-service-types";
-  version = "1.8.0";
+  version = "1.8.1";
   pyproject = true;
 
   src = fetchPypi {
     pname = "os_service_types";
     inherit version;
-    hash = "sha256-iQznTxMsozTCsj8AJRErR8aSbabSjC91vPwKg96jYD4=";
+    hash = "sha256-w9YBNO5QnPVUUsc/+L1BiRvLbPQkIaFZwBOIJOEmQCs=";
   };
 
   postPatch = ''

From 4b48ce458bead78a63f77e642ae91e3bde508f49 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 14:31:34 +0000
Subject: [PATCH 72/85] libretro.ppsspp: 0-unstable-2025-10-22 ->
 0-unstable-2025-10-31

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

diff --git a/pkgs/applications/emulators/libretro/cores/ppsspp.nix b/pkgs/applications/emulators/libretro/cores/ppsspp.nix
index 7acd6a288f8a..8b55fc42292b 100644
--- a/pkgs/applications/emulators/libretro/cores/ppsspp.nix
+++ b/pkgs/applications/emulators/libretro/cores/ppsspp.nix
@@ -13,13 +13,13 @@
 }:
 mkLibretroCore {
   core = "ppsspp";
-  version = "0-unstable-2025-10-22";
+  version = "0-unstable-2025-10-31";
 
   src = fetchFromGitHub {
     owner = "hrydgard";
     repo = "ppsspp";
-    rev = "28790c19af7ddfa822c4152a3cae4a7fb6c06bc7";
-    hash = "sha256-m1qmgr92Ni8wAYer6kIdcu+BUiBSROFcSC/M3v/JOmA=";
+    rev = "884ec9d16e39272d6f04ce6e7e202290ec31f45d";
+    hash = "sha256-vC2GPK5hHjOUtoxG2rw2ESiAbTOsQRx8tDABxNjRkFw=";
     fetchSubmodules = true;
   };
 

From 520a3885400c847834e12ec88035bf1fd2552df9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 14:39:49 +0000
Subject: [PATCH 73/85] ipget: 0.12.0 -> 0.12.1

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

diff --git a/pkgs/by-name/ip/ipget/package.nix b/pkgs/by-name/ip/ipget/package.nix
index 3d0b3f66dee9..408c5e4c5a97 100644
--- a/pkgs/by-name/ip/ipget/package.nix
+++ b/pkgs/by-name/ip/ipget/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "ipget";
-  version = "0.12.0";
+  version = "0.12.1";
 
   src = fetchFromGitHub {
     owner = "ipfs";
     repo = "ipget";
     rev = "v${version}";
-    hash = "sha256-7/wXrjnd7YD2qhVvP0yBMJDkDZjxJC1vZcQuqVd44rU=";
+    hash = "sha256-a+dVqIo+cmEnYrc1A98/APJq0m2pSKC5HKIN04rfziY=";
   };
 
-  vendorHash = "sha256-b6Lulzi7zgO0VdWboxi5Vibx8cjuZ6r6O1PJvYubZu4=";
+  vendorHash = "sha256-tYBM0NGHhLNTRfsv+UgBmtpxItjPIr7Klo708vaXItw=";
 
   postPatch = ''
     # main module (github.com/ipfs/ipget) does not contain package github.com/ipfs/ipget/sharness/dependencies

From eea09eb9d320d5f011c94d4572fc78ff89ee3bc0 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 11 Oct 2025 13:19:10 +0200
Subject: [PATCH 74/85] workflows/bot: migrate nixpkgs-merge-bot to GHA

Running the nixpkgs-merge-bot in GitHub Actions instead of a separate
workflow has multiple advantages:
- A much better development workflow, with improved testability.
- The ability to label PRs with a "merge-bot eligible" label from the
same codebase.
- Using more data for merge strategy decisions, for example the number
of rebuilds.

This commits re-implements most of the features from the current
nxipkgs-merge-bot directly in the bot workflow. Instead of reacting to
webhook events, this now runs on the regular 10 minute schedule. Some
merges might be delayed a few minutes, but that should not be a problem
in practice.

To give the user early feedback, there are additional workflows running
when a comment or review is posted. These react with "eyes" to make the
user aware that the comment has been recognized.

The only feature not taken over was the size check for files in the PR.
This kind of check is not really relevant for maintainer merges only -
if we want to prevent bigger files from making it into the tree, then we
need a generic CI check, which is out of scope for the merge-bot.

Other than that, everything should be implemented - any omissions are by
accident.
---
 .github/workflows/bot.yml      |   5 +
 .github/workflows/comment.yml  |  54 +++++++
 .github/workflows/review.yml   |  68 ++++++---
 .github/workflows/reviewed.yml |   2 +-
 ci/github-script/bot.js        |  40 +++--
 ci/github-script/merge.js      | 257 +++++++++++++++++++++++++++++++++
 6 files changed, 395 insertions(+), 31 deletions(-)
 create mode 100644 .github/workflows/comment.yml
 create mode 100644 ci/github-script/merge.js

diff --git a/.github/workflows/bot.yml b/.github/workflows/bot.yml
index 1fbef1134f14..cb1df7bdb0a1 100644
--- a/.github/workflows/bot.yml
+++ b/.github/workflows/bot.yml
@@ -39,6 +39,10 @@ jobs:
   run:
     runs-on: ubuntu-24.04-arm
     if: github.event_name != 'schedule' || github.repository_owner == 'NixOS'
+    env:
+      # TODO: Remove after 2026-03-04, when Node 24 becomes the default.
+      # https://github.blog/changelog/2025-09-19-deprecation-of-node-20-on-github-actions-runners/
+      FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: "true"
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
@@ -56,6 +60,7 @@ jobs:
         with:
           app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
           private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
+          permission-contents: write
           permission-issues: write
           permission-pull-requests: write
 
diff --git a/.github/workflows/comment.yml b/.github/workflows/comment.yml
new file mode 100644
index 000000000000..d09df6956c8c
--- /dev/null
+++ b/.github/workflows/comment.yml
@@ -0,0 +1,54 @@
+name: Comment
+
+on:
+  issue_comment:
+    types: [created]
+
+# This is used as fallback without app only.
+# This happens when testing in forks without setting up that app.
+permissions:
+  pull-requests: write
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  # The `bot` workflow reacts to comments with @NixOS/nixpkgs-merge-bot references, but might only
+  # pick up a comment after up to 10 minutes. To give the user instant feedback, this job adds
+  # a reaction to these comments.
+  react:
+    name: React with eyes
+    runs-on: ubuntu-24.04-arm
+    timeout-minutes: 2
+    if: contains(github.event.comment.body, '@NixOS/nixpkgs-merge-bot merge')
+    steps:
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        with:
+          persist-credentials: false
+          sparse-checkout: |
+            ci/github-script
+
+      # Use the GitHub App to make sure the reaction happens with the same user who will later merge.
+      - uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
+        if: github.event_name != 'pull_request' && vars.NIXPKGS_CI_APP_ID
+        id: app-token
+        with:
+          app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
+          private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
+          permission-pull-requests: write
+
+      - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        with:
+          github-token: ${{ steps.app-token.outputs.token || github.token }}
+          retries: 3
+          script: |
+            const { handleMergeComment } = require('./ci/github-script/merge.js')
+            const { body, node_id } = context.payload.comment
+
+            await handleMergeComment({
+              github,
+              body,
+              node_id,
+              reaction: 'EYES',
+            })
diff --git a/.github/workflows/review.yml b/.github/workflows/review.yml
index 6679f6852766..44ac3f0088d4 100644
--- a/.github/workflows/review.yml
+++ b/.github/workflows/review.yml
@@ -6,6 +6,8 @@ on:
       - Reviewed
     types: [completed]
 
+# This is used as fallback without app only.
+# This happens when testing in forks without setting up that app.
 permissions:
   pull-requests: write
 
@@ -14,18 +16,32 @@ defaults:
     shell: bash
 
 jobs:
-  # The `check-cherry-picks` workflow creates review comments which reviewers
-  # are encouraged to manually dismiss if they're not relevant.
-  # When a CI-generated review is dismissed, this job automatically minimizes
-  # it, preventing it from cluttering the PR.
-  minimize:
-    name: Minimize as resolved
+  process:
     runs-on: ubuntu-24.04-arm
     timeout-minutes: 2
     steps:
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        with:
+          persist-credentials: false
+          sparse-checkout: |
+            ci/github-script
+
+      # Use the GitHub App to make sure the reaction happens with the same user who will later merge.
+      - uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
+        if: github.event_name != 'pull_request' && vars.NIXPKGS_CI_APP_ID
+        id: app-token
+        with:
+          app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
+          private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
+          permission-pull-requests: write
+
       - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         with:
+          github-token: ${{ steps.app-token.outputs.token || github.token }}
+          retries: 3
           script: |
+            const { handleMergeComment } = require('./ci/github-script/merge.js')
+
             // PRs from forks don't have any PRs associated by default.
             // Thus, we request the PR number with an API call *to* the fork's repo.
             // Multiple pull requests can be open from the same head commit, either via
@@ -44,19 +60,33 @@ jobs:
                     owner: context.repo.owner,
                     repo: context.repo.repo,
                     pull_number: pull_request.number
-                  })).filter(review =>
-                    review.user?.login == 'github-actions[bot]' &&
-                    review.state == 'DISMISSED'
-                  ).map(review => github.graphql(`
-                    mutation($node_id:ID!) {
-                      minimizeComment(input: {
-                        classifier: RESOLVED,
-                        subjectId: $node_id
-                      })
-                      { clientMutationId }
-                    }`,
-                    { node_id: review.node_id }
-                  ))
+                  })).map(review => {
+                    // The `check` workflow creates review comments which reviewers
+                    // are encouraged to manually dismiss if they're not relevant.
+                    // When a CI-generated review is dismissed, this job automatically minimizes
+                    // it, preventing it from cluttering the PR.
+                    if (review.user?.login == 'github-actions[bot]' && review.state == 'DISMISSED')
+                      return github.graphql(`
+                        mutation($node_id:ID!) {
+                          minimizeComment(input: {
+                            classifier: RESOLVED,
+                            subjectId: $node_id
+                          })
+                          { clientMutationId }
+                        }`,
+                        { node_id: review.node_id }
+                      )
+
+                    // The `bot` workflow reacts to comments with @NixOS/nixpkgs-merge-bot references, but might only
+                    // pick up a comment after up to 10 minutes. To give the user instant feedback, this job adds
+                    // a reaction to these comments.
+                    return handleMergeComment({
+                      github,
+                      body: review.body,
+                      node_id: review.node_id,
+                      reaction: 'EYES',
+                    })
+                  })
                 )
               )
             )
diff --git a/.github/workflows/reviewed.yml b/.github/workflows/reviewed.yml
index ab959d8c2117..d7d368739eaa 100644
--- a/.github/workflows/reviewed.yml
+++ b/.github/workflows/reviewed.yml
@@ -2,7 +2,7 @@ name: Reviewed
 
 on:
   pull_request_review:
-    types: [dismissed]
+    types: [submitted, dismissed]
 
 permissions: {}
 
diff --git a/ci/github-script/bot.js b/ci/github-script/bot.js
index 807b134843dc..e0a67a747c82 100644
--- a/ci/github-script/bot.js
+++ b/ci/github-script/bot.js
@@ -4,6 +4,7 @@ module.exports = async ({ github, context, core, dry }) => {
   const { readFile, writeFile } = require('node:fs/promises')
   const withRateLimit = require('./withRateLimit.js')
   const { classify } = require('../supportedBranches.js')
+  const { handleMerge } = require('./merge.js')
 
   const artifactClient = new DefaultArtifactClient()
 
@@ -95,7 +96,7 @@ module.exports = async ({ github, context, core, dry }) => {
     return maintainerMaps[branch]
   }
 
-  async function handlePullRequest({ item, stats }) {
+  async function handlePullRequest({ item, stats, events }) {
     const log = (k, v) => core.info(`PR #${item.number} - ${k}: ${v}`)
 
     const pull_number = item.number
@@ -109,6 +110,19 @@ module.exports = async ({ github, context, core, dry }) => {
       })
     ).data
 
+    const maintainers = await getMaintainerMap(pull_request.base.ref)
+
+    await handleMerge({
+      github,
+      context,
+      core,
+      log,
+      dry,
+      pull_request,
+      events,
+      maintainers,
+    })
+
     // When the same change has already been merged to the target branch, a PR will still be
     // open and display the same changes - but will not actually have any effect. This causes
     // strange CI behavior, because the diff of the merge-commit is empty, no rebuilds will
@@ -305,8 +319,6 @@ module.exports = async ({ github, context, core, dry }) => {
         )
       }
 
-      const maintainers = await getMaintainerMap(pull_request.base.ref)
-
       Object.assign(prLabels, evalLabels, {
         '11.by: package-maintainer':
           packages.length &&
@@ -377,9 +389,21 @@ module.exports = async ({ github, context, core, dry }) => {
 
       const itemLabels = {}
 
+      const events = await github.paginate(
+        github.rest.issues.listEventsForTimeline,
+        {
+          ...context.repo,
+          issue_number,
+          per_page: 100,
+        },
+      )
+
       if (item.pull_request || context.payload.pull_request) {
         stats.prs++
-        Object.assign(itemLabels, await handlePullRequest({ item, stats }))
+        Object.assign(
+          itemLabels,
+          await handlePullRequest({ item, stats, events }),
+        )
       } else {
         stats.issues++
         if (item.labels.some(({ name }) => name === '4.workflow: auto-close')) {
@@ -391,13 +415,7 @@ module.exports = async ({ github, context, core, dry }) => {
       }
 
       const latest_event_at = new Date(
-        (
-          await github.paginate(github.rest.issues.listEventsForTimeline, {
-            ...context.repo,
-            issue_number,
-            per_page: 100,
-          })
-        )
+        events
           .filter(({ event }) =>
             [
               // These events are hand-picked from:
diff --git a/ci/github-script/merge.js b/ci/github-script/merge.js
new file mode 100644
index 000000000000..b08e2b4e2fdc
--- /dev/null
+++ b/ci/github-script/merge.js
@@ -0,0 +1,257 @@
+// Caching the list of committers saves API requests when running the bot on the schedule and
+// processing many PRs at once.
+let committers
+
+async function runChecklist({ github, context, pull_request, maintainers }) {
+  const pull_number = pull_request.number
+
+  if (!committers) {
+    committers = github
+      .paginate(github.rest.teams.listMembersInOrg, {
+        org: context.repo.owner,
+        team_slug: 'nixpkgs-committers',
+        per_page: 100,
+      })
+      .then((members) => new Set(members.map(({ id }) => id)))
+  }
+
+  const files = await github.paginate(github.rest.pulls.listFiles, {
+    ...context.repo,
+    pull_number,
+    per_page: 100,
+  })
+
+  const packages = files
+    .filter(({ filename }) => filename.startsWith('pkgs/by-name/'))
+    .map(({ filename }) => filename.split('/')[3])
+
+  const eligible = !packages.length
+    ? new Set()
+    : packages
+        .map((pkg) => new Set(maintainers[pkg]))
+        .reduce((acc, cur) => acc?.intersection(cur) ?? cur)
+
+  const checklist = {
+    'PR targets one of the allowed branches: master, staging, staging-next.': [
+      'master',
+      'staging',
+      'staging-next',
+    ].includes(pull_request.base.ref),
+    'PR touches only files in `pkgs/by-name/`.': files.every(({ filename }) =>
+      filename.startsWith('pkgs/by-name/'),
+    ),
+    'PR authored by r-ryantm or committer.':
+      pull_request.user.login === 'r-ryantm' ||
+      (await committers).has(pull_request.user.id),
+    'PR has maintainers eligible for merge.': eligible.size > 0,
+  }
+
+  return {
+    checklist,
+    eligible,
+    result: Object.values(checklist).every(Boolean),
+  }
+}
+
+// The merge command must be on a separate line and not within codeblocks or html comments.
+// Codeblocks can have any number of ` larger than 3 to open/close. We only look at code
+// blocks that are not indented, because the later regex wouldn't match those anyway.
+function hasMergeCommand(body) {
+  return (body ?? '')
+    .replace(/<!--.*?-->/gms, '')
+    .replace(/(^`{3,})[^`].*?\1/gms, '')
+    .match(/^@NixOS\/nixpkgs-merge-bot merge\s*$/m)
+}
+
+async function handleMergeComment({ github, body, node_id, reaction }) {
+  if (!hasMergeCommand(body)) return
+
+  await github.graphql(
+    `mutation($node_id: ID!, $reaction: ReactionContent!) {
+      addReaction(input: {
+        content: $reaction,
+        subjectId: $node_id
+      })
+      { clientMutationId }
+    }`,
+    { node_id, reaction },
+  )
+}
+
+async function handleMerge({
+  github,
+  context,
+  core,
+  log,
+  dry,
+  pull_request,
+  events,
+  maintainers,
+}) {
+  const pull_number = pull_request.number
+
+  const { checklist, eligible, result } = await runChecklist({
+    github,
+    context,
+    pull_request,
+    maintainers,
+  })
+  log('checklist', JSON.stringify(checklist))
+  log('eligible', JSON.stringify(Array.from(eligible)))
+  log('result', result)
+
+  // Only look through comments *after* the latest (force) push.
+  const latestChange = events.findLast(({ event }) =>
+    ['committed', 'head_ref_force_pushed'].includes(event),
+  ) ?? { sha: pull_request.head.sha }
+  const latestSha = latestChange.sha ?? latestChange.commit_id
+  log('latest sha', latestSha)
+  const latestIndex = events.indexOf(latestChange)
+
+  const comments = events.slice(latestIndex + 1).filter(
+    ({ event, body, node_id }) =>
+      ['commented', 'reviewed'].includes(event) &&
+      hasMergeCommand(body) &&
+      // Ignore comments which had already been responded to by the bot.
+      !events.some(
+        ({ event, user, body }) =>
+          ['commented'].includes(event) &&
+          // We're only testing this hidden reference, but not the author of the comment.
+          // We'll just assume that nobody creates comments with this marker on purpose.
+          // Additionally checking the author is quite annoying for local debugging.
+          body.match(new RegExp(`^<!-- comment: ${node_id} -->$`, 'm')),
+      ),
+  )
+
+  async function merge() {
+    if (dry) {
+      core.info(`Merging #${pull_number}... (dry)`)
+      return 'Merge completed (dry)'
+    }
+
+    // Using GraphQL's enablePullRequestAutoMerge mutation instead of the REST
+    // /merge endpoint, because the latter doesn't work with Merge Queues.
+    // This mutation works both with and without Merge Queues.
+    // It doesn't work when there are no required status checks for the target branch.
+    // All development branches have these enabled, so this is a non-issue.
+    try {
+      await github.graphql(
+        `mutation($node_id: ID!, $sha: GitObjectID) {
+          enablePullRequestAutoMerge(input: {
+            expectedHeadOid: $sha,
+            pullRequestId: $node_id
+          })
+          { clientMutationId }
+        }`,
+        { node_id: pull_request.node_id, sha: latestSha },
+      )
+      return 'Enabled Auto Merge'
+    } catch (e) {
+      log('Auto Merge failed', e.response.errors[0].message)
+    }
+
+    // Auto-merge doesn't work if the target branch has already run all CI, in which
+    // case the PR must be enqueued explicitly.
+    // We now have merge queues enabled on all development branches, thus don't need a
+    // fallback after this.
+    try {
+      const resp = await github.graphql(
+        `mutation($node_id: ID!, $sha: GitObjectID) {
+          enqueuePullRequest(input: {
+            expectedHeadOid: $sha,
+            pullRequestId: $node_id
+          })
+          {
+            clientMutationId,
+            mergeQueueEntry { mergeQueue { url } }
+          }
+        }`,
+        { node_id: pull_request.node_id, sha: latestSha },
+      )
+      return `[Queued](${resp.enqueuePullRequest.mergeQueueEntry.mergeQueue.url}) for merge`
+    } catch (e) {
+      log('Enqueing failed', e.response.errors[0].message)
+      throw new Error(e.response.errors[0].message)
+    }
+  }
+
+  for (const comment of comments) {
+    log('comment', comment.node_id)
+
+    async function react(reaction) {
+      if (dry) {
+        core.info(`Reaction ${reaction} on ${comment.node_id} (dry)`)
+        return
+      }
+
+      await handleMergeComment({
+        github,
+        body: comment.body,
+        node_id: comment.node_id,
+        reaction,
+      })
+    }
+
+    async function isMaintainer(username) {
+      try {
+        return (
+          (
+            await github.rest.teams.getMembershipForUserInOrg({
+              org: context.repo.owner,
+              team_slug: 'nixpkgs-maintainers',
+              username,
+            })
+          ).data.state === 'active'
+        )
+      } catch (e) {
+        if (e.status === 404) return false
+        else throw e
+      }
+    }
+
+    const canUseMergeBot = await isMaintainer(comment.user.login)
+    const isEligible = eligible.has(comment.user.id)
+    const canMerge = result && canUseMergeBot && isEligible
+
+    const body = [
+      `<!-- comment: ${comment.node_id} -->`,
+      '',
+      'Requirements to merge this PR:',
+      ...Object.entries(checklist).map(
+        ([msg, res]) => `- :${res ? 'white_check_mark' : 'x'}: ${msg}`,
+      ),
+      `- :${canUseMergeBot ? 'white_check_mark' : 'x'}: ${comment.user.login} can use the merge bot.`,
+      `- :${isEligible ? 'white_check_mark' : 'x'}: ${comment.user.login} is eligible to merge changes to the touched packages.`,
+      '',
+    ]
+
+    if (canMerge) {
+      await react('ROCKET')
+      try {
+        body.push(`:heavy_check_mark: ${await merge()} (#306934)`)
+      } catch (e) {
+        body.push(`:x: Merge failed with: ${e} (#371492)`)
+      }
+    } else {
+      await react('THUMBS_DOWN')
+      body.push(':x: Pull Request could not be merged (#305350)')
+    }
+
+    if (dry) {
+      core.info(body.join('\n'))
+    } else {
+      await github.rest.issues.createComment({
+        ...context.repo,
+        issue_number: pull_number,
+        body: body.join('\n'),
+      })
+    }
+
+    if (canMerge) break
+  }
+}
+
+module.exports = {
+  handleMerge,
+  handleMergeComment,
+}

From 89ace76ff11eebb7b0ab167df5b7b35f6b9629ae Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 12 Oct 2025 14:41:05 +0200
Subject: [PATCH 75/85] workflows/bot: retry failed merges

By not keeping the node_id in the comments resulting from a failed
merge, these merges will be automatically retried.
---
 ci/github-script/merge.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ci/github-script/merge.js b/ci/github-script/merge.js
index b08e2b4e2fdc..3c7576d659bb 100644
--- a/ci/github-script/merge.js
+++ b/ci/github-script/merge.js
@@ -230,6 +230,8 @@ async function handleMerge({
       try {
         body.push(`:heavy_check_mark: ${await merge()} (#306934)`)
       } catch (e) {
+        // Remove the HTML comment with node_id reference to allow retrying this merge on the next run.
+        body.shift()
         body.push(`:x: Merge failed with: ${e} (#371492)`)
       }
     } else {

From e8bd73ba48399fb1c97596244ca189996bb3a389 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 15:17:44 +0000
Subject: [PATCH 76/85] precious: 0.10.0 -> 0.10.1

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

diff --git a/pkgs/by-name/pr/precious/package.nix b/pkgs/by-name/pr/precious/package.nix
index b59055913bbe..b97cab9b3ce5 100644
--- a/pkgs/by-name/pr/precious/package.nix
+++ b/pkgs/by-name/pr/precious/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "precious";
-  version = "0.10.0";
+  version = "0.10.1";
 
   src = fetchFromGitHub {
     owner = "houseabsolute";
     repo = "precious";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-bHrn78wzdkxV92Lp3MzNUpSvMTyc8l3tw+z5NBxJPoA=";
+    hash = "sha256-xM4NqcT1NGR3tkLOPt59lfFpjRnohU+tTTk9Ijkf97o=";
   };
 
-  cargoHash = "sha256-OA1C98C0BHEVl056UCL5alT292djuBDGFjZn2HAytEQ=";
+  cargoHash = "sha256-tp0kvG5G7mW0czfZ43AbT7Lcv1sMnO5Zc+t2d5w4aqA=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;

From 9efc113722a4b59a21a64a096d598708e0f3bac3 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Mon, 20 Oct 2025 03:35:56 +0200
Subject: [PATCH 77/85] jack-link: init at 0.2.4

---
 pkgs/by-name/ja/jack-link/package.nix | 40 +++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 pkgs/by-name/ja/jack-link/package.nix

diff --git a/pkgs/by-name/ja/jack-link/package.nix b/pkgs/by-name/ja/jack-link/package.nix
new file mode 100644
index 000000000000..7a5bae52f8a4
--- /dev/null
+++ b/pkgs/by-name/ja/jack-link/package.nix
@@ -0,0 +1,40 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  unstableGitUpdater,
+  pkg-config,
+  libjack2,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "jack-link";
+  version = "0.2.4";
+
+  src = fetchFromGitHub {
+    owner = "rncbc";
+    repo = "jack_link";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-bIB3lxKKaI8DLtmnkRTTHXDopCZ3FAv15cAYcyJcBYA=";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    libjack2
+  ];
+
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  meta = {
+    homepage = "https://github.com/rncbc/jack_link";
+    description = "jack_link bridges JACK transport with Ableton Link";
+    license = lib.licenses.gpl2Plus;
+    mainProgram = "jack_link";
+    maintainers = with lib.maintainers; [ magnetophon ];
+    platforms = lib.platforms.linux;
+  };
+})

From a5296ec9d5d24f19511ca96a13461cff5a6ff212 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 1 Nov 2025 16:29:27 +0100
Subject: [PATCH 78/85] workflows/bot: request read permissions for members

The nixpkgs-ci token used in CI doesn't have permissions to read the
member list of the nixpkgs-committers team, yet. Let's request this
permission and see whether that fixes the errors we get so far.
---
 .github/workflows/bot.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/bot.yml b/.github/workflows/bot.yml
index cb1df7bdb0a1..8e37cf2aabc9 100644
--- a/.github/workflows/bot.yml
+++ b/.github/workflows/bot.yml
@@ -60,8 +60,10 @@ jobs:
         with:
           app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
           private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
+          permission-administration: read
           permission-contents: write
           permission-issues: write
+          permission-members: read
           permission-pull-requests: write
 
       - name: Log current API rate limits

From 1cd12cc17e8333b8eeec34a3ba479691ffa34294 Mon Sep 17 00:00:00 2001
From: diamond-deluxe <112557036+diamond-deluxe@users.noreply.github.com>
Date: Sun, 26 Oct 2025 14:48:59 +0000
Subject: [PATCH 79/85] yafc-ce: 2.14.0 -> 2.16.0

Release: https://github.com/shpaass/yafc-ce/releases/tag/v2.16.0
---
 pkgs/by-name/ya/yafc-ce/deps.json   | 25 +++++++++++++++++++++++++
 pkgs/by-name/ya/yafc-ce/package.nix |  6 +++---
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yafc-ce/deps.json b/pkgs/by-name/ya/yafc-ce/deps.json
index e3e3d046b6da..b408392da3a5 100644
--- a/pkgs/by-name/ya/yafc-ce/deps.json
+++ b/pkgs/by-name/ya/yafc-ce/deps.json
@@ -34,6 +34,21 @@
     "version": "3.26.1",
     "hash": "sha256-1tHxDuJwwvJWZ3H9ooPFAKuaJIthSdTDlmjHlxH/euc="
   },
+  {
+    "pname": "Microsoft.CodeAnalysis.Analyzers",
+    "version": "3.11.0",
+    "hash": "sha256-hQ2l6E6PO4m7i+ZsfFlEx+93UsLPo4IY3wDkNG11/Sw="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.Common",
+    "version": "4.14.0",
+    "hash": "sha256-ne/zxH3GqoGB4OemnE8oJElG5mai+/67ASaKqwmL2BE="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.CSharp",
+    "version": "4.14.0",
+    "hash": "sha256-5Mzj3XkYYLkwDWh17r1NEXSbXwwWYQPiOmkSMlgo1JY="
+  },
   {
     "pname": "Microsoft.CodeCoverage",
     "version": "17.11.1",
@@ -94,11 +109,21 @@
     "version": "6.0.0",
     "hash": "sha256-KQmlUpG9ovRpNqKhKe6rz3XMLUjkBqjyQhEm2hV5Sow="
   },
+  {
+    "pname": "System.Collections.Immutable",
+    "version": "9.0.0",
+    "hash": "sha256-+6q5VMeoc5bm4WFsoV6nBXA9dV5pa/O4yW+gOdi8yac="
+  },
   {
     "pname": "System.Reflection.Metadata",
     "version": "1.6.0",
     "hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E="
   },
+  {
+    "pname": "System.Reflection.Metadata",
+    "version": "9.0.0",
+    "hash": "sha256-avEWbcCh7XgpsSesnR3/SgxWi/6C5OxjR89Jf/SfRjQ="
+  },
   {
     "pname": "xunit",
     "version": "2.9.2",
diff --git a/pkgs/by-name/ya/yafc-ce/package.nix b/pkgs/by-name/ya/yafc-ce/package.nix
index 39a2b714a961..d2099636373b 100644
--- a/pkgs/by-name/ya/yafc-ce/package.nix
+++ b/pkgs/by-name/ya/yafc-ce/package.nix
@@ -12,13 +12,13 @@ let
 in
 buildDotnetModule (finalAttrs: {
   pname = "yafc-ce";
-  version = "2.14.0";
+  version = "2.16.0";
 
   src = fetchFromGitHub {
     owner = "shpaass";
     repo = "yafc-ce";
-    rev = finalAttrs.version;
-    hash = "sha256-EbVPPSci4AziF+n/8pIa9M44WEUj+vvEOQqu3HJ6aNQ=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-6+GGxEwn3tenmcukOZPTIZ7UZg/d9uudQP0qwU8mifY=";
   };
 
   projectFile = [

From 00e7b934fb10ba7a3f57481586da52cc712317df Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 12 Oct 2025 13:40:49 +0200
Subject: [PATCH 80/85] workflows/bot: set "merge-bot eligible" label

This makes it more visible which PRs are merge-bot eligible, by setting
a label respectively.
---
 ci/github-script/bot.js   | 3 ++-
 ci/github-script/merge.js | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ci/github-script/bot.js b/ci/github-script/bot.js
index e0a67a747c82..a40b3b227957 100644
--- a/ci/github-script/bot.js
+++ b/ci/github-script/bot.js
@@ -112,7 +112,7 @@ module.exports = async ({ github, context, core, dry }) => {
 
     const maintainers = await getMaintainerMap(pull_request.base.ref)
 
-    await handleMerge({
+    const merge_bot_eligible = await handleMerge({
       github,
       context,
       core,
@@ -199,6 +199,7 @@ module.exports = async ({ github, context, core, dry }) => {
       // The second pass will then read the result from the first pass and set the label.
       '2.status: merge conflict':
         merge_commit_sha_valid && !pull_request.merge_commit_sha,
+      '2.status: merge-bot eligible': merge_bot_eligible,
       '12.approvals: 1': approvals.size === 1,
       '12.approvals: 2': approvals.size === 2,
       '12.approvals: 3+': approvals.size >= 3,
diff --git a/ci/github-script/merge.js b/ci/github-script/merge.js
index 3c7576d659bb..0cb65a11ae97 100644
--- a/ci/github-script/merge.js
+++ b/ci/github-script/merge.js
@@ -251,6 +251,10 @@ async function handleMerge({
 
     if (canMerge) break
   }
+
+  // Returns a boolean, which indicates whether the PR is merge-bot eligible in principle.
+  // This is used to set the respective label in bot.js.
+  return result
 }
 
 module.exports = {

From 5dce07242bb3171999341796ca906b628585f29d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9-Paul=20D=2E?=
 <44802527+godelized@users.noreply.github.com>
Date: Fri, 31 Oct 2025 18:36:13 +0100
Subject: [PATCH 81/85] nixos/anubis: warn about legacy runtime directory when
 necessary

---
 nixos/modules/services/networking/anubis.nix | 31 +++++++++-----------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/nixos/modules/services/networking/anubis.nix b/nixos/modules/services/networking/anubis.nix
index cb1ca0ee293e..fefc7001677d 100644
--- a/nixos/modules/services/networking/anubis.nix
+++ b/nixos/modules/services/networking/anubis.nix
@@ -25,14 +25,14 @@ let
   instanceUsesDedicatedRuntimeDirectory =
     name: instance:
     lib.any (lib.hasPrefix (runtimeDirectoryPrefix name)) (unixSocketAddrs instance.settings);
-  useDedicatedRuntimeDirectory =
+  useLegacyRuntimeDirectory =
     # Set when:
-    # - Multiple instances are configured to use unix sockets.
-    # - At least one instance uses the new runtime directory prefix: /run/anubis/anubis-<instance name>.
-    lib.count instanceUsesUnixSockets (lib.attrValues enabledInstances) > 1
-    || lib.any (attrs: instanceUsesDedicatedRuntimeDirectory attrs.name attrs.value) (
+    # - Only one instance is configured with unix sockets.
+    # - No instance uses the new runtime directory prefix: /run/anubis/anubis-<name>.
+    lib.count instanceUsesUnixSockets (lib.attrValues enabledInstances) == 1
+    && !(lib.any (attrs: instanceUsesDedicatedRuntimeDirectory attrs.name attrs.value) (
       lib.attrsToList enabledInstances
-    );
+    ));
 
   commonSubmodule =
     isDefault:
@@ -207,7 +207,7 @@ let
         default = "/run/anubis/${instanceName name}.sock";
         description = ''
           The address that Anubis listens to. See Go's [`net.Listen`](https://pkg.go.dev/net#Listen) for syntax.
-          Use the prefix ${runtimeDirectoryPrefix "<instance name>"} when configuring multiple instances.
+          Use the prefix "${runtimeDirectoryPrefix "<name>"}". The prefix "/run/anubis" is deprecated.
 
           Defaults to Unix domain sockets. To use TCP sockets, set this to a TCP address and `BIND_NETWORK` to `"tcp"`.
         '';
@@ -219,7 +219,7 @@ let
         description = ''
           The address Anubis' metrics server listens to. See Go's [`net.Listen`](https://pkg.go.dev/net#Listen) for
           syntax.
-          Use the prefix ${runtimeDirectoryPrefix "<instance name>"} when configuring multiple instances.
+          Use the prefix "${runtimeDirectoryPrefix "<name>"}". The prefix "/run/anubis" is deprecated.
 
           The metrics server is enabled by default and may be disabled. However, due to implementation details, this is
           only possible by setting a command line flag. See {option}`services.anubis.defaultOptions.extraFlags` for an
@@ -269,9 +269,7 @@ in
   };
 
   config = lib.mkIf (enabledInstances != { }) {
-    warnings = [
-      "RuntimeDirectory is going to be migrated from `anubis` to `anubis/anubis-<instance name>`, update BIND and METRICS_BIND to ${runtimeDirectoryPrefix "<instance name>"} if using unix sockets"
-    ];
+    warnings = lib.optional useLegacyRuntimeDirectory ''Anubis service: runtime directory is going to be migrated from "anubis" to "anubis/anubis-<name>". Update services.anubis.instances.<name>.BIND to "${runtimeDirectoryPrefix "<name>"}anubis.sock" and services.anubis.instances.<name>.METRICS_BIND to "${runtimeDirectoryPrefix "<name>"}anubis-metrics.sock". Note: if <name> is "", use the prefix "/run/anubis/anubis".'';
 
     assertions =
       let
@@ -282,9 +280,9 @@ in
       [
         {
           assertion =
-            !useDedicatedRuntimeDirectory
+            useLegacyRuntimeDirectory
             || lib.all validInstanceUnixSocketAddrs (lib.attrsToList enabledInstances);
-          message = "use the prefix ${runtimeDirectoryPrefix "<instance name>"} in BIND and METRICS_BIND when configuring multiple instances";
+          message = ''use the prefix "${runtimeDirectoryPrefix "<name>"}" in services.anubis.instances.<name>.BIND and services.anubis.instances.<name>.METRICS_BIND'';
         }
       ];
 
@@ -331,12 +329,11 @@ in
             (lib.singleton (lib.getExe cfg.package)) ++ instance.extraFlags
           );
           RuntimeDirectory =
-            if useDedicatedRuntimeDirectory then
-              "anubis/${instanceName name}"
-            else if instanceUsesUnixSockets instance then
-              # `dedicatedRuntimeDirectory = false`: /run/anubis may still be used.
+            if useLegacyRuntimeDirectory && instanceUsesUnixSockets instance then
               # Warning: `anubis` will be deprecated eventually.
               "anubis"
+            else if instanceUsesUnixSockets instance then
+              "anubis/${instanceName name}"
             else
               null;
           # hardening

From 77a3b006cd6154ab2c3590c1d8229669e9f66265 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 1 Nov 2025 18:49:14 +0100
Subject: [PATCH 82/85] workflows/test: trigger on some github-scripts as well

Changes in these files can easily cause the Test workflow to break, so
they should be tested as well.
---
 .github/workflows/test.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f938ea5f64b1..8c0451a54754 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -66,6 +66,9 @@ jobs:
               '.github/workflows/pull-request-target.yml',
               '.github/workflows/reviewers.yml',
               '.github/workflows/test.yml',
+              'ci/github-script/bot.js',
+              'ci/github-script/merge.js',
+              'ci/github-script/withRateLimit.js',
             ].includes(file))) core.setOutput('pr', true)
 
   merge-group:

From 421974863f031fef03690906c2897483f60eccec Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 1 Nov 2025 17:37:03 +0100
Subject: [PATCH 83/85] workflows/bot: avoid access teams endpoints in Test
 workflow

We have no chance of getting a token that can request the team endpoints
in the pull_request context. This makes sense, because non-members of
the org are also not allowed to view the teams' memberships.

Thus, just fake an empty team - that's fine for the Test workflow.
---
 ci/github-script/merge.js | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/ci/github-script/merge.js b/ci/github-script/merge.js
index 3c7576d659bb..42d350fe3f39 100644
--- a/ci/github-script/merge.js
+++ b/ci/github-script/merge.js
@@ -6,13 +6,21 @@ async function runChecklist({ github, context, pull_request, maintainers }) {
   const pull_number = pull_request.number
 
   if (!committers) {
-    committers = github
-      .paginate(github.rest.teams.listMembersInOrg, {
-        org: context.repo.owner,
-        team_slug: 'nixpkgs-committers',
-        per_page: 100,
-      })
-      .then((members) => new Set(members.map(({ id }) => id)))
+    if (context.eventName === 'pull_request') {
+      // We have no chance of getting a token in the pull_request context with the right
+      // permissions to access the members endpoint below. Thus, we're pretending to have
+      // no committers. This is OK; because this is only for the Test workflow, not for
+      // real use.
+      committers = new Set()
+    } else {
+      committers = github
+        .paginate(github.rest.teams.listMembersInOrg, {
+          org: context.repo.owner,
+          team_slug: 'nixpkgs-committers',
+          per_page: 100,
+        })
+        .then((members) => new Set(members.map(({ id }) => id)))
+    }
   }
 
   const files = await github.paginate(github.rest.pulls.listFiles, {

From 37644003c3e62263785b926f6b4c8ffab7c6b40f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 1 Nov 2025 18:55:43 +0100
Subject: [PATCH 84/85] python3.pkgs.localzone: Fix tests with dnspython 2.8.0

Fixes build of `lexicon`.
---
 pkgs/development/python-modules/localzone/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/python-modules/localzone/default.nix b/pkgs/development/python-modules/localzone/default.nix
index 4ce88e0a71c3..3839d19b6954 100644
--- a/pkgs/development/python-modules/localzone/default.nix
+++ b/pkgs/development/python-modules/localzone/default.nix
@@ -30,6 +30,13 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "localzone" ];
 
+  postPatch = ''
+    # Fix tests with dnspython 2.8.0
+    # https://github.com/ags-slc/localzone/pull/6
+    substituteInPlace tests/test_models.py \
+      --replace-fail 'raises((AttributeError, DNSSyntaxError))' 'raises((AttributeError, DNSSyntaxError, ValueError))'
+  '';
+
   meta = with lib; {
     description = "Simple DNS library for managing zone files";
     homepage = "https://localzone.iomaestro.com";

From 72a5f80e84a04521958d0f4c9d7c427a140bd951 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 26 Oct 2025 16:34:48 +0100
Subject: [PATCH 85/85] ams-lv2: drop

It's been archived upstream and has been marked broken for a while.
I was unable to fix the build.
---
 pkgs/by-name/am/ams-lv2/package.nix | 56 -----------------------------
 pkgs/top-level/aliases.nix          |  1 +
 2 files changed, 1 insertion(+), 56 deletions(-)
 delete mode 100644 pkgs/by-name/am/ams-lv2/package.nix

diff --git a/pkgs/by-name/am/ams-lv2/package.nix b/pkgs/by-name/am/ams-lv2/package.nix
deleted file mode 100644
index 00b4916fe55e..000000000000
--- a/pkgs/by-name/am/ams-lv2/package.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cairo,
-  fftw,
-  gtkmm2,
-  lv2,
-  lvtk,
-  pkg-config,
-  wafHook,
-  python3,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "ams-lv2";
-  version = "1.2.2";
-
-  src = fetchFromGitHub {
-    owner = "blablack";
-    repo = "ams-lv2";
-    rev = version;
-    sha256 = "1lz2mvk4gqsyf92yxd3aaldx0d0qi28h4rnnvsaz4ls0ccqm80nk";
-  };
-
-  nativeBuildInputs = [
-    pkg-config
-    wafHook
-    python3
-  ];
-  buildInputs = [
-    cairo
-    fftw
-    gtkmm2
-    lv2
-    lvtk
-  ];
-
-  postPatch = ''
-    # U was removed in python 3.11 because it had no effect
-    substituteInPlace waflib/*.py \
-      --replace "m='rU" "m='r"
-  '';
-
-  meta = with lib; {
-    description = "LV2 port of the internal modules found in Alsa Modular Synth";
-    homepage = "https://github.com/blablack/ams-lv2";
-    license = licenses.gpl3;
-    maintainers = [ ];
-    platforms = platforms.linux;
-    # Build uses `-msse` and `-mfpmath=sse`
-    badPlatforms = [ "aarch64-linux" ];
-    # `ModuleNotFoundError: No module named 'imp'`
-    broken = true;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index ad0b662fe317..dda5476de33b 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -278,6 +278,7 @@ mapAliases {
   akkoma-frontends.akkoma-fe = throw "'akkoma-frontends.akkoma-fe' has been renamed to/replaced by 'akkoma-fe'"; # Converted to throw 2025-10-27
   amazon-qldb-shell = throw "'amazon-qldb-shell' has been removed due to being unmaintained upstream"; # Added 2025-07-30
   amdvlk = throw "'amdvlk' has been removed since it was deprecated by AMD. Its replacement, RADV, is enabled by default."; # Added 2025-09-20
+  ams-lv2 = throw "'ams-lv2' has been removed due to being archived upstream."; # Added 2025-10-26
   android-udev-rules = throw "'android-udev-rules' has been removed due to being superseded by built-in systemd uaccess rules."; # Added 2025-10-21
   androidndkPkgs_21 = throw "androidndkPkgs_21 has been removed, as it is EOL"; # Added 2025-08-09
   androidndkPkgs_23 = throw "androidndkPkgs_23 has been removed, as it is EOL"; # Added 2025-08-09