From e6b738aa1060bc660032d9ac45a7e74bc3a3dbcd Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Tue, 14 Jul 2026 11:50:44 -0400
Subject: [PATCH 01/19] openshadinglanguage: enable LLVM_STATIC to avoid
 conflicts

When OSL is included in a downstream consumer that has other
dependencies with different libllvm versions, crashes often ensue. Avoid
this by linking statically to it. This then requires libxml on Linux.

Notably, this fixes blender when built with rocmSupport, as ROCm deps
depend on a conflicting libllvm.
---
 pkgs/by-name/op/openshadinglanguage/package.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/openshadinglanguage/package.nix b/pkgs/by-name/op/openshadinglanguage/package.nix
index 9d0dc4df17a1..d0f4997ccacd 100644
--- a/pkgs/by-name/op/openshadinglanguage/package.nix
+++ b/pkgs/by-name/op/openshadinglanguage/package.nix
@@ -32,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   cmakeFlags = [
+    (lib.cmakeBool "LLVM_STATIC" true)
     (lib.cmakeBool "USE_QT" false)
 
     # Build system implies llvm-config and llvm-as are in the same directory.
@@ -60,6 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     hexdump
     libclang
+    libxml2
     llvm
     openexr
     openimageio
@@ -68,9 +70,6 @@ stdenv.mkDerivation (finalAttrs: {
     python3Packages.pybind11
     robin-map
     zlib
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    libxml2
   ];
 
   propagatedBuildInputs = [

From f49885ecdb026627fe270193f5a645024e2a8e8b Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Tue, 14 Jul 2026 06:30:11 -0400
Subject: [PATCH 02/19] blender: fix missing cattrs Python dep
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is in bpy’s install_requires list.
---
 pkgs/by-name/bl/blender/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix
index c4d80135ebf5..ade4a3545f62 100644
--- a/pkgs/by-name/bl/blender/package.nix
+++ b/pkgs/by-name/bl/blender/package.nix
@@ -337,6 +337,7 @@ stdenv'.mkDerivation (finalAttrs: {
       ps = python3Packages;
     in
     [
+      ps.cattrs
       ps.materialx
       ps.numpy
       ps.openshadinglanguage

From 03d3fa0074c3f810d5ab3d2b3b498b8c6713fd81 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Tue, 14 Jul 2026 10:53:37 -0400
Subject: [PATCH 03/19] blender: remove HIP RT support as it is broken
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Unfortunately it does not currently work (it builds, but cannot be
enabled at runtime). Further, Blender upstream expects HIP 2.x, which is
no longer in Nixpkgs and does not trivially build in Nixpkgs’
rocmPackages anymore. The current hiprt-3-compat.patch will soon not
apply in Blender 5.2, and a newer patch (in
https://projects.blender.org/blender/blender/pulls/157753) applies but
does not build.

As such, remove the support for now, rather than pretending that it is
functional.
---
 pkgs/by-name/bl/blender/hiprt-3-compat.patch | 42 --------------------
 pkgs/by-name/bl/blender/package.nix          |  8 +---
 2 files changed, 1 insertion(+), 49 deletions(-)
 delete mode 100644 pkgs/by-name/bl/blender/hiprt-3-compat.patch

diff --git a/pkgs/by-name/bl/blender/hiprt-3-compat.patch b/pkgs/by-name/bl/blender/hiprt-3-compat.patch
deleted file mode 100644
index ab42ff8ae27b..000000000000
--- a/pkgs/by-name/bl/blender/hiprt-3-compat.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/extern/hipew/src/hipew.c b/extern/hipew/src/hipew.c
-index e72ccde6..138e1efc 100644
---- a/extern/hipew/src/hipew.c
-+++ b/extern/hipew/src/hipew.c
-@@ -241,13 +241,13 @@ static int hipewHipInit(void) {
-   /* ROCm 6 changes paths from /opt/rocm/hip/lib to /opt/rocm/lib, so
-    * search for libraries there. */
- 
--  const char* hip_paths[] = { "libamdhip64.so",
-+  const char* hip_paths[] = { "libamdhip64.so.7",
-+                            "/opt/rocm/lib/libamdhip64.so.7",
-+                            "/opt/rocm/hip/lib/libamdhip64.so.7",
-                             "libamdhip64.so.6",
-                             "/opt/rocm/lib/libamdhip64.so.6",
-                             "/opt/rocm/hip/lib/libamdhip64.so.6",
--                            "libamdhip64.so.7",
--                            "/opt/rocm/lib/libamdhip64.so.7",
--                            "/opt/rocm/hip/lib/libamdhip64.so.7",
-+                            "libamdhip64.so",
-                              NULL };
- #endif
-   static int initialized = 0;
-diff --git a/intern/cycles/kernel/device/hiprt/CMakeLists.txt b/intern/cycles/kernel/device/hiprt/CMakeLists.txt
-index 9f48fb9be3..01e05159c9 100644
---- a/intern/cycles/kernel/device/hiprt/CMakeLists.txt
-+++ b/intern/cycles/kernel/device/hiprt/CMakeLists.txt
-@@ -30,13 +30,13 @@
- set(SRC_KERNEL_DEVICE_HIPRT_SDK
-   hiprt/impl/Aabb.h
-   hiprt/impl/BvhNode.h
--  hiprt/impl/Geometry.h
-+  hiprt/impl/Header.h
-   hiprt/impl/hiprt_device_impl.h
-   hiprt/impl/hiprt_kernels_bitcode.h
-   hiprt/impl/Instance.h
-+  hiprt/impl/Obb.h
-   hiprt/impl/QrDecomposition.h
-   hiprt/impl/Quaternion.h
--  hiprt/impl/Scene.h
-   hiprt/impl/Transform.h
-   hiprt/impl/Triangle.h
- )
diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix
index ade4a3545f62..1a86b82199f0 100644
--- a/pkgs/by-name/bl/blender/package.nix
+++ b/pkgs/by-name/bl/blender/package.nix
@@ -133,10 +133,6 @@ stdenv'.mkDerivation (finalAttrs: {
     # https://projects.blender.org/blender/blender/commit/470127ede2448de50a6936b8484b3c382c76d596
     ./fix-quite-clog-warning.patch
   ]
-  # Minimal backport of hiprt 3.x support from https://projects.blender.org/blender/blender/pulls/144889
-  ++ lib.optionals rocmSupport [
-    ./hiprt-3-compat.patch
-  ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     ./darwin.patch
   ];
@@ -157,7 +153,6 @@ stdenv'.mkDerivation (finalAttrs: {
     + (lib.optionalString rocmSupport ''
       substituteInPlace extern/hipew/src/hipew.c --replace-fail '"/opt/rocm/hip/lib/libamdhip64.so.${lib.versions.major rocmPackages.clr.version}"' '"${rocmPackages.clr}/lib/libamdhip64.so"'
       substituteInPlace extern/hipew/src/hipew.c --replace-fail '"opt/rocm/hip/bin"' '"${rocmPackages.clr}/bin"'
-      substituteInPlace extern/hipew/src/hiprtew.cc --replace-fail '"/opt/rocm/lib/libhiprt64.so"' '"${rocmPackages.hiprt}/lib/libhiprt64.so"'
     '');
 
   env.NIX_CFLAGS_COMPILE = "-I${python3}/include/${python3.libPrefix}";
@@ -205,8 +200,7 @@ stdenv'.mkDerivation (finalAttrs: {
     (lib.cmakeBool "WITH_CYCLES_CUDA_BINARIES" true)
   ]
   ++ lib.optionals rocmSupport [
-    (lib.cmakeFeature "HIPRT_INCLUDE_DIR" "${rocmPackages.hiprt}/include")
-    (lib.cmakeBool "WITH_CYCLES_DEVICE_HIPRT" true)
+    (lib.cmakeBool "WITH_CYCLES_DEVICE_HIPRT" false)
     (lib.cmakeBool "WITH_CYCLES_HIP_BINARIES" true)
   ]
   ++ lib.optionals waylandSupport [

From fab8604004f3fad618e0ac36e236b0d845d8edba Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Tue, 14 Jul 2026 10:13:10 +0000
Subject: [PATCH 04/19] blender: 5.1.2 -> 5.2.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Changelog: https://developer.blender.org/docs/release_notes/5.2/

- Add some now-required libs for build time
- Remove now-unneeded patches
- `bpy.utils.resource_path('SYSTEM_LIBS')` was returning e.g.
  `/nix/store/*//nix/store/*/…`. This is because CMake’s GNUInstallDirs’
  `CMAKE_INSTALL_LIBDIR` should not be an absolute path, but Nixpkgs’s
  CMake setup hook sets it to be (so that multiple outputs work).
  Blender follows this assumption and prepends the prefix, thus
  concatenating absolute paths. Since we know BLENDER_INSTALL_LIBDIR
  (which is just CMAKE_INSTALL_LIBDIR) will be an absolute path,
  substitute to omit the prefix. This fixes e.g. the import of
  Draco-compressed gITF files, since the lib is loaded at runtime from a
  path derived from the above.
---
 .../bl/blender/fix-quite-clog-warning.patch   | 13 -----
 pkgs/by-name/bl/blender/package.nix           | 50 +++++++++++--------
 2 files changed, 28 insertions(+), 35 deletions(-)
 delete mode 100644 pkgs/by-name/bl/blender/fix-quite-clog-warning.patch

diff --git a/pkgs/by-name/bl/blender/fix-quite-clog-warning.patch b/pkgs/by-name/bl/blender/fix-quite-clog-warning.patch
deleted file mode 100644
index ff75af489244..000000000000
--- a/pkgs/by-name/bl/blender/fix-quite-clog-warning.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/source/blender/gpu/vulkan/vk_texture_pool.cc b/source/blender/gpu/vulkan/vk_texture_pool.cc
-index 850e7808ae7..3478d4907f2 100644
---- a/source/blender/gpu/vulkan/vk_texture_pool.cc
-+++ b/source/blender/gpu/vulkan/vk_texture_pool.cc
-@@ -554,7 +554,7 @@ void VKTexturePool::log_usage_data()
-     log_message += std::format(" ({} cached VkImages)", current_usage_data_.image_cache_size);
-   }
- 
--  CLOG_TRACE(&LOG, log_message.c_str());
-+  CLOG_TRACE(&LOG, "%s", log_message.c_str());
- }
- 
- }  // namespace gpu
diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix
index 1a86b82199f0..9eaa6e1cdbf5 100644
--- a/pkgs/by-name/bl/blender/package.nix
+++ b/pkgs/by-name/bl/blender/package.nix
@@ -12,6 +12,7 @@
   cudaPackages,
   cudaSupport ? config.cudaSupport,
   dbus,
+  draco,
   embree,
   fetchFromGitHub,
   fetchzip,
@@ -49,6 +50,7 @@
   makeWrapper,
   manifold,
   mesa,
+  meshoptimizer,
   nix-update-script,
   onetbb,
   openal,
@@ -116,12 +118,12 @@ in
 
 stdenv'.mkDerivation (finalAttrs: {
   pname = "blender";
-  version = "5.1.2";
+  version = "5.2.0";
 
   src = fetchzip {
     name = "source";
     url = "https://download.blender.org/source/blender-${finalAttrs.version}.tar.xz";
-    hash = "sha256-FnReSNsP8U1/4jSgZN3cMQV2qkP7OZPh0f/9JA1lAxs=";
+    hash = "sha256-V2+Oc7GT31JvWccffzUaingEs8CtSFaazgQ+YdZUB7M=";
   };
 
   patches = [
@@ -129,31 +131,33 @@ stdenv'.mkDerivation (finalAttrs: {
     # ceres-solver dependency propagates eigen 3 and appears to be incompatible
     # with more recent versions.
     ./eigen-3-compat.patch
-    # Required due to `-Werror=format-security` in nixpkgs
-    # https://projects.blender.org/blender/blender/commit/470127ede2448de50a6936b8484b3c382c76d596
-    ./fix-quite-clog-warning.patch
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     ./darwin.patch
   ];
 
-  postPatch =
-    (lib.optionalString stdenv.hostPlatform.isDarwin ''
-      : > build_files/cmake/platform/platform_apple_xcode.cmake
-      substituteInPlace source/creator/CMakeLists.txt \
-        --replace-fail '${"$"}{LIBDIR}/python' \
-                  '${python3}' \
-        --replace-fail '${"$"}{LIBDIR}/materialx/' '${python3Packages.materialx}/'
-      substituteInPlace build_files/cmake/platform/platform_apple.cmake \
-        --replace-fail '${"$"}{LIBDIR}/brotli/lib/libbrotlicommon-static.a' \
-                  '${lib.getLib brotli}/lib/libbrotlicommon.dylib' \
-        --replace-fail '${"$"}{LIBDIR}/brotli/lib/libbrotlidec-static.a' \
-                  '${lib.getLib brotli}/lib/libbrotlidec.dylib'
-    '')
-    + (lib.optionalString rocmSupport ''
-      substituteInPlace extern/hipew/src/hipew.c --replace-fail '"/opt/rocm/hip/lib/libamdhip64.so.${lib.versions.major rocmPackages.clr.version}"' '"${rocmPackages.clr}/lib/libamdhip64.so"'
-      substituteInPlace extern/hipew/src/hipew.c --replace-fail '"opt/rocm/hip/bin"' '"${rocmPackages.clr}/bin"'
-    '');
+  postPatch = ''
+    substituteInPlace intern/ghost/intern/GHOST_SystemPathsUnix.cc \
+      --replace-fail \
+        'static const char *static_libs_path = PREFIX "/" BLENDER_INSTALL_LIBDIR;' \
+        'static const char *static_libs_path = BLENDER_INSTALL_LIBDIR;'
+  ''
+  + (lib.optionalString stdenv.hostPlatform.isDarwin ''
+    : > build_files/cmake/platform/platform_apple_xcode.cmake
+    substituteInPlace source/creator/CMakeLists.txt \
+      --replace-fail '${"$"}{LIBDIR}/python' \
+                '${python3}' \
+      --replace-fail '${"$"}{LIBDIR}/materialx/' '${python3Packages.materialx}/'
+    substituteInPlace build_files/cmake/platform/platform_apple.cmake \
+      --replace-fail '${"$"}{LIBDIR}/brotli/lib/libbrotlicommon-static.a' \
+                '${lib.getLib brotli}/lib/libbrotlicommon.dylib' \
+      --replace-fail '${"$"}{LIBDIR}/brotli/lib/libbrotlidec-static.a' \
+                '${lib.getLib brotli}/lib/libbrotlidec.dylib'
+  '')
+  + (lib.optionalString rocmSupport ''
+    substituteInPlace extern/hipew/src/hipew.c --replace-fail '"/opt/rocm/hip/lib/libamdhip64.so.${lib.versions.major rocmPackages.clr.version}"' '"${rocmPackages.clr}/lib/libamdhip64.so"'
+    substituteInPlace extern/hipew/src/hipew.c --replace-fail '"opt/rocm/hip/bin"' '"${rocmPackages.clr}/bin"'
+  '');
 
   env.NIX_CFLAGS_COMPILE = "-I${python3}/include/${python3.libPrefix}";
 
@@ -247,6 +251,7 @@ stdenv'.mkDerivation (finalAttrs: {
     alembic
     boost
     ceres-solver
+    draco
     ffmpeg_7
     fftw
     fftwFloat
@@ -264,6 +269,7 @@ stdenv'.mkDerivation (finalAttrs: {
     libtiff
     libwebp
     manifold
+    meshoptimizer
     opencolorio
     openexr
     openimageio

From 0eb7f664f8c01a4dfd65dbef655d7a376841dc9b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 11:16:14 +0000
Subject: [PATCH 05/19] shader-slang: 2026.12.2 -> 2026.13.1

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

diff --git a/pkgs/by-name/sh/shader-slang/package.nix b/pkgs/by-name/sh/shader-slang/package.nix
index bc11e72efcbd..4817ba59ca76 100644
--- a/pkgs/by-name/sh/shader-slang/package.nix
+++ b/pkgs/by-name/sh/shader-slang/package.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "shader-slang";
-  version = "2026.12.2";
+  version = "2026.13.1";
 
   src = fetchFromGitHub {
     owner = "shader-slang";
     repo = "slang";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-kSc8+McxHQ6Vh7M+AUDx6zre7zjjq0w5A8QZhLZ3wGw=";
+    hash = "sha256-nZAe/lQAcnKSi/XjbT2EAOvJeUG+5zRLtx0ArRMxTCE=";
     fetchSubmodules = true;
   };
 

From 694e6348b10da1be0d5243dd19e8ec1a9b42cf36 Mon Sep 17 00:00:00 2001
From: Nicolas Benes <nbenes.gh@xandea.de>
Date: Sat, 18 Jul 2026 12:10:04 +0200
Subject: [PATCH 06/19] opentelemetry-cpp: 1.27.0 -> 1.28.0

https://github.com/open-telemetry/opentelemetry-cpp/releases/tag/v1.28.0
---
 pkgs/by-name/op/opentelemetry-cpp/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/op/opentelemetry-cpp/package.nix b/pkgs/by-name/op/opentelemetry-cpp/package.nix
index 4bd91de3da4c..619927712215 100644
--- a/pkgs/by-name/op/opentelemetry-cpp/package.nix
+++ b/pkgs/by-name/op/opentelemetry-cpp/package.nix
@@ -29,13 +29,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "opentelemetry-cpp";
-  version = "1.27.0";
+  version = "1.28.0";
 
   src = fetchFromGitHub {
     owner = "open-telemetry";
     repo = "opentelemetry-cpp";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-7G9uHMlV7/rHvD/g+ktxT6RTfDRSfsXQO7QHk26XVKs=";
+    hash = "sha256-+S/C+msuUEzOVIcx/1lEuQh6ZmyujALVXsiSqb0s2FM=";
   };
 
   patches = [

From 6f3af9d4b1c67dcc74e8b91e138bf3d46b4c1eba Mon Sep 17 00:00:00 2001
From: BatteredBunny <ayes2022@protonmail.com>
Date: Mon, 20 Jul 2026 13:08:38 +0300
Subject: [PATCH 07/19] zkfuse: drop

---
 pkgs/by-name/zk/zkfuse/package.nix | 49 ------------------------------
 pkgs/top-level/aliases.nix         |  1 +
 2 files changed, 1 insertion(+), 49 deletions(-)
 delete mode 100644 pkgs/by-name/zk/zkfuse/package.nix

diff --git a/pkgs/by-name/zk/zkfuse/package.nix b/pkgs/by-name/zk/zkfuse/package.nix
deleted file mode 100644
index 3751f1e4dda5..000000000000
--- a/pkgs/by-name/zk/zkfuse/package.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  stdenv,
-  lib,
-  autoreconfHook,
-  boost,
-  fuse,
-  log4cxx,
-  zookeeper,
-  zookeeper_mt,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "zkfuse";
-  inherit (zookeeper_mt) version src;
-
-  sourceRoot = "apache-${zookeeper.pname}-${version}/zookeeper-contrib/zookeeper-contrib-zkfuse";
-
-  nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [
-    zookeeper_mt
-    log4cxx
-    boost
-    fuse
-  ];
-
-  postPatch = ''
-    # Make the async API accessible, and use the proper include path.
-    sed -i src/zkadapter.h \
-        -e '/"zookeeper\.h"/i#define THREADED' \
-        -e 's,"zookeeper\.h",<zookeeper/zookeeper.h>,'
-  '';
-
-  # c++17 (gcc-11's default) breaks the build as:
-  #   zkadapter.h:616:33: error: ISO C++17 does not allow dynamic exception specifications
-  env.NIX_CFLAGS_COMPILE = toString [ "-std=c++14" ];
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp -v src/zkfuse $out/bin
-  '';
-
-  meta = {
-    description = "Utility to mount a Zookeeper instance as a file-system";
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ ztzg ];
-    license = lib.licenses.asl20;
-    mainProgram = "zkfuse";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 92910ed3e139..2839a97d3428 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2832,6 +2832,7 @@ mapAliases {
   zigbee2mqtt_2 = zigbee2mqtt; # Added 2025-08-11
   zinc = throw "'zinc' has been renamed to/replaced by 'zincsearch'"; # Converted to throw 2025-10-27
   zint = throw "'zint' has been renamed to/replaced by 'zint-qt'"; # Converted to throw 2025-10-27
+  zkfuse = throw "'zkfuse' has been removed as it was unmaintained"; # Added 2026-07-20
   zmkBATx = warnAlias "'zmkBATx' has been renamed to 'zmkbatx'" zmkbatx; # Added 2026-02-18
   zombietrackergps = throw "'zombietrackergps' has been dropped, as it depends on KDE Gear 5 and is unmaintained"; # Added 2025-08-20
   zotero-beta = throw "'zotero-beta' has been removed. Use 'zotero' instead."; # Added 2026-03-05

From 4ca84bd6ffa9c7f8d2aeca587a112c0bed7f9ec0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jul 2026 15:51:00 +0000
Subject: [PATCH 08/19] lima-full: 2.1.4 -> 2.2.0

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

diff --git a/pkgs/by-name/li/lima/source.nix b/pkgs/by-name/li/lima/source.nix
index 2a214b36401a..00d144eb5dc2 100644
--- a/pkgs/by-name/li/lima/source.nix
+++ b/pkgs/by-name/li/lima/source.nix
@@ -4,7 +4,7 @@
 }:
 
 let
-  version = "2.1.4";
+  version = "2.2.0";
 in
 {
   inherit version;
@@ -13,10 +13,10 @@ in
     owner = "lima-vm";
     repo = "lima";
     tag = "v${version}";
-    hash = "sha256-3vn557inLuV1DF0x8Fzc+OtLRAYKa7oE7s6x2S4gKSY=";
+    hash = "sha256-4Wi+YzMdEN263jeBefEvizlF2k+nLVq3+AHyqagUeHw=";
   };
 
-  vendorHash = "sha256-8AksUgle1SlWuALi553TlpZ2qwO+jMA1kZQke91fimU=";
+  vendorHash = "sha256-gD9C0kupcEWCsU0nYOg+VcBCWR0oRf6Gaw0DDn0xits=";
 
   meta = {
     homepage = "https://github.com/lima-vm/lima";

From 07173bfbadc24b5013f08914274631bda74ae079 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jul 2026 16:08:03 +0000
Subject: [PATCH 09/19] git-pkgs: 0.17.0 -> 0.18.0

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

diff --git a/pkgs/by-name/gi/git-pkgs/package.nix b/pkgs/by-name/gi/git-pkgs/package.nix
index 19f7d4be6804..3f63928cac74 100644
--- a/pkgs/by-name/gi/git-pkgs/package.nix
+++ b/pkgs/by-name/gi/git-pkgs/package.nix
@@ -7,16 +7,16 @@
 }:
 buildGoModule rec {
   pname = "git-pkgs";
-  version = "0.17.0";
+  version = "0.18.0";
 
   src = fetchFromGitHub {
     owner = "git-pkgs";
     repo = "git-pkgs";
     tag = "v${version}";
-    hash = "sha256-4Q95ONe6tcrUk7TsxR347PAFQ/HuMjcqNfCLo6oZtws=";
+    hash = "sha256-xGcyl1BMgGkrjr0QgarQWkBBsZa5lKGYFqUpnHQRJvw=";
   };
 
-  vendorHash = "sha256-YjKktBQT62htk/nqZp9quKEg4eI3vTz6AY64o9IT3/4=";
+  vendorHash = "sha256-7wxcBDZKnTqBUsnQ7dznl8e5qHN1Ep4uJ4/nqc+oL3c=";
 
   subPackages = [ "." ];
 

From 029c575725242fa41b589954efd3a309a17b3277 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jul 2026 20:12:14 +0000
Subject: [PATCH 10/19] clickhouse-backup: 2.7.4 -> 2.8.0

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

diff --git a/pkgs/by-name/cl/clickhouse-backup/package.nix b/pkgs/by-name/cl/clickhouse-backup/package.nix
index ca3dd8b57720..1c4d3c9d5448 100644
--- a/pkgs/by-name/cl/clickhouse-backup/package.nix
+++ b/pkgs/by-name/cl/clickhouse-backup/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "clickhouse-backup";
-  version = "2.7.4";
+  version = "2.8.0";
 
   src = fetchFromGitHub {
     owner = "Altinity";
     repo = "clickhouse-backup";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-HlVngChgU+Do6e5gfP1fg1R/fSGfB8kjG2Ul+N7eJkE=";
+    hash = "sha256-FULdduxFQe1T2UbD/ieE7+ZqRqnRDvbydbmcC2v+D1I=";
   };
 
-  vendorHash = "sha256-HN0H2YFj7k/T2ff1GCrjfE9PO6MtdR/SWKZL/FoqHZ8=";
+  vendorHash = "sha256-fCn3zEaAR+HnbYKNhtuapvThMcIMgcMGCfpEDTZ+jcM=";
 
   ldflags = [
     "-X main.version=${finalAttrs.version}"

From c8805612da53fc579dfad92fc6a3f7c1fa84a248 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jul 2026 23:35:49 +0000
Subject: [PATCH 11/19] folia-major: 0.5.27 -> 0.6.1

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

diff --git a/pkgs/by-name/fo/folia-major/package.nix b/pkgs/by-name/fo/folia-major/package.nix
index bd4dc6d865d3..66fff26fb41e 100644
--- a/pkgs/by-name/fo/folia-major/package.nix
+++ b/pkgs/by-name/fo/folia-major/package.nix
@@ -14,7 +14,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "folia-major";
-  version = "0.5.27";
+  version = "0.6.1";
 
   strictDeps = true;
   __structuredAttrs = true;
@@ -23,12 +23,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     owner = "chthollyphile";
     repo = "folia-major";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-47W6nFDJlF9/voITX2nd9ZrH8gl+GNtESv1T6AXL3F4=";
+    hash = "sha256-rGkIFMbbLA2dxxDJ41NyIi++jcfIZQ3EoBpRJ0n+fTU=";
   };
 
   npmDeps = fetchNpmDeps {
     inherit (finalAttrs) src;
-    hash = "sha256-lLxa6fT35w+qdn08aNCi6Og/eFs72E8FfHTVM+fIvq8=";
+    hash = "sha256-bH9nSHRjYiQzJIU9MC9k+13Uc0ZIem+hRz0CD+9oWPs=";
   };
 
   nativeBuildInputs = [

From ce2f48f3909125197934826c5384368853f2ae8e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Jul 2026 00:11:54 +0000
Subject: [PATCH 12/19] javaPackages.compiler.openjdk25: 25.0.4+1 -> 25.0.4+7

---
 pkgs/development/compilers/openjdk/25/source.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/25/source.json b/pkgs/development/compilers/openjdk/25/source.json
index bbe61333afa1..f1c94058b6c4 100644
--- a/pkgs/development/compilers/openjdk/25/source.json
+++ b/pkgs/development/compilers/openjdk/25/source.json
@@ -1,6 +1,6 @@
 {
-  "hash": "sha256-A5TWx/HDFlx46VAgPmkanwcZeBeSwtgGCD90mmUu4Vc=",
+  "hash": "sha256-/42TUyZnw8LVOuUnupVFBkqsT5IIeTw9/WNQ0eCfQRQ=",
   "owner": "openjdk",
   "repo": "jdk25u",
-  "rev": "refs/tags/jdk-25.0.4+1"
+  "rev": "refs/tags/jdk-25.0.4+7"
 }

From 64f84aeb974079e9a0f96f86185317d203069707 Mon Sep 17 00:00:00 2001
From: tdback <tyler@tdback.net>
Date: Tue, 21 Jul 2026 20:30:28 -0400
Subject: [PATCH 13/19] inferno: 0.12.6 -> 0.12.8

Changelog: https://github.com/jonhoo/inferno/blob/v0.12.8/CHANGELOG.md
Diff: https://github.com/jonhoo/inferno/compare/v0.12.6...v0.12.8
---
 pkgs/by-name/in/inferno/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/in/inferno/package.nix b/pkgs/by-name/in/inferno/package.nix
index cd6f3f87fb76..049873d980c6 100644
--- a/pkgs/by-name/in/inferno/package.nix
+++ b/pkgs/by-name/in/inferno/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "inferno";
-  version = "0.12.6";
+  version = "0.12.8";
 
   src = fetchFromGitHub {
     owner = "jonhoo";
     repo = "inferno";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-maqyxntCm8F8B14+26+ASJNl7JL3Pk+xzwgA2f8r4zc=";
+    hash = "sha256-IRL7hHXZlJiYw4dea0gjxVTgpSwxeAZBCCqkMMkukRo=";
     fetchSubmodules = true;
   };
 
-  cargoHash = "sha256-0Zn3KS8Qo39yR+WUxj68eYt9jnDwpf4QUBGBqZPqFIU=";
+  cargoHash = "sha256-RB9XUURf+Eb2c3JcmqCmmM776FuNenn6Mj2zjo1X/Tw=";
 
   # skip flaky tests
   checkFlags = [

From 3deba7238772757b52120b576e16b6780cd545d7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Jul 2026 00:53:41 +0000
Subject: [PATCH 14/19] radicle-explorer: 0-unstable-2026-07-16 ->
 0-unstable-2026-07-21

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

diff --git a/pkgs/by-name/ra/radicle-explorer/package.nix b/pkgs/by-name/ra/radicle-explorer/package.nix
index 9cf3d893fa6f..fce42b8beb1b 100644
--- a/pkgs/by-name/ra/radicle-explorer/package.nix
+++ b/pkgs/by-name/ra/radicle-explorer/package.nix
@@ -23,13 +23,13 @@ in
 
 buildNpmPackage (finalAttrs: {
   pname = "radicle-explorer";
-  version = "0-unstable-2026-07-16";
+  version = "0-unstable-2026-07-21";
 
   src = fetchFromRadicle {
     seed = "seed.radicle.dev";
     repo = "z4V1sjrXqjvFdnCUbxPFqd5p4DtH5";
-    rev = "3c2935704f5767d60b3caf609ef772948bbecb10";
-    hash = "sha256-EpHKuFNgRLwCVdDDRKjPJEvfDpS9qka75B2fQEVc1ns=";
+    rev = "2afde78941226a6d791f8a7392713864457ec772";
+    hash = "sha256-fEfr2jt1NY7rFt2/BO61ukRYEpyH4ATsuheAz8MdKpY=";
   };
 
   npmDepsHash = "sha256-74r7cyggbuva9XpW++HdAHHFqEBJ6BgNuJJUR+8HE4c=";

From 20af6dcfebe20da52e5696b0b8640af315f86b5a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Jul 2026 01:42:40 +0000
Subject: [PATCH 15/19] prometheus-knot-exporter: 3.5.5 -> 3.5.6

---
 pkgs/by-name/pr/prometheus-knot-exporter/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pr/prometheus-knot-exporter/package.nix b/pkgs/by-name/pr/prometheus-knot-exporter/package.nix
index e988a2ffd33a..b2bdf816640f 100644
--- a/pkgs/by-name/pr/prometheus-knot-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-knot-exporter/package.nix
@@ -7,13 +7,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "knot-exporter";
-  version = "3.5.5";
+  version = "3.5.6";
   pyproject = true;
 
   src = fetchPypi {
     pname = "knot_exporter";
     inherit version;
-    hash = "sha256-4V7fIY5qgKFGSKoodRFgP8e0P0DDvsBPBmzP9TdG98A=";
+    hash = "sha256-jCBi/PHMizG/OkwuoCbkud5w+pgGumHwwGd8W5C4zXc=";
   };
 
   build-system = [

From 62d4d822fad0abf0e10431ddf5fc70ce22826c02 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Jul 2026 01:47:17 +0000
Subject: [PATCH 16/19] hyprsunset: 0.3.3 -> 0.4.0

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

diff --git a/pkgs/by-name/hy/hyprsunset/package.nix b/pkgs/by-name/hy/hyprsunset/package.nix
index 7e677b8d4794..613f2adf3905 100644
--- a/pkgs/by-name/hy/hyprsunset/package.nix
+++ b/pkgs/by-name/hy/hyprsunset/package.nix
@@ -15,13 +15,13 @@
 }:
 gcc16Stdenv.mkDerivation (finalAttrs: {
   pname = "hyprsunset";
-  version = "0.3.3";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "hyprsunset";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Yk6nDzCXrOehX3At8qdZ0cLr1kPySqACsihMYuP6T8w=";
+    hash = "sha256-MhrVi5f6n9eJv8kcDngb8j2P5F3i5/GCR77+qIWnjf4=";
   };
 
   postPatch = ''

From 88ebd9f5ec4bddf28180c2a5441d25ec95cfeba1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E5=9D=82=E9=9B=85?=
 <23130178+ShadowRZ@users.noreply.github.com>
Date: Wed, 22 Jul 2026 10:57:35 +0800
Subject: [PATCH 17/19] cider: drop

---
 pkgs/by-name/ci/cider/package.nix | 42 -------------------------------
 pkgs/top-level/aliases.nix        |  1 +
 2 files changed, 1 insertion(+), 42 deletions(-)
 delete mode 100644 pkgs/by-name/ci/cider/package.nix

diff --git a/pkgs/by-name/ci/cider/package.nix b/pkgs/by-name/ci/cider/package.nix
deleted file mode 100644
index 227c507862e8..000000000000
--- a/pkgs/by-name/ci/cider/package.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  appimageTools,
-  lib,
-  fetchurl,
-  makeWrapper,
-}:
-
-appimageTools.wrapType2 rec {
-  pname = "cider";
-  version = "1.6.3";
-
-  src = fetchurl {
-    url = "https://github.com/ciderapp/Cider/releases/download/v${version}/Cider-${version}.AppImage";
-    sha256 = "sha256-NwoV1eeAN0u9VXWpu5mANXhmgqe8u3h7BlsREP1f/pI=";
-  };
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  extraInstallCommands =
-    let
-      contents = appimageTools.extract { inherit pname version src; };
-    in
-    ''
-      wrapProgram $out/bin/${pname} \
-        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
-
-      install -m 444 -D ${contents}/${pname}.desktop -t $out/share/applications
-      substituteInPlace $out/share/applications/${pname}.desktop \
-        --replace-warn 'Exec=AppRun' 'Exec=${pname}'
-      cp -r ${contents}/usr/share/icons $out/share
-    '';
-
-  meta = {
-    description = "New look into listening and enjoying Apple Music in style and performance";
-    homepage = "https://github.com/ciderapp/Cider";
-    license = lib.licenses.agpl3Only;
-    mainProgram = "cider";
-    maintainers = [ lib.maintainers.cigrainger ];
-    platforms = [ "x86_64-linux" ];
-    broken = true;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 422eb0b0b3ec..9b0fa0511870 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -498,6 +498,7 @@ mapAliases {
   chrome-gnome-shell = throw "'chrome-gnome-shell' has been renamed to/replaced by 'gnome-browser-connector'"; # Converted to throw 2025-10-27
   chromium-xorg-conf = throw "'chromium-xorg-conf' has been removed as it was only used by the 'cmt' NixOS module, which was removed"; # Added 2026-05-25
   ci-edit = throw "'ci-edit' has been removed due to lack of maintenance upstream"; # Added 2025-08-26
+  cider = throw "'cider' has been removed as it is unmaintained and archived upstream."; # Added 2026-07-22
   cinnamon-common = cinnamon; # Added 2025-08-06
   ciopfs = throw "'ciopfs' has been removed due to lack of fuse 3 support."; # Added 2026-06-05
   cisco-packet-tracer_8 = throw "'cisco-packet-tracer_8' has been removed as it vendored qt5 webengine. Consider updating to 'cisco-packet-tracer_9' instead."; # Added 2026-04-26

From 66487b4c7179bd21098f6598fb03afc2ce0873f8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Jul 2026 02:59:08 +0000
Subject: [PATCH 18/19] skim: 5.1.0 -> 5.4.0

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

diff --git a/pkgs/by-name/sk/skim/package.nix b/pkgs/by-name/sk/skim/package.nix
index 313cba00a493..1571c0782b56 100644
--- a/pkgs/by-name/sk/skim/package.nix
+++ b/pkgs/by-name/sk/skim/package.nix
@@ -11,7 +11,7 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "skim";
-  version = "5.1.0";
+  version = "5.4.0";
   __structuredAttrs = true;
 
   outputs = [
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "skim-rs";
     repo = "skim";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-AB/73sU02/DHV/bnQXpBqmzmGy+roXyIWd4BnN6GWGw=";
+    hash = "sha256-inNBe4Qzn6QjmIL8VMnJ/RuSUIrZ0tCbUV63vP/61Y4=";
   };
 
   postPatch = ''
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail "expand('<sfile>:h:h')" "'$out'"
   '';
 
-  cargoHash = "sha256-tPNAwaefZrwhH7AoQnAkQYQUfKOKWMehHHeoUf7i4yE=";
+  cargoHash = "sha256-7nV/PxTpPLeblmjnzsYpAFM6u50AQ+OAaUWf/2JHGzQ=";
 
   nativeBuildInputs = [ installShellFiles ];
   nativeCheckInputs = [

From 303d51235e5aeb71fb15fd15dae3f6585d22acfa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Jul 2026 03:07:46 +0000
Subject: [PATCH 19/19] snx-rs: 6.2.0 -> 6.2.1

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

diff --git a/pkgs/by-name/sn/snx-rs/package.nix b/pkgs/by-name/sn/snx-rs/package.nix
index 52db924d889d..37ea23d2b3f2 100644
--- a/pkgs/by-name/sn/snx-rs/package.nix
+++ b/pkgs/by-name/sn/snx-rs/package.nix
@@ -15,13 +15,13 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "snx-rs";
-  version = "6.2.0";
+  version = "6.2.1";
 
   src = fetchFromGitHub {
     owner = "ancwrd1";
     repo = "snx-rs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-GA6YlsX2AgyorWSTPwZI84ViOG1RH9/CDSGOKzbUhHo=";
+    hash = "sha256-LjRU48OjXwkbXPPNDWsPFPipT2qPlwBB7YksUURCetA=";
   };
 
   passthru.updateScript = nix-update-script { };
@@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     versionCheckHook
   ];
 
-  cargoHash = "sha256-o01QwkDtbRLOjeAJhajqbWOB/rm7+/dK7t0Nzc1h/gc=";
+  cargoHash = "sha256-6IuU/qbLxrN3ZfynlL/w1bbDVvg8/1EbTcCzMaz4tng=";
 
   doInstallCheck = true;
   versionCheckProgram = "${placeholder "out"}/bin/snx-rs";