From 48ed59bf15482ad39e014ef7ea43df8d37716a44 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Sat, 20 Sep 2025 22:10:29 -0700
Subject: [PATCH 01/84] rocmPackages.hipfft: remove unneeded git dependency

---
 pkgs/development/rocm-modules/6/hipfft/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/rocm-modules/6/hipfft/default.nix b/pkgs/development/rocm-modules/6/hipfft/default.nix
index 1002b0b3d16f..bd4c2505eb6c 100644
--- a/pkgs/development/rocm-modules/6/hipfft/default.nix
+++ b/pkgs/development/rocm-modules/6/hipfft/default.nix
@@ -6,7 +6,6 @@
   cmake,
   rocm-cmake,
   clr,
-  git,
   rocfft,
   gtest,
   boost,
@@ -47,7 +46,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     clr
-    git
     cmake
     rocm-cmake
   ];

From 61e4694381c60133585abc0f77c623c1133c2137 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Sat, 20 Sep 2025 22:11:01 -0700
Subject: [PATCH 02/84] rocmPackages.rocdbgapi: remove unneeded git dependency

---
 pkgs/development/rocm-modules/6/rocdbgapi/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/rocm-modules/6/rocdbgapi/default.nix b/pkgs/development/rocm-modules/6/rocdbgapi/default.nix
index 0140218222a7..b3203f03d4c3 100644
--- a/pkgs/development/rocm-modules/6/rocdbgapi/default.nix
+++ b/pkgs/development/rocm-modules/6/rocdbgapi/default.nix
@@ -5,7 +5,6 @@
   rocmUpdateScript,
   cmake,
   rocm-cmake,
-  git,
   rocm-comgr,
   rocm-runtime,
   hwdata,
@@ -82,7 +81,6 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     rocm-cmake
-    git
   ]
   ++ lib.optionals buildDocs [
     writableTmpDirAsHomeHook

From 584aa424a39fffda122279e495014c0e386e95af Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Sat, 20 Sep 2025 22:11:53 -0700
Subject: [PATCH 03/84] rocmPackages.rocsparse: remove unneeded git dependency

---
 pkgs/development/rocm-modules/6/rocsparse/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/rocm-modules/6/rocsparse/default.nix b/pkgs/development/rocm-modules/6/rocsparse/default.nix
index 5b17880b2ea0..c16b67408fd3 100644
--- a/pkgs/development/rocm-modules/6/rocsparse/default.nix
+++ b/pkgs/development/rocm-modules/6/rocsparse/default.nix
@@ -9,7 +9,6 @@
   rocprim,
   clr,
   gfortran,
-  git,
   gtest,
   boost,
   python3Packages,
@@ -49,7 +48,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     rocprim
-    git
   ]
   ++ lib.optionals (buildTests || buildBenchmarks) [
     gtest

From 51082408812d7f56091e958ccbf6e4c546f6c008 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Sat, 20 Sep 2025 22:15:05 -0700
Subject: [PATCH 04/84] rocmPackages.rocprofiler: remove unneeded git, systemd
 deps

---
 pkgs/development/rocm-modules/6/rocprofiler/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/rocm-modules/6/rocprofiler/default.nix b/pkgs/development/rocm-modules/6/rocprofiler/default.nix
index 341aae4d1e95..9564dbd3675f 100644
--- a/pkgs/development/rocm-modules/6/rocprofiler/default.nix
+++ b/pkgs/development/rocm-modules/6/rocprofiler/default.nix
@@ -18,9 +18,7 @@
   libxml2,
   elfutils,
   mpi,
-  systemd,
   gtest,
-  git,
   python3Packages,
   gpuTargets ? clr.gpuTargets,
 }:
@@ -59,7 +57,6 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
     clang
     clr
-    git
     python3Packages.lxml
     python3Packages.cppheaderparser
     python3Packages.pyyaml
@@ -73,7 +70,6 @@ stdenv.mkDerivation (finalAttrs: {
     libxml2
     elfutils
     mpi
-    systemd
     gtest
     aqlprofile
   ];

From 5aad54041274aea281ff8e745cb1a2ee040118a6 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Sat, 20 Sep 2025 22:15:46 -0700
Subject: [PATCH 05/84] rocmPackages.rocmlir: remove unneeded git dependency

---
 pkgs/development/rocm-modules/6/rocmlir/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/rocm-modules/6/rocmlir/default.nix b/pkgs/development/rocm-modules/6/rocmlir/default.nix
index 281b75f76814..cc2b298f6ce1 100644
--- a/pkgs/development/rocm-modules/6/rocmlir/default.nix
+++ b/pkgs/development/rocm-modules/6/rocmlir/default.nix
@@ -6,7 +6,6 @@
   cmake,
   rocm-cmake,
   clr,
-  git,
   libxml2,
   libedit,
   zstd,
@@ -64,7 +63,6 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    git
     libxml2
     libedit
   ];

From 64d0f051ada160a9d0b84e6667d6ae34b4b8920e Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Sat, 20 Sep 2025 22:16:48 -0700
Subject: [PATCH 06/84] rocmPackages.rocblas: swap git for gitMinimal

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

diff --git a/pkgs/development/rocm-modules/6/rocblas/default.nix b/pkgs/development/rocm-modules/6/rocblas/default.nix
index 768ab094b38f..0cfcce2370d6 100644
--- a/pkgs/development/rocm-modules/6/rocblas/default.nix
+++ b/pkgs/development/rocm-modules/6/rocblas/default.nix
@@ -16,7 +16,7 @@
   gtest,
   gfortran,
   openmp,
-  git,
+  gitMinimal,
   amd-blis,
   zstd,
   roctracer,
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
     # no ninja, it buffers console output and nix times out long periods of no output
     rocm-cmake
     clr
-    git
+    gitMinimal
     pkg-config
   ]
   ++ lib.optionals buildTensile [

From e5514682abe715fc14daacea9494b2904c9a8930 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Sat, 20 Sep 2025 22:17:34 -0700
Subject: [PATCH 07/84] rocmPackages.rocr-debug-agent: remove unneeded git
 dependency

---
 pkgs/development/rocm-modules/6/rocr-debug-agent/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/rocm-modules/6/rocr-debug-agent/default.nix b/pkgs/development/rocm-modules/6/rocr-debug-agent/default.nix
index 2b1501dca51a..54af3dd967e4 100644
--- a/pkgs/development/rocm-modules/6/rocr-debug-agent/default.nix
+++ b/pkgs/development/rocm-modules/6/rocr-debug-agent/default.nix
@@ -5,7 +5,6 @@
   rocmUpdateScript,
   cmake,
   clr,
-  git,
   rocdbgapi,
   elfutils,
 }:
@@ -24,7 +23,6 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     clr
-    git
   ];
 
   buildInputs = [

From e4020e3e6c7b7467d213cbc382ac2a2c80e288bf Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Sat, 20 Sep 2025 22:18:05 -0700
Subject: [PATCH 08/84] rocmPackages.hipsparse: remove unneeded git dependency

---
 pkgs/development/rocm-modules/6/hipsparse/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/rocm-modules/6/hipsparse/default.nix b/pkgs/development/rocm-modules/6/hipsparse/default.nix
index f10280335ba0..6d91497c67d5 100644
--- a/pkgs/development/rocm-modules/6/hipsparse/default.nix
+++ b/pkgs/development/rocm-modules/6/hipsparse/default.nix
@@ -8,7 +8,6 @@
   rocsparse,
   clr,
   gfortran,
-  git,
   gtest,
   openmp,
   buildTests ? false,
@@ -48,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     rocsparse
-    git
   ]
   ++ lib.optionals (buildTests || buildBenchmarks) [
     gtest

From f633166ca7d59bd726893a8ac652a426bfcf324c Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Tue, 30 Sep 2025 07:40:19 -0700
Subject: [PATCH 09/84] rocmPackages.llvm: rename rocmcxx to rocm-toolchain

Previous name was inaccurate.
---
 pkgs/development/rocm-modules/6/clr/default.nix      |  1 +
 pkgs/development/rocm-modules/6/llvm/default.nix     | 12 ++++++------
 pkgs/development/rocm-modules/6/rocm-smi/default.nix |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/rocm-modules/6/clr/default.nix b/pkgs/development/rocm-modules/6/clr/default.nix
index 15c742fc4b70..90af58ad1203 100644
--- a/pkgs/development/rocm-modules/6/clr/default.nix
+++ b/pkgs/development/rocm-modules/6/clr/default.nix
@@ -13,6 +13,7 @@
   rocm-device-libs,
   rocm-comgr,
   rocm-runtime,
+  rocm-toolchain,
   rocm-core,
   roctracer,
   rocminfo,
diff --git a/pkgs/development/rocm-modules/6/llvm/default.nix b/pkgs/development/rocm-modules/6/llvm/default.nix
index 086e934bea5f..8b54aeade9a8 100644
--- a/pkgs/development/rocm-modules/6/llvm/default.nix
+++ b/pkgs/development/rocm-modules/6/llvm/default.nix
@@ -71,7 +71,7 @@ let
     stdenvToBuildRocmLlvm.cc
     stdenvToBuildRocmLlvm.cc.cc
   ];
-  # A prefix for use as the GCC prefix when building rocmcxx
+  # A prefix for use as the GCC prefix when building rocm-toolchain
   gcc-prefix-headers = symlinkJoin {
     name = "gcc-prefix-headers";
     paths = [
@@ -149,7 +149,7 @@ let
     runCommand name
       {
         # If this is erroring, try why-depends --precise on the symlinkJoin of inputs to look for the problem
-        # nix why-depends --precise .#rocmPackages.llvm.rocmcxx.linked /store/path/its/not/allowed
+        # nix why-depends --precise .#rocmPackages.llvm.rocm-toolchain.linked /store/path/its/not/allowed
         disallowedRequisites = disallowedRefsForToolchain;
         passthru.linked = linked;
       }
@@ -384,7 +384,7 @@ rec {
             (builtins.filter tablegenUsage old.cmakeFlags)
             ++ commonCmakeFlags
             ++ lib.optionals (!withLibcxx) [
-              # FIXME: Config file in rocmcxx instead of GCC_INSTALL_PREFIX?
+              # FIXME: Config file in rocm-toolchain instead of GCC_INSTALL_PREFIX?
               # Expected to be fully removed eventually
               "-DUSE_DEPRECATED_GCC_INSTALL_PREFIX=ON"
               "-DGCC_INSTALL_PREFIX=${gcc-prefix}"
@@ -407,7 +407,7 @@ rec {
   # A clang that understands standard include searching in a GNU sysroot and will put GPU libs in include path
   # in the right order
   # and expects its libc to be in the sysroot
-  rocmcxx =
+  rocm-toolchain =
     (sysrootCompiler clang-unwrapped "rocmcxx" (
       listUsefulOutputs (
         [
@@ -428,7 +428,7 @@ rec {
     ))
     // {
       version = llvmMajorVersion;
-      cc = rocmcxx;
+      cc = rocm-toolchain;
       libllvm = llvm;
       isClang = true;
       isGNU = false;
@@ -460,7 +460,7 @@ rec {
     };
   };
 
-  clang = rocmcxx;
+  clang = rocm-toolchain;
 
   # Emulate a monolithic ROCm LLVM build to support building ROCm's in-tree LLVM projects
   # TODO(@LunNova): destroy this
diff --git a/pkgs/development/rocm-modules/6/rocm-smi/default.nix b/pkgs/development/rocm-modules/6/rocm-smi/default.nix
index f146d6f9fb43..15477b7e9d9e 100644
--- a/pkgs/development/rocm-modules/6/rocm-smi/default.nix
+++ b/pkgs/development/rocm-modules/6/rocm-smi/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
       mv $out/libexec/rocm_smi/.rsmiBindings.py-wrapped $out/libexec/rocm_smi/rsmiBindings.py
     ''
     # workaround: propagate libdrm/ manually
-    # rocmcxx doesn't automatically add buildInputs to isystem include path like
+    # rocm-toolchain doesn't automatically add buildInputs to isystem include path like
     # wrapper based toolchains, cmake files often don't find_package(rocm-smi) so
     # can't rely on cmake propagated interface
     # upstream have been shipping libdrm copied into /opt/rocm

From d481667c842d5fb0a5a7b5ac776e5d0924deb000 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Sat, 20 Sep 2025 22:19:25 -0700
Subject: [PATCH 10/84] rocmPackages.rocalution: remove unneeded git dependency

---
 pkgs/development/rocm-modules/6/rocalution/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/rocm-modules/6/rocalution/default.nix b/pkgs/development/rocm-modules/6/rocalution/default.nix
index 0fbf4025bf3f..807f53187730 100644
--- a/pkgs/development/rocm-modules/6/rocalution/default.nix
+++ b/pkgs/development/rocm-modules/6/rocalution/default.nix
@@ -10,7 +10,6 @@
   rocprim,
   rocrand,
   clr,
-  git,
   pkg-config,
   openmp,
   openmpi,
@@ -49,7 +48,6 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
     rocm-cmake
     clr
-    git
     pkg-config
   ];
 

From 645a298fb34fb8b882540da4285733afb3e8bcdb Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Wed, 24 Sep 2025 07:03:33 -0700
Subject: [PATCH 11/84] rocmPackages.hipcc: don't depend on rocm-merged-llvm

---
 pkgs/development/rocm-modules/6/default.nix      |  5 +----
 .../development/rocm-modules/6/hipcc/default.nix | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/rocm-modules/6/default.nix b/pkgs/development/rocm-modules/6/default.nix
index 7c259148e23d..4bacc45b30ee 100644
--- a/pkgs/development/rocm-modules/6/default.nix
+++ b/pkgs/development/rocm-modules/6/default.nix
@@ -80,10 +80,7 @@ let
 
       hip-common = self.callPackage ./hip-common { };
 
-      hipcc = self.callPackage ./hipcc {
-        stdenv = origStdenv;
-        inherit (llvm) rocm-merged-llvm;
-      };
+      hipcc = self.callPackage ./hipcc { stdenv = origStdenv; };
 
       # Replaces hip, opencl-runtime, and rocclr
       clr = self.callPackage ./clr { };
diff --git a/pkgs/development/rocm-modules/6/hipcc/default.nix b/pkgs/development/rocm-modules/6/hipcc/default.nix
index 4dc1c609036e..1525cb49b223 100644
--- a/pkgs/development/rocm-modules/6/hipcc/default.nix
+++ b/pkgs/development/rocm-modules/6/hipcc/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  rocm-merged-llvm,
+  llvm,
   cmake,
   lsb-release,
 }:
@@ -9,13 +9,19 @@
 stdenv.mkDerivation (finalAttrs: {
   pname = "hipcc";
   # In-tree with ROCm LLVM
-  inherit (rocm-merged-llvm) version;
-  src = rocm-merged-llvm.llvm-src;
+  inherit (llvm.llvm) version;
+  src = llvm.llvm.monorepoSrc;
   sourceRoot = "${finalAttrs.src.name}/amd/hipcc";
+  strictDeps = true;
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [
+    llvm.rocm-toolchain
+    cmake
+  ];
 
-  buildInputs = [ rocm-merged-llvm ];
+  buildInputs = [
+    llvm.clang-unwrapped
+  ];
 
   patches = [
     # https://github.com/ROCm/llvm-project/pull/183

From 766dabeb38450d1c01c1f0b3035f384638c84883 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Wed, 24 Sep 2025 07:13:25 -0700
Subject: [PATCH 12/84] rocmPackages.ck4inductor: don't depend on
 rocm-merged-llvm

---
 .../rocm-modules/6/composable_kernel/ck4inductor.nix          | 4 ++--
 pkgs/development/rocm-modules/6/default.nix                   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/rocm-modules/6/composable_kernel/ck4inductor.nix b/pkgs/development/rocm-modules/6/composable_kernel/ck4inductor.nix
index c60552c490a2..5f839677bca0 100644
--- a/pkgs/development/rocm-modules/6/composable_kernel/ck4inductor.nix
+++ b/pkgs/development/rocm-modules/6/composable_kernel/ck4inductor.nix
@@ -3,9 +3,9 @@
   python,
   composable_kernel,
   lib,
+  rocm-toolchain,
   setuptools,
   setuptools-scm,
-  rocm-merged-llvm,
 }:
 buildPythonPackage {
   pyproject = true;
@@ -25,7 +25,7 @@ buildPythonPackage {
   propagatedBuildInputs = [
     # At runtime will fail to compile anything with ck4inductor without this
     # can't easily use in checks phase because most of the compiler machinery is in torch
-    rocm-merged-llvm
+    rocm-toolchain
   ];
   checkPhase = ''
     if [ ! -d "$out/${python.sitePackages}/ck4inductor" ]; then
diff --git a/pkgs/development/rocm-modules/6/default.nix b/pkgs/development/rocm-modules/6/default.nix
index 4bacc45b30ee..418f608b5707 100644
--- a/pkgs/development/rocm-modules/6/default.nix
+++ b/pkgs/development/rocm-modules/6/default.nix
@@ -177,7 +177,7 @@ let
 
       ck4inductor = pyPackages.callPackage ./composable_kernel/ck4inductor.nix {
         inherit (self) composable_kernel;
-        inherit (llvm) rocm-merged-llvm;
+        inherit (llvm) rocmcxx;
       };
 
       half = self.callPackage ./half { };

From ded510a1114526d5c2afd4f0837cf91b51ba1b89 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Wed, 24 Sep 2025 07:25:44 -0700
Subject: [PATCH 13/84] rocmPackages.hipify: don't depend on rocm-merged-llvm

---
 pkgs/development/rocm-modules/6/default.nix    |  4 ----
 .../rocm-modules/6/hipify/default.nix          | 18 +++++++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/rocm-modules/6/default.nix b/pkgs/development/rocm-modules/6/default.nix
index 418f608b5707..7a7450f9f633 100644
--- a/pkgs/development/rocm-modules/6/default.nix
+++ b/pkgs/development/rocm-modules/6/default.nix
@@ -89,10 +89,6 @@ let
 
       hipify = self.callPackage ./hipify {
         stdenv = origStdenv;
-        inherit (llvm)
-          clang
-          rocm-merged-llvm
-          ;
       };
 
       # hsakmt was merged into rocm-runtime
diff --git a/pkgs/development/rocm-modules/6/hipify/default.nix b/pkgs/development/rocm-modules/6/hipify/default.nix
index 1fe6e969a776..8d77fed0cf2e 100644
--- a/pkgs/development/rocm-modules/6/hipify/default.nix
+++ b/pkgs/development/rocm-modules/6/hipify/default.nix
@@ -4,9 +4,7 @@
   fetchFromGitHub,
   rocmUpdateScript,
   cmake,
-  clang,
-  libxml2,
-  rocm-merged-llvm,
+  llvm,
   zlib,
   zstd,
   perl,
@@ -23,21 +21,27 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-uj25WmGCpwouS1yzW9Oil5Vyrbyj5yRITvWF9WaGozM=";
   };
 
+  strictDeps = true;
+
   nativeBuildInputs = [
     cmake
+    perl
+    llvm.rocm-toolchain
   ];
 
   buildInputs = [
-    libxml2
-    rocm-merged-llvm
+    llvm.llvm
+    llvm.clang-unwrapped
+    perl
     zlib
     zstd
-    perl
   ];
 
+  env.CXXFLAGS = "-I${lib.getInclude llvm.llvm}/include -I${lib.getInclude llvm.clang-unwrapped}/include";
+
   postPatch = ''
     substituteInPlace CMakeLists.txt \
-      --replace "\''${LLVM_TOOLS_BINARY_DIR}/clang" "${clang}/bin/clang"
+      --replace-fail "\''${LLVM_TOOLS_BINARY_DIR}/clang" "${llvm.rocm-toolchain}/bin/clang"
     chmod +x bin/*
   '';
 

From 71f53a3c6a2b4eedf4f0a7545e43e6e447e04b61 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Wed, 24 Sep 2025 07:42:09 -0700
Subject: [PATCH 14/84] rocmPackages.rocm-device-libs: don't use
 rocm-merged-llvm, cleanup

correctly setting sourceRoot instead of cding in postPatch
---
 pkgs/development/rocm-modules/6/default.nix   |  5 +--
 .../6/rocm-device-libs/cmake.patch            |  4 +--
 .../6/rocm-device-libs/default.nix            | 34 +++++++++++--------
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/rocm-modules/6/default.nix b/pkgs/development/rocm-modules/6/default.nix
index 7a7450f9f633..cb37089dd73c 100644
--- a/pkgs/development/rocm-modules/6/default.nix
+++ b/pkgs/development/rocm-modules/6/default.nix
@@ -47,10 +47,7 @@ let
 
       rocm-cmake = self.callPackage ./rocm-cmake { stdenv = origStdenv; };
 
-      rocm-device-libs = self.callPackage ./rocm-device-libs {
-        stdenv = origStdenv;
-        inherit (llvm) rocm-merged-llvm;
-      };
+      rocm-device-libs = self.callPackage ./rocm-device-libs { };
 
       rocm-runtime = self.callPackage ./rocm-runtime {
         stdenv = origStdenv;
diff --git a/pkgs/development/rocm-modules/6/rocm-device-libs/cmake.patch b/pkgs/development/rocm-modules/6/rocm-device-libs/cmake.patch
index de46bdb87258..500ff37a9905 100644
--- a/pkgs/development/rocm-modules/6/rocm-device-libs/cmake.patch
+++ b/pkgs/development/rocm-modules/6/rocm-device-libs/cmake.patch
@@ -1,7 +1,7 @@
 diff --git a/cmake/Packages.cmake b/cmake/Packages.cmake
 index 07c60eb..c736b3e 100644
---- a/amd/device-libs/cmake/Packages.cmake
-+++ b/amd/device-libs/cmake/Packages.cmake
+--- a/cmake/Packages.cmake
++++ b/cmake/Packages.cmake
 @@ -12,24 +12,29 @@ set_target_properties(${target} PROPERTIES
    IMPORTED_LOCATION \"${target_path}\")")
  endforeach()
diff --git a/pkgs/development/rocm-modules/6/rocm-device-libs/default.nix b/pkgs/development/rocm-modules/6/rocm-device-libs/default.nix
index 9bdc8d186533..910a95ac9ff9 100644
--- a/pkgs/development/rocm-modules/6/rocm-device-libs/default.nix
+++ b/pkgs/development/rocm-modules/6/rocm-device-libs/default.nix
@@ -4,11 +4,9 @@
   fetchpatch,
   cmake,
   ninja,
-  libxml2,
   zlib,
   zstd,
-  ncurses,
-  rocm-merged-llvm,
+  llvm,
   python3,
 }:
 
@@ -21,22 +19,29 @@ let
     else
       throw "Unsupported ROCm LLVM platform";
 in
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "rocm-device-libs";
   # In-tree with ROCm LLVM
-  inherit (rocm-merged-llvm) version;
-  src = rocm-merged-llvm.llvm-src;
+  inherit (llvm.llvm) version;
+  src = llvm.llvm.monorepoSrc;
+  sourceRoot = "${finalAttrs.src.name}/amd/device-libs";
+  strictDeps = true;
+  __structuredAttrs = true;
 
-  postPatch = ''
-    cd amd/device-libs
-  '';
+  postPatch =
+    # Use our sysrooted toolchain instead of direct clang target
+    ''
+      substituteInPlace cmake/OCL.cmake \
+        --replace-fail '$<TARGET_FILE:clang>' "${llvm.rocm-toolchain}/bin/clang"
+    '';
 
   patches = [
     ./cmake.patch
     (fetchpatch {
       name = "cmake-4-compat-dont-set-cmp0053.patch";
       url = "https://github.com/ROCm/llvm-project/commit/a18cc4c7cb51f94182b6018c7c73acde1b8ebddb.patch";
-      hash = "sha256-LNT7srxd4gXDAJ6lSsJXKnRQKSepkAbHeRNH+eZYIFk=";
+      hash = "sha256-kp/Ld0IhjWgRbRR9R/CKdkI9ELvPkQSAMqPsAPFxzhM=";
+      relative = "amd/device-libs";
     })
   ];
 
@@ -44,18 +49,17 @@ stdenv.mkDerivation {
     cmake
     ninja
     python3
+    llvm.rocm-toolchain
   ];
 
   buildInputs = [
-    libxml2
+    llvm.llvm
+    llvm.clang-unwrapped
     zlib
     zstd
-    ncurses
-    rocm-merged-llvm
   ];
 
   cmakeFlags = [
-    "-DCMAKE_RELEASE_TYPE=Release"
     "-DLLVM_TARGETS_TO_BUILD=AMDGPU;${llvmNativeTarget}"
   ];
 
@@ -67,4 +71,4 @@ stdenv.mkDerivation {
     teams = [ teams.rocm ];
     platforms = platforms.linux;
   };
-}
+})

From d0194e29e9d73c796b8cb315b1cc4470e8662234 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Wed, 24 Sep 2025 07:45:35 -0700
Subject: [PATCH 15/84] rocmPackages.miopen: don't depend on rocm-merged-llvm

---
 pkgs/development/rocm-modules/6/miopen/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/rocm-modules/6/miopen/default.nix b/pkgs/development/rocm-modules/6/miopen/default.nix
index 47d79a9bf19c..01770ce8c16b 100644
--- a/pkgs/development/rocm-modules/6/miopen/default.nix
+++ b/pkgs/development/rocm-modules/6/miopen/default.nix
@@ -13,7 +13,6 @@
   rocmlir,
   rocrand,
   rocm-runtime,
-  rocm-merged-llvm,
   hipblas-common,
   hipblas,
   hipblaslt,
@@ -172,7 +171,6 @@ stdenv.mkDerivation (finalAttrs: {
   enableParallelBuilding = true;
   env.ROCM_PATH = clr;
   env.LD_LIBRARY_PATH = lib.makeLibraryPath [ rocm-runtime ];
-  env.HIP_CLANG_PATH = "${rocm-merged-llvm}/bin";
 
   nativeBuildInputs = [
     pkg-config

From f08fc581c354ad4ced5535c19ff5d425a7567998 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Wed, 24 Sep 2025 07:58:06 -0700
Subject: [PATCH 16/84] rocmPackages.clr: don't use rocm-merged-llvm

---
 .../rocm-modules/6/clr/default.nix            | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/rocm-modules/6/clr/default.nix b/pkgs/development/rocm-modules/6/clr/default.nix
index 90af58ad1203..d5f3e42f1193 100644
--- a/pkgs/development/rocm-modules/6/clr/default.nix
+++ b/pkgs/development/rocm-modules/6/clr/default.nix
@@ -18,6 +18,7 @@
   roctracer,
   rocminfo,
   rocm-smi,
+  symlinkJoin,
   numactl,
   libffi,
   zstd,
@@ -26,7 +27,7 @@
   libxml2,
   libX11,
   python3Packages,
-  rocm-merged-llvm,
+  llvm,
   khronos-ocl-icd-loader,
   gcc-unwrapped,
   writeShellScriptBin,
@@ -35,7 +36,20 @@
 
 let
   inherit (rocm-core) ROCM_LIBPATCH_VERSION;
-  hipClang = rocm-merged-llvm;
+  # HIP_CLANG_PATH or ROCM_PATH/llvm
+  # Note: relying on ROCM_PATH/llvm is bad for cross
+  hipClang = symlinkJoin {
+    name = "hipClang";
+    paths = [
+      # FIXME: if we don't put this first aotriton build fails with ld.lld: -flavor gnu
+      # Probably wrapper jank
+      llvm.bintools.bintools
+      llvm.rocm-toolchain
+    ];
+    postBuild = ''
+      rm -rf $out/{include,lib,share,etc,nix-support,usr}
+    '';
+  };
   hipClangPath = "${hipClang}/bin";
   wrapperArgs = [
     "--prefix PATH : $out/bin"
@@ -84,6 +98,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
+    llvm.llvm
     numactl
     libGL
     libxml2
@@ -101,6 +116,7 @@ stdenv.mkDerivation (finalAttrs: {
     rocm-comgr
     rocm-runtime
     rocminfo
+    hipClangPath
   ];
 
   cmakeBuildType = "RelWithDebInfo";
@@ -163,7 +179,8 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail "install(PROGRAMS \''${HIPCC_BIN_DIR}/hipconfig.bat DESTINATION bin)" ""
 
     substituteInPlace hipamd/src/hip_embed_pch.sh \
-      --replace-fail "\''$LLVM_DIR/bin/clang" "${hipClangPath}/clang"
+      --replace-fail "\''$LLVM_DIR/bin/clang" "${hipClangPath}/clang" \
+      --replace-fail "\''$LLVM_DIR/bin/llvm-mc" "${lib.getExe' llvm.bintools.bintools "llvm-mc"}"
 
     substituteInPlace opencl/khronos/icd/loader/icd_platform.h \
       --replace-fail '#define ICD_VENDOR_PATH "/etc/OpenCL/vendors/";' \
@@ -207,7 +224,6 @@ stdenv.mkDerivation (finalAttrs: {
     ln -s ${rocm-core}/.info/ $out/.info
 
     ln -s ${hipClang} $out/llvm
-    ln -s ${hipClang}/bin/{ld.lld,lld,clang-offload-bundler,llvm-objcopy,clang,clang++} $out/bin/
   '';
 
   disallowedRequisites = [

From 899fe31f443f57759f0b387ac22247f535f04593 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Wed, 24 Sep 2025 08:12:16 -0700
Subject: [PATCH 17/84] rocmPackages.rocm-comgr: don't use rocm-merged-llvm

---
 pkgs/development/rocm-modules/6/default.nix   |  5 +----
 .../rocm-modules/6/rocm-comgr/default.nix     | 21 +++++++++++--------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/rocm-modules/6/default.nix b/pkgs/development/rocm-modules/6/default.nix
index cb37089dd73c..37524f7ba832 100644
--- a/pkgs/development/rocm-modules/6/default.nix
+++ b/pkgs/development/rocm-modules/6/default.nix
@@ -54,10 +54,7 @@ let
         inherit (llvm) rocm-merged-llvm;
       };
 
-      rocm-comgr = self.callPackage ./rocm-comgr {
-        stdenv = origStdenv;
-        inherit (llvm) rocm-merged-llvm;
-      };
+      rocm-comgr = self.callPackage ./rocm-comgr { };
 
       rocminfo = self.callPackage ./rocminfo { stdenv = origStdenv; };
 
diff --git a/pkgs/development/rocm-modules/6/rocm-comgr/default.nix b/pkgs/development/rocm-modules/6/rocm-comgr/default.nix
index de0b2434cfac..69b4d953c35d 100644
--- a/pkgs/development/rocm-modules/6/rocm-comgr/default.nix
+++ b/pkgs/development/rocm-modules/6/rocm-comgr/default.nix
@@ -3,12 +3,11 @@
   stdenv,
   fetchpatch,
   cmake,
+  llvm,
   python3,
-  rocm-merged-llvm,
   rocm-device-libs,
   zlib,
   zstd,
-  libxml2,
 }:
 
 let
@@ -23,10 +22,10 @@ in
 stdenv.mkDerivation (finalAttrs: {
   pname = "rocm-comgr";
   # In-tree with ROCm LLVM
-  inherit (rocm-merged-llvm) version;
-  src = rocm-merged-llvm.llvm-src;
-
+  inherit (llvm.llvm) version;
+  src = llvm.llvm.monorepoSrc;
   sourceRoot = "${finalAttrs.src.name}/amd/comgr";
+  strictDeps = true;
 
   patches = [
     # [Comgr] Extend ISA compatibility
@@ -43,22 +42,26 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
+  postPatch = ''
+    substituteInPlace cmake/opencl_pch.cmake \
+      --replace-fail "\''${CLANG_CMAKE_DIR}/../../../" "${llvm.clang-unwrapped.lib}"
+  '';
+
   nativeBuildInputs = [
     cmake
     python3
   ];
 
   buildInputs = [
+    llvm.llvm
+    llvm.clang-unwrapped
+    llvm.lld
     rocm-device-libs
-    libxml2
     zlib
     zstd
-    rocm-merged-llvm
   ];
 
   cmakeFlags = [
-    "-DCMAKE_VERBOSE_MAKEFILE=ON"
-    "-DCMAKE_BUILD_TYPE=Release"
     "-DLLVM_TARGETS_TO_BUILD=AMDGPU;${llvmNativeTarget}"
   ];
 

From ed53bb6c6775047467fcfbd1675986c100807cbd Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Wed, 24 Sep 2025 08:13:10 -0700
Subject: [PATCH 18/84] rocmPackages.hipblaslt,rocblas: remove unused
 writableTmpDirAsHomeHook

---
 pkgs/development/rocm-modules/6/hipblaslt/default.nix | 1 -
 pkgs/development/rocm-modules/6/rocblas/default.nix   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/pkgs/development/rocm-modules/6/hipblaslt/default.nix b/pkgs/development/rocm-modules/6/hipblaslt/default.nix
index 47bfd00909fc..58d8a549d747 100644
--- a/pkgs/development/rocm-modules/6/hipblaslt/default.nix
+++ b/pkgs/development/rocm-modules/6/hipblaslt/default.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  writableTmpDirAsHomeHook,
   cmake,
   rocm-cmake,
   rocm-smi,
diff --git a/pkgs/development/rocm-modules/6/rocblas/default.nix b/pkgs/development/rocm-modules/6/rocblas/default.nix
index 0cfcce2370d6..33d707747056 100644
--- a/pkgs/development/rocm-modules/6/rocblas/default.nix
+++ b/pkgs/development/rocm-modules/6/rocblas/default.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   fetchpatch,
   rocmUpdateScript,
-  writableTmpDirAsHomeHook,
   cmake,
   rocm-cmake,
   clr,

From 92cd9fcf460b28715785dffae71b22e80129e885 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Wed, 24 Sep 2025 07:07:09 -0700
Subject: [PATCH 19/84] rocmPackages.composable_kernel: don't depend on
 rocm-merged-llvm

---
 pkgs/development/rocm-modules/6/composable_kernel/base.nix | 3 +--
 pkgs/development/rocm-modules/6/default.nix                | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/rocm-modules/6/composable_kernel/base.nix b/pkgs/development/rocm-modules/6/composable_kernel/base.nix
index a4f59c2e1d5f..ba5131c67408 100644
--- a/pkgs/development/rocm-modules/6/composable_kernel/base.nix
+++ b/pkgs/development/rocm-modules/6/composable_kernel/base.nix
@@ -5,7 +5,7 @@
   rocmUpdateScript,
   cmake,
   rocm-cmake,
-  rocm-merged-llvm,
+  llvm,
   clr,
   rocminfo,
   python3,
@@ -85,7 +85,6 @@ stdenv.mkDerivation (finalAttrs: {
   strictDeps = true;
   enableParallelBuilding = true;
   env.ROCM_PATH = clr;
-  env.HIP_CLANG_PATH = "${rocm-merged-llvm}/bin";
 
   cmakeFlags = [
     "-DCMAKE_MODULE_PATH=${clr}/hip/cmake"
diff --git a/pkgs/development/rocm-modules/6/default.nix b/pkgs/development/rocm-modules/6/default.nix
index 37524f7ba832..a1fbf9b42bf2 100644
--- a/pkgs/development/rocm-modules/6/default.nix
+++ b/pkgs/development/rocm-modules/6/default.nix
@@ -166,8 +166,7 @@ let
       composable_kernel = self.callPackage ./composable_kernel { };
 
       ck4inductor = pyPackages.callPackage ./composable_kernel/ck4inductor.nix {
-        inherit (self) composable_kernel;
-        inherit (llvm) rocmcxx;
+        inherit (self) composable_kernel rocm-toolchain;
       };
 
       half = self.callPackage ./half { };

From 4e0bc1c8dcd3570b3703b1c456647747307e3c8a Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Thu, 25 Sep 2025 18:09:03 -0700
Subject: [PATCH 20/84] rocmPackages.rocm-runtime: prefer sysrooted clang over
 clang target

---
 pkgs/development/rocm-modules/6/rocm-runtime/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/rocm-modules/6/rocm-runtime/default.nix b/pkgs/development/rocm-modules/6/rocm-runtime/default.nix
index 2bc797759af3..292ee9a07241 100644
--- a/pkgs/development/rocm-modules/6/rocm-runtime/default.nix
+++ b/pkgs/development/rocm-modules/6/rocm-runtime/default.nix
@@ -99,6 +99,9 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace CMakeLists.txt \
       --replace 'hsa/include/hsa' 'include/hsa'
 
+    substituteInPlace runtime/hsa-runtime/image/blit_src/CMakeLists.txt \
+      --replace-fail 'COMMAND clang' "COMMAND ${llvm.rocm-toolchain}/bin/clang"
+
     export HIP_DEVICE_LIB_PATH="${rocm-device-libs}/amdgcn/bitcode"
   '';
 

From 1d070587958e71a55906f94ccc3b6a5e0ed2e0fa Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Wed, 24 Sep 2025 06:55:38 -0700
Subject: [PATCH 21/84] rocmPackages.rocm-runtime: remove unneeded dependencies

---
 pkgs/development/rocm-modules/6/default.nix      |  1 -
 .../rocm-modules/6/rocm-runtime/default.nix      | 16 ++++++----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/rocm-modules/6/default.nix b/pkgs/development/rocm-modules/6/default.nix
index a1fbf9b42bf2..939c236c56dc 100644
--- a/pkgs/development/rocm-modules/6/default.nix
+++ b/pkgs/development/rocm-modules/6/default.nix
@@ -51,7 +51,6 @@ let
 
       rocm-runtime = self.callPackage ./rocm-runtime {
         stdenv = origStdenv;
-        inherit (llvm) rocm-merged-llvm;
       };
 
       rocm-comgr = self.callPackage ./rocm-comgr { };
diff --git a/pkgs/development/rocm-modules/6/rocm-runtime/default.nix b/pkgs/development/rocm-modules/6/rocm-runtime/default.nix
index 292ee9a07241..56d4fb253490 100644
--- a/pkgs/development/rocm-modules/6/rocm-runtime/default.nix
+++ b/pkgs/development/rocm-modules/6/rocm-runtime/default.nix
@@ -6,15 +6,12 @@
   rocmUpdateScript,
   pkg-config,
   cmake,
-  ninja,
   xxd,
   rocm-device-libs,
   elfutils,
   libdrm,
   numactl,
-  valgrind,
-  libxml2,
-  rocm-merged-llvm,
+  llvm,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -31,22 +28,21 @@ stdenv.mkDerivation (finalAttrs: {
   cmakeBuildType = "RelWithDebInfo";
   separateDebugInfo = true;
   __structuredAttrs = true;
+  strictDeps = true;
 
   nativeBuildInputs = [
     pkg-config
     cmake
-    ninja
-    xxd
-    rocm-merged-llvm
+    xxd # used by create_hsaco_ascii_file.sh
+    llvm.rocm-toolchain
   ];
 
   buildInputs = [
+    llvm.clang-unwrapped
+    llvm.llvm
     elfutils
     libdrm
     numactl
-    # without valgrind, additional work for "kCodeCopyAligned11" is done in the installPhase
-    valgrind
-    libxml2
   ];
 
   cmakeFlags = [

From 00ec55834ae92b81a377d4a7330ab6a5cd5fa1a9 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Wed, 24 Sep 2025 08:14:36 -0700
Subject: [PATCH 22/84] rocmPackages.rocm-merged-llvm: obliterate

---
 pkgs/development/rocm-modules/6/default.nix   |  2 +-
 .../rocm-modules/6/llvm/default.nix           | 38 -------------------
 2 files changed, 1 insertion(+), 39 deletions(-)

diff --git a/pkgs/development/rocm-modules/6/default.nix b/pkgs/development/rocm-modules/6/default.nix
index 939c236c56dc..fc71bed2bf39 100644
--- a/pkgs/development/rocm-modules/6/default.nix
+++ b/pkgs/development/rocm-modules/6/default.nix
@@ -41,7 +41,7 @@ let
           inherit (self) rocm-device-libs;
         }
       );
-      inherit (self.llvm) rocm-merged-llvm clang openmp;
+      inherit (self.llvm) rocm-toolchain clang openmp;
 
       rocm-core = self.callPackage ./rocm-core { stdenv = origStdenv; };
 
diff --git a/pkgs/development/rocm-modules/6/llvm/default.nix b/pkgs/development/rocm-modules/6/llvm/default.nix
index 8b54aeade9a8..e35b4f353270 100644
--- a/pkgs/development/rocm-modules/6/llvm/default.nix
+++ b/pkgs/development/rocm-modules/6/llvm/default.nix
@@ -462,44 +462,6 @@ rec {
 
   clang = rocm-toolchain;
 
-  # Emulate a monolithic ROCm LLVM build to support building ROCm's in-tree LLVM projects
-  # TODO(@LunNova): destroy this
-  rocm-merged-llvm = symlinkJoin {
-    name = "rocm-llvm-merge";
-    paths = [
-      llvm
-      llvm.dev
-      lld
-      lld.lib
-      lld.dev
-      compiler-rt
-      compiler-rt.dev
-      rocmcxx
-    ]
-    ++ lib.optionals withLibcxx [
-      libcxx
-      libcxx.out
-      libcxx.dev
-    ];
-    postBuild = builtins.unsafeDiscardStringContext ''
-      found_files=$(find $out -name '*.cmake')
-      if [ -z "$found_files" ]; then
-          >&2 echo "Error: No CMake files found in $out"
-          exit 1
-      fi
-
-      for target in ${clang-unwrapped.out} ${clang-unwrapped.lib} ${clang-unwrapped.dev}; do
-        if grep "$target" $found_files; then
-            >&2 echo "Unexpected ref to $target (clang-unwrapped) found"
-            # exit 1
-            # # FIXME: enable this to reduce closure size
-        fi
-      done
-    '';
-    inherit version;
-    llvm-src = llvmSrc;
-  };
-
   rocmClangStdenv = overrideCC (
     if withLibcxx then llvmPackagesRocm.libcxxStdenv else llvmPackagesRocm.stdenv
   ) clang;

From 209e382798825de49a5d067c078b5b6c1979e5a6 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Wed, 24 Sep 2025 09:03:08 -0700
Subject: [PATCH 23/84] rocmPackages.hipblaslt: provide llvm for
 find_package(LLVM)

---
 pkgs/development/rocm-modules/6/hipblaslt/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/rocm-modules/6/hipblaslt/default.nix b/pkgs/development/rocm-modules/6/hipblaslt/default.nix
index 58d8a549d747..8b777daee6f3 100644
--- a/pkgs/development/rocm-modules/6/hipblaslt/default.nix
+++ b/pkgs/development/rocm-modules/6/hipblaslt/default.nix
@@ -10,6 +10,7 @@
   gfortran,
   gtest,
   boost,
+  llvm,
   msgpack-cxx,
   amd-blis,
   libxml2,
@@ -135,6 +136,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
+    llvm.llvm
     clr
     rocm-cmake
     hipblas-common

From a1fb89f126606aacaa8e84c563249b713c146307 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Wed, 24 Sep 2025 10:47:16 -0700
Subject: [PATCH 24/84] rocmPackages.rocprofiler: add llvm build input

will become necessary when we drop rocm-merged-llvm in clr
---
 pkgs/development/rocm-modules/6/rocprofiler/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/rocm-modules/6/rocprofiler/default.nix b/pkgs/development/rocm-modules/6/rocprofiler/default.nix
index 9564dbd3675f..c9a181ce01b4 100644
--- a/pkgs/development/rocm-modules/6/rocprofiler/default.nix
+++ b/pkgs/development/rocm-modules/6/rocprofiler/default.nix
@@ -16,6 +16,7 @@
   numactl,
   libpciaccess,
   libxml2,
+  llvm,
   elfutils,
   mpi,
   gtest,
@@ -65,6 +66,8 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
+    llvm.clang-unwrapped
+    llvm.llvm
     numactl
     libpciaccess
     libxml2

From bd0292cf6bbbc900f641d3efd363e17f323fa556 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Wed, 24 Sep 2025 18:52:37 -0700
Subject: [PATCH 25/84] magma: don't assume clr has a compiler linked

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

diff --git a/pkgs/by-name/ma/magma/package.nix b/pkgs/by-name/ma/magma/package.nix
index 29a0104c66e1..4eb6bfa4bcdf 100644
--- a/pkgs/by-name/ma/magma/package.nix
+++ b/pkgs/by-name/ma/magma/package.nix
@@ -203,8 +203,8 @@ stdenv.mkDerivation (finalAttrs: {
     # Can't easily apply the PR as a patch because we rely on the tarball with pregenerated
     # hipified files ∴ fetchpatch of the PR will apply cleanly but fail to build
     (strings.cmakeFeature "ROCM_CORE" "${rocmPackages.clr}")
-    (strings.cmakeFeature "CMAKE_C_COMPILER" "${rocmPackages.clr}/bin/clang")
-    (strings.cmakeFeature "CMAKE_CXX_COMPILER" "${rocmPackages.clr}/bin/clang++")
+    (strings.cmakeFeature "CMAKE_C_COMPILER" "${rocmPackages.clang}/bin/clang")
+    (strings.cmakeFeature "CMAKE_CXX_COMPILER" "${rocmPackages.clang}/bin/clang++")
   ];
 
   # Magma doesn't have a test suite we can easily run, just loose executables, all of which require a GPU.

From 6fb5f7ac2e1dd573d0a693d5c844b71591b6ffe3 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Thu, 25 Sep 2025 18:05:50 -0700
Subject: [PATCH 26/84] rocmPackages.llvm: reduce closure size by moving clang
 static libs to dev

and then dealing with the consequences
---
 pkgs/development/rocm-modules/6/default.nix   |  10 +
 .../rocm-modules/6/llvm/default.nix           | 180 ++++++++++--------
 2 files changed, 113 insertions(+), 77 deletions(-)

diff --git a/pkgs/development/rocm-modules/6/default.nix b/pkgs/development/rocm-modules/6/default.nix
index fc71bed2bf39..f43d0852a7ad 100644
--- a/pkgs/development/rocm-modules/6/default.nix
+++ b/pkgs/development/rocm-modules/6/default.nix
@@ -417,6 +417,16 @@ let
       };
     }
     // lib.optionalAttrs config.allowAliases {
+      rocm-merged-llvm = throw ''
+        'rocm-merged-llvm' has been removed.
+        For 'libllvm' or 'libclang' use 'rocmPackages.llvm.libllvm/clang'.
+        For a ROCm compiler toolchain use 'rocmPackages.rocm-toolchain'.
+        If a package uses '$<TARGET_FILE:clang>' in CMake from 'libclang'
+        it may be necessary to convince it to use 'rocm-toolchain' instead.
+        'rocm-merged-llvm' avoided this at the cost of significantly bloating closure
+        size.
+      ''; # Added 2025-09-30
+
       hsa-amd-aqlprofile-bin = lib.warn ''
         'hsa-amd-aqlprofile-bin' has been replaced by 'aqlprofile'.
       '' self.aqlprofile; # Added 2025-08-27
diff --git a/pkgs/development/rocm-modules/6/llvm/default.nix b/pkgs/development/rocm-modules/6/llvm/default.nix
index e35b4f353270..c4a7181c0e9a 100644
--- a/pkgs/development/rocm-modules/6/llvm/default.nix
+++ b/pkgs/development/rocm-modules/6/llvm/default.nix
@@ -4,6 +4,7 @@
   # LLVM version closest to ROCm fork to override
   llvmPackages_19,
   overrideCC,
+  lndir,
   rocm-device-libs,
   fetchFromGitHub,
   runCommand,
@@ -112,14 +113,6 @@ let
       ln -s $out $out/x86_64-unknown-linux-gnu
     '';
   };
-  usefulOutputs =
-    drv:
-    builtins.filter (x: x != null) [
-      drv
-      (drv.lib or null)
-      (drv.dev or null)
-    ];
-  listUsefulOutputs = builtins.concatMap usefulOutputs;
   llvmSrc = fetchFromGitHub {
     owner = "ROCm";
     repo = "llvm-project";
@@ -141,8 +134,21 @@ let
     monorepoSrc = llvmSrc;
     doCheck = false;
   });
+  refsToRemove = builtins.concatStringsSep " -t " [
+    stdenvToBuildRocmLlvm
+    stdenvToBuildRocmLlvm.cc
+    stdenvToBuildRocmLlvm.cc.cc
+    stdenv.cc
+    stdenv.cc.cc
+    stdenv.cc.bintools
+  ];
   sysrootCompiler =
-    cc: name: paths:
+    {
+      cc,
+      name,
+      paths,
+      linkPaths,
+    }:
     let
       linked = symlinkJoin { inherit name paths; };
     in
@@ -152,29 +158,38 @@ let
         # nix why-depends --precise .#rocmPackages.llvm.rocm-toolchain.linked /store/path/its/not/allowed
         disallowedRequisites = disallowedRefsForToolchain;
         passthru.linked = linked;
+        linkPaths = linkPaths;
+        passAsFile = [ "linkPaths" ];
+        # TODO(@LunNova): Try to use --sysroot with clang in its original location instead of
+        # relying on copying the binary?
+        # $clang/bin/clang++ --sysroot=$rocm-toolchain is not equivalent
+        # to a clang copied to $rocm-toolchain/bin here, have not yet figured out why
       }
       ''
-        set -x
         mkdir -p $out/
         cp --reflink=auto -rL ${linked}/* $out/
         chmod -R +rw $out
         mkdir -p $out/usr
         ln -s $out/ $out/usr/local
-        mkdir -p $out/nix-support/
         # we don't need mixed 32 bit, the presence of lib64 is used by LLVM to decide it's a multilib sysroot
         rm -rf $out/lib64
-        echo 'export CC=clang' >> $out/nix-support/setup-hook
-        echo 'export CXX=clang++' >> $out/nix-support/setup-hook
+        rm -rf $out/lib/cmake $out/lib/lib*.a
         mkdir -p $out/lib/clang/${llvmMajorVersion}/lib/linux/
         ln -s $out/lib/linux/libclang_rt.* $out/lib/clang/${llvmMajorVersion}/lib/linux/
 
         find $out -type f -exec sed -i "s|${cc.out}|$out|g" {} +
         find $out -type f -exec sed -i "s|${cc.dev}|$out|g" {} +
 
-        # our /include now has more than clang expects, so this specific dir still needs to point to cc.dev
-        # FIXME: could copy into a different subdir?
-        sed -i 's|set(CLANG_INCLUDE_DIRS.*$|set(CLANG_INCLUDE_DIRS "${cc.dev}/include")|g' $out/lib/cmake/clang/ClangConfig.cmake
-        ${lib.getExe rdfind} -makesymlinks true $out/ # create links *within* the sysroot to save space
+        ${lib.getExe rdfind} -makesymlinks true ${
+          builtins.concatStringsSep " " (map (x: "${x}/lib") paths)
+        } $out/ # create links *within* the sysroot to save space
+
+        for i in $(cat $linkPathsPath); do
+          ${lib.getExe lndir} -silent $i $out
+        done
+
+        echo 'export CC=clang' >> $out/nix-support/setup-hook
+        echo 'export CXX=clang++' >> $out/nix-support/setup-hook
       '';
   # Removes patches which either aren't desired, or don't apply against ROCm LLVM
   removeInapplicablePatches =
@@ -277,6 +292,11 @@ rec {
       zstd
       zlib
     ];
+    preFixup = ''
+      moveToOutput "lib/lib*.a" "$dev"
+      moveToOutput "lib/cmake" "$dev"
+      sed -Ei "s|$lib/lib/(lib[^/]*)\.a|$dev/lib/\1.a|g" $dev/lib/cmake/llvm/*.cmake
+    '';
     env = (old.env or { }) // {
       NIX_CFLAGS_COMPILE = "${(old.env or { }).NIX_CFLAGS_COMPILE or ""} ${llvmExtraCflags}";
     };
@@ -285,10 +305,7 @@ rec {
     disallowedReferences = (old.disallowedReferences or [ ]) ++ disallowedRefsForToolchain;
     postFixup = ''
       ${old.postFixup or ""}
-      remove-references-to -t "${stdenv.cc}" "$lib/lib/libLLVMSupport.a"
-      find $lib -type f -exec remove-references-to -t ${stdenv.cc.cc} {} +
-      find $lib -type f -exec remove-references-to -t ${stdenvToBuildRocmLlvm.cc} {} +
-      find $lib -type f -exec remove-references-to -t ${stdenv.cc.bintools} {} +
+      find $lib -type f -exec remove-references-to -t ${refsToRemove} {} +
     '';
     meta = old.meta // llvmMeta;
   });
@@ -314,16 +331,15 @@ rec {
         disallowedReferences = (old.disallowedReferences or [ ]) ++ disallowedRefsForToolchain;
         postFixup = ''
           ${old.postFixup or ""}
-          find $lib -type f -exec remove-references-to -t ${stdenv.cc.cc} {} +
-          find $lib -type f -exec remove-references-to -t ${stdenv.cc.bintools} {} +
+          find $lib -type f -exec remove-references-to -t ${refsToRemove} {} +
         '';
         meta = old.meta // llvmMeta;
       });
-  clang-unwrapped =
-    (
-      (llvmPackagesRocm.clang-unwrapped.override {
-        libllvm = llvm;
-      }).overrideAttrs
+  clang-unwrapped = (
+    (llvmPackagesRocm.clang-unwrapped.override {
+      libllvm = llvm;
+      enableClangToolsExtra = false;
+    }).overrideAttrs
       (
         old:
         let
@@ -389,43 +405,52 @@ rec {
               "-DUSE_DEPRECATED_GCC_INSTALL_PREFIX=ON"
               "-DGCC_INSTALL_PREFIX=${gcc-prefix}"
             ];
-          postFixup = (old.postFixup or "") + ''
-            find $lib -type f -exec remove-references-to -t ${stdenvToBuildRocmLlvm} {} +
-            find $lib -type f -exec remove-references-to -t ${stdenvToBuildRocmLlvm.cc} {} +
-            find $lib -type f -exec remove-references-to -t ${stdenvToBuildRocmLlvm.cc.cc} {} +
-            find $lib -type f -exec remove-references-to -t ${stdenv.cc} {} +
-            find $lib -type f -exec remove-references-to -t ${stdenv.cc.cc} {} +
-            find $lib -type f -exec remove-references-to -t ${stdenv.cc.bintools} {} +
+          preFixup = ''
+            ${toString old.preFixup or ""}
+            moveToOutput "lib/lib*.a" "$dev"
+            moveToOutput "lib/cmake" "$dev"
+            mkdir -p $dev/lib/clang/
+            ln -s $lib/lib/clang/${llvmMajorVersion} $dev/lib/clang/
+            sed -Ei "s|$lib/lib/(lib[^/]*)\.a|$dev/lib/\1.a|g" $dev/lib/cmake/clang/*.cmake
+          '';
+          postFixup = ''
+            ${toString old.postFixup or ""}
+            find $lib -type f -exec remove-references-to -t ${refsToRemove} {} +
+            find $dev -type f -exec remove-references-to -t ${refsToRemove} {} +
           '';
           meta = old.meta // llvmMeta;
         }
       )
-    )
-    // {
-      libllvm = llvm;
-    };
+  );
   # A clang that understands standard include searching in a GNU sysroot and will put GPU libs in include path
   # in the right order
   # and expects its libc to be in the sysroot
   rocm-toolchain =
-    (sysrootCompiler clang-unwrapped "rocmcxx" (
-      listUsefulOutputs (
-        [
-          clang-unwrapped
-          bintools
-          compiler-rt
-          openmp
-        ]
-        ++ (lib.optionals withLibcxx [
-          libcxx
-        ])
-        ++ (lib.optionals (!withLibcxx) [
-          gcc-include
-          glibc
-          glibc.dev
-        ])
-      )
-    ))
+    (sysrootCompiler {
+      cc = clang-unwrapped;
+      name = "rocm-toolchain";
+      paths = [
+        clang-unwrapped.out
+        clang-unwrapped.lib
+        bintools.out
+        compiler-rt.out
+        openmp.out
+        openmp.dev
+      ]
+      ++ lib.optionals withLibcxx [
+        libcxx
+      ]
+      ++ lib.optionals (!withLibcxx) [
+        glibc
+        glibc.dev
+      ];
+      linkPaths = [
+        bintools.bintools.out
+      ]
+      ++ lib.optionals (!withLibcxx) [
+        gcc-include.out
+      ];
+    })
     // {
       version = llvmMajorVersion;
       cc = rocm-toolchain;
@@ -433,26 +458,27 @@ rec {
       isClang = true;
       isGNU = false;
     };
-  clang-tools = llvmPackagesRocm.clang-tools.override {
-    inherit clang-unwrapped clang;
-  };
-  compiler-rt-libc = llvmPackagesRocm.compiler-rt-libc.overrideAttrs (old: {
-    patches = old.patches ++ [
-      (fetchpatch {
-        name = "Fix-missing-main-function-in-float16-bfloat16-support-checks.patch";
-        url = "https://github.com/ROCm/llvm-project/commit/68d8b3846ab1e6550910f2a9a685690eee558af2.patch";
-        hash = "sha256-Db+L1HFMWVj4CrofsGbn5lnMoCzEcU+7q12KKFb17/g=";
-        relative = "compiler-rt";
-      })
-      (fetchpatch {
-        # Fixes fortify hardening compile error related to openat usage
-        hash = "sha256-pgpN1q1vIQrPXHPxNSZ6zfgV2EflHO5Amzl+2BDjXbs=";
-        url = "https://github.com/llvm/llvm-project/commit/155b7a12820ec45095988b6aa6e057afaf2bc892.patch";
-        relative = "compiler-rt";
-      })
-    ];
-    meta = old.meta // llvmMeta;
-  });
+  compiler-rt-libc =
+    (llvmPackagesRocm.compiler-rt-libc.override {
+      libllvm = llvm;
+    }).overrideAttrs
+      (old: {
+        patches = old.patches ++ [
+          (fetchpatch {
+            name = "Fix-missing-main-function-in-float16-bfloat16-support-checks.patch";
+            url = "https://github.com/ROCm/llvm-project/commit/68d8b3846ab1e6550910f2a9a685690eee558af2.patch";
+            hash = "sha256-Db+L1HFMWVj4CrofsGbn5lnMoCzEcU+7q12KKFb17/g=";
+            relative = "compiler-rt";
+          })
+          (fetchpatch {
+            # Fixes fortify hardening compile error related to openat usage
+            hash = "sha256-pgpN1q1vIQrPXHPxNSZ6zfgV2EflHO5Amzl+2BDjXbs=";
+            url = "https://github.com/llvm/llvm-project/commit/155b7a12820ec45095988b6aa6e057afaf2bc892.patch";
+            relative = "compiler-rt";
+          })
+        ];
+        meta = old.meta // llvmMeta;
+      });
   compiler-rt = compiler-rt-libc;
   bintools = wrapBintoolsWith {
     bintools = llvmPackagesRocm.bintools-unwrapped.override {

From c1cfcf382285459f793365a1dc56804e08f6c1a3 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Tue, 30 Sep 2025 07:13:42 -0700
Subject: [PATCH 27/84] rocmPackages.rocm-path: drop

rocm-path shouldn't have been added at top-level.
We have a separate non-recursed section containing symlinkJoins for
this, and best practice in nixpkgs is to avoid ROCM_PATH when possible
and create a minimal one in each package that needs one.
---
 pkgs/development/rocm-modules/6/default.nix   |  8 +++++-
 .../rocm-modules/6/rocm-path/default.nix      | 27 -------------------
 2 files changed, 7 insertions(+), 28 deletions(-)
 delete mode 100644 pkgs/development/rocm-modules/6/rocm-path/default.nix

diff --git a/pkgs/development/rocm-modules/6/default.nix b/pkgs/development/rocm-modules/6/default.nix
index f43d0852a7ad..49d44ccb9fdd 100644
--- a/pkgs/development/rocm-modules/6/default.nix
+++ b/pkgs/development/rocm-modules/6/default.nix
@@ -30,7 +30,6 @@ let
       buildTests = false;
       buildBenchmarks = false;
 
-      rocmPath = self.callPackage ./rocm-path { };
       rocmUpdateScript = self.callPackage ./update.nix { };
 
       ## ROCm ##
@@ -417,6 +416,13 @@ let
       };
     }
     // lib.optionalAttrs config.allowAliases {
+      rocmPath = throw ''
+        'rocm-path' has been removed. If a ROCM_PATH value is required in nixpkgs please
+        construct one with the minimal set of required deps.
+        For convenience use outside of nixpkgs consider one of the entries in
+        'rocmPackages.meta'.
+      ''; # Added 2025-09-30
+
       rocm-merged-llvm = throw ''
         'rocm-merged-llvm' has been removed.
         For 'libllvm' or 'libclang' use 'rocmPackages.llvm.libllvm/clang'.
diff --git a/pkgs/development/rocm-modules/6/rocm-path/default.nix b/pkgs/development/rocm-modules/6/rocm-path/default.nix
deleted file mode 100644
index 57970ffa4406..000000000000
--- a/pkgs/development/rocm-modules/6/rocm-path/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  symlinkJoin,
-  linkFarm,
-  clr,
-  hipblas,
-  hipblas-common,
-  rocblas,
-  rocsolver,
-  rocsparse,
-  rocm-device-libs,
-  rocm-smi,
-  llvm,
-}:
-symlinkJoin {
-  name = "rocm-path-${clr.version}";
-  paths = [
-    clr
-    hipblas-common
-    hipblas
-    rocblas
-    rocsolver
-    rocsparse
-    rocm-device-libs
-    rocm-smi
-    (linkFarm "rocm-llvm-subdir" { llvm = llvm.clang; })
-  ];
-}

From b28253f5185ee6c94458fa107c013380de26bc6a Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Sun, 5 Oct 2025 13:00:54 +0200
Subject: [PATCH 28/84] rlottie: build with meson

This works around rlottie not supporting CMake 4, and at the same time
drops some additional flags.
While some CMake metadata files are now missing, dependents should use
pkg-config to find rlottie anyways.
---
 pkgs/by-name/rl/rlottie/package.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/rl/rlottie/package.nix b/pkgs/by-name/rl/rlottie/package.nix
index 6b4c19bbbddd..14d30ab20d8c 100644
--- a/pkgs/by-name/rl/rlottie/package.nix
+++ b/pkgs/by-name/rl/rlottie/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   fetchpatch,
-  cmake,
+  meson,
   ninja,
   pkg-config,
 }:
@@ -28,15 +28,11 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [
-    cmake
+    meson
     ninja
     pkg-config
   ];
 
-  cmakeFlags = [
-    (lib.cmakeFeature "LIB_INSTALL_DIR" "${placeholder "out"}/lib")
-  ];
-
   env.NIX_CFLAGS_COMPILE = lib.optionalString (
     stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64
   ) "-U__ARM_NEON__";

From cc6dc0f3a8fa6fda5c4a056281b95e42ad5477b1 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 5 Oct 2025 14:26:23 +0200
Subject: [PATCH 29/84] libsForQt5.rlottie-qml: Fix build when rlottie is built
 via Meson

---
 ...001-Use-upstream-QuaZip-CMake-config.patch | 75 +++++++++++++++++++
 .../1002-Find-rlottie-via-pkg-config.patch    | 35 +++++++++
 .../libraries/rlottie-qml/default.nix         | 11 +--
 3 files changed, 116 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/libraries/rlottie-qml/1001-Use-upstream-QuaZip-CMake-config.patch
 create mode 100644 pkgs/development/libraries/rlottie-qml/1002-Find-rlottie-via-pkg-config.patch

diff --git a/pkgs/development/libraries/rlottie-qml/1001-Use-upstream-QuaZip-CMake-config.patch b/pkgs/development/libraries/rlottie-qml/1001-Use-upstream-QuaZip-CMake-config.patch
new file mode 100644
index 000000000000..af2079ad021a
--- /dev/null
+++ b/pkgs/development/libraries/rlottie-qml/1001-Use-upstream-QuaZip-CMake-config.patch
@@ -0,0 +1,75 @@
+From 5656211dd8ae190795e343f47a3393fd3d8d25a4 Mon Sep 17 00:00:00 2001
+From: OPNA2608 <opna2608@protonmail.com>
+Date: Fri, 2 Feb 2024 12:04:32 +0100
+Subject: [PATCH 1/2] Use upstream QuaZip CMake config
+
+---
+ CMakeLists.txt                  |  5 ++---
+ cmake/FindQuaZip.cmake          | 24 ------------------------
+ cmake/rLottieQmlConfig.cmake.in |  2 +-
+ 3 files changed, 3 insertions(+), 28 deletions(-)
+ delete mode 100644 cmake/FindQuaZip.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4bd97b4..4d06eb5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -21,10 +21,9 @@ find_package(Qt5 COMPONENTS Core Qml Quick Multimedia CONFIG REQUIRED)
+ # set(rlottie_DIR "${CMAKE_CURRENT_BINARY_DIR}/../rlottie/install/lib/cmake/rlottie")
+ find_package(rlottie REQUIRED)
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+-find_package(QuaZip REQUIRED)
++find_package(QuaZip-Qt5 REQUIRED)
+ 
+-target_include_directories(${PLUGIN} SYSTEM PRIVATE ${QUAZIP_INCLUDE_DIR})
+-target_link_libraries(${PLUGIN} ${QUAZIP_LIBRARIES} rlottie::rlottie)
++target_link_libraries(${PLUGIN} QuaZip::QuaZip rlottie::rlottie)
+ target_link_libraries(${PLUGIN}
+   # PUBLIC
+   Qt5::Qml
+diff --git a/cmake/FindQuaZip.cmake b/cmake/FindQuaZip.cmake
+deleted file mode 100644
+index 76c1d8a..0000000
+--- a/cmake/FindQuaZip.cmake
++++ /dev/null
+@@ -1,24 +0,0 @@
+-# QUAZIP_FOUND                   - QuaZip library was found
+-# QUAZIP_INCLUDE_DIR             - Path to QuaZip include dir
+-# QUAZIP_INCLUDE_DIRS            - Path to QuaZip and zlib include dir (combined from QUAZIP_INCLUDE_DIR + ZLIB_INCLUDE_DIR)
+-# QUAZIP_LIBRARIES               - List of QuaZip libraries
+-# QUAZIP_ZLIB_INCLUDE_DIR        - The include dir of zlib headers
+-
+-if(MINGW)
+-	find_library(QUAZIP_LIBRARIES libquazip5)
+-	find_path(QUAZIP_INCLUDE_DIR quazip.h PATH_SUFFIXES quazip5)
+-	find_path(QUAZIP_ZLIB_INCLUDE_DIR zlib.h)
+-else()
+-	find_library(QUAZIP_LIBRARIES
+-		NAMES quazip5 quazip quazip1-qt5
+-		PATHS /usr/lib /usr/lib64 /usr/local/lib
+-	)
+-	find_path(QUAZIP_INCLUDE_DIR quazip.h
+-		PATHS /usr/include /usr/local/include
+-		PATH_SUFFIXES quazip5 quazip "QuaZip-Qt5-1.1/quazip"
+-	)
+-	find_path(QUAZIP_ZLIB_INCLUDE_DIR zlib.h PATHS /usr/include /usr/local/include)
+-endif()
+-include(FindPackageHandleStandardArgs)
+-set(QUAZIP_INCLUDE_DIRS ${QUAZIP_INCLUDE_DIR} ${QUAZIP_ZLIB_INCLUDE_DIR})
+-find_package_handle_standard_args(QUAZIP DEFAULT_MSG QUAZIP_LIBRARIES QUAZIP_INCLUDE_DIR QUAZIP_ZLIB_INCLUDE_DIR QUAZIP_INCLUDE_DIRS)
+diff --git a/cmake/rLottieQmlConfig.cmake.in b/cmake/rLottieQmlConfig.cmake.in
+index 7848a1d..f606d25 100644
+--- a/cmake/rLottieQmlConfig.cmake.in
++++ b/cmake/rLottieQmlConfig.cmake.in
+@@ -2,7 +2,7 @@ get_filename_component(rLottieQml_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+ include(CMakeFindDependencyMacro)
+ 
+ # find_dependency(rlottie REQUIRED)
+-# find_dependency(QuaZip REQUIRED)
++find_dependency(QuaZip-Qt5 REQUIRED)
+ 
+ if(NOT TARGET rLottieQml::rLottieQml)
+     include("${rLottieQml_CMAKE_DIR}/rLottieQmlExport.cmake")
+-- 
+2.51.0
+
diff --git a/pkgs/development/libraries/rlottie-qml/1002-Find-rlottie-via-pkg-config.patch b/pkgs/development/libraries/rlottie-qml/1002-Find-rlottie-via-pkg-config.patch
new file mode 100644
index 000000000000..56e15f22e716
--- /dev/null
+++ b/pkgs/development/libraries/rlottie-qml/1002-Find-rlottie-via-pkg-config.patch
@@ -0,0 +1,35 @@
+From 1935d690c3eead6844093b5df3b0aecff4f95345 Mon Sep 17 00:00:00 2001
+From: OPNA2608 <opna2608@protonmail.com>
+Date: Sun, 5 Oct 2025 13:48:29 +0200
+Subject: [PATCH 2/2] Find rlottie via pkg-config
+
+Because availability of the CMake module depends on how rlottie was built - building via Meson doesn't generate the module.
+---
+ CMakeLists.txt | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4d06eb5..f12ae3c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -17,13 +17,15 @@ add_library(${PLUGIN} MODULE ${SRC})
+ # set_target_properties(${PLUGIN} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PLUGIN})
+ # qt5_use_modules(${PLUGIN} Qml Quick DBus Multimedia)
+ 
++find_package(PkgConfig REQUIRED)
+ find_package(Qt5 COMPONENTS Core Qml Quick Multimedia CONFIG REQUIRED)
+ # set(rlottie_DIR "${CMAKE_CURRENT_BINARY_DIR}/../rlottie/install/lib/cmake/rlottie")
+-find_package(rlottie REQUIRED)
++pkg_check_modules(RLOTTIE REQUIRED rlottie)
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+ find_package(QuaZip-Qt5 REQUIRED)
+ 
+-target_link_libraries(${PLUGIN} QuaZip::QuaZip rlottie::rlottie)
++target_include_directories(${PLUGIN} PUBLIC ${RLOTTIE_INCLUDE_DIRS})
++target_link_libraries(${PLUGIN} QuaZip::QuaZip ${RLOTTIE_LIBRARIES})
+ target_link_libraries(${PLUGIN}
+   # PUBLIC
+   Qt5::Qml
+-- 
+2.51.0
+
diff --git a/pkgs/development/libraries/rlottie-qml/default.nix b/pkgs/development/libraries/rlottie-qml/default.nix
index 7a71fa3295d7..88ed659d4230 100644
--- a/pkgs/development/libraries/rlottie-qml/default.nix
+++ b/pkgs/development/libraries/rlottie-qml/default.nix
@@ -4,6 +4,7 @@
   fetchFromGitLab,
   fetchpatch,
   cmake,
+  pkg-config,
   qtbase,
   qtdeclarative,
   qtmultimedia,
@@ -29,11 +30,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   patches = [
     # Remove when https://gitlab.com/mymike00/rlottie-qml/-/merge_requests/1 merged
-    (fetchpatch {
-      name = "0001-rlottie-qml-Use-upstream-QuaZip-config-module.patch";
-      url = "https://gitlab.com/mymike00/rlottie-qml/-/commit/5656211dd8ae190795e343f47a3393fd3d8d25a4.patch";
-      hash = "sha256-t2NlYVU+D8hKd+AvBWPEavAhJKlk7Q3y2iAQSYtks5k=";
-    })
+    ./1001-Use-upstream-QuaZip-CMake-config.patch
+
+    # Remove when https://gitlab.com/mymike00/rlottie-qml/-/merge_requests/3 merged
+    ./1002-Find-rlottie-via-pkg-config.patch
   ];
 
   postPatch = ''
@@ -47,6 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     cmake
+    pkg-config
   ];
 
   buildInputs = [

From 0c64416e151010fee077362c3b2b77ce2bae6305 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 5 Oct 2025 14:56:16 +0200
Subject: [PATCH 30/84] lomiri.teleports: Drop dependency on rlottie CMake
 config

rlottie itself doesn't seem to be used by anything in TELEports, it relies on rlottie-qml.

Still in buildInputs because rlottie-qml propagates a link against rlottie to its users. Prolly needs some cleanup of its CMake files...
---
 ...-Drop-explicit-dependency-on-rlottie.patch | 27 +++++++++++++++++++
 .../lomiri/applications/teleports/default.nix |  3 +++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/desktops/lomiri/applications/teleports/1001-app-CMakeLists.txt-Drop-explicit-dependency-on-rlottie.patch

diff --git a/pkgs/desktops/lomiri/applications/teleports/1001-app-CMakeLists.txt-Drop-explicit-dependency-on-rlottie.patch b/pkgs/desktops/lomiri/applications/teleports/1001-app-CMakeLists.txt-Drop-explicit-dependency-on-rlottie.patch
new file mode 100644
index 000000000000..468612cb5c3a
--- /dev/null
+++ b/pkgs/desktops/lomiri/applications/teleports/1001-app-CMakeLists.txt-Drop-explicit-dependency-on-rlottie.patch
@@ -0,0 +1,27 @@
+From f9dfacc4b92faa7b60ae37489aa58520b4da95d7 Mon Sep 17 00:00:00 2001
+From: OPNA2608 <opna2608@protonmail.com>
+Date: Sun, 5 Oct 2025 14:34:43 +0200
+Subject: [PATCH] app/CMakeLists.txt: Drop explicit dependency on rlottie
+
+- If rlottie is built via Meson instead of CMake, then there will be no CMake module to find here.
+- rlottie-qml already links against rlottie, and there is no direct usage of rlottie headers in this project,
+  so explicitly pulling it in shouldn't be necessary.
+---
+ app/CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
+index c1f0b85..7a59db5 100644
+--- a/app/CMakeLists.txt
++++ b/app/CMakeLists.txt
+@@ -1,7 +1,6 @@
+ find_package(Qt5 COMPONENTS Core Quick Multimedia REQUIRED)
+ 
+ find_package(QuickFlux REQUIRED)
+-find_package(rlottie REQUIRED)
+ find_package(rLottieQml REQUIRED)
+ 
+ #"qtdclient.cpp" "qtdthread.cpp" "qml.qrc"
+-- 
+2.51.0
+
diff --git a/pkgs/desktops/lomiri/applications/teleports/default.nix b/pkgs/desktops/lomiri/applications/teleports/default.nix
index ec02d9e1d093..fa5a9417819f 100644
--- a/pkgs/desktops/lomiri/applications/teleports/default.nix
+++ b/pkgs/desktops/lomiri/applications/teleports/default.nix
@@ -58,6 +58,9 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://gitlab.com/ubports/development/apps/teleports/-/commit/dd537c08453be9bfcdb2ee1eb692514c7e867e41.patch";
       hash = "sha256-zxxFvoj6jluGPCA9GQsxuYYweaSOVrkD01hZwCtq52U=";
     })
+
+    # Remove when https://gitlab.com/ubports/development/apps/teleports/-/merge_requests/586 merged & in release
+    ./1001-app-CMakeLists.txt-Drop-explicit-dependency-on-rlottie.patch
   ];
 
   postPatch = ''

From 44b702e8b44dbcef0f4df4c8a40e60b35007b11c Mon Sep 17 00:00:00 2001
From: Slendi <slendi@socopon.com>
Date: Mon, 6 Oct 2025 17:43:36 +0300
Subject: [PATCH 31/84] pyside2: Fix CMake build

Signed-off-by: Slendi <slendi@socopon.com>
---
 pkgs/development/python-modules/pyside2-tools/default.nix | 3 +++
 pkgs/development/python-modules/pyside2/default.nix       | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/pkgs/development/python-modules/pyside2-tools/default.nix b/pkgs/development/python-modules/pyside2-tools/default.nix
index 367b44f48208..568877012ac2 100644
--- a/pkgs/development/python-modules/pyside2-tools/default.nix
+++ b/pkgs/development/python-modules/pyside2-tools/default.nix
@@ -24,6 +24,9 @@ stdenv.mkDerivation {
 
   postPatch = ''
     cd sources/pyside2-tools
+    substituteInPlace CMakeLists.txt --replace-fail \
+      "cmake_minimum_required(VERSION 3.1)" \
+      "cmake_minimum_required(VERSION 3.10)"
   '';
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pyside2/default.nix b/pkgs/development/python-modules/pyside2/default.nix
index ae6d1b373c52..bd3182d1202d 100644
--- a/pkgs/development/python-modules/pyside2/default.nix
+++ b/pkgs/development/python-modules/pyside2/default.nix
@@ -37,6 +37,14 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     cd sources/pyside2
+    for i in {.,doc}/CMakeLists.txt; do
+      substituteInPlace $i --replace-fail \
+        "cmake_minimum_required(VERSION 3.1)" \
+        "cmake_minimum_required(VERSION 3.10)"
+      substituteInPlace $i --replace-fail \
+        "cmake_policy(VERSION 3.1)" \
+        "cmake_policy(VERSION 3.10)"
+    done
   '';
 
   cmakeFlags = [

From 21120692bf1992569fcf4b9d4fc5b6ecc174199e Mon Sep 17 00:00:00 2001
From: Slendi <slendi@socopon.com>
Date: Mon, 6 Oct 2025 17:44:02 +0300
Subject: [PATCH 32/84] shiboken2: Fix CMake build

Signed-off-by: Slendi <slendi@socopon.com>
---
 .../development/python-modules/shiboken2/default.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/development/python-modules/shiboken2/default.nix b/pkgs/development/python-modules/shiboken2/default.nix
index f8d1eb12fb21..2721ecb36329 100644
--- a/pkgs/development/python-modules/shiboken2/default.nix
+++ b/pkgs/development/python-modules/shiboken2/default.nix
@@ -16,6 +16,18 @@ stdenv.mkDerivation {
 
   postPatch = ''
     cd sources/shiboken2
+    substituteInPlace doc/CMakeLists.txt --replace-fail \
+      "cmake_minimum_required(VERSION 3.1)" \
+      "cmake_minimum_required(VERSION 3.10)"
+    for i in {.,ApiExtractor}/CMakeLists.txt; do
+      substituteInPlace $i --replace-fail \
+        "cmake_minimum_required(VERSION 3.1)" \
+        "cmake_minimum_required(VERSION 3.10)"
+      substituteInPlace $i --replace-fail \
+        "cmake_policy(VERSION 3.1)" \
+        "cmake_policy(VERSION 3.10)"
+    done
+    head CMakeLists.txt
   '';
 
   CLANG_INSTALL_DIR = llvmPackages.libclang.out;

From 308544b08229604c35ab150e77a17fd344329f8e Mon Sep 17 00:00:00 2001
From: Slendi <slendi@socopon.com>
Date: Mon, 6 Oct 2025 17:44:48 +0300
Subject: [PATCH 33/84] renderdoc: Enable aarch64-linux

Signed-off-by: Slendi <slendi@socopon.com>
---
 pkgs/by-name/re/renderdoc/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/re/renderdoc/package.nix b/pkgs/by-name/re/renderdoc/package.nix
index 93d929ad148c..105deb7bc02e 100644
--- a/pkgs/by-name/re/renderdoc/package.nix
+++ b/pkgs/by-name/re/renderdoc/package.nix
@@ -14,7 +14,6 @@
   nix-update-script,
   pcre,
   pkg-config,
-  # python3Packages.shiboken2 is currently broken
   python312Packages,
   qt5,
   stdenv,
@@ -154,6 +153,8 @@ stdenv.mkDerivation (finalAttrs: {
       pbsds
       ShyAssassin
     ];
-    platforms = lib.intersectLists lib.platforms.linux (lib.platforms.x86_64 ++ lib.platforms.i686);
+    platforms = lib.intersectLists lib.platforms.linux (
+      lib.platforms.x86_64 ++ lib.platforms.i686 ++ lib.platforms.aarch64
+    );
   };
 })

From 9459a994d390bcebb98a8c03033e1ce245b6a4bb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Oct 2025 21:55:46 +0000
Subject: [PATCH 34/84] openimageio: 3.0.10.1 -> 3.1.6.2

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

diff --git a/pkgs/by-name/op/openimageio/package.nix b/pkgs/by-name/op/openimageio/package.nix
index 2501a26418ab..0d5261d7fd25 100644
--- a/pkgs/by-name/op/openimageio/package.nix
+++ b/pkgs/by-name/op/openimageio/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "openimageio";
-  version = "3.0.10.1";
+  version = "3.1.6.2";
 
   src = fetchFromGitHub {
     owner = "AcademySoftwareFoundation";
     repo = "OpenImageIO";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-BBrzmukPfQVYR0CdfiYOxvPfIEXCj/45lQFRxl9Loc0=";
+    hash = "sha256-0AfkJXFn+dEPUJF4GJq6Gk5vBJDRPL2Z03dVa5+xKVA=";
   };
 
   outputs = [

From ab01c588b514838c539400de10d560b7e58a6117 Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Mon, 6 Oct 2025 10:36:43 +0200
Subject: [PATCH 35/84] rlottie: 0.2 -> unstable-20251001

---
 pkgs/by-name/rl/rlottie/package.nix | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/rl/rlottie/package.nix b/pkgs/by-name/rl/rlottie/package.nix
index 14d30ab20d8c..54c0ac6a5d88 100644
--- a/pkgs/by-name/rl/rlottie/package.nix
+++ b/pkgs/by-name/rl/rlottie/package.nix
@@ -8,25 +8,17 @@
   pkg-config,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "rlottie";
-  version = "0.2";
+  version = "0.2-unstable-2025-10-01";
 
   src = fetchFromGitHub {
     owner = "Samsung";
     repo = "rlottie";
-    rev = "v${version}";
-    sha256 = "10bxr1zf9wxl55d4cw2j02r6sgqln7mbxplhhfvhw0z92fi40kr3";
+    rev = "671c561130ead1c6e44805a7ec1263573a3440fd";
+    hash = "sha256-od3zatv4ZxUIoLkwy0TT8lAsDcjoPS4plci+ZDyz34Y=";
   };
 
-  patches = [
-    # Fixed build with GCC 11
-    (fetchpatch {
-      url = "https://github.com/Samsung/rlottie/commit/2d7b1fa2b005bba3d4b45e8ebfa632060e8a157a.patch";
-      hash = "sha256-2JPsj0WiBMMu0N3NUYDrHumvPN2YS8nPq5Zwagx6UWE=";
-    })
-  ];
-
   nativeBuildInputs = [
     meson
     ninja

From 5ff37ac457968cd608ed76bb10060dfef0b9d148 Mon Sep 17 00:00:00 2001
From: Zhong Jianxin <azuwis@gmail.com>
Date: Wed, 8 Oct 2025 20:03:38 +0800
Subject: [PATCH 36/84] blueutil: 2.12.0 -> 2.13.0

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

diff --git a/pkgs/by-name/bl/blueutil/package.nix b/pkgs/by-name/bl/blueutil/package.nix
index 289a445a897a..31d6eaf1cadd 100644
--- a/pkgs/by-name/bl/blueutil/package.nix
+++ b/pkgs/by-name/bl/blueutil/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "blueutil";
-  version = "2.12.0";
+  version = "2.13.0";
 
   src = fetchFromGitHub {
     owner = "toy";
     repo = "blueutil";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-JwX3NHXbGgEj+ZCyu9gWp2TCihokaAw5oHCrlmpy6HA=";
+    hash = "sha256-Qw5c9dp7wpuOcQSLsg1pfJ+NbrEtme2o6nKD3Ba3A3M=";
   };
 
   env.NIX_CFLAGS_COMPILE = "-Wall -Wextra -Werror -mmacosx-version-min=10.9 -framework Foundation -framework IOBluetooth";

From 706787d926c57c152db0ff8f64a091f0d9a6640c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Oct 2025 07:30:36 +0000
Subject: [PATCH 37/84] jsoncons: 1.4.2 -> 1.4.3

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

diff --git a/pkgs/by-name/js/jsoncons/package.nix b/pkgs/by-name/js/jsoncons/package.nix
index 3cf6e3ef99d2..df12a8985f78 100644
--- a/pkgs/by-name/js/jsoncons/package.nix
+++ b/pkgs/by-name/js/jsoncons/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "jsoncons";
-  version = "1.4.2";
+  version = "1.4.3";
 
   src = fetchFromGitHub {
     owner = "danielaparker";
     repo = "jsoncons";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-aWJTJiEBpWVvNl3l8MB30NakqXVni+VoalV66Sg2g9M=";
+    hash = "sha256-7ySbnWiX5pHMG2BcnLowKegEwjSdkKReh72Y3z8cpLg=";
   };
 
   nativeBuildInputs = [ cmake ];

From caffd6a9bbc687aa793aff9961ed5c14ac8b81de Mon Sep 17 00:00:00 2001
From: wetrustinprize <git@wetrustinprize.com>
Date: Thu, 9 Oct 2025 13:03:31 -0300
Subject: [PATCH 38/84] maintainers: add wetrustinprize

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index df1dff6b5564..5fd6a2d7c351 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -27709,6 +27709,12 @@
     githubId = 43357387;
     keys = [ { fingerprint = "F844 80B2 0CA9 D6CC C7F5  2479 A776 D2AD 099E 8BC0"; } ];
   };
+  wetrustinprize = {
+    email = "git@wetrustinprize.com";
+    github = "wetrustinprize";
+    githubId = 38386927;
+    name = "Peterson 'Prize' Adami Candido";
+  };
   wexder = {
     email = "wexder19@gmail.com";
     github = "wexder";

From 2528b7f9c8c44a9d1c099f9805c04b208101f16c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 9 Oct 2025 09:25:11 -0700
Subject: [PATCH 39/84] pytrainer: mark broken

It fails to run with

    TypeError: MetaData.reflect() missing 1 required positional argument: 'bind'
---
 pkgs/by-name/py/pytrainer/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/py/pytrainer/package.nix b/pkgs/by-name/py/pytrainer/package.nix
index 28c03760ab0d..9cc8686cf22f 100644
--- a/pkgs/by-name/py/pytrainer/package.nix
+++ b/pkgs/by-name/py/pytrainer/package.nix
@@ -106,6 +106,8 @@ python.pkgs.buildPythonApplication rec {
   '';
 
   meta = with lib; {
+    # https://github.com/pytrainer/pytrainer/issues/280
+    broken = true;
     homepage = "https://github.com/pytrainer/pytrainer";
     description = "Application for logging and graphing sporting excursions";
     mainProgram = "pytrainer";

From b493ec9ca80b2e6c58eeb2da72b03dfb533c7ad6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Oct 2025 00:23:07 +0000
Subject: [PATCH 40/84] bookstack: 25.07.2 -> 25.07.3

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

diff --git a/pkgs/by-name/bo/bookstack/package.nix b/pkgs/by-name/bo/bookstack/package.nix
index dc36cfba748d..393a6fdacb6d 100644
--- a/pkgs/by-name/bo/bookstack/package.nix
+++ b/pkgs/by-name/bo/bookstack/package.nix
@@ -8,16 +8,16 @@
 
 php83.buildComposerProject2 (finalAttrs: {
   pname = "bookstack";
-  version = "25.07.2";
+  version = "25.07.3";
 
   src = fetchFromGitHub {
     owner = "bookstackapp";
     repo = "bookstack";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-j6vDox70HPLwBlBDyewpwi1FUpNq62fj9RvqppjZ16Q=";
+    hash = "sha256-DR15EkvoFzAFo8Gv1bqD9ry4WtbNSIiR7qii1Va2b2g=";
   };
 
-  vendorHash = "sha256-UjIFk23BFfghieHnvomU0UAwZJslN8ya+IDat001RrE=";
+  vendorHash = "sha256-OTsH7MOmbhu6xeBg9YfUk08bjQEFU0Br+oXcuZUCVME=";
 
   passthru = {
     phpPackage = php83;

From 1d1027281875f5eaa17a7cae6cfc89ce3e88d0a2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Oct 2025 10:42:50 +0000
Subject: [PATCH 41/84] cnquery: 12.3.0 -> 12.4.0

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

diff --git a/pkgs/by-name/cn/cnquery/package.nix b/pkgs/by-name/cn/cnquery/package.nix
index 74232dbf526c..a03afd123977 100644
--- a/pkgs/by-name/cn/cnquery/package.nix
+++ b/pkgs/by-name/cn/cnquery/package.nix
@@ -6,18 +6,18 @@
 
 buildGoModule rec {
   pname = "cnquery";
-  version = "12.3.0";
+  version = "12.4.0";
 
   src = fetchFromGitHub {
     owner = "mondoohq";
     repo = "cnquery";
     tag = "v${version}";
-    hash = "sha256-/4T5Rncsk7aOS6Do2DyyLVim/dVNMTPUOnqZ6Isbj/I=";
+    hash = "sha256-A/2/pk9ncGZwxiA4BOcpiPZcLiyRB0dTmf/tw3yDikc=";
   };
 
   subPackages = [ "apps/cnquery" ];
 
-  vendorHash = "sha256-mU3bVENWgMoD6BZzGpl8qN/MmnUUJT5s8XwvifFZ+ig=";
+  vendorHash = "sha256-i0atpv6vtbbpTKuh9aJU6oPILCqdshB0MVbgOn6fppw=";
 
   ldflags = [
     "-w"

From 116493b61123b614727f12acda31ccb46c42364e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Oct 2025 15:41:30 +0000
Subject: [PATCH 42/84] xlights: 2025.09 -> 2025.10.2

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

diff --git a/pkgs/by-name/xl/xlights/package.nix b/pkgs/by-name/xl/xlights/package.nix
index 27116fb6b93c..b70bb479b640 100644
--- a/pkgs/by-name/xl/xlights/package.nix
+++ b/pkgs/by-name/xl/xlights/package.nix
@@ -6,11 +6,11 @@
 
 appimageTools.wrapType2 rec {
   pname = "xlights";
-  version = "2025.09";
+  version = "2025.10.2";
 
   src = fetchurl {
     url = "https://github.com/smeighan/xLights/releases/download/${version}/xLights-${version}-x86_64.AppImage";
-    hash = "sha256-EfaYI2AapHg8TSoVn7luPNOgqSfSkuPVH0XbzNf0G6I=";
+    hash = "sha256-LfT1AQktBklN1IUiJdqxFY4bM/CQEBg/5sxEvWUQkGQ=";
   };
 
   meta = {

From 3953af8272c415bdf01253af4fcfd4b7a83731ed Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas.gerbet@enalean.com>
Date: Fri, 10 Oct 2025 14:49:52 +0200
Subject: [PATCH 43/84] openssh_hpn: 10.1p1 -> 10.2p1

Changes:
https://www.openssh.com/releasenotes.html#10.2p1
---
 pkgs/tools/networking/openssh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 02af793aa628..de6739e3ccaa 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -50,12 +50,12 @@ in
 
   openssh_hpn = common rec {
     pname = "openssh-with-hpn";
-    version = "10.1p1";
+    version = "10.2p1";
     extraDesc = " with high performance networking patches";
 
     src = fetchurl {
       url = urlFor version;
-      hash = "sha256-ufx6K4JXlGem8vQ+SoHI4d/aYU3bT5slWq/XAgu/B1g=";
+      hash = "sha256-zMQsBBmTeVkmP6Hb0W2vwYxWuYTANWLSk3zlamD3mLI=";
     };
 
     extraPatches =

From 0014656c61af1a066dcc6fe8b9999f8e33afcd9c Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas.gerbet@enalean.com>
Date: Fri, 10 Oct 2025 14:52:02 +0200
Subject: [PATCH 44/84] openssh_gssapi: 10.1p1 -> 10.2p1

Changes:
https://www.openssh.com/releasenotes.html#10.2p1
---
 pkgs/tools/networking/openssh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index de6739e3ccaa..690794bf5ec6 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -93,12 +93,12 @@ in
 
   openssh_gssapi = common rec {
     pname = "openssh-with-gssapi";
-    version = "10.1p1";
+    version = "10.2p1";
     extraDesc = " with GSSAPI support";
 
     src = fetchurl {
       url = urlFor version;
-      hash = "sha256-ufx6K4JXlGem8vQ+SoHI4d/aYU3bT5slWq/XAgu/B1g=";
+      hash = "sha256-zMQsBBmTeVkmP6Hb0W2vwYxWuYTANWLSk3zlamD3mLI=";
     };
 
     extraPatches = [

From ab4cb5fdf6659bd6c7e333e77f23f80b3054fbc6 Mon Sep 17 00:00:00 2001
From: wetrustinprize <git@wetrustinprize.com>
Date: Fri, 10 Oct 2025 15:18:12 -0300
Subject: [PATCH 45/84] vscode: 1.104.3 -> 1.105.0

---
 pkgs/applications/editors/vscode/vscode.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix
index 783c4d7d2f85..a4529b5fb817 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -36,20 +36,20 @@ let
 
   hash =
     {
-      x86_64-linux = "sha256-S9H1IZGV3BZe2kjSdkt8S+ShE1EQA0yiKEl65tNNtJw=";
-      x86_64-darwin = "sha256-Wi21LByNSjaTKdpJJM9d/5yspaoplJ1pDxGBMxAxLT0=";
-      aarch64-linux = "sha256-m1AkCRiVJbUPArvK/QyG+Y/7qCLHY20vv40suFXK1fk=";
-      aarch64-darwin = "sha256-iwUegTexE0Iroh+VN9/cQ/s1f2SjLSePjIJanjMDzHU=";
-      armv7l-linux = "sha256-06LY6PrWg1VBjUjoLNIrbuKu9YzJS4MM38wlx8JQdvw=";
+      x86_64-linux = "sha256-i1MFtqfWiAsvxgyc/MZlOdo/Py6PQlJmjHGeYnhygso=";
+      x86_64-darwin = "sha256-HElY2mOgYxfE5LULFMpipmd/igDAapd6G2VlZeCGWTI=";
+      aarch64-linux = "sha256-NiVXjiii9Df3mRkDVULsiLgRhfJKX+H2/VYuxUImFzI=";
+      aarch64-darwin = "sha256-IDqupYgoslZb7Po8nimOTwojTJ0TO5efgfTqtTQ+dUI=";
+      armv7l-linux = "sha256-cN4EXCM5v5ULZUb+glqbI9g+oOsjELB+OWEGDVxN/Y4=";
     }
     .${system} or throwSystem;
 
   # Please backport all compatible updates to the stable release.
   # This is important for the extension ecosystem.
-  version = "1.104.3";
+  version = "1.105.0";
 
   # This is used for VS Code - Remote SSH test
-  rev = "385651c938df8a906869babee516bffd0ddb9829";
+  rev = "03c265b1adee71ac88f833e065f7bb956b60550a";
 in
 callPackage ./generic.nix {
   pname = "vscode" + lib.optionalString isInsiders "-insiders";

From 2d78f5d8f6bab41cef9e40e91cf529ff29c50ebc Mon Sep 17 00:00:00 2001
From: wetrustinprize <git@wetrustinprize.com>
Date: Fri, 10 Oct 2025 15:29:13 -0300
Subject: [PATCH 46/84] vscode: added wetrustinprize as maintainer

---
 pkgs/applications/editors/vscode/vscode.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix
index a4529b5fb817..57f7e03d9012 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -116,6 +116,7 @@ callPackage ./generic.nix {
       bobby285271
       johnrtitor
       jefflabonte
+      wetrustinprize
     ];
     platforms = [
       "x86_64-linux"

From 77706590763a04528d735c965d0bd3921d209181 Mon Sep 17 00:00:00 2001
From: Ludovico Piero <lewdovico@gnuweeb.org>
Date: Sat, 11 Oct 2025 03:38:10 +0900
Subject: [PATCH 47/84] vscodium: 1.104.36664 -> 1.105.06808

Changelog: https://github.com/VSCodium/vscodium/releases/tag/1.105.06808

Signed-off-by: Ludovico Piero <lewdovico@gnuweeb.org>
---
 pkgs/applications/editors/vscode/vscodium.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix
index 97bfe3e762f0..029e30ebde83 100644
--- a/pkgs/applications/editors/vscode/vscodium.nix
+++ b/pkgs/applications/editors/vscode/vscodium.nix
@@ -26,11 +26,11 @@ let
 
   hash =
     {
-      x86_64-linux = "sha256-OWJqNm08Uy7Wr5pbucS0eWUyN3xU6/qLYM8wL/hg2dY=";
-      x86_64-darwin = "sha256-Cq+JfzSTYJ85OWW9QjDSGU6yBqvoEniaqlwA/eT/+c0=";
-      aarch64-linux = "sha256-u5IRp1qoPN2A5T9iPDPrZjhw/UAHcBrRanWPJMeFD0k=";
-      aarch64-darwin = "sha256-KDqNpsLi+EXoAAY0TZFkbHT8WBy1f4hU1ag7Fp24MKY=";
-      armv7l-linux = "sha256-9R4FBxyIx7+jMNrUDfMrvIMNqggJ97mTSTXIjG5ccLI=";
+      x86_64-linux = "sha256-XtYKg8SmODBHcbi+n70OrvZnl+YYbn8fxC8lhW4ZJ8g=";
+      x86_64-darwin = "sha256-jRryZ7YsgrPGl8La2GT4ntPjYjW7Va1DWr4x4fmDOao=";
+      aarch64-linux = "sha256-GUSd7wkn/AefoN9y5m0fGs9n0/XWCNosfppGNzLsqfQ=";
+      aarch64-darwin = "sha256-eesfcTp2mIVxFnWDe8umf9d4zIBSskiLsUw5Tp6K7/8=";
+      armv7l-linux = "sha256-bH4oz5EIpQls8SleSStxGHmhKCJHTmR4wPYJSu4biMI=";
     }
     .${system} or throwSystem;
 
@@ -41,7 +41,7 @@ callPackage ./generic.nix rec {
 
   # Please backport all compatible updates to the stable release.
   # This is important for the extension ecosystem.
-  version = "1.104.36664";
+  version = "1.105.06808";
   pname = "vscodium";
 
   executableName = "codium";

From 8c4ab456b1d0dfe9ec3a2c71cc2ed3a6ca1a25f2 Mon Sep 17 00:00:00 2001
From: Tom Herbers <mail@tomherbers.de>
Date: Fri, 10 Oct 2025 21:16:52 +0200
Subject: [PATCH 48/84] nebula: 1.9.6 -> 1.9.7

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

diff --git a/pkgs/by-name/ne/nebula/package.nix b/pkgs/by-name/ne/nebula/package.nix
index 6da695d75156..b17fb8a3651f 100644
--- a/pkgs/by-name/ne/nebula/package.nix
+++ b/pkgs/by-name/ne/nebula/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "nebula";
-  version = "1.9.6";
+  version = "1.9.7";
 
   src = fetchFromGitHub {
     owner = "slackhq";
     repo = "nebula";
     tag = "v${version}";
-    hash = "sha256-klVbLseqIaibcXL83BVjRgY1ziZlxf+w4bRkkPlUnlU=";
+    hash = "sha256-U6PCHRSETkrA/nulTqIn9vvj3zks10kJ1k2syFsPMnM=";
   };
 
   vendorHash = "sha256-oXhq+s5gDKPVClZpOzYi7BaYwcDqbCLBEO5BNGy9LJA=";

From 4716ba499a1a7068c300ba449bd17c8e437b9470 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Oct 2025 19:22:23 +0000
Subject: [PATCH 49/84] prisma-language-server: 6.16.3 -> 6.17.1

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

diff --git a/pkgs/by-name/pr/prisma-language-server/package.nix b/pkgs/by-name/pr/prisma-language-server/package.nix
index 4c0834ba2060..a7b5f6fc35d4 100644
--- a/pkgs/by-name/pr/prisma-language-server/package.nix
+++ b/pkgs/by-name/pr/prisma-language-server/package.nix
@@ -6,17 +6,17 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "prisma-language-server";
-  version = "6.16.3";
+  version = "6.17.1";
 
   src = fetchFromGitHub {
     owner = "prisma";
     repo = "language-tools";
     tag = "${finalAttrs.version}";
-    hash = "sha256-89/XErfqdMYTbATa8SmSTBMwY8Hlb364jNAuQgql5zo=";
+    hash = "sha256-L2THhIjCeoNRUWTQ0aMkXeatjunRPhd0m4No5UE11lI=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/packages/language-server";
-  npmDepsHash = "sha256-RCwHl8UNQfGOmq4QY6ECY+/Beo2enaOlWsS7RiMlyLc=";
+  npmDepsHash = "sha256-Fa6Eajzm3/NHHr4ngsgJ/CFfEcQ2J3DTEQEUcK7ZdeU=";
 
   meta = {
     description = "Language server for Prisma";

From 9e4e205dadf923d9f4273135e822108969097bf8 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sun, 5 Oct 2025 15:32:46 -0300
Subject: [PATCH 50/84] freedink: 1.08.20121209 -> 109.6

---
 pkgs/by-name/fr/freedink/package.nix | 108 ++++++++++++++++++---------
 1 file changed, 73 insertions(+), 35 deletions(-)

diff --git a/pkgs/by-name/fr/freedink/package.nix b/pkgs/by-name/fr/freedink/package.nix
index 9513a1dee521..3917d5cc78ac 100644
--- a/pkgs/by-name/fr/freedink/package.nix
+++ b/pkgs/by-name/fr/freedink/package.nix
@@ -1,65 +1,106 @@
 {
-  lib,
-  stdenv,
+  cxxtest,
   fetchurl,
-  SDL,
-  SDL_mixer,
-  SDL_image,
-  SDL_ttf,
-  SDL_gfx,
-  pkg-config,
-  intltool,
   fontconfig,
+  glm,
+  help2man,
+  intltool,
+  lib,
   libzip,
+  pkg-config,
+  SDL2,
+  SDL2_gfx,
+  SDL2_image,
+  SDL2_mixer,
+  SDL2_ttf,
+  stdenv,
   zip,
   zlib,
 }:
 
 let
-  version = "1.08.20121209";
 
-  freedink_data = stdenv.mkDerivation rec {
+  freedink_data = stdenv.mkDerivation (finalAttrs: {
     pname = "freedink-data";
-    inherit version;
+    version = "1.08.20190120";
 
     src = fetchurl {
-      url = "mirror://gnu/freedink/${pname}-${version}.tar.gz";
-      sha256 = "1mhns09l1s898x18ahbcy9gabrmgsr8dv7pm0a2ivid8mhxahn1j";
+      url = "mirror://gnu/freedink/freedink-data-${finalAttrs.version}.tar.gz";
+      hash = "sha256-cV9EdzsFtzqeybYrDhUvPygb4aFRL7qqOGF22pTP+50=";
     };
 
-    prePatch = "substituteInPlace Makefile --replace /usr/local $out";
-  };
+    prePatch = "substituteInPlace Makefile --replace-fail /usr/local $out";
+  });
 
 in
-stdenv.mkDerivation rec {
+
+stdenv.mkDerivation (finalAttrs: {
   pname = "freedink";
-  inherit version;
+  version = "109.6";
 
   src = fetchurl {
-    url = "mirror://gnu/freedink/${pname}-${version}.tar.gz";
-    sha256 = "19xximbcm6506kvpf3s0q96697kmzca3yrjdr6dgphklp33zqsqr";
+    url = "mirror://gnu/freedink/freedink-${finalAttrs.version}.tar.gz";
+    hash = "sha256-Xgs1rI9G17uH5lbv1fnHwqwabFGakI/FtYHlJleYEAI=";
   };
 
   nativeBuildInputs = [
-    pkg-config
+    cxxtest
+    help2man
     intltool
+    pkg-config
   ];
 
   buildInputs = [
-    SDL
-    SDL_mixer
-    SDL_image
-    SDL_ttf
-    SDL_gfx
     fontconfig
+    glm
     libzip
+    SDL2
+    SDL2_mixer
+    SDL2_image
+    SDL2_ttf
+    SDL2_gfx
     zip
     zlib
   ];
 
-  preConfigure = ''
-    # Build fails on Linux with windres.
-    export ac_cv_prog_ac_ct_WINDRES=
+  preBuild = ''
+        # Fix SDL2_ttf constness error in gfx_fonts.cpp
+        substituteInPlace src/gfx_fonts.cpp \
+          --replace-fail "char *familyname = TTF_FontFaceFamilyName(font);" \
+                    "const char *familyname = TTF_FontFaceFamilyName(font);"
+        substituteInPlace src/gfx_fonts.cpp \
+          --replace-fail "char *stylename = TTF_FontFaceStyleName(font);" \
+                    "const char *stylename = TTF_FontFaceStyleName(font);"
+
+        # Fix missing SDL hint macro error in input.cpp
+        substituteInPlace src/input.cpp \
+          --replace-fail "SDL_SetHint(SDL_HINT_ANDROID_SEPARATE_MOUSE_AND_TOUCH, \"0\");" \
+                    "/* SDL_SetHint(SDL_HINT_ANDROID_SEPARATE_MOUSE_AND_TOUCH, \"0\"); */"
+
+        # Fix config.h errors in some platforms
+        substituteInPlace src/ImageLoader.cpp \
+          --replace-fail '#include "ImageLoader.h"' '#include "../config.h"
+    #include "ImageLoader.h"'
+
+        substituteInPlace src/IOGfxGLFuncs.cpp \
+          --replace-fail '#include "IOGfxGLFuncs.h"' '#include "../config.h"
+    #include "IOGfxGLFuncs.h"'
+
+        substituteInPlace src/IOGfxSurface.cpp \
+          --replace-fail '#include "IOGfxSurface.h"' '#include "../config.h"
+    #include "IOGfxSurface.h"'
+
+        substituteInPlace src/IOGfxSurfaceSW.cpp \
+          --replace-fail '#include "IOGfxSurfaceSW.h"' '#include "../config.h"
+    #include "IOGfxSurfaceSW.h"'
+
+        substituteInPlace src/IOGfxPrimitivesSW.cpp \
+          --replace-fail '#include "SDL.h"' '#include "../config.h"
+    #include "SDL.h"'
+
+        substituteInPlace src/dinkc_console_renderer.cpp \
+          --replace-fail '#include "dinkc_console_renderer.h"' '#include "../config.h"
+    #include "dinkc_console_renderer.h"'
   '';
 
   postInstall = ''
@@ -71,18 +112,15 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Free, portable and enhanced version of the Dink Smallwood game engine";
-
     longDescription = ''
       GNU FreeDink is a new and portable version of the Dink Smallwood
       game engine, which runs the original game as well as its D-Mods,
       with close compatibility, under multiple platforms.
     '';
-
-    homepage = "https://www.gnu.org/software/freedink/"; # Formerly http://www.freedink.org
+    homepage = "https://gnu.org/software/freedink/"; # Formerly http://www.freedink.org
     license = lib.licenses.gpl3Plus;
-
     maintainers = [ ];
     platforms = lib.platforms.all;
-    hydraPlatforms = lib.platforms.linux; # sdl-config times out on darwin
+    mainProgram = "freedink";
   };
-}
+})

From 4e10cdbaa495227b1e8cf30125631ed636dcf7b0 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 6 Oct 2025 00:21:46 -0300
Subject: [PATCH 51/84] freedink: add maintainer iedame

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

diff --git a/pkgs/by-name/fr/freedink/package.nix b/pkgs/by-name/fr/freedink/package.nix
index 3917d5cc78ac..403987aa189c 100644
--- a/pkgs/by-name/fr/freedink/package.nix
+++ b/pkgs/by-name/fr/freedink/package.nix
@@ -119,7 +119,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     homepage = "https://gnu.org/software/freedink/"; # Formerly http://www.freedink.org
     license = lib.licenses.gpl3Plus;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ iedame ];
     platforms = lib.platforms.all;
     mainProgram = "freedink";
   };

From 6a1fd4633f803718623d4407c84df6f454e7f409 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Oct 2025 21:27:43 +0000
Subject: [PATCH 52/84] bashunit: 0.24.0 -> 0.25.0

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

diff --git a/pkgs/by-name/ba/bashunit/package.nix b/pkgs/by-name/ba/bashunit/package.nix
index f1b72c3921f3..2a02ddd9d390 100644
--- a/pkgs/by-name/ba/bashunit/package.nix
+++ b/pkgs/by-name/ba/bashunit/package.nix
@@ -12,13 +12,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "bashunit";
-  version = "0.24.0";
+  version = "0.25.0";
 
   src = fetchFromGitHub {
     owner = "TypedDevs";
     repo = "bashunit";
     tag = finalAttrs.version;
-    hash = "sha256-TIt1EG/KQCslwZH9seF5SUgH242ZkUkWf8HWqNBIrD0=";
+    hash = "sha256-GYHI1vrZ+WlHCWR9O1LrVSFr3+HKO8aBLSs79RJyl2Y=";
     forceFetchGit = true; # needed to include the tests directory for the check phase
   };
 

From 4366defbc859449981275b9fd31ebc35fe1377e1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Oct 2025 21:38:32 +0000
Subject: [PATCH 53/84] ast-grep: 0.39.5 -> 0.39.6

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

diff --git a/pkgs/by-name/as/ast-grep/package.nix b/pkgs/by-name/as/ast-grep/package.nix
index 33b034cbde85..7789f0e5ee9d 100644
--- a/pkgs/by-name/as/ast-grep/package.nix
+++ b/pkgs/by-name/as/ast-grep/package.nix
@@ -11,13 +11,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ast-grep";
-  version = "0.39.5";
+  version = "0.39.6";
 
   src = fetchFromGitHub {
     owner = "ast-grep";
     repo = "ast-grep";
     tag = finalAttrs.version;
-    hash = "sha256-hgJD3cc+FbOuI2ZCuKDN2u9vMZngIvPGUqFRjpFE/zY=";
+    hash = "sha256-ZZ9GQcvNj038GUEKCGO9X+t1U5vqcztrm97o7y8RLGM=";
   };
 
   # error: linker `aarch64-linux-gnu-gcc` not found
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     rm .cargo/config.toml
   '';
 
-  cargoHash = "sha256-KLiE1lbgrWj8RYLTFLMqukeH1W9ipE1vYaId2/DJHrE=";
+  cargoHash = "sha256-BPw/BczPspW3pvkLwR2PBCkEzcVKmHK5r18KBvwAAa8=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From b8d2ae2e318622425d5b0086a2b88ce90a208ca9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Oct 2025 22:20:06 +0000
Subject: [PATCH 54/84] qownnotes: 25.10.0 -> 25.10.1

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

diff --git a/pkgs/by-name/qo/qownnotes/package.nix b/pkgs/by-name/qo/qownnotes/package.nix
index 73750185fcec..0a0666dbd724 100644
--- a/pkgs/by-name/qo/qownnotes/package.nix
+++ b/pkgs/by-name/qo/qownnotes/package.nix
@@ -19,11 +19,11 @@
 stdenv.mkDerivation (finalAttrs: {
   pname = "qownnotes";
   appname = "QOwnNotes";
-  version = "25.10.0";
+  version = "25.10.1";
 
   src = fetchurl {
     url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz";
-    hash = "sha256-hBRVho+BsxGSc+8XGur0AX7iZ/li9p5mM5N87vh92KA=";
+    hash = "sha256-fH8lLVp8u9cL8bWy2SJGZWdh9gbLMw5MZgw6M4rSr+4=";
   };
 
   nativeBuildInputs = [

From fb0290f763a44d4d36dc49b692f7b618f04a189c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Oct 2025 22:26:52 +0000
Subject: [PATCH 55/84] glaze: 5.7.2 -> 6.0.0

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

diff --git a/pkgs/by-name/gl/glaze/package.nix b/pkgs/by-name/gl/glaze/package.nix
index c7a3a404ecd4..6248ad5aad49 100644
--- a/pkgs/by-name/gl/glaze/package.nix
+++ b/pkgs/by-name/gl/glaze/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (final: {
   pname = "glaze";
-  version = "5.7.2";
+  version = "6.0.0";
 
   src = fetchFromGitHub {
     owner = "stephenberry";
     repo = "glaze";
     tag = "v${final.version}";
-    hash = "sha256-lj4VjPBZql6lfIcXKzZ2hXe9dtonZHj2DqwMrX3q1dI=";
+    hash = "sha256-4bEBnPLp7v6Jrd8h6q5LJc93om2VP3ZqB4JNSpKzPao=";
   };
 
   nativeBuildInputs = [ cmake ];

From 582cea1ea79f14442e457682b35864ae2b56b905 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Fri, 10 Oct 2025 20:15:43 +0000
Subject: [PATCH 56/84] ty: 0.0.1-alpha.21 -> 0.0.1-alpha.22

Changelog: https://github.com/astral-sh/ty/blob/0.0.1-alpha.22/CHANGELOG.md
---
 pkgs/by-name/ty/ty/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ty/ty/package.nix b/pkgs/by-name/ty/ty/package.nix
index 66397b638332..98bc3ed43c37 100644
--- a/pkgs/by-name/ty/ty/package.nix
+++ b/pkgs/by-name/ty/ty/package.nix
@@ -14,14 +14,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ty";
-  version = "0.0.1-alpha.21";
+  version = "0.0.1-alpha.22";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "ty";
     tag = finalAttrs.version;
     fetchSubmodules = true;
-    hash = "sha256-C7u2fBOtKGIYnBkYIIsbbcDsfZezXoZjQN1/TTXU2bg=";
+    hash = "sha256-jNjYorSybR33wDFUbmTz0BroVbR1wNjNXn5XsNRIqMg=";
   };
 
   # For Darwin platforms, remove the integration test for file notifications,
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoBuildFlags = [ "--package=ty" ];
 
-  cargoHash = "sha256-sjnLsOQSSCB5Yz3GsUzgPpTCUj0sJ4T3ZV60Vl7+ng0=";
+  cargoHash = "sha256-71pu0cC0CzOv3tJk7+eirUUUr/OertdIgWCatScXTqQ=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 482a5d902f8dc49684a96f1a420bb3155b8fc70f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Oct 2025 23:12:55 +0000
Subject: [PATCH 57/84] cloudflare-warp: 2025.7.176 -> 2025.8.779

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

diff --git a/pkgs/by-name/cl/cloudflare-warp/package.nix b/pkgs/by-name/cl/cloudflare-warp/package.nix
index 28abf20de44d..6dca7375d280 100644
--- a/pkgs/by-name/cl/cloudflare-warp/package.nix
+++ b/pkgs/by-name/cl/cloudflare-warp/package.nix
@@ -24,15 +24,15 @@
 }:
 
 let
-  version = "2025.7.176";
+  version = "2025.8.779";
   sources = {
     x86_64-linux = fetchurl {
       url = "https://pkg.cloudflareclient.com/pool/noble/main/c/cloudflare-warp/cloudflare-warp_${version}.0_amd64.deb";
-      hash = "sha256-tRz7T3Sevf00ViWYALzSdiyY1i3BEnFQUjRFs+Uybbk=";
+      hash = "sha256-488sXR0CqZAkeXSMawYVXHszK9NXsTCQc5RAd87Hj9k=";
     };
     aarch64-linux = fetchurl {
       url = "https://pkg.cloudflareclient.com/pool/noble/main/c/cloudflare-warp/cloudflare-warp_${version}.0_arm64.deb";
-      hash = "sha256-GYMC+v3yqP2G+WILhTTGg5SGnb7ts5MpWrhulj4udqA=";
+      hash = "sha256-rLDGY8kmYU/B0wks20oE1sQ7luaX6teTNfWZ6atJzhU=";
     };
   };
 in

From 0be31071a4c2d699e36ada0f2c7c637bb3b7ac41 Mon Sep 17 00:00:00 2001
From: Alexis Williams <alexis@typedr.at>
Date: Fri, 10 Oct 2025 16:27:15 -0700
Subject: [PATCH 58/84] pgx_ulid 0.2.0 -> 0.2.1

Update pgx_ulid and add support for PostgreSQL 18.
---
 pkgs/servers/sql/postgresql/ext/pgx_ulid.nix | 25 ++++++++------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pgx_ulid.nix b/pkgs/servers/sql/postgresql/ext/pgx_ulid.nix
index 456d7bca4efa..866d8c719911 100644
--- a/pkgs/servers/sql/postgresql/ext/pgx_ulid.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgx_ulid.nix
@@ -1,6 +1,6 @@
 {
   buildPgrxExtension,
-  cargo-pgrx_0_12_6,
+  cargo-pgrx_0_16_0,
   fetchFromGitHub,
   lib,
   nix-update-script,
@@ -9,19 +9,19 @@
 }:
 buildPgrxExtension (finalAttrs: {
   inherit postgresql;
-  cargo-pgrx = cargo-pgrx_0_12_6;
+  cargo-pgrx = cargo-pgrx_0_16_0;
 
   pname = "pgx_ulid";
-  version = "0.2.0";
+  version = "0.2.1";
 
   src = fetchFromGitHub {
     owner = "pksunkara";
     repo = "pgx_ulid";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-VdLWwkUA0sVs5Z/Lyf5oTRhcHVzPmhgnYQhIM8MWJ0c=";
+    hash = "sha256-yjPTCJTeT1HQt8huDHBHs0DAHpmseMHeSaQhpPV6qdo=";
   };
 
-  cargoHash = "sha256-OyrfwLMHn2aihfijHxE5oaz+XQC1HFlYbTp8Sw8RcK0=";
+  cargoHash = "sha256-LRfn/TO/bBEvvzY9m6C8Lb0qdUStQD3oAzjDovS6H1s=";
 
   postInstall = ''
     # Upstream renames the extension when packaging
@@ -40,19 +40,14 @@ buildPgrxExtension (finalAttrs: {
 
   meta = {
     # Support for PostgreSQL 13 was removed in 0.2.0: https://github.com/pksunkara/pgx_ulid/blob/084778c3e2af08d16ec5ec3ef4e8f345ba0daa33/CHANGELOG.md?plain=1#L6
-    broken =
-      lib.versionOlder postgresql.version "14"
-      ||
-        # PostgreSQL 18 support issue upstream: https://github.com/pksunkara/pgx_ulid/issues/65
-        # Note: already fixed on `master` branch.
-        # Check after next package update.
-        lib.warnIf (finalAttrs.version != "0.2.0") "Is postgresql18Packages.pgx_ulid still broken?" (
-          lib.versionAtLeast postgresql.version "18"
-        );
+    broken = lib.versionOlder postgresql.version "14";
     description = "ULID Postgres extension written in Rust";
     homepage = "https://github.com/pksunkara/pgx_ulid";
     changelog = "https://github.com/pksunkara/pgx_ulid/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ myypo ];
+    maintainers = with lib.maintainers; [
+      myypo
+      typedrat
+    ];
   };
 })

From 1a9647db525d2fc12e639ca9300d8f05e2dca624 Mon Sep 17 00:00:00 2001
From: Eric Helgeson <erichelgeson@gmail.com>
Date: Fri, 10 Oct 2025 08:32:12 -0500
Subject: [PATCH 59/84] picotool: 2.1.1 -> 2.2.0-a4

a4 refers to the new rp2350-a4, not an alpha version.
---
 pkgs/by-name/pi/picotool/package.nix | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/pi/picotool/package.nix b/pkgs/by-name/pi/picotool/package.nix
index 2e60a2b57e80..c1051c67040c 100644
--- a/pkgs/by-name/pi/picotool/package.nix
+++ b/pkgs/by-name/pi/picotool/package.nix
@@ -6,30 +6,22 @@
   pkg-config,
   libusb1,
   pico-sdk,
-  mbedtls_2,
+  mbedtls,
   versionCheckHook,
   gitUpdater,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "picotool";
-  version = "2.1.1";
+  version = "2.2.0-a4";
 
   src = fetchFromGitHub {
     owner = "raspberrypi";
     repo = "picotool";
     tag = finalAttrs.version;
-    hash = "sha256-WA17FXSUGylzUcbvzgAGCeds+XeuSvDlgFBJD10ERVY=";
+    hash = "sha256-kIB/ODAvwWWoAQDq2cMiFuNWjzzLgPuRQv0NluWYU+Y=";
   };
 
-  postPatch = ''
-    # necessary for signing/hashing support. our pico-sdk does not come with
-    # it by default, and it shouldn't due to submodule size. pico-sdk uses
-    # an upstream version of mbedtls 2.x so we patch ours in directly.
-    substituteInPlace lib/CMakeLists.txt \
-      --replace-fail "''$"'{PICO_SDK_PATH}/lib/mbedtls' '${mbedtls_2.src}'
-  '';
-
   buildInputs = [
     libusb1
     pico-sdk
@@ -38,11 +30,9 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
     pkg-config
   ];
-  cmakeFlags = [ "-DPICO_SDK_PATH=${pico-sdk}/lib/pico-sdk" ];
-
-  postInstall = ''
-    install -Dm444 ../udev/99-picotool.rules -t $out/etc/udev/rules.d
-  '';
+  cmakeFlags = [
+    "-DPICO_SDK_PATH=${pico-sdk}/lib/pico-sdk"
+  ];
 
   nativeInstallCheckInputs = [
     versionCheckHook

From 1a41cc3687c5aedbb6464c897e900e9724570a11 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Fri, 10 Oct 2025 21:44:23 -0400
Subject: [PATCH 60/84] virtualbox: fix curl 8.16 upgrade breakage

---
 pkgs/applications/virtualization/virtualbox/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index f8f4c285cd15..f61db1225a89 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -260,6 +260,11 @@ stdenv.mkDerivation (finalAttrs: {
       ./qt-dependency-paths.patch
       # https://github.com/NixOS/nixpkgs/issues/123851
       ./fix-audio-driver-loading.patch
+      # curl 8.16 upgrade breakage
+      (fetchpatch {
+        url = "https://salsa.debian.org/pkg-virtualbox-team/virtualbox/-/raw/dbf9a6ef75380ebd2705df0198c6ac8073d0b4cb/debian/patches/new-curl.patch";
+        hash = "sha256-WWnCWdXlJo9jTr8yXA0NxcDQBScryuu/53wyX0rhszk=";
+      })
     ];
 
   postPatch = ''

From 8f2f06cd38a239004e361858ea3d0910ec0358d8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Oct 2025 03:34:23 +0000
Subject: [PATCH 61/84] phpExtensions.xdebug: 3.4.5 -> 3.4.6

---
 pkgs/development/php-packages/xdebug/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/php-packages/xdebug/default.nix b/pkgs/development/php-packages/xdebug/default.nix
index 48a0b10da3e5..56af7dd6bf5a 100644
--- a/pkgs/development/php-packages/xdebug/default.nix
+++ b/pkgs/development/php-packages/xdebug/default.nix
@@ -5,7 +5,7 @@
 }:
 
 let
-  version = "3.4.5";
+  version = "3.4.6";
 in
 buildPecl {
   inherit version;
@@ -16,7 +16,7 @@ buildPecl {
     owner = "xdebug";
     repo = "xdebug";
     rev = version;
-    hash = "sha256-tJNN1GNEH3z/bsmzNMPoF6TAgOQ4EiM4QheqmhCQzM4=";
+    hash = "sha256-xld8qUCkAOWqLQjqT9wl2PN+giXtq4gu/yFHBLdmg+c=";
   };
 
   doCheck = true;

From bdf9125a2b40a7f0a329fa4abc54b06022a64e44 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 10 Oct 2025 08:55:51 +0200
Subject: [PATCH 62/84] python313Packages.aioamazondevices: 6.2.8 -> 6.4.0

Diff: https://github.com/chemelli74/aioamazondevices/compare/v6.2.8...v6.4.0

Changelog: https://github.com/chemelli74/aioamazondevices/blob/v6.4.0/CHANGELOG.md
---
 pkgs/development/python-modules/aioamazondevices/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aioamazondevices/default.nix b/pkgs/development/python-modules/aioamazondevices/default.nix
index a283f3026451..98d8c986d519 100644
--- a/pkgs/development/python-modules/aioamazondevices/default.nix
+++ b/pkgs/development/python-modules/aioamazondevices/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "aioamazondevices";
-  version = "6.2.8";
+  version = "6.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "chemelli74";
     repo = "aioamazondevices";
     tag = "v${version}";
-    hash = "sha256-73z4mWWBfJLewLFQvhSj7hIOfBzcwIVrNlyPPAk7PPM=";
+    hash = "sha256-Lif2WNGdd4zLMzjpkZE0mdntC8sXzO5GF4nDLbjkFjo=";
   };
 
   build-system = [ poetry-core ];

From 52d2e894fdf3c54f533b7c9a4cc31abe32b270f4 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Fri, 10 Oct 2025 20:40:09 -0700
Subject: [PATCH 63/84] nixos/tenstorrent: add meta.maintainers

---
 nixos/modules/hardware/tenstorrent.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/hardware/tenstorrent.nix b/nixos/modules/hardware/tenstorrent.nix
index 7c3fa2b92cb0..0faee3a232a3 100644
--- a/nixos/modules/hardware/tenstorrent.nix
+++ b/nixos/modules/hardware/tenstorrent.nix
@@ -26,4 +26,6 @@ in
     # TODO: add tt-smi to environment.systemPackages once https://github.com/NixOS/nixpkgs/pull/444714 is merged
     # TODO: add tt-system-tools to environment.systemPackages once https://github.com/NixOS/nixpkgs/pull/444748 is merged
   };
+
+  meta.maintainers = with lib.maintainers; [ RossComputerGuy ];
 }

From ab3e01f1676f25e133556d98fd2bdaf8abb842cd Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Fri, 10 Oct 2025 20:40:36 -0700
Subject: [PATCH 64/84] nixos/tenstorrent: add tt-system-tools

---
 nixos/modules/hardware/tenstorrent.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/hardware/tenstorrent.nix b/nixos/modules/hardware/tenstorrent.nix
index 0faee3a232a3..2b9bac7b6afe 100644
--- a/nixos/modules/hardware/tenstorrent.nix
+++ b/nixos/modules/hardware/tenstorrent.nix
@@ -23,8 +23,11 @@ in
       tt-kmd
     ];
 
+    environment.systemPackages = with pkgs; [
+      tt-system-tools
+    ];
+
     # TODO: add tt-smi to environment.systemPackages once https://github.com/NixOS/nixpkgs/pull/444714 is merged
-    # TODO: add tt-system-tools to environment.systemPackages once https://github.com/NixOS/nixpkgs/pull/444748 is merged
   };
 
   meta.maintainers = with lib.maintainers; [ RossComputerGuy ];

From 954d1e2a010e8fa2627f6145ef22e524a728087f Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@determinate.systems>
Date: Fri, 10 Oct 2025 21:39:56 -0700
Subject: [PATCH 65/84] nixos/tenstorrent: add tt-smi

---
 nixos/modules/hardware/tenstorrent.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/hardware/tenstorrent.nix b/nixos/modules/hardware/tenstorrent.nix
index 2b9bac7b6afe..30840021b714 100644
--- a/nixos/modules/hardware/tenstorrent.nix
+++ b/nixos/modules/hardware/tenstorrent.nix
@@ -24,10 +24,9 @@ in
     ];
 
     environment.systemPackages = with pkgs; [
+      python3Packages.tt-smi
       tt-system-tools
     ];
-
-    # TODO: add tt-smi to environment.systemPackages once https://github.com/NixOS/nixpkgs/pull/444714 is merged
   };
 
   meta.maintainers = with lib.maintainers; [ RossComputerGuy ];

From 0b1aaeabd281751973b022dba022f492b3d620dc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Oct 2025 05:15:07 +0000
Subject: [PATCH 66/84] solana-cli: 2.3.8 -> 2.3.13

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

diff --git a/pkgs/by-name/so/solana-cli/package.nix b/pkgs/by-name/so/solana-cli/package.nix
index 95d74c881c0c..f42fd64de891 100644
--- a/pkgs/by-name/so/solana-cli/package.nix
+++ b/pkgs/by-name/so/solana-cli/package.nix
@@ -36,8 +36,8 @@
   ],
 }:
 let
-  version = "2.3.8";
-  hash = "sha256-CqkedeQk66VXG6lQAIVGd7ci0KPltf2Qq69iErBAQGo=";
+  version = "2.3.13";
+  hash = "sha256-RSucqvbshaaby4fALhAQJtZztwsRdA+X7yRnoBxQvsg=";
 in
 rustPlatform.buildRustPackage rec {
   pname = "solana-cli";
@@ -50,7 +50,7 @@ rustPlatform.buildRustPackage rec {
     inherit hash;
   };
 
-  cargoHash = "sha256-J7gyR7K1hauV+VrzoNzRrooLuSkjk8U6A3aFn9O2yFY=";
+  cargoHash = "sha256-yTS++bUu+4wmbXXZkU4eDq4sGNzls1euptJoY6OYZOM=";
 
   strictDeps = true;
   cargoBuildFlags = map (n: "--bin=${n}") solanaPkgs;

From 54f0f65c23cb52b107cf6698236aee496e8a1c28 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Oct 2025 05:23:00 +0000
Subject: [PATCH 67/84] vscode-extensions.redhat.vscode-yaml: 1.19.0 -> 1.19.1

---
 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 2f5c29cf3167..1a9dd5b3ad47 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -3863,8 +3863,8 @@ let
         mktplcRef = {
           publisher = "redhat";
           name = "vscode-yaml";
-          version = "1.19.0";
-          hash = "sha256-Nc/lkcZh5kp71eygkUCJQT7iNT+9Jg+ud1hgaXdV0Ls=";
+          version = "1.19.1";
+          hash = "sha256-ZLuGtB7DjIVrcYomcwptwJxGmIjz0Vu1fCFqYb2XLk4=";
         };
         meta = {
           description = "YAML Language Support by Red Hat, with built-in Kubernetes syntax support";

From d82857919065d07076d18b7b560a03ab2af85ccc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Oct 2025 05:23:14 +0000
Subject: [PATCH 68/84] python3Packages.disposable-email-domains: 0.0.137 ->
 0.0.139

---
 .../python-modules/disposable-email-domains/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/disposable-email-domains/default.nix b/pkgs/development/python-modules/disposable-email-domains/default.nix
index 05130f538900..ecd3ccb2f695 100644
--- a/pkgs/development/python-modules/disposable-email-domains/default.nix
+++ b/pkgs/development/python-modules/disposable-email-domains/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "disposable-email-domains";
-  version = "0.0.137";
+  version = "0.0.139";
   pyproject = true;
 
   # No tags on GitHub
   src = fetchPypi {
     pname = "disposable_email_domains";
     inherit version;
-    hash = "sha256-XX8WqoDKf+ub2EzIiLalFYvJRvIZhD5zXdJ1Q4X/PW0=";
+    hash = "sha256-9SGzCWRaZaH5FxffpL2eaGHewlEbuyI9yxZs5NRZq9g=";
   };
 
   build-system = [

From 7e518c783dc9a8f46ece3089b7f1a82ac2edec86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 10 Oct 2025 20:47:59 -0700
Subject: [PATCH 69/84] python3Packages.python-melcloud: 0.1.0 -> 0.1.2

Diff: https://github.com/erwindouna/python-melcloud/compare/0.1.0...0.1.2

Changelog: https://github.com/erwindouna/python-melcloud/blob/0.1.2/CHANGELOG.md
---
 .../python-modules/python-melcloud/default.nix           | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-melcloud/default.nix b/pkgs/development/python-modules/python-melcloud/default.nix
index d035efcef944..1c90472cedfd 100644
--- a/pkgs/development/python-modules/python-melcloud/default.nix
+++ b/pkgs/development/python-modules/python-melcloud/default.nix
@@ -15,16 +15,21 @@
 
 buildPythonPackage rec {
   pname = "python-melcloud";
-  version = "0.1.0";
+  version = "0.1.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "erwindouna";
     repo = "python-melcloud";
     tag = version;
-    hash = "sha256-1WFE8k16aDIp1S/WDHXVdUtQmISEoE8yQAn9nndmQWs=";
+    hash = "sha256-ccc6mIYWZEBENbmkbAZ0cFXJFhFNBjXoU/VDe+ETgoQ=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "poetry-core>=1.5,<2.0" poetry-core
+  '';
+
   build-system = [ poetry-core ];
 
   pythonRemoveDeps = [

From ee36bc520d2660e6349821620c0a659eab21b4b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 10 Oct 2025 20:51:00 -0700
Subject: [PATCH 70/84] python3Packages.python-roborock: 2.49.1 -> 2.50.2

Diff: https://github.com/Python-roborock/python-roborock/compare/v2.49.1...v2.50.2

Changelog: https://github.com/Python-roborock/python-roborock/blob/v2.50.2/CHANGELOG.md
---
 pkgs/development/python-modules/python-roborock/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix
index b5e8aadf05c0..fc5bb111b935 100644
--- a/pkgs/development/python-modules/python-roborock/default.nix
+++ b/pkgs/development/python-modules/python-roborock/default.nix
@@ -28,7 +28,7 @@
 
 buildPythonPackage rec {
   pname = "python-roborock";
-  version = "2.49.1";
+  version = "2.50.2";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -37,7 +37,7 @@ buildPythonPackage rec {
     owner = "Python-roborock";
     repo = "python-roborock";
     tag = "v${version}";
-    hash = "sha256-Fvrr+ILPy1vOPv1xw3TBJFBPLqz+6fmLTqTKWQ2IGY8=";
+    hash = "sha256-66kSNkivq6BHnqIqx1INtdoysBJfCqV76yIAJiHmfxQ=";
   };
 
   postPatch = ''

From 9bd29aa1c3095165a8e61c89ea21e6b6c281963f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sun, 5 Oct 2025 11:33:53 +0200
Subject: [PATCH 71/84] python313Packages.pyvesync: 3.0.0 -> 3.1.0

Diff: https://github.com/webdjoe/pyvesync/compare/3.0.0...3.1.0

Changelog: https://github.com/webdjoe/pyvesync/releases/tag/3.1.0
---
 pkgs/development/python-modules/pyvesync/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyvesync/default.nix b/pkgs/development/python-modules/pyvesync/default.nix
index c20d832a3e2c..3b1094388f60 100644
--- a/pkgs/development/python-modules/pyvesync/default.nix
+++ b/pkgs/development/python-modules/pyvesync/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "pyvesync";
-  version = "3.0.0";
+  version = "3.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "webdjoe";
     repo = "pyvesync";
     tag = version;
-    hash = "sha256-P5zIdc+lUmiBfibRiWIcwyoKqjw8F7XBj85Nwvawreo=";
+    hash = "sha256-ZoEQbMV3ofE5pV7nbYOqzXq3/7a2pkDKx88894kzU7Y=";
   };
 
   build-system = [ setuptools ];

From e0df0d25414cb968df4bada79ea017072f37d636 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 10 Oct 2025 20:49:07 -0700
Subject: [PATCH 72/84] python3Packages.sharkiq: 1.4.1 -> 1.4.2

Diff: https://github.com/JeffResc/sharkiq/compare/v1.4.1...v1.4.2

Changelog: https://github.com/JeffResc/sharkiq/releases/tag/v1.4.2
---
 pkgs/development/python-modules/sharkiq/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sharkiq/default.nix b/pkgs/development/python-modules/sharkiq/default.nix
index f7976059511d..738a44e0a8f1 100644
--- a/pkgs/development/python-modules/sharkiq/default.nix
+++ b/pkgs/development/python-modules/sharkiq/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "sharkiq";
-  version = "1.4.1";
+  version = "1.4.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "JeffResc";
     repo = "sharkiq";
     tag = "v${version}";
-    hash = "sha256-AGulExhA+dmRbCjrLJngRee8yT+q/djyNe7toY1FeFg=";
+    hash = "sha256-VhWqYYGZRsEPW4g9kQznr50ujGhLcTs+TS3atxsqCng=";
   };
 
   postPatch = ''

From d72cdb62269ba7344a5e2188fe27a6c71abdb27c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 10 Oct 2025 20:47:48 -0700
Subject: [PATCH 73/84] home-assistant.frontend: 20251001.0 -> 20251001.2

Changelog: https://github.com/home-assistant/frontend/releases/tag/20251001.2
---
 pkgs/servers/home-assistant/frontend.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index e30852e3dfe7..e7e6ff98d0d3 100644
--- a/pkgs/servers/home-assistant/frontend.nix
+++ b/pkgs/servers/home-assistant/frontend.nix
@@ -8,7 +8,7 @@ buildPythonPackage rec {
   # the frontend version corresponding to a specific home-assistant version can be found here
   # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
   pname = "home-assistant-frontend";
-  version = "20251001.0";
+  version = "20251001.2";
   format = "wheel";
 
   src = fetchPypi {
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     pname = "home_assistant_frontend";
     dist = "py3";
     python = "py3";
-    hash = "sha256-gyipiEkT4AvTVvc/7pdBz9+2Oou5l9txOOboG/EQb80=";
+    hash = "sha256-VDfj1dshILdTD/r6tuiImzYFMO3suytMQoFQzJfIeBQ=";
   };
 
   # there is nothing to strip in this package

From 2eaf1d0272fa2d455d1aa13858d2c5ee02f276f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 10 Oct 2025 20:42:00 -0700
Subject: [PATCH 74/84] home-assistant: 2025.10.1 -> 2025.10.2

Diff: https://github.com/home-assistant/core/compare/2025.10.1...2025.10.2

Changelog: https://github.com/home-assistant/core/releases/tag/2025.10.2
---
 pkgs/servers/home-assistant/component-packages.nix | 2 +-
 pkgs/servers/home-assistant/default.nix            | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 8e56ef1c9be6..aa0f36aeb8c9 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
 # Do not edit!
 
 {
-  version = "2025.10.1";
+  version = "2025.10.2";
   components = {
     "3_day_blinds" =
       ps: with ps; [
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 4676768278d0..876bd80e051a 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -330,7 +330,7 @@ let
   extraBuildInputs = extraPackages python.pkgs;
 
   # Don't forget to run update-component-packages.py after updating
-  hassVersion = "2025.10.1";
+  hassVersion = "2025.10.2";
 
 in
 python.pkgs.buildPythonApplication rec {
@@ -351,13 +351,13 @@ python.pkgs.buildPythonApplication rec {
     owner = "home-assistant";
     repo = "core";
     tag = version;
-    hash = "sha256-1C7Lg/pL1C+pUoo4RiL1TVECTqtEn6jnZ6muLohYPcw=";
+    hash = "sha256-Y9StuiDaICKgqRrYc8d0i/Ey6R78J/5tvk/0qGVeZPQ=";
   };
 
   # Secondary source is pypi sdist for translations
   sdist = fetchPypi {
     inherit pname version;
-    hash = "sha256-cVARVLg80wVkruSed7ywrnK+lutLWbMJL2MBIwAapBA=";
+    hash = "sha256-tIUImUHGh8nrf0IuSOjSuV718B0SIS/oL6yLnyu8gOE=";
   };
 
   build-system = with python.pkgs; [

From 75d010dc8fd31f233003c9e888a7d177ba694878 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 10 Oct 2025 21:12:59 -0700
Subject: [PATCH 75/84] python3Packages.homeassistant-stubs: 2025.10.1 ->
 2025.10.2

Diff: https://github.com/KapJI/homeassistant-stubs/compare/2025.10.1...2025.10.2

Changelog: https://github.com/KapJI/homeassistant-stubs/releases/tag/2025.10.2
---
 pkgs/servers/home-assistant/stubs.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix
index fb08bb681361..771bd9b3981e 100644
--- a/pkgs/servers/home-assistant/stubs.nix
+++ b/pkgs/servers/home-assistant/stubs.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "homeassistant-stubs";
-  version = "2025.10.1";
+  version = "2025.10.2";
   pyproject = true;
 
   disabled = python.version != home-assistant.python.version;
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "KapJI";
     repo = "homeassistant-stubs";
     tag = version;
-    hash = "sha256-uLr6ZBasZNsCqD2DmOV/zestPW0lak9MSvvvUVWgUqQ=";
+    hash = "sha256-iLQm7ERY5S9rMuk0RCLmGNxHiwIAAckuUvAjeKPvu1Q=";
   };
 
   build-system = [

From c5345ff753ec21c50585497c1629d9e4a1f2f4cc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Oct 2025 06:31:33 +0000
Subject: [PATCH 76/84] cargo-sweep: 0.7.0 -> 0.8.0

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

diff --git a/pkgs/by-name/ca/cargo-sweep/package.nix b/pkgs/by-name/ca/cargo-sweep/package.nix
index cd8a84a1c410..781ede8252df 100644
--- a/pkgs/by-name/ca/cargo-sweep/package.nix
+++ b/pkgs/by-name/ca/cargo-sweep/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-sweep";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "holmgr";
     repo = "cargo-sweep";
     rev = "v${version}";
-    sha256 = "sha256-L9tWTgW8PIjxeby+wa71NPp3kWMYH5D7PNtpk8Bmeyc=";
+    sha256 = "sha256-/a7quBIX3gr9vVwQfDHdfkt4Xt7UYpjMNiyqivhOvBQ=";
   };
 
-  cargoHash = "sha256-FCpCGp2WUTKTjvUewcOqLoNPlZDnOa4TsamSQNU1xxU=";
+  cargoHash = "sha256-6J512mezcMn82z7qN+ppy66v4tzqMFyqDXU6H9+xyaQ=";
 
   checkFlags = [
     # Requires a rustup toolchain to be installed.

From 075555ec703583bb9efc40322c5ca48073839e09 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sat, 11 Oct 2025 15:35:26 +0900
Subject: [PATCH 77/84] nixos/lxd-image-server: set reload trigger in systemd
 unit

---
 nixos/modules/services/networking/lxd-image-server.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/networking/lxd-image-server.nix b/nixos/modules/services/networking/lxd-image-server.nix
index 34f6ace072b2..7867c831e62b 100644
--- a/nixos/modules/services/networking/lxd-image-server.nix
+++ b/nixos/modules/services/networking/lxd-image-server.nix
@@ -78,6 +78,8 @@ in
           ${pkgs.lxd-image-server}/bin/lxd-image-server watch
         '';
 
+        reloadTriggers = [ config.environment.etc."lxd-image-server/config.toml".source ];
+
         serviceConfig = {
           User = "lxd-image-server";
           Group = cfg.group;

From 21e4aadc8fcb4fd43636a54cb15bb499a3317421 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sat, 11 Oct 2025 15:37:18 +0900
Subject: [PATCH 78/84] nixos/lxd-image-server: split script into `ExecStart`
 and `ExecStartPre`

---
 nixos/modules/services/networking/lxd-image-server.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/networking/lxd-image-server.nix b/nixos/modules/services/networking/lxd-image-server.nix
index 7867c831e62b..059822d69342 100644
--- a/nixos/modules/services/networking/lxd-image-server.nix
+++ b/nixos/modules/services/networking/lxd-image-server.nix
@@ -73,11 +73,6 @@ in
 
         description = "LXD Image Server";
 
-        script = ''
-          ${pkgs.lxd-image-server}/bin/lxd-image-server init
-          ${pkgs.lxd-image-server}/bin/lxd-image-server watch
-        '';
-
         reloadTriggers = [ config.environment.etc."lxd-image-server/config.toml".source ];
 
         serviceConfig = {
@@ -86,6 +81,8 @@ in
           DynamicUser = true;
           LogsDirectory = "lxd-image-server";
           RuntimeDirectory = "lxd-image-server";
+          ExecStartPre = "${pkgs.lxd-image-server}/bin/lxd-image-server init";
+          ExecStart = "${pkgs.lxd-image-server}/bin/lxd-image-server watch";
           ExecReload = "${pkgs.lxd-image-server}/bin/lxd-image-server reload";
           ReadWritePaths = [ location ];
         };

From 4f28ff1b11f114538632f2526332ff2784b747ce Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Oct 2025 07:09:53 +0000
Subject: [PATCH 79/84] vimPlugins.vim-stationeers-ic10-syntax:
 0-unstable-2025-01-08 -> 0-unstable-2025-10-09

---
 .../non-generated/vim-stationeers-ic10-syntax/default.nix   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/non-generated/vim-stationeers-ic10-syntax/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/vim-stationeers-ic10-syntax/default.nix
index e78ad5e630f9..dc81b884361d 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/vim-stationeers-ic10-syntax/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/vim-stationeers-ic10-syntax/default.nix
@@ -6,13 +6,13 @@
 }:
 vimUtils.buildVimPlugin {
   pname = "vim-ic10";
-  version = "0-unstable-2025-01-08";
+  version = "0-unstable-2025-10-09";
 
   src = fetchFromGitLab {
     owner = "LittleMorph";
     repo = "vim-ic10";
-    rev = "7c1f13b198cfe122fb52f6abfb8dc95d5ca51013";
-    hash = "sha256-4Q1JiDA7PBUWNBNfCIZC6nImhe2FJzOqrslHazAOs18=";
+    rev = "7e9cb3bf91f692e26e899a6d513fcee7dd60bf72";
+    hash = "sha256-7mQ8PEbqQS4E8Kg6nU+uTj9Nyke80FEcLpmV46B7GFA=";
   };
 
   passthru.updateScript = nix-update-script {

From cfdb6c1284f95e29bda18b985ca4b2131dc53a67 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sat, 11 Oct 2025 09:48:22 +0200
Subject: [PATCH 80/84] wordpress_6_7: 6.7.2 -> 6.7.3

Fixes CVE-2025-58246 and CVE-2025-58674.

https://wordpress.org/news/2025/09/wordpress-6-8-3-release/
---
 pkgs/servers/web-apps/wordpress/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix
index 744243f19793..56adb31fa006 100644
--- a/pkgs/servers/web-apps/wordpress/default.nix
+++ b/pkgs/servers/web-apps/wordpress/default.nix
@@ -2,8 +2,8 @@
 builtins.mapAttrs (_: callPackage ./generic.nix) rec {
   wordpress = wordpress_6_8;
   wordpress_6_7 = {
-    version = "6.7.2";
-    hash = "sha256-z9nIPPqd2gNRiY6ptz9YmVyBeZSlQkvhh3f4PohqPPY=";
+    version = "6.7.3";
+    hash = "sha256-zWLpZ/NKla1u4CHh2Bu0P7UmFWvnuTUheRq6Bq5NZjU=";
   };
   wordpress_6_8 = {
     version = "6.8.3";

From 75114216e2974392c0359b2ea57016fbd0f4f398 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sat, 11 Oct 2025 08:51:00 +0100
Subject: [PATCH 81/84] systemd: drop reference to deleted `systemd-timesyncd`
 nixos test
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Without the change the eval fails as:

    $ nix build --no-link -f. defaultPkgConfigPackages.libsystemd.tests
    error:
       … while evaluating the attribute 'systemd-timesyncd'

       … in the condition of the assert statement
         at pkgs/os-specific/linux/systemd/default.nix:1023:11:
         1022|           name: value:
         1023|           assert lib.assertMsg (lib.isDerivation value) "${name} is not a derivation";
             |           ^
         1024|           value

       … in the left operand of the OR (||) operator
         at /home/slyfox/dev/git/nixpkgs-master/lib/asserts.nix:50:31:
           49|   # TODO(Profpatsch): add tests that check stderr
           50|   assertMsg = pred: msg: pred || throw msg;
             |                               ^
           51|

       error: attribute 'systemd-timesyncd' missing
       at pkgs/os-specific/linux/systemd/default.nix:1010:13:
         1009|             systemd-sysusers-password-option-override-ordering
         1010|             systemd-timesyncd
             |             ^
         1011|             systemd-timesyncd-nscd-dnssec
---
 pkgs/os-specific/linux/systemd/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 7e35a8a06842..ca3d876d33fe 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -1007,7 +1007,6 @@ stdenv.mkDerivation (finalAttrs: {
             systemd-sysusers-mutable
             systemd-sysusers-immutable
             systemd-sysusers-password-option-override-ordering
-            systemd-timesyncd
             systemd-timesyncd-nscd-dnssec
             systemd-user-linger
             systemd-user-tmpfiles-rules

From d830f3dce1ec3502f45ea9f8e52954e91963cda4 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 11 Oct 2025 13:08:00 +0300
Subject: [PATCH 82/84] wireplumber: 0.5.11 -> 0.5.12

Diff: https://gitlab.freedesktop.org/pipewire/wireplumber/-/compare/0.5.11...0.5.12
---
 pkgs/development/libraries/pipewire/wireplumber.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/pipewire/wireplumber.nix b/pkgs/development/libraries/pipewire/wireplumber.nix
index db3717eaaa31..42b0ec2432cb 100644
--- a/pkgs/development/libraries/pipewire/wireplumber.nix
+++ b/pkgs/development/libraries/pipewire/wireplumber.nix
@@ -25,7 +25,7 @@
 
 stdenv.mkDerivation rec {
   pname = "wireplumber";
-  version = "0.5.11";
+  version = "0.5.12";
 
   outputs = [
     "out"
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     owner = "pipewire";
     repo = "wireplumber";
     rev = version;
-    hash = "sha256-ZTduzHeEBqcranJxHhNnfZE5PV/by5ZUaale9W6AJrE=";
+    hash = "sha256-3LdERBiPXal+OF7tgguJcVXrqycBSmD3psFzn4z5krY=";
   };
 
   nativeBuildInputs = [

From 43ee7fd5815d9dc9d7e22330d6adedaeab455ff5 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sat, 11 Oct 2025 04:36:42 -0600
Subject: [PATCH 83/84] vencord: 1.13.1 -> 1.13.3

https://github.com/Vendicated/Vencord/compare/v1.13.1...v1.13.3
---
 pkgs/by-name/ve/vencord/fix-deps.patch | 13 +++++++++++++
 pkgs/by-name/ve/vencord/package.nix    | 23 ++++++++++++++++-------
 2 files changed, 29 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/by-name/ve/vencord/fix-deps.patch

diff --git a/pkgs/by-name/ve/vencord/fix-deps.patch b/pkgs/by-name/ve/vencord/fix-deps.patch
new file mode 100644
index 000000000000..7e9757080b5e
--- /dev/null
+++ b/pkgs/by-name/ve/vencord/fix-deps.patch
@@ -0,0 +1,13 @@
+diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
+index 2ba2d317..9758074b 100644
+--- a/pnpm-lock.yaml
++++ b/pnpm-lock.yaml
+@@ -162,7 +162,7 @@ importers:
+         specifier: ^22.13.4
+         version: 22.13.13
+       '@types/react':
+-        specifier: 18.3.1
++        specifier: 19.0.12
+         version: 19.0.12
+       '@types/react-dom':
+         specifier: 18.3.1
diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix
index 2bb5378dd97a..3f07fab88faa 100644
--- a/pkgs/by-name/ve/vencord/package.nix
+++ b/pkgs/by-name/ve/vencord/package.nix
@@ -18,20 +18,29 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vencord";
-  version = "1.13.1";
+  version = "1.13.3";
 
   src = fetchFromGitHub {
     owner = "Vendicated";
     repo = "Vencord";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-FqRRpsS1NPpxJr6iaDvQJ3fuX07oo08lZ6f+oEQb3MM=";
+    hash = "sha256-wKLI2YE1rEzkRjDeM85XAx2DIrWYGoZrQT8OHtsNJ7E=";
   };
 
-  pnpmDeps = pnpm_10.fetchDeps {
-    inherit (finalAttrs) pname src;
-    fetcherVersion = 2;
-    hash = "sha256-JP9HOaP3DG+2F89tC77JZFD0ls35u/MzxNmvMCbBo9Y=";
-  };
+  patches = [ ./fix-deps.patch ];
+
+  postPatch = ''
+    substituteInPlace packages/vencord-types/package.json \
+      --replace-fail '"@types/react": "18.3.1"' '"@types/react": "19.0.12"'
+  '';
+
+  pnpmDeps =
+    (pnpm_10.fetchDeps {
+      inherit (finalAttrs) pname src;
+      fetcherVersion = 2;
+      hash = "sha256-5MjxEs+jbowJJbJ9+Z+vppFImpB+PZzEhntwRAgv+xM=";
+    }).overrideAttrs
+      { inherit (finalAttrs) patches postPatch; };
 
   nativeBuildInputs = [
     git

From 574841142e2e2ad530ea5440f47ea505e3597c21 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sat, 11 Oct 2025 04:37:38 -0600
Subject: [PATCH 84/84] vencord: add ryand56 to maintainers

---
 pkgs/by-name/ve/vencord/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix
index 3f07fab88faa..fcc43ce64836 100644
--- a/pkgs/by-name/ve/vencord/package.nix
+++ b/pkgs/by-name/ve/vencord/package.nix
@@ -105,6 +105,7 @@ stdenv.mkDerivation (finalAttrs: {
       Gliczy
       NotAShelf
       Scrumplex
+      ryand56
     ];
   };
 })