From deeef424cfe9e966b3b046b8f0204d2bb34ea48d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Apr 2026 17:42:29 +0000
Subject: [PATCH 01/80] rutorrent: 5.2.10 -> 5.3.1

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

diff --git a/pkgs/by-name/ru/rutorrent/package.nix b/pkgs/by-name/ru/rutorrent/package.nix
index 56679265cd5e..11ae8465b548 100644
--- a/pkgs/by-name/ru/rutorrent/package.nix
+++ b/pkgs/by-name/ru/rutorrent/package.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rutorrent";
-  version = "5.2.10";
+  version = "5.3.1";
 
   src = fetchFromGitHub {
     owner = "Novik";
     repo = "ruTorrent";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-g1CjwK0GLAdRLWbQeyF8H+OFaL8WgibGrQti9kHz2iM=";
+    hash = "sha256-UWXykIrpmnbjJZih+SAxmqjdu1+F/5ohBXxWLr5fa1c=";
   };
 
   installPhase = ''

From c31ef2b5e1f62bbfb165f08c8975d198ea1ac701 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Thu, 23 Apr 2026 23:37:25 -0400
Subject: [PATCH 02/80] openshadinglanguage: adopt

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

diff --git a/pkgs/by-name/op/openshadinglanguage/package.nix b/pkgs/by-name/op/openshadinglanguage/package.nix
index 589df0d95b7d..533eb045fc6d 100644
--- a/pkgs/by-name/op/openshadinglanguage/package.nix
+++ b/pkgs/by-name/op/openshadinglanguage/package.nix
@@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Advanced shading language for production GI renderers";
     homepage = "http://openshadinglanguage.org";
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.amarshall ];
     license = lib.licenses.bsd3;
     platforms = lib.platforms.unix;
   };

From b482e627f548e5c3acfb4f2fac18c2f8045c9043 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Thu, 23 Apr 2026 23:37:40 -0400
Subject: [PATCH 03/80] openshadinglanguage: unpin llvm

Originally pinned in 96e3dd4aa1de9011e9fff57eddb38517a85e71e8 because
the newest LLVM was, at the time, not supported by OSL. Then it was
bumped in 7660fe5ce074bcfb40acc0719fc904f1f5e1fea6 presumably just to
bump, when in fact this pin has likely been unnecessary for some time.
So remove, as it causes dependency conflicts at runtime in downstream
consumers (e.g. Blender).
---
 pkgs/by-name/op/openshadinglanguage/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/op/openshadinglanguage/package.nix b/pkgs/by-name/op/openshadinglanguage/package.nix
index 533eb045fc6d..4be994bbb77e 100644
--- a/pkgs/by-name/op/openshadinglanguage/package.nix
+++ b/pkgs/by-name/op/openshadinglanguage/package.nix
@@ -6,7 +6,7 @@
   flex,
   lib,
   libxml2,
-  llvmPackages_19,
+  llvmPackages,
   openexr,
   openimageio,
   partio,
@@ -20,7 +20,7 @@
 
 let
   boost_static = boost.override { enableStatic = true; };
-  inherit (llvmPackages_19) clang libclang llvm;
+  inherit (llvmPackages) clang libclang llvm;
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "openshadinglanguage";

From 1a9a7113b6b7d59033c8ed8faa325fd63175948e Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Sat, 25 Apr 2026 21:36:33 -0400
Subject: [PATCH 04/80] openshadinglanguage: use cmakeBool & cmakeFeature
 helpers

---
 pkgs/by-name/op/openshadinglanguage/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/op/openshadinglanguage/package.nix b/pkgs/by-name/op/openshadinglanguage/package.nix
index 4be994bbb77e..32b85fc20c2a 100644
--- a/pkgs/by-name/op/openshadinglanguage/package.nix
+++ b/pkgs/by-name/op/openshadinglanguage/package.nix
@@ -34,15 +34,15 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   cmakeFlags = [
-    "-DBoost_ROOT=${boost}"
-    "-DUSE_BOOST_WAVE=ON"
-    "-DENABLE_RTTI=ON"
+    (lib.cmakeBool "ENABLE_RTTI" true)
+    (lib.cmakeBool "USE_BOOST_WAVE" true)
+    (lib.cmakeFeature "Boost_ROOT" "${boost}")
 
     # Build system implies llvm-config and llvm-as are in the same directory.
     # Override defaults.
-    "-DLLVM_DIRECTORY=${llvm}"
-    "-DLLVM_CONFIG=${llvm.dev}/bin/llvm-config"
-    "-DLLVM_BC_GENERATOR=${clang}/bin/clang++"
+    (lib.cmakeFeature "LLVM_BC_GENERATOR" "${clang}/bin/clang++")
+    (lib.cmakeFeature "LLVM_CONFIG" "${llvm.dev}/bin/llvm-config")
+    (lib.cmakeFeature "LLVM_DIRECTORY" "${llvm}")
   ];
 
   prePatch = ''

From e70f67cf0f6e89e928e7fc0250fdb52aafc65e77 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Sat, 25 Apr 2026 21:40:59 -0400
Subject: [PATCH 05/80] openshadinglanguage: prefer hexdump over full
 util-linux

This is the general recommendation in util-linux.
---
 pkgs/by-name/op/openshadinglanguage/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/op/openshadinglanguage/package.nix b/pkgs/by-name/op/openshadinglanguage/package.nix
index 32b85fc20c2a..4b579057bc52 100644
--- a/pkgs/by-name/op/openshadinglanguage/package.nix
+++ b/pkgs/by-name/op/openshadinglanguage/package.nix
@@ -4,6 +4,7 @@
   cmake,
   fetchFromGitHub,
   flex,
+  hexdump,
   lib,
   libxml2,
   llvmPackages,
@@ -14,7 +15,6 @@
   python3Packages,
   robin-map,
   stdenv,
-  util-linux,
   zlib,
 }:
 
@@ -63,6 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     boost_static
+    hexdump
     libclang
     llvm
     openexr
@@ -71,7 +72,6 @@ stdenv.mkDerivation (finalAttrs: {
     pugixml
     python3Packages.pybind11
     robin-map
-    util-linux # needed just for hexdump
     zlib
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [

From 52edbc5063d54387398d71985c00bfd195cb4948 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Sat, 25 Apr 2026 21:52:15 -0400
Subject: [PATCH 06/80] openshadinglanguage: remove unused cmake flags

- ENABLE_RTTI was removed ~6 years ago in upstream 9e64b14a354f5b657d0664b2ebedfb2bfe8b0f7a
- USE_BOOST_WAVE was removed ~6 years ago in upstream f4ec638e6b4d031fb1076036f6777af546805088
- Boost dependency was removed ~2 years ago in upstream 3ff5d5d91d707d33b50733e83626aa65fb40973f
---
 pkgs/by-name/op/openshadinglanguage/package.nix | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkgs/by-name/op/openshadinglanguage/package.nix b/pkgs/by-name/op/openshadinglanguage/package.nix
index 4b579057bc52..a8e4eac90d0c 100644
--- a/pkgs/by-name/op/openshadinglanguage/package.nix
+++ b/pkgs/by-name/op/openshadinglanguage/package.nix
@@ -1,6 +1,5 @@
 {
   bison,
-  boost,
   cmake,
   fetchFromGitHub,
   flex,
@@ -19,7 +18,6 @@
 }:
 
 let
-  boost_static = boost.override { enableStatic = true; };
   inherit (llvmPackages) clang libclang llvm;
 in
 stdenv.mkDerivation (finalAttrs: {
@@ -34,10 +32,6 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   cmakeFlags = [
-    (lib.cmakeBool "ENABLE_RTTI" true)
-    (lib.cmakeBool "USE_BOOST_WAVE" true)
-    (lib.cmakeFeature "Boost_ROOT" "${boost}")
-
     # Build system implies llvm-config and llvm-as are in the same directory.
     # Override defaults.
     (lib.cmakeFeature "LLVM_BC_GENERATOR" "${clang}/bin/clang++")
@@ -62,7 +56,6 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    boost_static
     hexdump
     libclang
     llvm

From 5cdc846972cb4d8a7f86b5b07cc3a583a7c690f2 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Sat, 25 Apr 2026 21:48:14 -0400
Subject: [PATCH 07/80] openshadinglanguage: explicitly disable Qt to avoid
 warnings

Otherwise build logs have some scary red output about it missing.
---
 pkgs/by-name/op/openshadinglanguage/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/op/openshadinglanguage/package.nix b/pkgs/by-name/op/openshadinglanguage/package.nix
index a8e4eac90d0c..3a8912a16314 100644
--- a/pkgs/by-name/op/openshadinglanguage/package.nix
+++ b/pkgs/by-name/op/openshadinglanguage/package.nix
@@ -32,6 +32,8 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   cmakeFlags = [
+    (lib.cmakeBool "USE_QT" false)
+
     # Build system implies llvm-config and llvm-as are in the same directory.
     # Override defaults.
     (lib.cmakeFeature "LLVM_BC_GENERATOR" "${clang}/bin/clang++")

From 2f1ec9fe15f3e5ae4adf631d685c6261ba001eac Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Sat, 25 Apr 2026 22:58:59 -0400
Subject: [PATCH 08/80] openshadinglanguage: prefer postPatch over prePatch

`prePatch` is rarely what is wanted, since it means most patches that
change the same hunk would not apply.
---
 pkgs/by-name/op/openshadinglanguage/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/op/openshadinglanguage/package.nix b/pkgs/by-name/op/openshadinglanguage/package.nix
index 3a8912a16314..800d0097ca64 100644
--- a/pkgs/by-name/op/openshadinglanguage/package.nix
+++ b/pkgs/by-name/op/openshadinglanguage/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeFeature "LLVM_DIRECTORY" "${llvm}")
   ];
 
-  prePatch = ''
+  postPatch = ''
     substituteInPlace src/cmake/modules/FindLLVM.cmake \
       --replace-fail "NO_DEFAULT_PATH" ""
   '';

From 5f1357f5a93b92aa7c0bbbcf1daf23e0b94a29a7 Mon Sep 17 00:00:00 2001
From: Alexander Bantyev <balsoft@balsoft.ru>
Date: Wed, 3 Dec 2025 22:19:23 +0100
Subject: [PATCH 09/80] busybox: add tests

Adds the upstream test suite as passthru.tests.withCheck.

We have to fix up some tests due to our constraints (no FHS, no
internet), and some tests are too hard to fix and are disabled for now.
---
 pkgs/os-specific/linux/busybox/default.nix | 87 ++++++++++++++++++++--
 1 file changed, 82 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix
index 4155f345bc7e..a2f76b86de39 100644
--- a/pkgs/os-specific/linux/busybox/default.nix
+++ b/pkgs/os-specific/linux/busybox/default.nix
@@ -13,6 +13,13 @@
   useMusl ? stdenv.hostPlatform.libc == "musl",
   musl,
   extraConfig ? "",
+
+  # For tests
+  hostname,
+  coreutils,
+  zip,
+  which,
+  simple-http-server,
 }:
 
 assert stdenv.hostPlatform.libc == "musl" -> useMusl;
@@ -50,11 +57,13 @@ let
   };
   debianDispatcherScript = "${debianSource}/debian/tree/udhcpc/etc/udhcpc/default.script";
   outDispatchPath = "$out/default.script";
-in
 
-stdenv.mkDerivation rec {
   pname = "busybox";
   version = "1.37.0";
+in
+
+stdenv.mkDerivation (finalAttrs: {
+  inherit pname version;
 
   # Note to whoever is updating busybox: please verify that:
   # nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test
@@ -183,9 +192,77 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  doCheck = false; # tries to access the net
+  doCheck = false; # Takes a while, requires extra dependencies
+  passthru = {
+    shellPath = "/bin/ash";
 
-  passthru.shellPath = "/bin/ash";
+    tests.withCheck = finalAttrs.finalPackage.overrideAttrs (_: {
+      doCheck = true;
+
+      nativeCheckInputs = [
+        hostname
+        zip
+        which
+        simple-http-server
+      ];
+
+      preCheck = ''
+        # Replace hard-coded dependencies on /bin
+        sed -i 's|/bin/date|${lib.getExe' coreutils "date"}|' testsuite/date/date-works-1
+
+        # wget tests rely on network access, use simple-http-server instead
+        simple-http-server --index &
+        sed -i 's|http://www.google.com|http://127.0.0.1:8000|' testsuite/wget/*
+
+        skip-files() {
+          for file in "$@"; do
+            echo "echo SKIPPED $file; exit 0" > $file
+          done
+        }
+
+        skip-testcase() {
+          sed -i "s@testing \"$2\"@echo SKIPPED $2 || testing \"$2\"@" "$1"
+        }
+
+        # Skip known-broken tests
+        export SKIP_KNOWN_BUGS=y
+
+        # There are some semi-expected locale-related issues, disable tests that rely on it
+        export CONFIG_UNICODE_USING_LOCALE=y
+
+        # DISABLE SOME TESTS
+        # TODO(balsoft): fix the tests instead of skipping
+
+        pushd testsuite
+
+        # Weird failures, may or may not be related to locales
+        skip-files du/du-{h,k,l}-works
+
+        # Relies on a default PATH (/bin/ls in particular)
+        skip-files which/which-uses-default-path
+
+        # Hangs indefinitely if run from sandbox
+        skip-files md5sum.tests
+
+        # Doesn't work with coreutils's "false"
+        skip-testcase start-stop-daemon.tests "start-stop-daemon with both -x and -a"
+
+        # Relies on /usr/bin
+        skip-testcase cpio.tests "cpio -p with absolute paths"
+
+        # Relies on suid/guid bits
+        skip-testcase cpio.tests "cpio restores suid/sgid bits"
+
+        # Weird failures, looks related to our sandbox
+        skip-testcase tar.tests "tar does not extract into symlinks"
+        skip-testcase tar.tests "tar -k does not extract into symlinks"
+        skip-testcase tar.tests "tar Symlink attack: create symlink and then write through it"
+        skip-testcase tar.tests "tar Symlinks and hardlinks coexist"
+
+        popd
+      '';
+    });
+  };
 
   meta = {
     description = "Tiny versions of common UNIX utilities in a single small executable";
@@ -201,4 +278,4 @@ stdenv.mkDerivation rec {
     priority = 15; # below systemd (halt, init, poweroff, reboot) and coreutils
     identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "busybox" version;
   };
-}
+})

From 4b85bbcd387256718c92de5bdceaad9e307cf939 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 May 2026 12:30:11 +0000
Subject: [PATCH 10/80] xmp: 4.2.0 -> 4.3.0

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

diff --git a/pkgs/by-name/xm/xmp/package.nix b/pkgs/by-name/xm/xmp/package.nix
index 7a181ad6a670..967bf1989869 100644
--- a/pkgs/by-name/xm/xmp/package.nix
+++ b/pkgs/by-name/xm/xmp/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "xmp";
-  version = "4.2.0";
+  version = "4.3.0";
 
   src = fetchFromGitHub {
     owner = "libxmp";
     repo = "xmp-cli";
     rev = "${pname}-${version}";
-    hash = "sha256-037k1rFjGR6XFtr08bzs4zVz+GyUGuuutuWFlNEuATA=";
+    hash = "sha256-bHepVTkh7Gu8ea/WW5bY7zTiqYWpENlsPqsMV+4WVT4=";
   };
 
   nativeBuildInputs = [

From c0c842272d99eb11b614f444cd5bbdeb83dbf46e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 May 2026 19:23:35 +0000
Subject: [PATCH 11/80] commitlint: 20.5.3 -> 21.0.0

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

diff --git a/pkgs/by-name/co/commitlint/package.nix b/pkgs/by-name/co/commitlint/package.nix
index fcd755eac4b5..2b5481a76839 100644
--- a/pkgs/by-name/co/commitlint/package.nix
+++ b/pkgs/by-name/co/commitlint/package.nix
@@ -12,18 +12,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "commitlint";
-  version = "20.5.3";
+  version = "21.0.0";
 
   src = fetchFromGitHub {
     owner = "conventional-changelog";
     repo = "commitlint";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-mdylzB/60wuSmlBpNu96n+mxbkq18AmtUcy4kvMkzEs=";
+    hash = "sha256-i1Nom/piZHBPV7d8DwBsu/42CCopAu2OAOzlJTwNFP8=";
   };
 
   yarnOfflineCache = fetchYarnDeps {
     inherit (finalAttrs) src;
-    hash = "sha256-XHtWaXVCdDuulrQY24/6XvDoqGOFQFSc6COmpIxbPvs=";
+    hash = "sha256-e51t2ODoBU19ADUZ4IJBsRs92XipmWCywJWMJ4EzRf8=";
   };
 
   nativeBuildInputs = [

From e6f3d5813e58fc1a9124151276d1170e4840c8a0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 13 May 2026 15:34:50 +0000
Subject: [PATCH 12/80] jetbrains.datagrip: 2026.1.2 -> 2026.1.3

---
 .../editors/jetbrains/ides/datagrip.nix       | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/ides/datagrip.nix b/pkgs/applications/editors/jetbrains/ides/datagrip.nix
index 6fcbecb4f837..dfe4ed7f7d3f 100644
--- a/pkgs/applications/editors/jetbrains/ides/datagrip.nix
+++ b/pkgs/applications/editors/jetbrains/ides/datagrip.nix
@@ -12,20 +12,20 @@ let
   # update-script-start: urls
   urls = {
     x86_64-linux = {
-      url = "https://download.jetbrains.com/datagrip/datagrip-2026.1.2.tar.gz";
-      hash = "sha256-DaAqg6Xce1RkvEM6++7CxC72AvB1SHKFBWOzJD9RIuY=";
+      url = "https://download.jetbrains.com/datagrip/datagrip-2026.1.3.tar.gz";
+      hash = "sha256-XxwvXiaWAfK318BjbzKPLVDeMBlOr5BFuD2bqU8+12o=";
     };
     aarch64-linux = {
-      url = "https://download.jetbrains.com/datagrip/datagrip-2026.1.2-aarch64.tar.gz";
-      hash = "sha256-QY7ZX4OiON7km4wjBEDCIcD8HxALAW9PRAHJNZ0t+YM=";
+      url = "https://download.jetbrains.com/datagrip/datagrip-2026.1.3-aarch64.tar.gz";
+      hash = "sha256-G+tinD/+qM5HVR4u2E0cNXtdVsbwgK8/PdZ3ic6hf4M=";
     };
     x86_64-darwin = {
-      url = "https://download.jetbrains.com/datagrip/datagrip-2026.1.2.dmg";
-      hash = "sha256-CdhVxjc7wbvTSA/RU39bnek6kU3/G8z9Tj2uEadsZKA=";
+      url = "https://download.jetbrains.com/datagrip/datagrip-2026.1.3.dmg";
+      hash = "sha256-vW2LEonl0D9S0VxbeJX4jRrwhELGBwlOXwiHslvh06E=";
     };
     aarch64-darwin = {
-      url = "https://download.jetbrains.com/datagrip/datagrip-2026.1.2-aarch64.dmg";
-      hash = "sha256-rMiVEmkbJIIeBfOXpPVXFBFLmkW6TLnzsPCheQWszhc=";
+      url = "https://download.jetbrains.com/datagrip/datagrip-2026.1.3-aarch64.dmg";
+      hash = "sha256-Kyt3fYPXzwTVxPFVKd+atiHWb/i7gjGahz1MJ4iXxy8=";
     };
   };
   # update-script-end: urls
@@ -39,8 +39,8 @@ mkJetBrainsProduct {
   product = "DataGrip";
 
   # update-script-start: version
-  version = "2026.1.2";
-  buildNumber = "261.23567.23";
+  version = "2026.1.3";
+  buildNumber = "261.24374.56";
   # update-script-end: version
 
   src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));

From fdb3fb44db4818bbe4be924b4dc06fd06146b12e Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Fri, 15 May 2026 11:44:53 +0200
Subject: [PATCH 13/80] croaring: 3.6.1 -> 4.7.0

changelog: https://github.com/RoaringBitmap/CRoaring/releases/tag/v4.7.0

diff: https://github.com/RoaringBitmap/CRoaring/compare/v4.6.1...v4.7.0
---
 pkgs/by-name/cr/croaring/package.nix | 25 ++-----------------------
 1 file changed, 2 insertions(+), 23 deletions(-)

diff --git a/pkgs/by-name/cr/croaring/package.nix b/pkgs/by-name/cr/croaring/package.nix
index ccc77ce42f7a..4b2be5003143 100644
--- a/pkgs/by-name/cr/croaring/package.nix
+++ b/pkgs/by-name/cr/croaring/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "croaring";
-  version = "4.6.1";
+  version = "4.7.0";
 
   src = fetchFromGitHub {
     owner = "RoaringBitmap";
     repo = "CRoaring";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wks7kkF0va7RUJXY74ku/yWTSsHQKlFczfhAHyuNudM=";
+    hash = "sha256-YXEEiWbbP6G7x/rQiihAq20OEMxJNSgky+JTEaKlNDU=";
   };
 
   # roaring.pc.in cannot handle absolute CMAKE_INSTALL_*DIRs, nor
@@ -28,27 +28,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   doCheck = true;
 
-  postPatch = ''
-    # Fixes the build of dependent projects by updating the supported
-    # CMake version.
-    # Issue: https://github.com/RoaringBitmap/CRoaring/issues/793
-    # PR: https://github.com/RoaringBitmap/CRoaring/pull/794
-    substituteInPlace CMakeLists.txt \
-      --replace-fail '2.8...3.15' '3.15'
-  '';
-
-  preConfigure = ''
-    mkdir -p dependencies/.cache
-    ln -s ${
-      fetchFromGitHub {
-        owner = "clibs";
-        repo = "cmocka";
-        rev = "f5e2cd77c88d9f792562888d2b70c5a396bfbf7a";
-        hash = "sha256-Oq0nFsZhl8IF7kQN/LgUq8VBy+P7gO98ep/siy5A7Js=";
-      }
-    } dependencies/.cache/cmocka
-  '';
-
   cmakeFlags = [ (lib.cmakeBool "ROARING_USE_CPM" false) ];
 
   meta = {

From 3d7036473f2158fb003365cc8a2909da78d4ff32 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 May 2026 14:33:31 +0000
Subject: [PATCH 14/80] pure-prompt: 1.27.0 -> 1.28.0

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

diff --git a/pkgs/by-name/pu/pure-prompt/package.nix b/pkgs/by-name/pu/pure-prompt/package.nix
index ddd0d97d43f8..9f39772e2cc2 100644
--- a/pkgs/by-name/pu/pure-prompt/package.nix
+++ b/pkgs/by-name/pu/pure-prompt/package.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pure-prompt";
-  version = "1.27.0";
+  version = "1.28.0";
 
   src = fetchFromGitHub {
     owner = "sindresorhus";
     repo = "pure";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-+X3JehQOKaWKz2jTfWiEUIFc2/+z81sox1dWU+jXiz8=";
+    sha256 = "sha256-4And0+06KbIsFDTNupi42yR8fa1BjHoZVi9btdYPkTg=";
   };
 
   strictDeps = true;

From ecd3f46f7214ed3f7b27081e61db63a163ba0d13 Mon Sep 17 00:00:00 2001
From: reo101 <pavel.atanasov2001@gmail.com>
Date: Wed, 6 May 2026 23:47:32 +0300
Subject: [PATCH 15/80] raylib: 5.5-unstable-2026-01-20 -> 6.0

---
 pkgs/by-name/ra/raylib/package.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ra/raylib/package.nix b/pkgs/by-name/ra/raylib/package.nix
index 5fee6c4498df..7bb97094f440 100644
--- a/pkgs/by-name/ra/raylib/package.nix
+++ b/pkgs/by-name/ra/raylib/package.nix
@@ -11,11 +11,13 @@
   raylib-games,
   libGLU,
   libx11,
+  libxrandr,
   platform ? "Desktop", # Note that "Web", "Android" and "Raspberry Pi" do not currently work
   pulseSupport ? stdenv.hostPlatform.isLinux,
   alsaSupport ? false,
   sharedLib ? true,
   includeEverything ? true,
+  customFrameControlSupport ? false,
 }:
 let
   inherit (lib) optional;
@@ -36,13 +38,13 @@ lib.checkListOfEnum "raylib: platform"
       __structuredAttrs = true;
 
       pname = "raylib";
-      version = "5.5-unstable-2026-01-20";
+      version = "6.0";
 
       src = fetchFromGitHub {
         owner = "raysan5";
         repo = "raylib";
-        rev = "c610d228a244f930ad53492604640f39584c66da";
-        hash = "sha256-7Lhgqb7QJwz94M1ZxWgueTwIgSVclGCvHklZXGzoJgQ=";
+        rev = finalAttrs.version;
+        hash = "sha256-8+6MDTMc7Spix4ndAUzp51Q5iWcl7pQmyXuV2RutnOk=";
       };
 
       # autoPatchelfHook is needed for appendRunpaths
@@ -56,11 +58,17 @@ lib.checkListOfEnum "raylib: platform"
       propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [
         libGLU
         libx11
+        libxrandr
       ];
 
       # https://github.com/raysan5/raylib/wiki/CMake-Build-Options
       cmakeFlags = [
         "-DCUSTOMIZE_BUILD=ON"
+        # The above also enables `SUPPORT_CUSTOM_FRAME_CONTROL` (otherwise off)
+        # That skips `SwapScreenBuffer` and `PollInputEvents` from `EndDrawing`
+        # In turn, normal `raylib-games` demos start but never present a window
+        # Keep the default game loop behavior unless explicitly requested
+        (lib.cmakeBool "SUPPORT_CUSTOM_FRAME_CONTROL" customFrameControlSupport)
         "-DPLATFORM=${platform}"
       ]
       ++ optional (platform == "Desktop") "-DUSE_EXTERNAL_GLFW=ON"

From 39c6385b1db711ed9fc3a7cd5ca412235ec60dca Mon Sep 17 00:00:00 2001
From: reo101 <pavel.atanasov2001@gmail.com>
Date: Tue, 26 May 2026 12:39:47 +0300
Subject: [PATCH 16/80] raylib: refactor

- Make use of `lib.cmake{Bool,Feature}` for creating the CMake flags
---
 pkgs/by-name/ra/raylib/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ra/raylib/package.nix b/pkgs/by-name/ra/raylib/package.nix
index 7bb97094f440..69de9e052379 100644
--- a/pkgs/by-name/ra/raylib/package.nix
+++ b/pkgs/by-name/ra/raylib/package.nix
@@ -63,17 +63,17 @@ lib.checkListOfEnum "raylib: platform"
 
       # https://github.com/raysan5/raylib/wiki/CMake-Build-Options
       cmakeFlags = [
-        "-DCUSTOMIZE_BUILD=ON"
+        (lib.cmakeBool "CUSTOMIZE_BUILD" true)
         # The above also enables `SUPPORT_CUSTOM_FRAME_CONTROL` (otherwise off)
         # That skips `SwapScreenBuffer` and `PollInputEvents` from `EndDrawing`
         # In turn, normal `raylib-games` demos start but never present a window
         # Keep the default game loop behavior unless explicitly requested
         (lib.cmakeBool "SUPPORT_CUSTOM_FRAME_CONTROL" customFrameControlSupport)
-        "-DPLATFORM=${platform}"
+        (lib.cmakeFeature "PLATFORM" platform)
       ]
-      ++ optional (platform == "Desktop") "-DUSE_EXTERNAL_GLFW=ON"
-      ++ optional includeEverything "-DINCLUDE_EVERYTHING=ON"
-      ++ optional sharedLib "-DBUILD_SHARED_LIBS=ON";
+      ++ optional (platform == "Desktop") (lib.cmakeFeature "USE_EXTERNAL_GLFW" "ON")
+      ++ optional includeEverything (lib.cmakeBool "INCLUDE_EVERYTHING" true)
+      ++ optional sharedLib (lib.cmakeBool "BUILD_SHARED_LIBS" true);
 
       appendRunpaths = optional stdenv.hostPlatform.isLinux (
         lib.makeLibraryPath (optional alsaSupport alsa-lib ++ optional pulseSupport libpulseaudio)

From 8267aca00f0b1597a024e6b239093a70ecd6b45a Mon Sep 17 00:00:00 2001
From: reo101 <pavel.atanasov2001@gmail.com>
Date: Thu, 7 May 2026 14:01:36 +0300
Subject: [PATCH 17/80] raylib-games: 2022-10-24 -> 2026-05-07

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

diff --git a/pkgs/by-name/ra/raylib-games/package.nix b/pkgs/by-name/ra/raylib-games/package.nix
index 8f4c6a144360..ae24ae776976 100644
--- a/pkgs/by-name/ra/raylib-games/package.nix
+++ b/pkgs/by-name/ra/raylib-games/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation {
   pname = "raylib-games";
-  version = "2022-10-24";
+  version = "2026-05-07";
 
   src = fetchFromGitHub {
     owner = "raysan5";
     repo = "raylib-games";
-    rev = "e00d77cf96ba63472e8316ae95a23c624045dcbe";
-    hash = "sha256-N9ip8yFUqXmNMKcvQuOyxDI4yF/w1YaoIh0prvS4Xr4=";
+    rev = "2175f1fe857aa91a749b66482359545f28cc596f";
+    hash = "sha256-gmCbBcS5tlq6jySvDPUqZz4ONyDkSeUdgAd20c5sUls=";
   };
 
   buildInputs = [ raylib ];

From 41c785231dfdb3b0ac58760b8a53837a17bd475c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 May 2026 17:30:46 +0000
Subject: [PATCH 18/80] haruna: 1.7.1 -> 1.8.1

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

diff --git a/pkgs/by-name/ha/haruna/package.nix b/pkgs/by-name/ha/haruna/package.nix
index 917e5b56af0d..af51f38369c3 100644
--- a/pkgs/by-name/ha/haruna/package.nix
+++ b/pkgs/by-name/ha/haruna/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "haruna";
-  version = "1.7.1";
+  version = "1.8.1";
 
   src = fetchFromGitLab {
     owner = "multimedia";
     repo = "haruna";
     rev = "v${finalAttrs.finalPackage.version}";
-    hash = "sha256-yoYF9R4Z8W7Alw3EL3sfJYndjxCZxTu6fQrCXQzypx8=";
+    hash = "sha256-JIpaP9Tfw1+RhTqHmNoP7tsSHfELxw7bJBk8oLq6iYQ=";
     domain = "invent.kde.org";
   };
 

From 86f6ef85d89d40154dbc37a9b833afd04b7beb5c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 May 2026 08:24:55 +0000
Subject: [PATCH 19/80] livekit-cli: 2.16.2 -> 2.16.4

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

diff --git a/pkgs/by-name/li/livekit-cli/package.nix b/pkgs/by-name/li/livekit-cli/package.nix
index 0af6f643d0d4..5534cb60fce5 100644
--- a/pkgs/by-name/li/livekit-cli/package.nix
+++ b/pkgs/by-name/li/livekit-cli/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "livekit-cli";
-  version = "2.16.2";
+  version = "2.16.4";
 
   src = fetchFromGitHub {
     owner = "livekit";
     repo = "livekit-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-3nyYX/BX6FxiAOcyAx/BEmzKvT+SQYXVERplEXvnscg=";
+    hash = "sha256-D3moluv7tWi9BIvhHq4NDgDmCBNtWPEJPIbvpaAHtao=";
   };
 
-  vendorHash = "sha256-0MOZp6ZZ+UbGGykJ5TZL0KM1rP/ZlLS297/uU9HNaO8=";
+  vendorHash = "sha256-/vhISkzvfsPswsM0g4/RuyTZxqEEtfbtyAQV8YDRmu8=";
 
   subPackages = [ "cmd/lk" ];
 

From b9c2225ad4b2859f7dfa7e5af83ca000062d73fd Mon Sep 17 00:00:00 2001
From: Nico Felbinger <nico@felbinger.eu>
Date: Tue, 10 Mar 2026 17:56:30 +0100
Subject: [PATCH 20/80] gr-dect2: init at 0-unstable-2025-03-16

---
 pkgs/by-name/gr/gr-dect2/package.nix | 51 ++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 pkgs/by-name/gr/gr-dect2/package.nix

diff --git a/pkgs/by-name/gr/gr-dect2/package.nix b/pkgs/by-name/gr/gr-dect2/package.nix
new file mode 100644
index 000000000000..0a450ec3a103
--- /dev/null
+++ b/pkgs/by-name/gr/gr-dect2/package.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  gnuradio,
+  spdlog,
+  mpir,
+  boost,
+  volk,
+  python3Packages,
+  gmpxx,
+}:
+
+stdenv.mkDerivation {
+  pname = "gr-dect2";
+  version = "0-unstable-2025-03-16";
+
+  src = fetchFromGitHub {
+    owner = "pavelyazev";
+    repo = "gr-dect2";
+    rev = "0d973fe433eebfe3eee6e7f2eeb1322f8976ab42";
+    hash = "sha256-zb22toxkVeAeMm3PHRS8crZ1PejjkAhvCFgz30kiPzo=";
+  };
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  buildInputs = [
+    gnuradio
+    spdlog
+    mpir
+    boost
+    volk
+    python3Packages.pybind11
+    gmpxx
+    python3Packages.numpy
+  ];
+
+  meta = {
+    description = "Gnuradio module for real-time decoding of unencrypted DECT voice chnanels";
+    homepage = "https://github.com/pavelyazev/gr-dect2";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ felbinger ];
+    platforms = lib.platforms.linux;
+  };
+}

From 09046bfef2490927eb2baa2a396f3f0124c5ee26 Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Sat, 30 May 2026 13:27:59 +0000
Subject: [PATCH 21/80] texlive.withPackages: fix typo

---
 pkgs/tools/typesetting/tex/texlive/build-tex-env.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix b/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix
index 01ae7e52c427..dc98b0a64297 100644
--- a/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix
+++ b/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix
@@ -509,7 +509,7 @@ lib.fix (
 
         postactionScripts = builtins.catAttrs "postactionScript" pkgList.tlpkg;
 
-        # whethe to include doc, source containers
+        # whether to include doc, source containers
         withDocs = false;
         withSources = false;
 

From 895c726b94685f4dde71e1fe7403d0ea516ee45c Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Sat, 30 May 2026 14:07:50 +0000
Subject: [PATCH 22/80] texlive.withPackages: treat texsource containers as
 regular outputs

Since Hydra no longer builds the texlivePackages subtree, texsource containers
can now be treated as regular outputs in buildTeXLivePackage.
This also enables the withSources argument of buildTeXEnv to work as intended.
---
 .../typesetting/tex/texlive/build-texlive-package.nix      | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix b/pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix
index 841fc76479d8..80f2051d0ba7 100644
--- a/pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix
+++ b/pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix
@@ -106,11 +106,8 @@ let
     lib.optional hasBinfiles "out"
     ++ lib.optional hasRunfiles "tex"
     ++ lib.optional hasDocfiles "texdoc"
-    ++
-      # omit building sources, since as far as we know, installing them is not common
-      # the sources will still be available under drv.texsource
-      # lib.optional hasSource "texsource" ++
-      lib.optional hasTlpkg "tlpkg"
+    ++ lib.optional hasSource "texsource"
+    ++ lib.optional hasTlpkg "tlpkg"
     ++ lib.optional hasManpages "man"
     ++ lib.optional hasInfo "info";
   outputDrvs = lib.getAttrs outputs containers;

From 53a5ed78877f78e2a655324810ffc1b235e26102 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 30 May 2026 18:03:05 +0000
Subject: [PATCH 23/80] jetbrains.dataspell: 2026.1 -> 2026.1.2

---
 .../editors/jetbrains/ides/dataspell.nix      | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/ides/dataspell.nix b/pkgs/applications/editors/jetbrains/ides/dataspell.nix
index 858715bde3e2..18dd09b48cf9 100644
--- a/pkgs/applications/editors/jetbrains/ides/dataspell.nix
+++ b/pkgs/applications/editors/jetbrains/ides/dataspell.nix
@@ -14,20 +14,20 @@ let
   # update-script-start: urls
   urls = {
     x86_64-linux = {
-      url = "https://download.jetbrains.com/python/dataspell-2026.1.tar.gz";
-      hash = "sha256-FcbflBzHsSWvkXVtrlltvb3PjihP91s0gm3wmV3zuRA=";
+      url = "https://download.jetbrains.com/python/dataspell-2026.1.2.tar.gz";
+      hash = "sha256-D5eONrO+5EL1cuskUU4cRYLgcbG7RCvlucnmw9t2COM=";
     };
     aarch64-linux = {
-      url = "https://download.jetbrains.com/python/dataspell-2026.1-aarch64.tar.gz";
-      hash = "sha256-JKAW0YtwNDjk3Un4e/cWipreAI8pJaJgLNvx7oOw4RQ=";
+      url = "https://download.jetbrains.com/python/dataspell-2026.1.2-aarch64.tar.gz";
+      hash = "sha256-SSmIPF0pDMolxeXL21UaHMbZdtYbChWVxTKZOsPhH+I=";
     };
     x86_64-darwin = {
-      url = "https://download.jetbrains.com/python/dataspell-2026.1.dmg";
-      hash = "sha256-w/nFLddHi/l7VqQKngxhYm/LL49eiawXhK+xGBU6Ej0=";
+      url = "https://download.jetbrains.com/python/dataspell-2026.1.2.dmg";
+      hash = "sha256-2qzwzGMYuy1qEuTprxwNa5gOPgCZq2MadSKN8FT8w8c=";
     };
     aarch64-darwin = {
-      url = "https://download.jetbrains.com/python/dataspell-2026.1-aarch64.dmg";
-      hash = "sha256-/yZpE2aY07AedubVG6yarO4uObdaIZ4KCtKl9DaRU4c=";
+      url = "https://download.jetbrains.com/python/dataspell-2026.1.2-aarch64.dmg";
+      hash = "sha256-MGWufS0nlswdqhACNQWtlXJwfPiYw8wUx7olIxPS15k=";
     };
   };
   # update-script-end: urls
@@ -41,8 +41,8 @@ mkJetBrainsProduct {
   product = "DataSpell";
 
   # update-script-start: version
-  version = "2026.1";
-  buildNumber = "261.22158.332";
+  version = "2026.1.2";
+  buildNumber = "261.25134.18";
   # update-script-end: version
 
   src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));

From db0f227cfccef0f060c3694372699c2d6604d469 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 30 May 2026 18:04:46 +0000
Subject: [PATCH 24/80] jetbrains.pycharm: 2026.1.1 -> 2026.1.2

---
 .../editors/jetbrains/ides/pycharm.nix        | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/ides/pycharm.nix b/pkgs/applications/editors/jetbrains/ides/pycharm.nix
index 6e5f5396f582..e972abdd1633 100644
--- a/pkgs/applications/editors/jetbrains/ides/pycharm.nix
+++ b/pkgs/applications/editors/jetbrains/ides/pycharm.nix
@@ -13,20 +13,20 @@ let
   # update-script-start: urls
   urls = {
     x86_64-linux = {
-      url = "https://download.jetbrains.com/python/pycharm-2026.1.1.tar.gz";
-      hash = "sha256-b4HFh0Q4ll8lZgAa0mXnJ8AuTbfQtXKH2G80ef1keJE=";
+      url = "https://download.jetbrains.com/python/pycharm-2026.1.2.tar.gz";
+      hash = "sha256-kcd1vhb7CFn5sY69RW2I4THK3zN7DOn52O0YeIZWGWY=";
     };
     aarch64-linux = {
-      url = "https://download.jetbrains.com/python/pycharm-2026.1.1-aarch64.tar.gz";
-      hash = "sha256-13cDbgcmKL6sb1MAFJ/e8m6DNR29hMOZR2uo2iCaDqo=";
+      url = "https://download.jetbrains.com/python/pycharm-2026.1.2-aarch64.tar.gz";
+      hash = "sha256-5rTyUmevreBL5nZPa7FuodFhWcrjSQ+7T1jMFo7P/uM=";
     };
     x86_64-darwin = {
-      url = "https://download.jetbrains.com/python/pycharm-2026.1.1.dmg";
-      hash = "sha256-noy9KK6nVN/dldf4wUV+er/44aB/5xjHawAAvt5WkZw=";
+      url = "https://download.jetbrains.com/python/pycharm-2026.1.2.dmg";
+      hash = "sha256-Fej8KylKSFKVxCMrBAcUIDwb0v5B5r1RysMAvcBVgh8=";
     };
     aarch64-darwin = {
-      url = "https://download.jetbrains.com/python/pycharm-2026.1.1-aarch64.dmg";
-      hash = "sha256-3cYWkYcwHM+BiRpogcc8v9JaRoNZZKz/UpnhWBB1MD4=";
+      url = "https://download.jetbrains.com/python/pycharm-2026.1.2-aarch64.dmg";
+      hash = "sha256-oau/wa9spYnn7XE07NGsINyqof3Mu9t9WQLuPAQ4TDc=";
     };
   };
   # update-script-end: urls
@@ -40,8 +40,8 @@ in
   product = "PyCharm";
 
   # update-script-start: version
-  version = "2026.1.1";
-  buildNumber = "261.23567.174";
+  version = "2026.1.2";
+  buildNumber = "261.24374.152";
   # update-script-end: version
 
   src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));

From d0a6e1a3fc69804bfa8a30bee703653a2a1537e2 Mon Sep 17 00:00:00 2001
From: Jonas Eana <jonas@eana.ro>
Date: Wed, 20 May 2026 10:37:14 +0200
Subject: [PATCH 25/80] opentofu-mcp-server: init at 1.0.0

---
 .../op/opentofu-mcp-server/package.nix        | 67 +++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 pkgs/by-name/op/opentofu-mcp-server/package.nix

diff --git a/pkgs/by-name/op/opentofu-mcp-server/package.nix b/pkgs/by-name/op/opentofu-mcp-server/package.nix
new file mode 100644
index 000000000000..0c7412035ff9
--- /dev/null
+++ b/pkgs/by-name/op/opentofu-mcp-server/package.nix
@@ -0,0 +1,67 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchPnpmDeps,
+  nodejs,
+  nix-update-script,
+  pnpm_8,
+  pnpmConfigHook,
+  makeWrapper,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "opentofu-mcp-server";
+  version = "1.0.0";
+
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  src = fetchFromGitHub {
+    owner = "opentofu";
+    repo = "opentofu-mcp-server";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-qgjAnoduzAjvxgbgG8QW53CMF3/bW0NQhDbVv3ebntw=";
+  };
+
+  pnpmDeps = fetchPnpmDeps {
+    inherit (finalAttrs) pname version src;
+    fetcherVersion = 3;
+    pnpm = pnpm_8;
+    hash = "sha256-8U+yGjUtgpASLU5LewUMRFT0uxz45trw27+HH/h+sdA=";
+  };
+
+  nativeBuildInputs = [
+    nodejs
+    pnpm_8
+    pnpmConfigHook
+    makeWrapper
+  ];
+
+  buildPhase = ''
+    runHook preBuild
+    pnpm build
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/lib/opentofu-mcp-server
+    cp -r dist node_modules $out/lib/opentofu-mcp-server/
+    mkdir -p $out/bin
+    makeWrapper ${nodejs}/bin/node $out/bin/opentofu-mcp-server \
+      --add-flags "$out/lib/opentofu-mcp-server/dist/local.js"
+    runHook postInstall
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "OpenTofu MCP server for accessing the OpenTofu Registry";
+    homepage = "https://github.com/opentofu/opentofu-mcp-server";
+    changelog = "https://github.com/opentofu/opentofu-mcp-server/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ eana ];
+    mainProgram = "opentofu-mcp-server";
+  };
+})

From 553803c6fb2e9d3a07833123183c38d1e45dfa3c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 2 Jun 2026 17:11:47 +0000
Subject: [PATCH 26/80] python3Packages.libvirt: 12.2.0 -> 12.4.0

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

diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix
index 5e1ac5d88164..80db6a1845e2 100644
--- a/pkgs/development/python-modules/libvirt/default.nix
+++ b/pkgs/development/python-modules/libvirt/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "libvirt";
-  version = "12.2.0";
+  version = "12.4.0";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "libvirt";
     repo = "libvirt-python";
     tag = "v${version}";
-    hash = "sha256-ACnRYDUb+1J7ZDFnuvktkwLGxwi91l2ursKG/NPt62o=";
+    hash = "sha256-8+o3ji7b0PCGxnHbsUJTUn1oudeN3rV+ehUILmufD1M=";
   };
 
   postPatch = ''

From d25c76920d02cf3c966b41316399d05d6c378c95 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 3 Jun 2026 14:22:36 +0000
Subject: [PATCH 27/80] libqb: 2.0.9 -> 2.0.10

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

diff --git a/pkgs/by-name/li/libqb/package.nix b/pkgs/by-name/li/libqb/package.nix
index 51b18f0ef9c9..55ae38254ba1 100644
--- a/pkgs/by-name/li/libqb/package.nix
+++ b/pkgs/by-name/li/libqb/package.nix
@@ -10,7 +10,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libqb";
-  version = "2.0.9";
+  version = "2.0.10";
 
   src = fetchFromGitHub {
     owner = "ClusterLabs";
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
         --replace-fail "AC_INIT([libqb]," "AC_INIT([libqb], ${finalAttrs.version},"
       sed -i '/m4_esyscmd(\[build-aux\/git-version-gen/ , /\]),/ d' $out/configure.ac
     '';
-    hash = "sha256-LhB7Q78heCmcgtcHqL+uEv0O2s4mXyfdTzmoCVqC0x0=";
+    hash = "sha256-raKu1JgaHvi2MHzSkS41UxwOV85RP4sgqBS9WtmX6iI=";
   };
 
   nativeBuildInputs = [

From 404357cbaa5e74ae8c0f0274f235e2eed6d6ca27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 3 Jun 2026 12:15:08 -0700
Subject: [PATCH 28/80] liblo: 0.32 -> 0.35

Changelog: https://liblo.sourceforge.net/NEWS.html
---
 pkgs/by-name/li/liblo/package.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/liblo/package.nix b/pkgs/by-name/li/liblo/package.nix
index a959fe220bda..341c1036f914 100644
--- a/pkgs/by-name/li/liblo/package.nix
+++ b/pkgs/by-name/li/liblo/package.nix
@@ -2,20 +2,26 @@
   lib,
   stdenv,
   fetchurl,
+  doxygen,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "liblo";
-  version = "0.32";
+  version = "0.35";
 
   src = fetchurl {
     url = "mirror://sourceforge/liblo/liblo/${finalAttrs.version}/liblo-${finalAttrs.version}.tar.gz";
-    sha256 = "sha256-XfBfKgOV/FrJD2tTi4yCuyGUFAb9GnCnZcczakfXAgg=";
+    hash = "sha256-msxPflok8zRy6azX5Am3vWgQpG8KHzz+7Ooi1g86rhM=";
   };
 
+  nativeBuildInputs = [
+    doxygen
+  ];
+
   doCheck = false; # fails 1 out of 3 tests
 
   meta = {
+    changelog = "https://liblo.sourceforge.net/NEWS.html";
     description = "Lightweight library to handle the sending and receiving of messages according to the Open Sound Control (OSC) protocol";
     homepage = "https://sourceforge.net/projects/liblo";
     license = lib.licenses.gpl2;

From 9cb511ed55def8443f9bc4d5b917fcc6e8b819d3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 4 Jun 2026 00:54:45 +0000
Subject: [PATCH 29/80] saga: 9.12.4 -> 9.12.5

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

diff --git a/pkgs/by-name/sa/saga/package.nix b/pkgs/by-name/sa/saga/package.nix
index 3282bc613896..7c88882ad114 100644
--- a/pkgs/by-name/sa/saga/package.nix
+++ b/pkgs/by-name/sa/saga/package.nix
@@ -43,11 +43,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "saga";
-  version = "9.12.4";
+  version = "9.12.5";
 
   src = fetchurl {
     url = "mirror://sourceforge/saga-gis/saga-${finalAttrs.version}.tar.gz";
-    hash = "sha256-hI7l0XiIACD65/i+Mhwlp2FMYrpXKHnGr3oYhwNEw3U=";
+    hash = "sha256-sqZYbdLOLtpTd168ZUZdK9zBBSixHiLuQcH9KDT2jP0=";
   };
 
   sourceRoot = "saga-${finalAttrs.version}/saga-gis";

From 5e410d367e55791c3ebcf883dd916d9e7e087de1 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Thu, 4 Jun 2026 14:56:38 +0200
Subject: [PATCH 30/80] python3Packages.lxmf: add missing `qrcode` dependency

---
 pkgs/development/python-modules/lxmf/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/lxmf/default.nix b/pkgs/development/python-modules/lxmf/default.nix
index 81d79182ead4..1f960e7383f7 100644
--- a/pkgs/development/python-modules/lxmf/default.nix
+++ b/pkgs/development/python-modules/lxmf/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  qrcode,
   rns,
   setuptools,
   versionCheckHook,
@@ -24,7 +25,10 @@ buildPythonPackage (finalAttrs: {
 
   pythonRelaxDeps = [ "rns" ];
 
-  dependencies = [ rns ];
+  dependencies = [
+    qrcode
+    rns
+  ];
 
   pythonImportsCheck = [ "LXMF" ];
 

From 611d34aaa381b549b95a3ea72006541c0071986b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 4 Jun 2026 15:25:04 +0000
Subject: [PATCH 31/80] pawn-appetit: 0.12.0 -> 0.12.1

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

diff --git a/pkgs/by-name/pa/pawn-appetit/package.nix b/pkgs/by-name/pa/pawn-appetit/package.nix
index 50dd83f55a9f..6ee0cc7ab08a 100644
--- a/pkgs/by-name/pa/pawn-appetit/package.nix
+++ b/pkgs/by-name/pa/pawn-appetit/package.nix
@@ -27,13 +27,13 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "pawn-appetit";
-  version = "0.12.0";
+  version = "0.12.1";
 
   src = fetchFromGitHub {
     owner = "Pawn-Appetit";
     repo = "pawn-appetit";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-9D8zeo62+xb5EsVQ39nPcwCx1w/47oY0NNFQyrSpFGQ=";
+    hash = "sha256-3kpExWdZh4Y0ZwBttpqE/nALyUJNWSEOy8HLcfauReY=";
   };
 
   pnpmDeps = fetchPnpmDeps {
@@ -53,7 +53,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoRoot = "src-tauri";
 
-  cargoHash = "sha256-bglNpRsHUZoHE7/KGAc9UHWI6Dtg7foA7/8NZ7qtfqw=";
+  cargoHash = "sha256-b+v16vF5Puyp23r32Y1HtOvkboA2R2HRs1ktyDBQd84=";
 
   buildAndTestSubdir = finalAttrs.cargoRoot;
 

From 55e1858f04d9b2ce28af2e2888299146285e1245 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 4 Jun 2026 12:21:10 -0700
Subject: [PATCH 32/80] rns: add optional dependency lxmf

---
 pkgs/by-name/rn/rns/package.nix               | 21 ++++++++++++++++++-
 .../python-modules/lxmf/default.nix           | 12 ++++++++++-
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/rn/rns/package.nix b/pkgs/by-name/rn/rns/package.nix
index 2392ffa84691..b8d2c34c937b 100644
--- a/pkgs/by-name/rn/rns/package.nix
+++ b/pkgs/by-name/rn/rns/package.nix
@@ -1 +1,20 @@
-{ python3Packages }: with python3Packages; toPythonApplication rns
+{
+  python3Packages,
+}:
+
+let
+  pythonPackages = python3Packages.overrideScope (
+    self: super: {
+      lxmf = super.lxmf.override {
+        propagateRns = false;
+      };
+    }
+  );
+in
+pythonPackages.toPythonApplication (
+  pythonPackages.rns.overridePythonAttrs (old: {
+    dependencies = old.dependencies ++ [
+      pythonPackages.lxmf
+    ];
+  })
+)
diff --git a/pkgs/development/python-modules/lxmf/default.nix b/pkgs/development/python-modules/lxmf/default.nix
index 1f960e7383f7..81de08cf79c3 100644
--- a/pkgs/development/python-modules/lxmf/default.nix
+++ b/pkgs/development/python-modules/lxmf/default.nix
@@ -2,6 +2,8 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  # rns optionally depends on lxmf but we can't have two versions of rns in a closure
+  propagateRns ? false,
   qrcode,
   rns,
   setuptools,
@@ -25,14 +27,22 @@ buildPythonPackage (finalAttrs: {
 
   pythonRelaxDeps = [ "rns" ];
 
+  buildInputs = lib.optionals (!propagateRns) [
+    rns
+  ];
+
   dependencies = [
     qrcode
+  ]
+  ++ lib.optionals propagateRns [
     rns
   ];
 
   pythonImportsCheck = [ "LXMF" ];
 
-  nativeCheckInputs = [ versionCheckHook ];
+  nativeCheckInputs = lib.optionals propagateRns [
+    versionCheckHook
+  ];
 
   meta = {
     description = "Lightweight Extensible Message Format for Reticulum";

From 77572763d48fda5f4df71190da5b42e2b5985d86 Mon Sep 17 00:00:00 2001
From: Timo Gottszky <timogottszky+git@gmail.com>
Date: Fri, 5 Jun 2026 15:22:39 +0200
Subject: [PATCH 33/80] htgettoken: migrate to pyproject

---
 pkgs/by-name/ht/htgettoken/package.nix | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/ht/htgettoken/package.nix b/pkgs/by-name/ht/htgettoken/package.nix
index 7f94f37d9dc1..4fc0bbd98f1e 100644
--- a/pkgs/by-name/ht/htgettoken/package.nix
+++ b/pkgs/by-name/ht/htgettoken/package.nix
@@ -2,13 +2,12 @@
   lib,
   fetchFromGitHub,
   python3,
-  makeWrapper,
 }:
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "htgettoken";
   version = "2.6";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fermitools";
@@ -17,21 +16,15 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     hash = "sha256-jHKKTnFZ+6LHaB61wi5+Ht6ZHrE4dDqADIMfGWI47oM=";
   };
 
-  nativeBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [
     setuptools
-    makeWrapper
   ];
 
-  postInstall = with python3.pkgs; ''
-    wrapProgram $out/bin/htgettoken \
-      --prefix PYTHONPATH : "${
-        makePythonPath [
-          gssapi
-          paramiko
-          urllib3
-        ]
-      }"
-  '';
+  dependencies = with python3.pkgs; [
+    gssapi
+    paramiko
+    urllib3
+  ];
 
   meta = {
     description = "Gets OIDC authentication tokens for High Throughput Computing via a Hashicorp vault server ";

From d236a69de2b6964eef29920e1c9e07a4f29a51bf Mon Sep 17 00:00:00 2001
From: Vonfry <dev@vonfry.name>
Date: Thu, 4 Jun 2026 21:18:52 +0800
Subject: [PATCH 34/80] emacsPackages.ghostel: 0.31.0-unstable-2026-06-01 ->
 0.33.0-unstable-2026-06-06

---
 .../elisp-packages/manual-packages/ghostel/package.nix    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghostel/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghostel/package.nix
index d768cde925cb..d42d07ceca11 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghostel/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghostel/package.nix
@@ -13,13 +13,13 @@ let
 
   pname = "ghostel";
 
-  version = "0.31.0-unstable-2026-06-01";
+  version = "0.33.0-unstable-2026-06-06";
 
   src = fetchFromGitHub {
     owner = "dakra";
     repo = "ghostel";
-    rev = "09aad9fefffce6370256a9888a1ed4f77535fcfd";
-    hash = "sha256-CKN0m+DVvxJhLkr/Hi/44w0m+kJVrx28axLCKLogIQs=";
+    rev = "a614f0f30d8a65da928a840e62cc9b2c6a1381af";
+    hash = "sha256-vG7JfgXUm6b1zf0WgyDlvy29wpTvcI/X74NP8s66c/4=";
   };
 
   module = stdenv.mkDerivation (finalAttrs: {
@@ -28,7 +28,7 @@ let
     deps = zig.fetchDeps {
       inherit (finalAttrs) src pname version;
       fetchAll = true;
-      hash = "sha256-ghN/UMACgkFQQEr4nH5gbbJbt/+2bz6tL2bJpbw9mGE=";
+      hash = "sha256-CTsG3dXu3DECDbklBAtr2fYou82WNvQ1Q3JET0TmuyM=";
     };
 
     nativeBuildInputs = [ zig ];

From f388a973249278f3a92770ba73186df8e31e3fa3 Mon Sep 17 00:00:00 2001
From: Timo Gottszky <timogottszky+git@gmail.com>
Date: Fri, 5 Jun 2026 15:33:32 +0200
Subject: [PATCH 35/80] htgettoken: wrap secondary programs

---
 pkgs/by-name/ht/htgettoken/package.nix | 45 ++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/pkgs/by-name/ht/htgettoken/package.nix b/pkgs/by-name/ht/htgettoken/package.nix
index 4fc0bbd98f1e..2827257ff15a 100644
--- a/pkgs/by-name/ht/htgettoken/package.nix
+++ b/pkgs/by-name/ht/htgettoken/package.nix
@@ -1,7 +1,14 @@
 {
   lib,
   fetchFromGitHub,
+  makeBinaryWrapper,
   python3,
+  bash,
+  curl,
+  coreutils,
+  gnused,
+  jq,
+  scitokens-cpp,
 }:
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
@@ -20,12 +27,50 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     setuptools
   ];
 
+  nativeBuildInputs = [
+    makeBinaryWrapper
+  ];
+
+  buildInputs = [
+    bash
+    curl
+    coreutils
+    jq
+    scitokens-cpp
+  ];
+
   dependencies = with python3.pkgs; [
     gssapi
     paramiko
     urllib3
   ];
 
+  postInstall = ''
+    wrapProgram $out/bin/htdecodetoken \
+        --prefix PATH : ${
+          lib.makeBinPath [
+            coreutils
+            jq
+            scitokens-cpp
+          ]
+        }
+    wrapProgram $out/bin/htdestroytoken \
+        --prefix PATH : $out/bin:${
+          lib.makeBinPath [
+            coreutils
+            curl
+          ]
+        }
+    wrapProgram $out/bin/httokensh \
+        --prefix PATH : $out/bin:${
+          lib.makeBinPath [
+            coreutils
+            gnused
+            jq
+          ]
+        }
+  '';
+
   meta = {
     description = "Gets OIDC authentication tokens for High Throughput Computing via a Hashicorp vault server ";
     license = lib.licenses.bsd3;

From 955aa6de6c8e0163a7709f467f8876022ea8e070 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 6 Jun 2026 13:14:45 +0000
Subject: [PATCH 36/80] python3Packages.snakemake: 9.21.1 -> 9.22.0

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

diff --git a/pkgs/by-name/sn/snakemake/package.nix b/pkgs/by-name/sn/snakemake/package.nix
index c4cc82e62483..b07e000f80cc 100644
--- a/pkgs/by-name/sn/snakemake/package.nix
+++ b/pkgs/by-name/sn/snakemake/package.nix
@@ -11,7 +11,7 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "snakemake";
-  version = "9.21.1";
+  version = "9.22.0";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -19,7 +19,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     owner = "snakemake";
     repo = "snakemake";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-i5F8Dt6DJtR3WBoAAt+/6WMaB+LDG18xKuNQ7HZ2zow=";
+    hash = "sha256-x9kz1GZJqrdknO1KK2MiSsFMTO3IstDy9uCBbhmBuxg=";
   };
 
   postPatch = ''

From b81cffc96ec602ee5c004394de9cd5241d2473a8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 6 Jun 2026 21:35:20 +0000
Subject: [PATCH 37/80] libtorrent-rakshasa: 0.16.11 -> 0.16.13

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

diff --git a/pkgs/by-name/li/libtorrent-rakshasa/package.nix b/pkgs/by-name/li/libtorrent-rakshasa/package.nix
index e38f49a34d3b..6a771d39158e 100644
--- a/pkgs/by-name/li/libtorrent-rakshasa/package.nix
+++ b/pkgs/by-name/li/libtorrent-rakshasa/package.nix
@@ -14,7 +14,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libtorrent-rakshasa";
-  version = "0.16.11";
+  version = "0.16.13";
 
   __structuredAttrs = true;
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "rakshasa";
     repo = "libtorrent";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-T8Td2bQlO21ieXdJ+oZ4GytJiGxb9AcgBsygl8yMrpI=";
+    hash = "sha256-PRVSH2kOzQhmUSdueDSB9stLwCtbITisuvpysrw4M+I=";
   };
 
   strictDeps = true;

From f9eb0f9e54d2f7807d06cdd4d604f25862605d31 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 7 Jun 2026 03:52:04 +0000
Subject: [PATCH 38/80] gildas: 20260501_a -> 20260601_a

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

diff --git a/pkgs/by-name/gi/gildas/package.nix b/pkgs/by-name/gi/gildas/package.nix
index 3fc1ae6b605b..f8cb4faa3b7b 100644
--- a/pkgs/by-name/gi/gildas/package.nix
+++ b/pkgs/by-name/gi/gildas/package.nix
@@ -24,8 +24,8 @@ let
 in
 
 stdenv.mkDerivation rec {
-  srcVersion = "may26a";
-  version = "20260501_a";
+  srcVersion = "jun26a";
+  version = "20260601_a";
   pname = "gildas";
 
   src = fetchurl {
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
       "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz"
       "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz"
     ];
-    hash = "sha256-c/GwX4II6JFJXRaslPN/DfvtAis8apk+xonJ9WAvrQM=";
+    hash = "sha256-Fi6yVuTXxffkZ0lyxIZXOlDDqSbnrnP5nJI5cS3Mrt4=";
   };
 
   nativeBuildInputs = [

From 1cc0e5c2181091cae756deb529a6bcd992d9125d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 7 Jun 2026 11:48:52 +0200
Subject: [PATCH 39/80] peirates: init at 1.29a

Kubernetes Penetration Testing tool

https://github.com/inguardians/peirates
---
 pkgs/by-name/pe/peirates/package.nix | 38 ++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 pkgs/by-name/pe/peirates/package.nix

diff --git a/pkgs/by-name/pe/peirates/package.nix b/pkgs/by-name/pe/peirates/package.nix
new file mode 100644
index 000000000000..d73beebe21cd
--- /dev/null
+++ b/pkgs/by-name/pe/peirates/package.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "peirates";
+  version = "1.29a";
+
+  src = fetchFromGitHub {
+    owner = "inguardians";
+    repo = "peirates";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-VSb0l1yLFl5dZQn0Pb0HWLbeFiTUhZQBsJcjmrt4C7g=";
+  };
+
+  __structuredAttrs = true;
+
+  vendorHash = "sha256-QwESK8ZTlb0boI+PCvoXYbVG6a47Ws1k8nrc7yQWPtE=";
+
+  proxyVendor = true;
+
+  preBuild = ''
+    export GOFLAGS="$GOFLAGS -mod=mod"
+  '';
+
+  ldflags = [ "-s" ];
+
+  meta = {
+    description = "Kubernetes Penetration Testing tool";
+    homepage = "https://github.com/inguardians/peirates";
+    changelog = "https://github.com/inguardians/peirates/blob/${finalAttrs.src.rev}/changelog.md";
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ fab ];
+    mainProgram = "peirates";
+  };
+})

From a9bc0bce98a81afb5cfa988211297fdfe0831118 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 7 Jun 2026 14:53:54 +0000
Subject: [PATCH 40/80] qtorganizer-mkcal: 0-unstable-2025-04-24 ->
 0-unstable-2026-06-06

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

diff --git a/pkgs/by-name/qt/qtorganizer-mkcal/package.nix b/pkgs/by-name/qt/qtorganizer-mkcal/package.nix
index 7768bafc85a4..15451c6981c4 100644
--- a/pkgs/by-name/qt/qtorganizer-mkcal/package.nix
+++ b/pkgs/by-name/qt/qtorganizer-mkcal/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qtorganizer-mkcal";
-  version = "0-unstable-2025-04-24";
+  version = "0-unstable-2026-06-06";
 
   src = fetchFromGitHub {
     owner = "dcaliste";
     repo = "qtorganizer-mkcal";
-    rev = "45906b1df8ad758a824369873f423d9e0c457fbf";
-    hash = "sha256-sgYCO8LxBFhMkjGnKVvOx2d4hyw9Oa5lbu6LKhuwl8s=";
+    rev = "6efa089553ccc3c44ada8fd2fe1349a004d4f619";
+    hash = "sha256-vycfq5meq+u7Ntv0n1XrcqlZfjU7flfQAi17vZId6Ww=";
   };
 
   postPatch = ''

From e589e0c922db3e0493f323cdcc209aa8ab61a3fb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 7 Jun 2026 19:08:17 +0000
Subject: [PATCH 41/80] claude-agent-acp: 0.39.0 -> 0.42.0

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

diff --git a/pkgs/by-name/cl/claude-agent-acp/package.nix b/pkgs/by-name/cl/claude-agent-acp/package.nix
index f332ce4e95fd..4c16ea153213 100644
--- a/pkgs/by-name/cl/claude-agent-acp/package.nix
+++ b/pkgs/by-name/cl/claude-agent-acp/package.nix
@@ -8,16 +8,16 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "claude-agent-acp";
-  version = "0.39.0";
+  version = "0.42.0";
 
   src = fetchFromGitHub {
     owner = "agentclientprotocol";
     repo = "claude-agent-acp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-0FHq8dZny4i3AhS4Xqy1CwNoN/F8nYQVIgHd5OdQ/NA=";
+    hash = "sha256-yvljKMNVCQAFcobHzgPwXSTYGU1IWdOGdX6nsxBfWyw=";
   };
 
-  npmDepsHash = "sha256-f5ULuNKO+kb7aoYpxKsF/fHCbT2LLWwYnTN1VKVLgpY=";
+  npmDepsHash = "sha256-ecMy4cgsM+PKdsiqAG4Deoiz8DQeJRDgZ8aWzjS/EjA=";
 
   nativeBuildInputs = [ makeWrapper ];
 

From 9677a8569cee9641c6970d8a1c4beed422a43d24 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 7 Jun 2026 23:45:46 +0000
Subject: [PATCH 42/80] postgresqlPackages.pg_search: 0.23.4 -> 0.24.0

---
 pkgs/servers/sql/postgresql/ext/pg_search.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pg_search.nix b/pkgs/servers/sql/postgresql/ext/pg_search.nix
index 7c4bd1b93378..612f6eb370ec 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_search.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_search.nix
@@ -11,16 +11,16 @@
 
 buildPgrxExtension (finalAttrs: {
   pname = "pg_search";
-  version = "0.23.4";
+  version = "0.24.0";
 
   src = fetchFromGitHub {
     owner = "paradedb";
     repo = "paradedb";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4XvIzeZFLh9uge3oj7l4MXtEZDVprVxHfUpWuXqHeNY=";
+    hash = "sha256-w/MRK3NUqBXQig9VgtbbDvVkgYXDUH6ZhmiJqPKJgQk=";
   };
 
-  cargoHash = "sha256-Mcpen2SSPcV9Ltb9TFM9QgVMruimCDEiYlRDaaaNgGU=";
+  cargoHash = "sha256-aH2Uivowht2AN3Tx6PTwp0+8yoVaZn8Yn8QMmUr43k8=";
 
   inherit postgresql;
 

From 8c8ce1a6bc80245656d1ac30fb2b4023d17e2165 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 8 Jun 2026 00:04:30 +0000
Subject: [PATCH 43/80] postgresqlPackages.pg_background: 1.9.3 -> 2.0

---
 pkgs/servers/sql/postgresql/ext/pg_background.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pg_background.nix b/pkgs/servers/sql/postgresql/ext/pg_background.nix
index 3e1562ecd21b..2c38ce7769ab 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_background.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_background.nix
@@ -8,13 +8,13 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "pg_background";
-  version = "1.9.3";
+  version = "2.0";
 
   src = fetchFromGitHub {
     owner = "vibhorkum";
     repo = "pg_background";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-m5mdXTmml6iX4UKcHeN6uMjypLvHasjD5AXzUhvEHdI=";
+    hash = "sha256-aFr/3FG2W+yER3agtycznobvVKH0XdylPWs8uCyr3H4=";
   };
 
   buildInputs = postgresql.buildInputs;

From f081f14e86244c9f4c71f0f8dbccece57841cb5c Mon Sep 17 00:00:00 2001
From: lucasew <lucas59356@gmail.com>
Date: Sun, 7 Jun 2026 21:30:44 -0300
Subject: [PATCH 44/80] porn-vault: update pnpm to 10

Signed-off-by: lucasew <lucas59356@gmail.com>
---
 pkgs/by-name/po/porn-vault/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/po/porn-vault/package.nix b/pkgs/by-name/po/porn-vault/package.nix
index f988949b587c..a2c7cd011433 100644
--- a/pkgs/by-name/po/porn-vault/package.nix
+++ b/pkgs/by-name/po/porn-vault/package.nix
@@ -2,7 +2,7 @@
   fetchFromGitLab,
   rustPlatform,
   lib,
-  pnpm_9,
+  pnpm_10,
   fetchPnpmDeps,
   pnpmConfigHook,
   stdenvNoCC,
@@ -38,7 +38,7 @@ let
     };
   };
   nodejs-slim = nodejs-slim_22;
-  pnpm' = pnpm_9.override { inherit nodejs-slim; };
+  pnpm' = pnpm_10.override { inherit nodejs-slim; };
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "porn-vault";
@@ -54,8 +54,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     pnpm = pnpm';
-    fetcherVersion = 3;
-    hash = "sha256-CAsUP+bLrTkbUd3h/FP4gBVwZECyqQg0nnmap4zsRTs=";
+    fetcherVersion = 4;
+    hash = "sha256-5ZMa7/3nbG1xsTfd09oh+NTU+FFhd0lV425pU3s9bZE=";
   };
 
   nativeBuildInputs = [

From de9415a3b513bafa4becd08363e41201c7202254 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 8 Jun 2026 01:15:42 +0000
Subject: [PATCH 45/80] phpunit: 13.1.13 -> 13.2.0

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

diff --git a/pkgs/by-name/ph/phpunit/package.nix b/pkgs/by-name/ph/phpunit/package.nix
index a2fb55c00ba6..12c23e4ff368 100644
--- a/pkgs/by-name/ph/phpunit/package.nix
+++ b/pkgs/by-name/ph/phpunit/package.nix
@@ -8,16 +8,16 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "phpunit";
-  version = "13.1.13";
+  version = "13.2.0";
 
   src = fetchFromGitHub {
     owner = "sebastianbergmann";
     repo = "phpunit";
     tag = finalAttrs.version;
-    hash = "sha256-cfS2BdsNO+tl00L2jGOfW1CN0sEzlFuj7OYdXIW2i/M=";
+    hash = "sha256-BCrL70H/VVK4UnRBCqqrC33OdltLV0V2OXmpsHfDVZY=";
   };
 
-  vendorHash = "sha256-SH/vaOz1eKlg1QujTJvQzARbn77G5XfK1eaCu+Ufrl4=";
+  vendorHash = "sha256-MccgE9NEH9TKrldfdO/ahCQl0iyS2EK7i0O/glsJHV0=";
 
   passthru = {
     updateScript = nix-update-script { };

From 5efdf81321429ccdba32b67697d8c452e3f50193 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 8 Jun 2026 03:32:13 +0000
Subject: [PATCH 46/80] netwatch: 0.25.4 -> 0.25.5

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

diff --git a/pkgs/by-name/ne/netwatch/package.nix b/pkgs/by-name/ne/netwatch/package.nix
index d38bda29f38f..ce39b1693811 100644
--- a/pkgs/by-name/ne/netwatch/package.nix
+++ b/pkgs/by-name/ne/netwatch/package.nix
@@ -10,17 +10,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "netwatch-tui";
-  version = "0.25.4";
+  version = "0.25.5";
   __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "matthart1983";
     repo = "netwatch";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-rbQ9lTQJgy93Z2WojaTkU5z1fkJX4mUjsx2Or7FNrJc=";
+    hash = "sha256-JE/jKQVAkHpgI8nwgrJcaynixJX7c4C1Qhe8VULggAE=";
   };
 
-  cargoHash = "sha256-D06ywfwurtfI8NAfGS88YOoSVi4KfjEBgUA8EfLKamQ=";
+  cargoHash = "sha256-W8CSx/MM9M6FoN/LHcV/d3vh27/hysgsPh7eLZVUgjA=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 8a9d012ea5f574056eb233f19135fa2b76e6613a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 8 Jun 2026 03:44:20 +0000
Subject: [PATCH 47/80] python3Packages.praw: 7.8.1 -> 7.8.2

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

diff --git a/pkgs/development/python-modules/praw/default.nix b/pkgs/development/python-modules/praw/default.nix
index 89a818e3c763..01da49ee8c86 100644
--- a/pkgs/development/python-modules/praw/default.nix
+++ b/pkgs/development/python-modules/praw/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "praw";
-  version = "7.8.1";
+  version = "7.8.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "praw-dev";
     repo = "praw";
     tag = "v${version}";
-    hash = "sha256-jxF7rlMwKIKwyYv35vYWAdtClsVhnIkywoyMQeggGBc=";
+    hash = "sha256-mAXRLo8xBTigtXYRbc6qxjjoRJ0+v0DZeLEwLISh2PE=";
   };
 
   patches = [

From ad63cd14a457b845ee108dae88f8e837d9241b22 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Mon, 8 Jun 2026 10:50:56 +0200
Subject: [PATCH 48/80] python3Packages.bumble: fix tests, add
 `__darwinAllowLocalNetworking`

---
 pkgs/development/python-modules/bumble/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/bumble/default.nix b/pkgs/development/python-modules/bumble/default.nix
index 94a3dbf05e95..8bc6b25c42ad 100644
--- a/pkgs/development/python-modules/bumble/default.nix
+++ b/pkgs/development/python-modules/bumble/default.nix
@@ -77,6 +77,7 @@ buildPythonPackage rec {
   ];
 
   pytestFlags = [ "--asyncio-mode=auto" ];
+  __darwinAllowLocalNetworking = true;
 
   disabledTests = [
     # tests require networking

From 7934c294b16c6e4e76e86aa1c35598d02f47685b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleix=20Bon=C3=A9?= <aleix.boneribo@bsc.es>
Date: Mon, 8 Jun 2026 11:27:56 +0200
Subject: [PATCH 49/80] vimPlugins.cmp-latex-symbols: fix override source

---
 pkgs/applications/editors/vim/plugins/overrides.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 93d5479dd182..42278849f698 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -722,7 +722,7 @@ assertNoAdditions {
     checkInputs = [ self.nvim-cmp ];
   };
 
-  cmp-latex-symbols = super.cmp-look.overrideAttrs {
+  cmp-latex-symbols = super.cmp-latex-symbols.overrideAttrs {
     checkInputs = [ self.nvim-cmp ];
   };
 

From 0b842d528e34ebc265b05bda423dd2ddfb752725 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Mon, 8 Jun 2026 10:30:11 +0100
Subject: [PATCH 50/80] libretro.dolphin: removed unnecessary dependencies

Including pcre, part of #356387.
---
 .../emulators/libretro/cores/dolphin.nix          | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/dolphin.nix b/pkgs/applications/emulators/libretro/cores/dolphin.nix
index cd32ce5399ef..eb3ca8de39b7 100644
--- a/pkgs/applications/emulators/libretro/cores/dolphin.nix
+++ b/pkgs/applications/emulators/libretro/cores/dolphin.nix
@@ -3,25 +3,18 @@
   fetchFromGitHub,
   cmake,
   curl,
-  gettext,
-  hidapi,
   libGL,
   libGLU,
   libevdev,
   mkLibretroCore,
-  pcre,
   pkg-config,
-  sfml,
   udev,
   libxcb-util,
-  libxxf86vm,
   libxrandr,
   libxi,
   libxinerama,
   libxext,
   libx11,
-  libsm,
-  libpthread-stubs,
   libxcb,
 }:
 mkLibretroCore {
@@ -41,23 +34,17 @@ mkLibretroCore {
     curl
     pkg-config
   ];
+
   extraBuildInputs = [
-    gettext
-    hidapi
     libGL
     libGLU
     libevdev
-    pcre
-    sfml
     udev
-    libsm
     libx11
     libxext
     libxi
     libxinerama
     libxrandr
-    libxxf86vm
-    libpthread-stubs
     libxcb
     libxcb-util
   ];

From b8a4325b8bbe40983854d44e7d03906cc3f07155 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Mon, 8 Jun 2026 10:32:28 +0100
Subject: [PATCH 51/80] libretro.dolphin: add glslang as extraBuildInputs

---
 .../emulators/libretro/cores/dolphin.nix      | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/dolphin.nix b/pkgs/applications/emulators/libretro/cores/dolphin.nix
index eb3ca8de39b7..9ff08b1ff89f 100644
--- a/pkgs/applications/emulators/libretro/cores/dolphin.nix
+++ b/pkgs/applications/emulators/libretro/cores/dolphin.nix
@@ -3,19 +3,20 @@
   fetchFromGitHub,
   cmake,
   curl,
+  glslang,
+  libevdev,
   libGL,
   libGLU,
-  libevdev,
+  libx11,
+  libxcb,
+  libxcb-util,
+  libxext,
+  libxi,
+  libxinerama,
+  libxrandr,
   mkLibretroCore,
   pkg-config,
   udev,
-  libxcb-util,
-  libxrandr,
-  libxi,
-  libxinerama,
-  libxext,
-  libx11,
-  libxcb,
 }:
 mkLibretroCore {
   core = "dolphin";
@@ -36,17 +37,18 @@ mkLibretroCore {
   ];
 
   extraBuildInputs = [
+    glslang
     libGL
     libGLU
     libevdev
-    udev
     libx11
+    libxcb
+    libxcb-util
     libxext
     libxi
     libxinerama
     libxrandr
-    libxcb
-    libxcb-util
+    udev
   ];
 
   makefile = "Makefile";

From 859423608ff043d0d9bb86e021413baf7614e054 Mon Sep 17 00:00:00 2001
From: Aiden Schembri <aidsch0605@outlook.com>
Date: Mon, 8 Jun 2026 11:36:47 +0200
Subject: [PATCH 52/80] zed-editor: 1.4.4 -> 1.5.4

---
 pkgs/by-name/ze/zed-editor/package.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix
index 6908ceaf96fd..a1ffef86f5ec 100644
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -31,6 +31,7 @@
   libx11,
   libxext,
   livekit-libwebrtc,
+  lld,
   testers,
   writableTmpDirAsHomeHook,
 
@@ -97,7 +98,7 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zed-editor";
-  version = "1.4.4";
+  version = "1.5.4";
 
   outputs = [
     "out"
@@ -110,7 +111,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "zed-industries";
     repo = "zed";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ALK/ZffZ+sqMaZi5dy40nzE1dLqZrbgbxRcQaYL6AkI=";
+    hash = "sha256-I9+v5qeubBA9bAS4OU7V/BsxxfP5rj9aS4xvopbF578=";
   };
 
   postPatch = ''
@@ -139,7 +140,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     rm -r $out/git/*/candle-book/
   '';
 
-  cargoHash = "sha256-XHkQ9jrOsDbpt+zC96QrBqvCzEeuzC/WY4cjRdYVr9Q=";
+  cargoHash = "sha256-x40nSnpksKX+JFuN1RSsVm3OrrArb0rtalQplLstAd8=";
 
   __structuredAttrs = true;
 
@@ -152,6 +153,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ++ lib.optionals stdenv.hostPlatform.isLinux [ makeBinaryWrapper ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     cargo-bundle
+    lld
     rustPlatform.bindgenHook
   ];
 
@@ -208,6 +210,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
     # Used by `zed --version`
     RELEASE_VERSION = finalAttrs.version;
     LK_CUSTOM_WEBRTC = livekit-libwebrtc;
+  }
+  // lib.optionalAttrs stdenv.hostPlatform.isDarwin {
+    # Link with lld on Darwin. nixpkgs' classic open-source ld64 fails to insert
+    # ARM64 branch thunks for this binary, producing `b(l) ARM64 branch out of range`.
+    NIX_CFLAGS_LINK = "-fuse-ld=lld";
   };
 
   preBuild = ''

From 836596790cae2c21fef9b1e6723fb2da7e836d32 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 8 Jun 2026 10:35:58 +0000
Subject: [PATCH 53/80] spaceship-prompt: 4.22.1 -> 4.22.3

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

diff --git a/pkgs/by-name/sp/spaceship-prompt/package.nix b/pkgs/by-name/sp/spaceship-prompt/package.nix
index e212a8bdcf61..e411a473be3c 100644
--- a/pkgs/by-name/sp/spaceship-prompt/package.nix
+++ b/pkgs/by-name/sp/spaceship-prompt/package.nix
@@ -6,13 +6,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "spaceship-prompt";
-  version = "4.22.1";
+  version = "4.22.3";
 
   src = fetchFromGitHub {
     owner = "denysdovhan";
     repo = "spaceship-prompt";
     rev = "v${version}";
-    sha256 = "sha256-shZf1IfSkHnaHnQ4idiDrmaJYXtViwGntpfEOBUDyBk=";
+    sha256 = "sha256-v2D8+EwOV5gzzawjgn99WJnYjI9N6bxqbHtTTfNWBNo=";
   };
 
   strictDeps = true;

From 56555753d53f435c399ef11ba40c4e6610f678cc Mon Sep 17 00:00:00 2001
From: Vonfry <dev@vonfry.name>
Date: Tue, 2 Jun 2026 23:11:15 +0800
Subject: [PATCH 54/80] misskey: 2025.12.2 -> 2026.5.4

---
 pkgs/by-name/mi/misskey/package.nix | 35 ++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/mi/misskey/package.nix b/pkgs/by-name/mi/misskey/package.nix
index 5d5ae826eb76..ff93f8a46789 100644
--- a/pkgs/by-name/mi/misskey/package.nix
+++ b/pkgs/by-name/mi/misskey/package.nix
@@ -5,25 +5,29 @@
   fetchFromGitHub,
   nix-update-script,
   nodejs,
-  pnpm_9,
+  pnpm_11,
   fetchPnpmDeps,
   pnpmConfigHook,
   makeWrapper,
   python3,
+  dart-sass,
   bash,
   jemalloc,
   ffmpeg-headless,
   writeShellScript,
 }:
+let
+  pnpm = pnpm_11;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "misskey";
-  version = "2025.12.2";
+  version = "2026.5.4";
 
   src = fetchFromGitHub {
     owner = "misskey-dev";
     repo = "misskey";
     tag = finalAttrs.version;
-    hash = "sha256-7S6m97wHFeITABLcnQiPVGLg6d1xcPCHCp7/7d/w48E=";
+    hash = "sha256-ENq5V1lIFGKIr1xZccy1LFRYVqZVEhDzBhAbDNcG5sM=";
     fetchSubmodules = true;
   };
 
@@ -35,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
   postPatch = ''
     substituteInPlace packages/backend/src/config.ts \
       --replace-fail \
-        "resolve(_dirname, '../../../built/.config.json')" \
+        "resolve(projectBuiltDir, '.config.json')" \
         "resolve('/run/misskey/default.json')"
     substituteInPlace {.,packages/backend}/package.json \
       --replace-fail "pnpm compile-config && " ""
@@ -44,21 +48,21 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     nodejs
     pnpmConfigHook
-    pnpm_9
+    pnpm
     makeWrapper
     python3
+    dart-sass
   ];
 
-  # https://nixos.org/manual/nixpkgs/unstable/#javascript-pnpm
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs)
       pname
       version
       src
       ;
-    pnpm = pnpm_9;
-    fetcherVersion = 3;
-    hash = "sha256-iMS+sFDnGShOQfFQjGtj4+7McqMQvfE8KK1MV/jPC2s=";
+    inherit pnpm;
+    fetcherVersion = 4;
+    hash = "sha256-wEbYkfp+zfytOPBjEcyTHCaoohGRNRjG5oTUefI5BVw=";
   };
 
   buildPhase = ''
@@ -74,13 +78,17 @@ stdenv.mkDerivation (finalAttrs: {
     export npm_config_nodedir=${nodejs}
     (
       cd node_modules/.pnpm/node_modules/re2
-      pnpm run rebuild
+      pnpm run rebuild --nodedir=${nodejs}
     )
     (
       cd node_modules/.pnpm/node_modules/sharp
       pnpm run install
     )
 
+    # Force sass-embedded npm package to use our dart-sass instead of bundled binaries.
+    substituteInPlace node_modules/.pnpm/sass-embedded@*/node_modules/sass-embedded/dist/lib/src/compiler-path.js \
+      --replace-fail 'compilerCommand = (() => {' 'compilerCommand = (() => { return ["${lib.getExe dart-sass}"];'
+
     pnpm build
 
     runHook postBuild
@@ -108,15 +116,16 @@ stdenv.mkDerivation (finalAttrs: {
       # Otherwise, maybe somehow bindmount a writable directory into <package>/data/files.
       ln -s /var/lib/misskey $out/data/files
 
-      makeWrapper ${pnpm_9}/bin/pnpm $out/bin/misskey \
+      makeWrapper ${pnpm}/bin/pnpm $out/bin/misskey \
         --run "${checkEnvVarScript} || exit" \
         --chdir $out/data \
-        --add-flags run \
+        --add-flag "--config.verify-deps-before-run=false" \
+        --add-flag run \
         --set-default NODE_ENV production \
         --prefix PATH : ${
           lib.makeBinPath [
             nodejs
-            pnpm_9
+            pnpm
             bash
           ]
         } \

From ac23a899c161e0c831a8db76e00784a393eeec9e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 8 Jun 2026 11:39:03 +0000
Subject: [PATCH 55/80] qmapshack: 1.20.2 -> 1.20.3

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

diff --git a/pkgs/by-name/qm/qmapshack/package.nix b/pkgs/by-name/qm/qmapshack/package.nix
index 21c2213a1e9a..8c5ce410b4eb 100644
--- a/pkgs/by-name/qm/qmapshack/package.nix
+++ b/pkgs/by-name/qm/qmapshack/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qmapshack";
-  version = "1.20.2";
+  version = "1.20.3";
 
   src = fetchFromGitHub {
     owner = "Maproom";
     repo = "qmapshack";
     tag = "V_${finalAttrs.version}";
-    hash = "sha256-WLuD1qm1KoM5LtvanUrhV4ZsdvnXkanQVLT0p/fzRXg=";
+    hash = "sha256-U9sOIcQKE9v5vXsfvloLbfxtrCNliJEYnbc1mlwk9bo=";
   };
 
   nativeBuildInputs = [

From 29ddc603bda0cc2a830b0675f58670d57b66fa54 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 8 Jun 2026 13:58:13 +0200
Subject: [PATCH 56/80] python3Packages.praw: migrate to finalAttrs

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

diff --git a/pkgs/development/python-modules/praw/default.nix b/pkgs/development/python-modules/praw/default.nix
index 01da49ee8c86..76660c93e5d1 100644
--- a/pkgs/development/python-modules/praw/default.nix
+++ b/pkgs/development/python-modules/praw/default.nix
@@ -15,7 +15,7 @@
   websocket-client,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "praw";
   version = "7.8.2";
   pyproject = true;
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "praw-dev";
     repo = "praw";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-mAXRLo8xBTigtXYRbc6qxjjoRJ0+v0DZeLEwLISh2PE=";
   };
 
@@ -63,8 +63,8 @@ buildPythonPackage rec {
   meta = {
     description = "Python Reddit API wrapper";
     homepage = "https://praw.readthedocs.org/";
-    changelog = "https://github.com/praw-dev/praw/blob/v${version}/CHANGES.rst";
+    changelog = "https://github.com/praw-dev/praw/blob/${finalAttrs.src.tag}/CHANGES.rst";
     license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

From a0fa2a24d5d1cc43790999bcf768e3a1dc6920d2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 8 Jun 2026 12:02:06 +0000
Subject: [PATCH 57/80] taproot-assets: 0.7.2 -> 0.8.0

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

diff --git a/pkgs/by-name/ta/taproot-assets/package.nix b/pkgs/by-name/ta/taproot-assets/package.nix
index f842eddb0227..bbd886bedd8b 100644
--- a/pkgs/by-name/ta/taproot-assets/package.nix
+++ b/pkgs/by-name/ta/taproot-assets/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "taproot-assets";
-  version = "0.7.2";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "lightninglabs";
     repo = "taproot-assets";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-HFWSO5h/hp/XGCQ9MEqwe++P12XPbxv878xcJhUZTpQ=";
+    hash = "sha256-pgsorq+dWjGTkbdrHSIZm36S16xhcjvDCUin2bzcldc=";
   };
 
-  vendorHash = "sha256-sKyaj/PiNz0VbzWon4g5jIKcYAUdlXwBQwJoWEkMYsM=";
+  vendorHash = "sha256-K8XwCRTj4UECZpVb8g7+6VAC4khTcnRrhPaKDXJvJCI=";
 
   subPackages = [
     "cmd/tapcli"

From 8c778e2c43e9a1a94a125ae114c854d98d638dce Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 8 Jun 2026 12:25:05 +0000
Subject: [PATCH 58/80] vimPlugins.fff-nvim: 0.8.4 -> 0.9.3

---
 .../editors/vim/plugins/non-generated/fff-nvim/default.nix  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix
index 2fbb9ffbc986..fae96fde6b60 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix
@@ -13,18 +13,18 @@
   writableTmpDirAsHomeHook,
 }:
 let
-  version = "0.8.4";
+  version = "0.9.3";
   src = fetchFromGitHub {
     owner = "dmtrKovalenko";
     repo = "fff.nvim";
     tag = "v${version}";
-    hash = "sha256-w88NovzYVTiUVZmgvvmRvRq1didlbxMJYtKj1A3VB/Y=";
+    hash = "sha256-9k1XWnHzBjy7dABCzZ0yxCHqgX1bsWkkxksLVLDqdmc=";
   };
   fff-nvim-lib = rustPlatform.buildRustPackage {
     pname = "fff-nvim-lib";
     inherit version src;
 
-    cargoHash = "sha256-2LGrohseOYdroUFY3cHy57HzgfS34CBuIbN1AFuYTUg=";
+    cargoHash = "sha256-R/w3Km9LTqWQ2NFbwYbTCld72av26BdXtxC/K0sqdlQ=";
 
     cargoBuildFlags = [
       "-p"

From 6428a39d221cc690fe91d91435577a4802b8847c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 8 Jun 2026 12:26:12 +0000
Subject: [PATCH 59/80] xemu: 0.8.135 -> 0.8.136

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

diff --git a/pkgs/by-name/xe/xemu/package.nix b/pkgs/by-name/xe/xemu/package.nix
index 290e5c5ebdd9..b69437e9c3de 100644
--- a/pkgs/by-name/xe/xemu/package.nix
+++ b/pkgs/by-name/xe/xemu/package.nix
@@ -36,13 +36,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xemu";
-  version = "0.8.135";
+  version = "0.8.136";
 
   src = fetchFromGitHub {
     owner = "xemu-project";
     repo = "xemu";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-IyOv+OdPHrQxOkYSFDGcf4b051+dTzvAgIm1W9DGhOs=";
+    hash = "sha256-eZRv3GImEkT/zM0m8gnLF8hhPSbbUA5yPR7lr+fzHOI=";
 
     nativeBuildInputs = [
       git

From cdb29e2bfdfa17a6a4c893ca30ffbe6394461943 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Mon, 8 Jun 2026 14:32:28 +0200
Subject: [PATCH 60/80] maintainers: remove rb2k

---
 maintainers/maintainer-list.nix      | 6 ------
 pkgs/by-name/li/libdnf/package.nix   | 5 +----
 pkgs/by-name/mi/microdnf/package.nix | 2 +-
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 725fc2088733..5948b546be59 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -23085,12 +23085,6 @@
     githubId = 7775707;
     name = "RB";
   };
-  rb2k = {
-    email = "nix@marc-seeger.com";
-    github = "rb2k";
-    githubId = 9519;
-    name = "Marc Seeger";
-  };
   rbasso = {
     email = "rbasso@sharpgeeks.net";
     github = "rbasso";
diff --git a/pkgs/by-name/li/libdnf/package.nix b/pkgs/by-name/li/libdnf/package.nix
index 5f29d2c8aba6..56bbf5b075ca 100644
--- a/pkgs/by-name/li/libdnf/package.nix
+++ b/pkgs/by-name/li/libdnf/package.nix
@@ -103,9 +103,6 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/rpm-software-management/libdnf/releases/tag/${finalAttrs.version}";
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
-    maintainers = with lib.maintainers; [
-      rb2k
-      katexochen
-    ];
+    maintainers = with lib.maintainers; [ katexochen ];
   };
 })
diff --git a/pkgs/by-name/mi/microdnf/package.nix b/pkgs/by-name/mi/microdnf/package.nix
index c55fdc6cc7ba..ae1bac395d95 100644
--- a/pkgs/by-name/mi/microdnf/package.nix
+++ b/pkgs/by-name/mi/microdnf/package.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Lightweight implementation of dnf in C";
     homepage = "https://github.com/rpm-software-management/microdnf";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ rb2k ];
+    maintainers = [ ];
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
     mainProgram = "microdnf";
   };

From 3a78aa305c35c3f5a28e9c80380e4f6613160939 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 8 Jun 2026 13:11:53 +0000
Subject: [PATCH 61/80] jetbrains.gateway: 2026.1.2 -> 2026.1.3

---
 .../editors/jetbrains/ides/gateway.nix        | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/ides/gateway.nix b/pkgs/applications/editors/jetbrains/ides/gateway.nix
index 5907a504ce53..56370da57946 100644
--- a/pkgs/applications/editors/jetbrains/ides/gateway.nix
+++ b/pkgs/applications/editors/jetbrains/ides/gateway.nix
@@ -12,20 +12,20 @@ let
   # update-script-start: urls
   urls = {
     x86_64-linux = {
-      url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2026.1.2.tar.gz";
-      hash = "sha256-9NEHD9FXekwjRHTrPMeK4xU4sHnXPge+wRXyCFMmPBk=";
+      url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2026.1.3.tar.gz";
+      hash = "sha256-HizogKH6goX1NdcI/Fj4YsCRzDWfFvQGYSaMM9wVDCA=";
     };
     aarch64-linux = {
-      url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2026.1.2-aarch64.tar.gz";
-      hash = "sha256-M7XiLlIl7JFKbARb9Zli0c3cHUo2X0nPVrGhs3pK2bQ=";
+      url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2026.1.3-aarch64.tar.gz";
+      hash = "sha256-CSe04BBo4jS1cIhu4NfZqaSHMaNue2eFUPa+1gOxuoo=";
     };
     x86_64-darwin = {
-      url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2026.1.2.dmg";
-      hash = "sha256-Wuuj6/K/5xoM9+d59IGzBo19iOJusbIMigoflPLQ+ts=";
+      url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2026.1.3.dmg";
+      hash = "sha256-WKwIP19y5EKO98JgEm468ofaRp/JO5z8lqNhtpsH4tY=";
     };
     aarch64-darwin = {
-      url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2026.1.2-aarch64.dmg";
-      hash = "sha256-ADWFPMC4ptj2mZk4RJgtIQjOT2xwOkL67UahoKte6mQ=";
+      url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2026.1.3-aarch64.dmg";
+      hash = "sha256-AHY/lY0ARkW0VoSgy0t7LLNXA965PLooWBSWxBKBV5M=";
     };
   };
   # update-script-end: urls
@@ -40,8 +40,8 @@ mkJetBrainsProduct {
   productShort = "Gateway";
 
   # update-script-start: version
-  version = "2026.1.2";
-  buildNumber = "261.24374.120";
+  version = "2026.1.3";
+  buildNumber = "261.25134.98";
   # update-script-end: version
 
   src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));

From 9c4068ff6ee3bf1a7650ed9ec6b893fa2c8e7075 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 8 Jun 2026 13:11:58 +0000
Subject: [PATCH 62/80] jetbrains.ruby-mine: 2026.1.2 -> 2026.1.3

---
 .../editors/jetbrains/ides/ruby-mine.nix      | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/ides/ruby-mine.nix b/pkgs/applications/editors/jetbrains/ides/ruby-mine.nix
index 6c22776e6acf..807fe17c4e06 100644
--- a/pkgs/applications/editors/jetbrains/ides/ruby-mine.nix
+++ b/pkgs/applications/editors/jetbrains/ides/ruby-mine.nix
@@ -12,20 +12,20 @@ let
   # update-script-start: urls
   urls = {
     x86_64-linux = {
-      url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.2.tar.gz";
-      hash = "sha256-6rvtK1TsZsuuVqfya9eh7fHk7LJyyxg4SYrU/yXnK1I=";
+      url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.3.tar.gz";
+      hash = "sha256-0KF/IEVRT8kgHpULEmqMy9gOf06IIDA4vEV3RujjQoE=";
     };
     aarch64-linux = {
-      url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.2-aarch64.tar.gz";
-      hash = "sha256-EvKpY3zbUHT03GVIT/HJxVkOtJgsCG+jYNcKfiX0mTI=";
+      url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.3-aarch64.tar.gz";
+      hash = "sha256-kiuRp9JhdS0aUFPX1brI1T9ik/iWhglIckHvv4bdPWk=";
     };
     x86_64-darwin = {
-      url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.2.dmg";
-      hash = "sha256-KWbysSPVHM0BS09rntD78i8BuP3v26zha8GatFMZtg0=";
+      url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.3.dmg";
+      hash = "sha256-UjpwMCXhI+bMOvyyEbRBoNW3GGCDpi7aF6hUxffW/h0=";
     };
     aarch64-darwin = {
-      url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.2-aarch64.dmg";
-      hash = "sha256-NEmps3wxao9cb2wgbmIndXPs78Tmona4wC9+8DBv7cI=";
+      url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.3-aarch64.dmg";
+      hash = "sha256-lqa3L+rBiEH/hPmFcevWBumvvyBBzoUR3ttvA8s0uT0=";
     };
   };
   # update-script-end: urls
@@ -39,8 +39,8 @@ mkJetBrainsProduct {
   product = "RubyMine";
 
   # update-script-start: version
-  version = "2026.1.2";
-  buildNumber = "261.24374.145";
+  version = "2026.1.3";
+  buildNumber = "261.25134.97";
   # update-script-end: version
 
   src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));

From 9f218ef73eae09f63359a98a8551bcd87b73bf12 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 8 Jun 2026 13:22:44 +0000
Subject: [PATCH 63/80] jetbrains.phpstorm: 2026.1.2 -> 2026.1.3

---
 .../editors/jetbrains/ides/phpstorm.nix       | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/ides/phpstorm.nix b/pkgs/applications/editors/jetbrains/ides/phpstorm.nix
index c4ae7a80d6bd..a034954c8e1e 100644
--- a/pkgs/applications/editors/jetbrains/ides/phpstorm.nix
+++ b/pkgs/applications/editors/jetbrains/ides/phpstorm.nix
@@ -12,20 +12,20 @@ let
   # update-script-start: urls
   urls = {
     x86_64-linux = {
-      url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.2.tar.gz";
-      hash = "sha256-VbXsfKahp1X4AwAC10VghE+ZkxThovnYHHYyvkOTtFc=";
+      url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.3.tar.gz";
+      hash = "sha256-hXb2KcCaNKIJOGbN0ZUDxMKuX++dO1FRoxvC580VIHQ=";
     };
     aarch64-linux = {
-      url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.2-aarch64.tar.gz";
-      hash = "sha256-f0Owuq0OjVwnp4Gj/diiPFn9F1Hf4gm/MwHzkabIH2w=";
+      url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.3-aarch64.tar.gz";
+      hash = "sha256-+As41qcyCvAICIttMEi30b8mBTZoWKK4rjxjkVx4TXs=";
     };
     x86_64-darwin = {
-      url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.2.dmg";
-      hash = "sha256-XzYv58bR8ts6MTREUjqQinCzHvTdrLVEDH5vg1vQ3so=";
+      url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.3.dmg";
+      hash = "sha256-Q9m/XIgDg4F4yH0P35IaInk/se5CXqewvp248VqA4uc=";
     };
     aarch64-darwin = {
-      url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.2-aarch64.dmg";
-      hash = "sha256-dJOqdY+D5FssDAvocMOXk9O22qk+QLxwDm2MHK2Wggg=";
+      url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.3-aarch64.dmg";
+      hash = "sha256-Yo50EhVQDg7c/C3JZ9utZxpsOY0DuZfgYzYtBN9Nmwk=";
     };
   };
   # update-script-end: urls
@@ -39,8 +39,8 @@ mkJetBrainsProduct {
   product = "PhpStorm";
 
   # update-script-start: version
-  version = "2026.1.2";
-  buildNumber = "261.24374.185";
+  version = "2026.1.3";
+  buildNumber = "261.25134.104";
   # update-script-end: version
 
   src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));

From 50f2e0e108c75e47c622ee90cdf52b6d98152f81 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 8 Jun 2026 13:27:22 +0000
Subject: [PATCH 64/80] jetbrains.idea: 2026.1.1 -> 2026.1.3

---
 .../editors/jetbrains/ides/idea.nix           | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/ides/idea.nix b/pkgs/applications/editors/jetbrains/ides/idea.nix
index 6c36ecbd2a64..bf9dbdae54be 100644
--- a/pkgs/applications/editors/jetbrains/ides/idea.nix
+++ b/pkgs/applications/editors/jetbrains/ides/idea.nix
@@ -15,20 +15,20 @@ let
   # update-script-start: urls
   urls = {
     x86_64-linux = {
-      url = "https://download.jetbrains.com/idea/ideaIU-2026.1.1.tar.gz";
-      hash = "sha256-eljThvKi5ajNfkWRZXtP5ZmurCLZYMesz1+SeEZQe/s=";
+      url = "https://download.jetbrains.com/idea/ideaIU-2026.1.3.tar.gz";
+      hash = "sha256-pvBJcW2h0J2eDsFQDGC/AaX/ig/iQZF43R/y/bK3dWM=";
     };
     aarch64-linux = {
-      url = "https://download.jetbrains.com/idea/ideaIU-2026.1.1-aarch64.tar.gz";
-      hash = "sha256-jnVqDCmBix3njTxDga0aG89C9fvDW70gnE3I/nvHtXA=";
+      url = "https://download.jetbrains.com/idea/ideaIU-2026.1.3-aarch64.tar.gz";
+      hash = "sha256-dlnnkWCSM8Pmv2fBv8yG9foRdkd8pYFa5hJbDq6EqIs=";
     };
     x86_64-darwin = {
-      url = "https://download.jetbrains.com/idea/ideaIU-2026.1.1.dmg";
-      hash = "sha256-lPNwVLPSrmlQVFY9AD3+xzYeMG7JZnUTMl43rXjvtWM=";
+      url = "https://download.jetbrains.com/idea/ideaIU-2026.1.3.dmg";
+      hash = "sha256-Sv6A37Y5yIkaE+qnFEGDBq/q9fSSSZPjJC59NB2Fsns=";
     };
     aarch64-darwin = {
-      url = "https://download.jetbrains.com/idea/ideaIU-2026.1.1-aarch64.dmg";
-      hash = "sha256-0nOcHiGOHS9QoncuJwtD6cl4v34mp9cOx2oOB0tFIOM=";
+      url = "https://download.jetbrains.com/idea/ideaIU-2026.1.3-aarch64.dmg";
+      hash = "sha256-LRyg2DLmTgChdFKR8NMGGjWDZTAWnjQpoTp3NIBvYrI=";
     };
   };
   # update-script-end: urls
@@ -43,8 +43,8 @@ mkJetBrainsProduct {
   productShort = "IDEA";
 
   # update-script-start: version
-  version = "2026.1.1";
-  buildNumber = "261.23567.138";
+  version = "2026.1.3";
+  buildNumber = "261.25134.95";
   # update-script-end: version
 
   src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));

From 7c491cd136dfcf1658ba9cd228ceec12b702c4a6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 8 Jun 2026 13:33:17 +0000
Subject: [PATCH 65/80] abcmidi: 2026.04.26 -> 2026.06.06

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

diff --git a/pkgs/by-name/ab/abcmidi/package.nix b/pkgs/by-name/ab/abcmidi/package.nix
index 326184e817ec..29deb4b5181d 100644
--- a/pkgs/by-name/ab/abcmidi/package.nix
+++ b/pkgs/by-name/ab/abcmidi/package.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "abcmidi";
-  version = "2026.04.26";
+  version = "2026.06.06";
 
   src = fetchFromGitHub {
     owner = "sshlien";
     repo = "abcmidi";
     tag = finalAttrs.version;
-    hash = "sha256-d3mzAMFohBppduP25FUWmmQFFCo5lnP5LFLcoVFwjn0=";
+    hash = "sha256-2XPtLjvj+gyXTOOvUWzAO0magnjF3CWC7ZDCCuYN6vE=";
   };
 
   # TODO: remove once https://github.com/sshlien/abcmidi/pull/15 merged

From 8f8a576bd7523f087c1989e57070491ce229195b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 8 Jun 2026 13:49:37 +0000
Subject: [PATCH 66/80] werf: 2.69.0 -> 2.69.1

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

diff --git a/pkgs/by-name/we/werf/package.nix b/pkgs/by-name/we/werf/package.nix
index eb20f23e352c..c7db2d2b7d4d 100644
--- a/pkgs/by-name/we/werf/package.nix
+++ b/pkgs/by-name/we/werf/package.nix
@@ -10,13 +10,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "werf";
-  version = "2.69.0";
+  version = "2.69.1";
 
   src = fetchFromGitHub {
     owner = "werf";
     repo = "werf";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-pSWrHbstEHvN9Kzql6naZ7HVxuH76xM5v2UMDY5QZ74=";
+    hash = "sha256-w3H+SwCNkAg8MfA1FbSOTrG6pHDBMhkoaBlsuwERBNM=";
   };
 
   proxyVendor = true;

From 2a004027d77f0281720b193e80a7d95bde2f70ef Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Mon, 8 Jun 2026 14:35:46 +0000
Subject: [PATCH 67/80] fastfetch: 2.63.1 -> 2.64.2

Changelog: https://github.com/fastfetch-cli/fastfetch/releases/tag/2.64.2
Diff: https://github.com/fastfetch-cli/fastfetch/compare/2.63.1...2.64.2
---
 pkgs/by-name/fa/fastfetch/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix
index 1149ffdad002..b1e4cc25a67b 100644
--- a/pkgs/by-name/fa/fastfetch/package.nix
+++ b/pkgs/by-name/fa/fastfetch/package.nix
@@ -66,7 +66,7 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "fastfetch";
-  version = "2.63.1";
+  version = "2.64.2";
 
   strictDeps = true;
   __structuredAttrs = true;
@@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "fastfetch-cli";
     repo = "fastfetch";
     tag = finalAttrs.version;
-    hash = "sha256-6c3vA8AFSfew1TdSeUmJ4mIbFyDaJPVWUc93iZyqRY0=";
+    hash = "sha256-isSVcmtNglHy7+F3yemGyY8Jnsy3h5mjOnl159CyJ2Q=";
   };
 
   outputs = [

From b0099763f8624435e683ef2633ddd25cf54e8166 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 8 Jun 2026 14:49:30 +0000
Subject: [PATCH 68/80] home-assistant-custom-components.octopus_energy: 18.3.0
 -> 18.3.1

---
 .../custom-components/octopus_energy/package.nix              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/octopus_energy/package.nix b/pkgs/servers/home-assistant/custom-components/octopus_energy/package.nix
index 658bbf83bc0f..2c76e6733ecd 100644
--- a/pkgs/servers/home-assistant/custom-components/octopus_energy/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/octopus_energy/package.nix
@@ -11,13 +11,13 @@
 buildHomeAssistantComponent rec {
   owner = "BottlecapDave";
   domain = "octopus_energy";
-  version = "18.3.0";
+  version = "18.3.1";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "HomeAssistant-OctopusEnergy";
     tag = "v${version}";
-    hash = "sha256-V26sdgzA7i16SbAKTLiUgdRVTKJo23kgsRxaJsEtbyw=";
+    hash = "sha256-5Cjaq4DIe11hx/goKxGDSj6zyOb3H16s8KqlFRzhOYs=";
   };
 
   dependencies = [ pydantic ];

From 2d2cce7f4cb3314bc1f532d3de3d1c9eeab7c247 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Mon, 8 Jun 2026 16:43:44 +0200
Subject: [PATCH 69/80] fastfetch: add support for codec module

---
 pkgs/by-name/fa/fastfetch/package.nix | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix
index b1e4cc25a67b..3fc1154db9e1 100644
--- a/pkgs/by-name/fa/fastfetch/package.nix
+++ b/pkgs/by-name/fa/fastfetch/package.nix
@@ -21,6 +21,8 @@
   libsepol,
   libsysprof-capture,
   libxcb,
+  libva,
+  libvdpau,
   makeBinaryWrapper,
   moltenvk,
   nix-update-script,
@@ -48,6 +50,7 @@
   # Feature flags
   audioSupport ? true,
   brightnessSupport ? true,
+  codecSupport ? true,
   dbusSupport ? true,
   flashfetchSupport ? false,
   terminalSupport ? true,
@@ -92,9 +95,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs =
     let
-      commonDeps = [
-        yyjson
-      ];
+      commonDeps = [ yyjson ];
 
       # Cross-platform optional dependencies
       imageDeps = lib.optionals imageSupport [
@@ -111,9 +112,7 @@ stdenv.mkDerivation (finalAttrs: {
       ];
 
       linuxCoreDeps = lib.optionals stdenv.hostPlatform.isLinux (
-        [
-          hwdata
-        ]
+        [ hwdata ]
         # Fallback if both `wayland` and `x11` are not available. AMD GPU properties detection
         ++ lib.optional (!x11Support && !waylandSupport) libdrm
       );
@@ -127,6 +126,11 @@ stdenv.mkDerivation (finalAttrs: {
           # Brightness detection of external displays
           ddcutil
         ]
+        ++ lib.optionals codecSupport [
+          # Hardware-accelerated video codec detection
+          libva
+          libvdpau
+        ]
         ++ lib.optionals dbusSupport [
           # Bluetooth, wifi, player & media detection
           dbus
@@ -223,6 +227,9 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     (lib.cmakeBool "ENABLE_PULSE" audioSupport)
 
+    (lib.cmakeBool "ENABLE_VA" codecSupport)
+    (lib.cmakeBool "ENABLE_VDPAU" codecSupport)
+
     (lib.cmakeBool "ENABLE_DDCUTIL" brightnessSupport)
 
     (lib.cmakeBool "ENABLE_DBUS" dbusSupport)
@@ -281,6 +288,7 @@ stdenv.mkDerivation (finalAttrs: {
     minimal = fastfetch.override {
       audioSupport = false;
       brightnessSupport = false;
+      codecSupport = false;
       dbusSupport = false;
       enlightenmentSupport = false;
       flashfetchSupport = false;
@@ -316,6 +324,7 @@ stdenv.mkDerivation (finalAttrs: {
       Feature flags (all default to 'true' except rpmSupport, flashfetchSupport and zfsSupport):
       * audioSupport: PulseAudio functionality
       * brightnessSupport: External display brightness detection via DDCUtil
+      * codecSupport: Hardware-accelerated video codec detection
       * dbusSupport: DBus functionality for Bluetooth, WiFi, player & media detection
       * enlightenmentSupport: Enlightenment configuration detection via EFL's Eet
       * flashfetchSupport: Build the flashfetch utility (default: false)

From 34737cba685fc199953a5f9101d0ec5505b14054 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 7 Jun 2026 15:31:29 -0700
Subject: [PATCH 70/80] deltachat-desktop: use pnpm_10

---
 pkgs/by-name/de/deltachat-desktop/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/de/deltachat-desktop/package.nix b/pkgs/by-name/de/deltachat-desktop/package.nix
index b66b60db51b8..7d5f639fb079 100644
--- a/pkgs/by-name/de/deltachat-desktop/package.nix
+++ b/pkgs/by-name/de/deltachat-desktop/package.nix
@@ -8,7 +8,7 @@
   makeWrapper,
   nodejs,
   pkg-config,
-  pnpm_9,
+  pnpm_10,
   fetchPnpmDeps,
   pnpmConfigHook,
   python3,
@@ -49,9 +49,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
-    pnpm = pnpm_9;
-    fetcherVersion = 3;
-    hash = "sha256-OP+FbBxSnyFdeKvhqhmdEr1htFSX+WoPj6Ti8Q+ab/Y=";
+    pnpm = pnpm_10;
+    fetcherVersion = 4;
+    hash = "sha256-BSDeOkT75usLmXdAY8QNO+9YxxchrJH2gjFpTzErPXo=";
   };
 
   nativeBuildInputs = [
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
     nodejs
     pkg-config
     pnpmConfigHook
-    pnpm_9
+    pnpm_10
     python3
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [

From e7e6095be18ccaf814314d48ddc37a94da97316a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 7 Jun 2026 15:35:58 -0700
Subject: [PATCH 71/80] deltachat-tauri: use pnpm_10

---
 pkgs/by-name/de/deltachat-tauri/package.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/de/deltachat-tauri/package.nix b/pkgs/by-name/de/deltachat-tauri/package.nix
index 039750226993..8194eaf8a6c3 100644
--- a/pkgs/by-name/de/deltachat-tauri/package.nix
+++ b/pkgs/by-name/de/deltachat-tauri/package.nix
@@ -12,7 +12,7 @@
   openssl,
   perl,
   pkg-config,
-  pnpm_9,
+  pnpm_10,
   pnpmConfigHook,
   python3,
   rustPlatform,
@@ -23,7 +23,7 @@
 }:
 
 let
-  pnpm = pnpm_9;
+  pnpm = pnpm_10;
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "deltachat-tauri";
@@ -38,10 +38,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
   };
 
   pnpmDeps = fetchPnpmDeps {
-    inherit (finalAttrs) pname version src;
+    pname = "deltachat-desktop";
+    inherit (finalAttrs) version src;
     inherit pnpm;
-    fetcherVersion = 3;
-    hash = "sha256-OP+FbBxSnyFdeKvhqhmdEr1htFSX+WoPj6Ti8Q+ab/Y=";
+    fetcherVersion = 4;
+    hash = "sha256-BSDeOkT75usLmXdAY8QNO+9YxxchrJH2gjFpTzErPXo=";
   };
 
   cargoHash = "sha256-JhsoIQZrU4GVcs/TCIug6y/84gODyEWl0Bl2jRNxL5Y=";

From d81ee288f6d31163fd44ec51287ff4c529b2ff45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 7 Jun 2026 15:41:26 -0700
Subject: [PATCH 72/80] deltachat-desktop: use __structuredAttrs and strictDeps

---
 pkgs/by-name/de/deltachat-desktop/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/de/deltachat-desktop/package.nix b/pkgs/by-name/de/deltachat-desktop/package.nix
index 7d5f639fb079..80aeb4f63933 100644
--- a/pkgs/by-name/de/deltachat-desktop/package.nix
+++ b/pkgs/by-name/de/deltachat-desktop/package.nix
@@ -39,6 +39,7 @@ in
 stdenv.mkDerivation (finalAttrs: {
   pname = "deltachat-desktop";
   version = "2.51.0";
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "deltachat";
@@ -54,6 +55,8 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-BSDeOkT75usLmXdAY8QNO+9YxxchrJH2gjFpTzErPXo=";
   };
 
+  strictDeps = true;
+
   nativeBuildInputs = [
     yq
     makeWrapper

From c477004805e793b4a3f00d3c67b36828c2abf176 Mon Sep 17 00:00:00 2001
From: Kerstin Humm <kerstin@erictapen.name>
Date: Mon, 8 Jun 2026 16:56:46 +0200
Subject: [PATCH 73/80] nixos/lauti: remove nonsensical comment

---
 nixos/modules/services/web-apps/lauti.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/nixos/modules/services/web-apps/lauti.nix b/nixos/modules/services/web-apps/lauti.nix
index a804e1943743..1da419604b5e 100644
--- a/nixos/modules/services/web-apps/lauti.nix
+++ b/nixos/modules/services/web-apps/lauti.nix
@@ -17,8 +17,6 @@ in
 {
 
   imports = [
-    # since 0.12.0 (2025-05-26) release, upstream re-branded project to 'stalwart' due to inclusion of collaboration features (CalDAV, CardDAV, and WebDAV)
-    #  https://github.com/stalwartlabs/stalwart/releases/tag/v0.12.0
     (lib.mkRenamedOptionModule [ "services" "eintopf" ] [ "services" "lauti" ])
   ];
 

From f9dc47ee618759ec823ba199d15fb4fac3960f5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 8 Jun 2026 07:59:13 -0700
Subject: [PATCH 74/80] rtorrent: 0.16.11 -> 0.16.13

Diff: https://github.com/rakshasa/rtorrent/compare/v0.16.11...v0.16.13
---
 pkgs/by-name/rt/rtorrent/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/rt/rtorrent/package.nix b/pkgs/by-name/rt/rtorrent/package.nix
index 567d82e67a7c..aea9c2a1def6 100644
--- a/pkgs/by-name/rt/rtorrent/package.nix
+++ b/pkgs/by-name/rt/rtorrent/package.nix
@@ -23,7 +23,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rtorrent";
-  version = "0.16.11";
+  version = "0.16.13";
 
   __structuredAttrs = true;
 
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "rakshasa";
     repo = "rtorrent";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-OEIJMBj1UfIOpR1w8c8ztKWJVD5hKxiJaxweF7mBRNM=";
+    hash = "sha256-QvABQKKH/4KUbG6mSkvfcqMpX552nAKp1vZerin2sLA=";
   };
 
   outputs = [

From d74ffb2d2d4a68c64641bcf1c0716925c241d507 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Mon, 8 Jun 2026 10:32:35 -0400
Subject: [PATCH 75/80] gleam: fix linux build by skipping network test

also removed openssl which hasn't been needed since v1.1
---
 pkgs/by-name/gl/gleam/package.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/gl/gleam/package.nix b/pkgs/by-name/gl/gleam/package.nix
index 58580ef85722..928c7f2613e3 100644
--- a/pkgs/by-name/gl/gleam/package.nix
+++ b/pkgs/by-name/gl/gleam/package.nix
@@ -2,10 +2,10 @@
   lib,
   stdenv,
   rustPlatform,
+
   fetchFromGitHub,
   git,
   pkg-config,
-  openssl,
   erlang,
   nodejs,
   bun,
@@ -33,8 +33,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     erlang
   ];
 
-  buildInputs = [ openssl ];
-
   nativeCheckInputs = [
     # used by several tests
     git
@@ -48,8 +46,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ];
 
   checkFlags = [
-    # Makes a network request
+    # These tests make network requests
     "--skip=tests::echo::echo_dict"
+    "--skip=tests::escript_success_with_dependency"
   ]
   ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
     # Snapshot tests fail because a warning is shown on stdout

From f6833f3bb389d59f802a6d6099e1e51ec405a8c9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 8 Jun 2026 09:30:03 +0000
Subject: [PATCH 76/80] protoc-gen-elixir: 0.16.0 -> 0.17.0

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

diff --git a/pkgs/by-name/pr/protoc-gen-elixir/package.nix b/pkgs/by-name/pr/protoc-gen-elixir/package.nix
index 237f52d810c2..d5280edebe28 100644
--- a/pkgs/by-name/pr/protoc-gen-elixir/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-elixir/package.nix
@@ -5,17 +5,17 @@
   nix-update-script,
 }:
 let
-  inherit (beamPackages) mixRelease fetchMixDeps erlang;
+  inherit (beamPackages) mixRelease fetchMixDeps;
 in
 mixRelease rec {
   pname = "protoc-gen-elixir";
-  version = "0.16.0";
+  version = "0.17.0";
 
   src = fetchFromGitHub {
     owner = "elixir-protobuf";
     repo = "protobuf";
     tag = "v${version}";
-    hash = "sha256-kyS9KZENdoEuB64k48RegtZQa57/RDnm8bY+piAAk2w=";
+    hash = "sha256-hxtG7w+cL02yM2pZ4aL8/nse8qFULP8IhkpX6cCXwwA=";
   };
 
   mixFodDeps = fetchMixDeps {

From c2c5e3839d57c6b364634f4e7f3152cb56a3b561 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 8 Jun 2026 14:26:05 +0000
Subject: [PATCH 77/80] gpxsee: 16.7 -> 16.8

---
 pkgs/by-name/gp/gpxsee/package.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gp/gpxsee/package.nix b/pkgs/by-name/gp/gpxsee/package.nix
index 2926b7851266..cf93f011dfb4 100644
--- a/pkgs/by-name/gp/gpxsee/package.nix
+++ b/pkgs/by-name/gp/gpxsee/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gpxsee";
-  version = "16.7";
+  version = "16.8";
 
   src = fetchFromGitHub {
     owner = "tumic0";
     repo = "GPXSee";
     tag = finalAttrs.version;
-    hash = "sha256-MO7x/IvKv2L6GFKjdVPJg1/Fj6uC6rSj9n5YxGfk+3o=";
+    hash = "sha256-8G1PN4sN/OawEetbud+va8tTSzY2sb27e3sLNWOwSfk=";
   };
 
   buildInputs = [
@@ -24,6 +24,9 @@ stdenv.mkDerivation (finalAttrs: {
     qt6.qtpositioning
     qt6.qtserialport
     qt6.qtsvg
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    qt6.qt5compat
   ];
 
   nativeBuildInputs = [

From 4bd030a4658092f4d936a382f2cadcb35dbee8ca Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 8 Jun 2026 16:36:44 +0000
Subject: [PATCH 78/80] code-cursor: 3.6.21 -> 3.7.19

---
 pkgs/by-name/co/code-cursor/sources.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/co/code-cursor/sources.json b/pkgs/by-name/co/code-cursor/sources.json
index ee778a21ba1c..80858c762470 100644
--- a/pkgs/by-name/co/code-cursor/sources.json
+++ b/pkgs/by-name/co/code-cursor/sources.json
@@ -1,22 +1,22 @@
 {
-  "version": "3.6.21",
+  "version": "3.7.19",
   "vscodeVersion": "1.105.1",
   "sources": {
     "x86_64-linux": {
-      "url": "https://downloads.cursor.com/production/e7a7e93f4d75f8272503ecf33cedbaae10114a15/linux/x64/Cursor-3.6.21-x86_64.AppImage",
-      "hash": "sha256-6zIhSz5fxEMLA8zd6oZtwNDUMAW65bZu/fYMSV/Iuh0="
+      "url": "https://downloads.cursor.com/production/80c653c2c3528e65016a0d304b54486084b470bb/linux/x64/Cursor-3.7.19-x86_64.AppImage",
+      "hash": "sha256-qlNQwaDqPL1/wsxwyUXPWvoeXuWoVahibnk0H0h6KZ4="
     },
     "aarch64-linux": {
-      "url": "https://downloads.cursor.com/production/e7a7e93f4d75f8272503ecf33cedbaae10114a15/linux/arm64/Cursor-3.6.21-aarch64.AppImage",
-      "hash": "sha256-5DxmpvFUqNybbHSRB6RlM9yVzFKHSoXIkEDygg0b/5A="
+      "url": "https://downloads.cursor.com/production/80c653c2c3528e65016a0d304b54486084b470bb/linux/arm64/Cursor-3.7.19-aarch64.AppImage",
+      "hash": "sha256-JqFyV6OORi1IywBsTqCcamiyBojA7wFgMbcvD2PXjrQ="
     },
     "x86_64-darwin": {
-      "url": "https://downloads.cursor.com/production/e7a7e93f4d75f8272503ecf33cedbaae10114a15/darwin/x64/Cursor-darwin-x64.dmg",
-      "hash": "sha256-CHxaG3gNgAJSBpTGJcqX4LhfpW7BJI44nEbphDvoTDo="
+      "url": "https://downloads.cursor.com/production/80c653c2c3528e65016a0d304b54486084b470bb/darwin/x64/Cursor-darwin-x64.dmg",
+      "hash": "sha256-nHewB1kn7wJDlzWWzuFD6yV6/LpcGGANHDQHTUgL6Ks="
     },
     "aarch64-darwin": {
-      "url": "https://downloads.cursor.com/production/e7a7e93f4d75f8272503ecf33cedbaae10114a15/darwin/arm64/Cursor-darwin-arm64.dmg",
-      "hash": "sha256-QproM1zUY3xpXKzzae+yAmb7yb5Os9zwJlvliwDKLc8="
+      "url": "https://downloads.cursor.com/production/80c653c2c3528e65016a0d304b54486084b470bb/darwin/arm64/Cursor-darwin-arm64.dmg",
+      "hash": "sha256-Dj2JQmL5VDT7WpejNX4wQi4wOrx7pt22oryycY9BXj0="
     }
   }
 }

From fb86fecd8cb861977496c8db6db8be50ffed7951 Mon Sep 17 00:00:00 2001
From: Chloe A <chloe@sapphic.moe>
Date: Mon, 8 Jun 2026 21:55:48 +0500
Subject: [PATCH 79/80] chiri: 0.9.0 -> 0.9.1

---
 pkgs/by-name/ch/chiri/package.nix | 194 ++++++++++++++++--------------
 1 file changed, 106 insertions(+), 88 deletions(-)

diff --git a/pkgs/by-name/ch/chiri/package.nix b/pkgs/by-name/ch/chiri/package.nix
index 590b9352d68c..b0ad9f5a174b 100644
--- a/pkgs/by-name/ch/chiri/package.nix
+++ b/pkgs/by-name/ch/chiri/package.nix
@@ -22,104 +22,122 @@
   webkitgtk_4_1,
 }:
 
-rustPlatform.buildRustPackage (finalAttrs: {
-  pname = "chiri";
-  version = "0.9.0";
+rustPlatform.buildRustPackage (
+  finalAttrs:
+  let
+    # on macOS, Node.js worker threads default to `trackUnmanagedFds: true`
+    # when used with pnpm's graceful-fs EAGAIN retry loop, this causes file descriptor
+    # churn that leads to a crash during cleanup (presenting as `Killed: 9` / SIGKILL)
+    # within the Nix sandbox. so we just disable `trackUnmanagedFds` to prevent this
+    # see: https://github.com/NixOS/nixpkgs/issues/525627
+    pnpm-patched = pnpm_11.overrideAttrs (old: {
+      postPatch = (old.postPatch or "") + ''
+        substituteInPlace dist/pnpm.mjs \
+          --replace-fail \
+            'resourceLimits: this._workerResourceLimits' \
+            'resourceLimits: this._workerResourceLimits, trackUnmanagedFds: false'
+      '';
+    });
+  in
+  {
+    pname = "chiri";
+    version = "0.9.1";
 
-  src = fetchFromGitHub {
-    owner = "chiriapp";
-    repo = "chiri";
-    tag = "app-v${finalAttrs.version}";
-    hash = "sha256-xlB7VqHXBljOjOOK96hK3HYENsuICMqRqfgJdtEnlUI=";
-  };
+    src = fetchFromGitHub {
+      owner = "chiriapp";
+      repo = "chiri";
+      tag = "app-v${finalAttrs.version}";
+      hash = "sha256-rkkyp36EIfvD0DXq0Tn+uLS/cBtgGk4x4sVkppTDaLg=";
+    };
 
-  cargoHash = "sha256-MTPd8HqbU35wmYVCv8HtfAuooBPsZk+p5J2Y5HjHTsA=";
+    cargoHash = "sha256-nSK4oyaW+chFHKrCI80d9785UsqBlX8YAdU26b/aa0s=";
 
-  pnpmDeps = fetchPnpmDeps {
-    inherit (finalAttrs) pname version src;
-    pnpm = pnpm_11;
-    hash = "sha256-dxfoo5Ajjt7zUsdQojXhePHp0K2itpdjequvGqqnZ7k=";
-    fetcherVersion = 3;
-  };
+    pnpmDeps = fetchPnpmDeps {
+      inherit (finalAttrs) pname version src;
+      pnpm = pnpm-patched;
+      hash = "sha256-dxfoo5Ajjt7zUsdQojXhePHp0K2itpdjequvGqqnZ7k=";
+      fetcherVersion = 3;
+    };
 
-  nativeBuildInputs = [
-    cargo-tauri.hook
-    nodejs_26
-    pnpmConfigHook
-    pnpm_11
-    pkg-config
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isLinux [
-    wrapGAppsHook4
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    makeBinaryWrapper
-  ];
+    nativeBuildInputs = [
+      cargo-tauri.hook
+      nodejs_26
+      pnpmConfigHook
+      pnpm-patched
+      pkg-config
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      wrapGAppsHook4
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      makeBinaryWrapper
+    ];
 
-  buildInputs = [
-    openssl
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isLinux [
-    glib-networking
-    libayatana-appindicator
-    webkitgtk_4_1
-  ];
+    buildInputs = [
+      openssl
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      glib-networking
+      libayatana-appindicator
+      webkitgtk_4_1
+    ];
 
-  cargoRoot = "src-tauri";
-  buildAndTestSubdir = "src-tauri";
+    cargoRoot = "src-tauri";
+    buildAndTestSubdir = "src-tauri";
 
-  postPatch =
-    lib.optionalString stdenv.hostPlatform.isLinux ''
-      for libappindicatorRs in $cargoDepsCopy/*/libappindicator-sys-*/src/lib.rs; do
-        if [[ -f "$libappindicatorRs" ]]; then
-          substituteInPlace "$libappindicatorRs" \
-            --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
-        fi
-      done
-    ''
-    + ''
-      substituteInPlace src-tauri/tauri.conf.json \
-        --replace-fail '"createUpdaterArtifacts": true' '"createUpdaterArtifacts": false'
-    '';
-
-  # This is needed since the signing keys are private, and are only used in CI during releases anyways. Regular users won't need this.
-  preBuild = ''
-    unset TAURI_SIGNING_PRIVATE_KEY
-    unset TAURI_SIGNING_PUBLIC_KEY
-    pnpm build
-  '';
-
-  postInstall =
-    if stdenv.hostPlatform.isDarwin then
-      ''
-        mkdir -p $out/bin
-        makeWrapper "$out/Applications/Chiri.app/Contents/MacOS/chiri" "$out/bin/chiri"
-      ''
-    else
-      ''
-        mv $out/bin/Chiri $out/bin/chiri
-        for desktopFile in \
-          $out/share/applications/Chiri.desktop \
-          $out/share/applications/garden.chiri.Chiri.desktop
-        do
-          if [ -f "$desktopFile" ]; then
-            substituteInPlace "$desktopFile" \
-              --replace-fail "Exec=Chiri" "Exec=chiri"
+    postPatch =
+      lib.optionalString stdenv.hostPlatform.isLinux ''
+        for libappindicatorRs in $cargoDepsCopy/*/libappindicator-sys-*/src/lib.rs; do
+          if [[ -f "$libappindicatorRs" ]]; then
+            substituteInPlace "$libappindicatorRs" \
+              --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
           fi
         done
+      ''
+      + ''
+        substituteInPlace src-tauri/tauri.conf.json \
+          --replace-fail '"createUpdaterArtifacts": true' '"createUpdaterArtifacts": false'
       '';
 
-  doCheck = false;
+    # This is needed since the signing keys are private, and are only used in CI during releases anyways. Regular users won't need this.
+    preBuild = ''
+      unset TAURI_SIGNING_PRIVATE_KEY
+      unset TAURI_SIGNING_PUBLIC_KEY
+      pnpm build
+    '';
 
-  passthru.updateScript = nix-update-script;
+    postInstall =
+      if stdenv.hostPlatform.isDarwin then
+        ''
+          mkdir -p $out/bin
+          makeWrapper "$out/Applications/Chiri.app/Contents/MacOS/chiri" "$out/bin/chiri"
+        ''
+      else
+        ''
+          mv $out/bin/Chiri $out/bin/chiri
+          for desktopFile in \
+            $out/share/applications/Chiri.desktop \
+            $out/share/applications/garden.chiri.Chiri.desktop
+          do
+            if [ -f "$desktopFile" ]; then
+              substituteInPlace "$desktopFile" \
+                --replace-fail "Exec=Chiri" "Exec=chiri"
+            fi
+          done
+        '';
 
-  meta = {
-    description = "Cross-platform CalDAV task management app";
-    homepage = "https://github.com/chiriapp/chiri";
-    changelog = "https://github.com/chiriapp/chiri/releases/tag/app-v${finalAttrs.version}";
-    license = lib.licenses.zlib;
-    maintainers = with lib.maintainers; [ SapphoSys ];
-    mainProgram = "chiri";
-    platforms = lib.platforms.linux ++ lib.platforms.darwin;
-  };
-})
+    doCheck = false;
+
+    passthru.updateScript = nix-update-script;
+
+    meta = {
+      description = "Cross-platform CalDAV task management app";
+      homepage = "https://github.com/chiriapp/chiri";
+      changelog = "https://github.com/chiriapp/chiri/releases/tag/app-v${finalAttrs.version}";
+      license = lib.licenses.zlib;
+      maintainers = with lib.maintainers; [ SapphoSys ];
+      mainProgram = "chiri";
+      platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    };
+  }
+)

From 03b97822bf9476ad984b6f6db33d3ffd17a1ee52 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 8 Jun 2026 18:22:23 +0000
Subject: [PATCH 80/80] python3Packages.stravalib: 2.4 -> 2.5.0

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

diff --git a/pkgs/development/python-modules/stravalib/default.nix b/pkgs/development/python-modules/stravalib/default.nix
index 14e58697b567..fb7c49575df3 100644
--- a/pkgs/development/python-modules/stravalib/default.nix
+++ b/pkgs/development/python-modules/stravalib/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "stravalib";
-  version = "2.4";
+  version = "2.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "stravalib";
     repo = "stravalib";
     tag = "v${version}";
-    hash = "sha256-RMvahoUOy4RnSu0O7dBpYylaQ8nPfMiivx8k1XBeEGA=";
+    hash = "sha256-3xmWg20fbp2tbwPNcxLtWSVajgeyDoZfRTQbwROEGVE=";
   };
 
   build-system = [