From 5575434e6d84d3d433936052aa4b5f0615ad888b Mon Sep 17 00:00:00 2001
From: Benjamin Levy <7348004+io12@users.noreply.github.com>
Date: Thu, 16 Jul 2026 08:21:51 -0400
Subject: [PATCH 01/23] dovecot: disable tests on 32-bit to fix build

---
 pkgs/by-name/do/dovecot/generic.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/do/dovecot/generic.nix b/pkgs/by-name/do/dovecot/generic.nix
index 7c54332c89ab..54e5665a6b29 100644
--- a/pkgs/by-name/do/dovecot/generic.nix
+++ b/pkgs/by-name/do/dovecot/generic.nix
@@ -226,7 +226,7 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optional withPgSQL "--with-pgsql"
   ++ lib.optional withSQLite "--with-sqlite";
 
-  doCheck = !stdenv.hostPlatform.isDarwin;
+  doCheck = !(stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.is32bit);
 
   strictDeps = true;
 

From 591a9f05d04e8e7efce954e56d193024980b6f4b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Jul 2026 01:35:50 +0000
Subject: [PATCH 02/23] python3Packages.comet-ml: 3.58.3 -> 3.58.4

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

diff --git a/pkgs/development/python-modules/comet-ml/default.nix b/pkgs/development/python-modules/comet-ml/default.nix
index cd0e555deacb..15f5ea10c677 100644
--- a/pkgs/development/python-modules/comet-ml/default.nix
+++ b/pkgs/development/python-modules/comet-ml/default.nix
@@ -24,7 +24,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "comet-ml";
-  version = "3.58.3";
+  version = "3.58.4";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -32,7 +32,7 @@ buildPythonPackage (finalAttrs: {
   src = fetchPypi {
     pname = "comet_ml";
     inherit (finalAttrs) version;
-    hash = "sha256-fl+9ywbh3g1/mXRavW4V5aaLDyHcpUu+dMK4mQGVkEE=";
+    hash = "sha256-h5sYsTA4fZcPdN+w/gWrKzCLFstbVmbFuwHUTQ621Dk=";
   };
 
   build-system = [

From 103602e78c73c0eb108391d1bd6d9322173d2708 Mon Sep 17 00:00:00 2001
From: loner <2788892716@qq.com>
Date: Tue, 28 Jul 2026 07:01:40 +0800
Subject: [PATCH 03/23] resterm: 0.46.4 -> 0.48.1

---
 pkgs/by-name/re/resterm/package.nix | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/re/resterm/package.nix b/pkgs/by-name/re/resterm/package.nix
index f71c28a0c679..1ed421f5632c 100644
--- a/pkgs/by-name/re/resterm/package.nix
+++ b/pkgs/by-name/re/resterm/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "resterm";
-  version = "0.46.4";
+  version = "0.48.1";
 
   src = fetchFromGitHub {
     owner = "unkn0wn-root";
     repo = "resterm";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Fpt/ZYdLC4OVA9Aj8NXJ76TY1ofxifXfjqD6irVV6cM=";
+    hash = "sha256-pOP09WnnPFCMUnwhcNTwctQVYNLmnC8f1oGdXzBlIwQ=";
   };
 
   vendorHash = "sha256-K6edyYLkVQwEZBAfRwgckUJI8dmo/ZxFRjEkExtyLxY=";
@@ -27,6 +27,20 @@ buildGoModule (finalAttrs: {
 
   subPackages = [ "cmd/resterm" ];
 
+  # Skip tests that require network access or socket binding
+  checkFlags = [
+    "-skip"
+    "^(${
+      lib.concatStringsSep "|" [
+        "TestServeMocksStartsAndStopsWithContext"
+        "TestServeMocksRequiresTLSPair"
+        "TestServeMocksValidatesJournalLimitsAsUsageErrors"
+        "TestMockControlCommandsResetClearAndVerify"
+        "TestCLIUpdaterCheckDev"
+      ]
+    })$"
+  ];
+
   ldflags = [
     "-s"
     "-w"

From fade5f4c77e9e4d743a1d0d29f13d5116faae0cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 30 Jul 2026 13:08:43 -0700
Subject: [PATCH 04/23] nfs-utils: 2.9.1 -> 2.9.2

Changelog: https://www.kernel.org/pub/linux/utils/nfs-utils/2.9.2/2.9.2-Changelog
---
 pkgs/by-name/nf/nfs-utils/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/nf/nfs-utils/package.nix b/pkgs/by-name/nf/nfs-utils/package.nix
index 814ede883f76..b53ea79bb39d 100644
--- a/pkgs/by-name/nf/nfs-utils/package.nix
+++ b/pkgs/by-name/nf/nfs-utils/package.nix
@@ -40,11 +40,11 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nfs-utils";
-  version = "2.9.1";
+  version = "2.9.2";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/nfs-utils/${finalAttrs.version}/nfs-utils-${finalAttrs.version}.tar.xz";
-    hash = "sha256-MChGNDv1Cfj4hMI729D+hTt/fLtlcgYKkIInnROyGiw=";
+    hash = "sha256-4d2KnJWvFUkgZZQsw7UrEzn/1Ya6oigO2GydPcQJfow=";
   };
 
   # libnfsidmap is built together with nfs-utils from the same source,

From c0de18224064776c41681372b3d4a3734276d667 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Jul 2026 02:21:59 +0000
Subject: [PATCH 05/23] python3Packages.petsc4py: 3.25.3 -> 3.25.4

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

diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix
index 54d042ac465c..770d1f94a371 100644
--- a/pkgs/by-name/pe/petsc/package.nix
+++ b/pkgs/by-name/pe/petsc/package.nix
@@ -109,11 +109,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "petsc";
-  version = "3.25.3";
+  version = "3.25.4";
 
   src = fetchzip {
     url = "https://web.cels.anl.gov/projects/petsc/download/release-snapshots/petsc-${finalAttrs.version}.tar.gz";
-    hash = "sha256-rGaqQ5uNY4b8+9PJb6y9rhaCdQuNyfGuomjfm2kVvps=";
+    hash = "sha256-iF8HPlqhSkOUkAWDTMOUfWSFsLHMASeOeTXJw7qqgYQ=";
   };
 
   postPatch = ''

From 28a61c075e30f0a6575eb0141489e465fc23f338 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Jul 2026 07:59:54 +0000
Subject: [PATCH 06/23] livekit: 1.13.4 -> 1.13.5

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

diff --git a/pkgs/by-name/li/livekit/package.nix b/pkgs/by-name/li/livekit/package.nix
index 3f8f0261c778..f98636d225cf 100644
--- a/pkgs/by-name/li/livekit/package.nix
+++ b/pkgs/by-name/li/livekit/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "livekit";
-  version = "1.13.4";
+  version = "1.13.5";
 
   src = fetchFromGitHub {
     owner = "livekit";
     repo = "livekit";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-XdyXjDI9q1RjdLY19O2Gzp/KBTLk88soB5W60y9hFCs=";
+    hash = "sha256-TfQDYChRtowFzkVhuQrLfKeKrcSWLPY9R/D6to4mRSI=";
   };
 
-  vendorHash = "sha256-wHra0WyEnN8bfBi2MWJaZmWwVeSchzN18zbu2hzJw5Q=";
+  vendorHash = "sha256-Mn+6+lDtSZPp3xrf1OzsBdecuXnwaKwGDXtcYXb5S7Y=";
 
   subPackages = [ "cmd/server" ];
 

From 7ae2b98ebd2d36094dd2eb5962e22f9085633577 Mon Sep 17 00:00:00 2001
From: Jakob Stender Guldberg <jakob1379@gmail.com>
Date: Fri, 31 Jul 2026 09:50:35 +0200
Subject: [PATCH 07/23] t3code: 0.0.30 -> 0.0.31

Changelog: https://github.com/pingdotgg/t3code/releases/tag/v0.0.31

Assisted-by: Claude Code (claude-opus-5)
---
 pkgs/by-name/t3/t3code/package.nix          | 25 ++++++++++++++++++---
 pkgs/by-name/t3/t3code/resource-monitor.nix | 25 +++++++++++++++++++++
 pkgs/by-name/t3/t3code/unwrapped.nix        |  6 ++---
 3 files changed, 50 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/by-name/t3/t3code/resource-monitor.nix

diff --git a/pkgs/by-name/t3/t3code/package.nix b/pkgs/by-name/t3/t3code/package.nix
index 6352c9047ff7..a380fbeee98a 100644
--- a/pkgs/by-name/t3/t3code/package.nix
+++ b/pkgs/by-name/t3/t3code/package.nix
@@ -26,7 +26,9 @@
   jujutsu,
   enableOpencode ? false,
   opencode,
+  enableResourceMonitor ? true,
   t3code-unwrapped ? callPackage ./unwrapped.nix { },
+  t3code-resource-monitor ? callPackage ./resource-monitor.nix { inherit t3code-unwrapped; },
 }:
 
 let
@@ -45,6 +47,23 @@ let
     ++ lib.optionals enableJujutsu [ jujutsu ]
     ++ lib.optionals enableOpencode [ opencode ];
 
+  # The resource monitor sidecar is a separate Rust binary that upstream only
+  # builds in its electron-builder pipeline, not in `build:desktop`. The server
+  # checks this variable before any bundled location, and the desktop app's
+  # server child inherits it.
+  wrapperArgs =
+    lib.optionals (runtimePackages != [ ]) [
+      "--prefix"
+      "PATH"
+      ":"
+      (lib.makeBinPath runtimePackages)
+    ]
+    ++ lib.optionals enableResourceMonitor [
+      "--set-default"
+      "T3CODE_RESOURCE_MONITOR_PATH"
+      (lib.getExe t3code-resource-monitor)
+    ];
+
 in
 symlinkJoin {
   pname = "t3code";
@@ -56,15 +75,15 @@ symlinkJoin {
 
   nativeBuildInputs = [ makeBinaryWrapper ];
 
-  postBuild = lib.optionalString (runtimePackages != [ ]) ''
+  postBuild = lib.optionalString (wrapperArgs != [ ]) ''
     for program in "$out/bin"/*; do
-      wrapProgram "$program" \
-        --prefix PATH : "${lib.makeBinPath runtimePackages}"
+      wrapProgram "$program" ${lib.escapeShellArgs wrapperArgs}
     done
   '';
 
   passthru = {
     unwrapped = t3code-unwrapped;
+    resourceMonitor = t3code-resource-monitor;
   }
   // t3code-unwrapped.passthru;
 
diff --git a/pkgs/by-name/t3/t3code/resource-monitor.nix b/pkgs/by-name/t3/t3code/resource-monitor.nix
new file mode 100644
index 000000000000..021f6c2fb97a
--- /dev/null
+++ b/pkgs/by-name/t3/t3code/resource-monitor.nix
@@ -0,0 +1,25 @@
+{
+  rustPlatform,
+  t3code-unwrapped,
+}:
+
+rustPlatform.buildRustPackage {
+  pname = "t3code-resource-monitor";
+  inherit (t3code-unwrapped) version src;
+
+  sourceRoot = "${t3code-unwrapped.src.name}/native/resource-monitor";
+
+  cargoHash = "sha256-5cmG2daM1bVOA23gjjoalbx0fEL1hmqV6WZov0sUZp8=";
+
+  meta = {
+    description = "Native resource diagnostics sidecar for T3 Code";
+    inherit (t3code-unwrapped.meta)
+      homepage
+      changelog
+      license
+      maintainers
+      platforms
+      ;
+    mainProgram = "t3-resource-monitor";
+  };
+}
diff --git a/pkgs/by-name/t3/t3code/unwrapped.nix b/pkgs/by-name/t3/t3code/unwrapped.nix
index eee8555ac056..e14b82581f91 100644
--- a/pkgs/by-name/t3/t3code/unwrapped.nix
+++ b/pkgs/by-name/t3/t3code/unwrapped.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation (
   in
   {
     pname = "t3code-unwrapped";
-    version = "0.0.30";
+    version = "0.0.31";
     strictDeps = true;
     __structuredAttrs = true;
 
@@ -45,7 +45,7 @@ stdenv.mkDerivation (
       owner = "pingdotgg";
       repo = "t3code";
       tag = "v${finalAttrs.version}";
-      hash = "sha256-8N/TbKjaeog5+fbFr1o/Hs0xgbJijsZigo2FdOFtMco=";
+      hash = "sha256-KFGwgAIOqHbi3enmNAPt95+UAakm6pmClPK1nYNoOlk=";
     };
 
     postPatch = ''
@@ -93,7 +93,7 @@ stdenv.mkDerivation (
         ;
 
       fetcherVersion = 4;
-      hash = "sha256-Qiwbg1EPjcVvt8YGc0YYP+1NbgBIxMkwIyTq5f3gtl4=";
+      hash = "sha256-6tuT9MS+PIMV0PFiw1q6vtZyk3yFB5Y4yHgWohMJczs=";
     };
 
     preBuild = ''

From fc7b9a429ae01d83fde0d99c7b29e57f9241511e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 31 Jul 2026 11:22:32 -0700
Subject: [PATCH 08/23] python3Packages.niquests: 3.20.1 -> 3.21.0

Diff: https://github.com/jawah/niquests/compare/v3.20.1...v3.21.0

Changelog: https://github.com/jawah/niquests/blob/v3.21.0/HISTORY.md
---
 pkgs/development/python-modules/niquests/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/niquests/default.nix b/pkgs/development/python-modules/niquests/default.nix
index cc20a284f81c..056b86e55986 100644
--- a/pkgs/development/python-modules/niquests/default.nix
+++ b/pkgs/development/python-modules/niquests/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "niquests";
-  version = "3.20.1";
+  version = "3.21.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jawah";
     repo = "niquests";
     tag = "v${version}";
-    hash = "sha256-ux0Nypp3gvf//vNyTt/BygkneEfX2Z3wHaLpbb3TGyI=";
+    hash = "sha256-oKxs1ivKzoCIqFnh81MwCbLfjH5JTKj/orTZNe7uiC4=";
   };
 
   build-system = [ hatchling ];
@@ -75,6 +75,8 @@ buildPythonPackage rec {
   disabledTestPaths = [
     # tests connect to the internet
     "tests/test_requests.py"
+    # we don't care about coverage
+    "tests/wasi_guest/coverage_runner.py"
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     # NameResolutionError: Failed to resolve 'localhost'

From f935f79a314571c27aa3967940e6d95aa598a82b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 31 Jul 2026 11:25:19 -0700
Subject: [PATCH 09/23] python3Packages.niquests: use finalAttrs

---
 pkgs/development/python-modules/niquests/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/niquests/default.nix b/pkgs/development/python-modules/niquests/default.nix
index 056b86e55986..d74ea8c69f42 100644
--- a/pkgs/development/python-modules/niquests/default.nix
+++ b/pkgs/development/python-modules/niquests/default.nix
@@ -16,7 +16,7 @@
   wassima,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "niquests";
   version = "3.21.0";
   pyproject = true;
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jawah";
     repo = "niquests";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-oKxs1ivKzoCIqFnh81MwCbLfjH5JTKj/orTZNe7uiC4=";
   };
 
@@ -70,7 +70,7 @@ buildPythonPackage rec {
     pytest-httpbin
     pytestCheckHook
   ]
-  ++ optional-dependencies.socks;
+  ++ finalAttrs.passthru.optional-dependencies.socks;
 
   disabledTestPaths = [
     # tests connect to the internet
@@ -101,10 +101,10 @@ buildPythonPackage rec {
     ];
 
   meta = {
-    changelog = "https://github.com/jawah/niquests/blob/${src.tag}/HISTORY.md";
+    changelog = "https://github.com/jawah/niquests/blob/${finalAttrs.src.tag}/HISTORY.md";
     description = "Simple HTTP library that is a drop-in replacement for Requests";
     homepage = "https://github.com/jawah/niquests";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ dotlambda ];
   };
-}
+})

From b16538e8d70a370864ac3e04994badbb48d514d4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Aug 2026 01:27:12 +0000
Subject: [PATCH 10/23] python3Packages.netbox-dns: 1.5.10 -> 1.5.11

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

diff --git a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-dns/package.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-dns/package.nix
index 8a86085099b2..b43b265ca17c 100644
--- a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-dns/package.nix
+++ b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-dns/package.nix
@@ -7,7 +7,7 @@
 }:
 buildPythonPackage (finalAttrs: {
   pname = "netbox-plugin-dns";
-  version = "1.5.10";
+  version = "1.5.11";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -15,7 +15,7 @@ buildPythonPackage (finalAttrs: {
     owner = "peteeckel";
     repo = "netbox-plugin-dns";
     tag = finalAttrs.version;
-    hash = "sha256-wxTW/qiwp+1CXUeCDJnllEW2oCTjlFVUot7JfWPooaw=";
+    hash = "sha256-9YMUrxqjyp9qixETAf/MpSTKO4HnItPH1qQ1MqGPcv4=";
   };
 
   build-system = [ setuptools ];

From 1a5bd73bec84c5a935c09ba7986c15d65c800047 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Aug 2026 07:06:21 +0000
Subject: [PATCH 11/23] python3Packages.langchain-aws: 1.6.3 -> 1.6.4

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

diff --git a/pkgs/development/python-modules/langchain-aws/default.nix b/pkgs/development/python-modules/langchain-aws/default.nix
index 28fa57fbb920..29a60272aa50 100644
--- a/pkgs/development/python-modules/langchain-aws/default.nix
+++ b/pkgs/development/python-modules/langchain-aws/default.nix
@@ -31,7 +31,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "langchain-aws";
-  version = "1.6.3";
+  version = "1.6.4";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -39,7 +39,7 @@ buildPythonPackage (finalAttrs: {
     owner = "langchain-ai";
     repo = "langchain-aws";
     tag = "langchain-aws==${finalAttrs.version}";
-    hash = "sha256-BSq8b5hNfBRp2PkLXSJRpGqJ5+T48x0zQUYlgzzcz7E=";
+    hash = "sha256-7qg2cUjlFEo6ekK269Ew0wmmSx+1BwUdTJZCMPd2tBU=";
   };
 
   postPatch = ''

From 98e01881ea5e6af53cc2b41c9b6d2235800140e0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Aug 2026 09:29:53 +0000
Subject: [PATCH 12/23] code: 0.6.100 -> 0.6.162

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

diff --git a/pkgs/by-name/co/code/package.nix b/pkgs/by-name/co/code/package.nix
index 9cda52c8b26c..6b9121b2cc46 100644
--- a/pkgs/by-name/co/code/package.nix
+++ b/pkgs/by-name/co/code/package.nix
@@ -11,18 +11,18 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "code";
-  version = "0.6.100";
+  version = "0.6.162";
 
   src = fetchFromGitHub {
     owner = "just-every";
     repo = "code";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-I/QdFRo6FeNtwlwwZXkCkeknJlkTo9wWrhJTZ5fdv7A=";
+    hash = "sha256-0UrAphFzKFpaCdPtlGZ8vLbbP3lROTcOlPGZSRibCNc=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/code-rs";
 
-  cargoHash = "sha256-ig90sWozfLZQJ/F6BuhRbLbR4GiyygqAaumO6WOItpw=";
+  cargoHash = "sha256-PRiXU6ZPruHpIBNEg9FmYPOWuMpMal7W8ChfTBgXztQ=";
 
   nativeBuildInputs = lib.optionals stdenvNoCC.hostPlatform.isLinux [
     pkg-config

From e9b2e1cfb27de0b63fa16c729ded7c973c545c69 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Sat, 1 Aug 2026 21:10:28 +0800
Subject: [PATCH 13/23] emacs.pkgs.rtags: simplify its override with fix-rtags

This causes 0 rebuilds.
---
 .../editors/emacs/elisp-packages/melpa-packages.nix             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
index bb3d01ab8b5e..fba5ecc72f8d 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
@@ -520,7 +520,7 @@ let
             '';
           });
 
-          rtags = ignoreCompilationError (dontConfigure (externalSrc super.rtags pkgs.rtags)); # elisp error
+          rtags = ignoreCompilationError (fix-rtags super.rtags); # elisp error
 
           rtags-xref = dontConfigure super.rtags;
 

From d4e46396b65223371de73b4149bd4b59a4671fca Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Sat, 1 Aug 2026 21:18:16 +0800
Subject: [PATCH 14/23] emacs: move propagatedUserEnvPkgs from externalSrc to
 fix-rtags

It is weird to modify propagatedUserEnvPkgs in externalSrc.

The only changed package of this patch is emacs.pkgs.evil-ghostel,
which is intended.
---
 .../emacs/elisp-packages/lib-override-helper.nix    | 13 +++++++++----
 .../editors/emacs/elisp-packages/melpa-packages.nix |  3 +++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/lib-override-helper.nix b/pkgs/applications/editors/emacs/elisp-packages/lib-override-helper.nix
index 91a20bd3647e..e0cab0021f1f 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/lib-override-helper.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/lib-override-helper.nix
@@ -32,12 +32,17 @@ rec {
 
   externalSrc =
     pkg: epkg:
-    pkg.overrideAttrs (previousAttrs: {
+    pkg.overrideAttrs {
       inherit (epkg) src version;
-      propagatedUserEnvPkgs = previousAttrs.propagatedUserEnvPkgs or [ ] ++ [ epkg ];
-    });
+    };
 
-  fix-rtags = pkg: dontConfigure (externalSrc pkg pkgs.rtags);
+  fix-rtags =
+    pkg:
+    dontConfigure (
+      (externalSrc pkg pkgs.rtags).overrideAttrs (previousAttrs: {
+        propagatedUserEnvPkgs = previousAttrs.propagatedUserEnvPkgs or [ ] ++ [ pkgs.rtags ];
+      })
+    );
 
   fixRequireHelmCore =
     pkg:
diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
index fba5ecc72f8d..a51a2827c775 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
@@ -289,6 +289,9 @@ let
           # Build same version as Haskell package
           hindent = (externalSrc super.hindent pkgs.haskellPackages.hindent).overrideAttrs (attrs: {
             packageRequires = [ self.haskell-mode ];
+            propagatedUserEnvPkgs = attrs.propagatedUserEnvPkgs or [ ] ++ [
+              pkgs.haskellPackages.hindent
+            ];
           });
 
           hotfuzz = super.hotfuzz.overrideAttrs (old: {

From 907cf345942efa5d237a902aff9aa24bf93e7a84 Mon Sep 17 00:00:00 2001
From: KangaZero <samuelyongw@gmail.com>
Date: Sat, 1 Aug 2026 23:06:26 +0900
Subject: [PATCH 15/23] zvm: 0.8.22 -> 0.8.27

Variable `meta.VERSION` that outputs the version to binary is lagging
behind at `v0.8.25` instead of `v0.8.27` (this has since been corrected
on `master` in  https://github.com/tristanisham/zvm/commit/4bac2bd7e9dcd9b9d56e9dd2add59f9f9313f675)
postPatch added to satisfy `versionCheckHook`
---
 pkgs/by-name/zv/zvm/package.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/zv/zvm/package.nix b/pkgs/by-name/zv/zvm/package.nix
index 61b2e5ef32cc..0b6b5d84e00e 100644
--- a/pkgs/by-name/zv/zvm/package.nix
+++ b/pkgs/by-name/zv/zvm/package.nix
@@ -8,17 +8,22 @@
 
 buildGoModule (finalAttrs: {
   pname = "zvm";
-  version = "0.8.22";
+  version = "0.8.27";
 
   src = fetchFromGitHub {
     owner = "tristanisham";
     repo = "zvm";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-uKn4ysaNuvWpV4fhrpm7pdS61pQJTYr6WfIhBzTfNT8=";
+    hash = "sha256-NDkvTghdqabfzzXSyxYHZj67u+upY0WfLOAO5DWAZ3s=";
   };
 
   vendorHash = "sha256-kJrCUxzbpyxEUF9UQeAI28tWKA+T7zT1DBI1wf3pjjM=";
 
+  postPatch = ''
+    substituteInPlace cli/meta/version.go \
+      --replace-fail 'VERSION = "v0.8.25"' 'VERSION = "v${finalAttrs.version}"'
+  '';
+
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
 

From 2dfd8499fc3541b91a8648a8f0adbf4e83a9f03c Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Sat, 1 Aug 2026 20:09:56 +0200
Subject: [PATCH 16/23] kdePackages.calligra: remove deprecated patch

---
 pkgs/kde/gear/calligra/default.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pkgs/kde/gear/calligra/default.nix b/pkgs/kde/gear/calligra/default.nix
index cbd17e8fc688..4e816b99551e 100644
--- a/pkgs/kde/gear/calligra/default.nix
+++ b/pkgs/kde/gear/calligra/default.nix
@@ -1,7 +1,6 @@
 {
   mkKdeDerivation,
   lib,
-  fetchpatch,
   boost,
   eigen,
   gsl,
@@ -27,14 +26,6 @@
 mkKdeDerivation {
   pname = "calligra";
 
-  patches = [
-    # Fix build with Poppler 26.04
-    (fetchpatch {
-      url = "https://invent.kde.org/office/calligra/-/commit/e9aae90db47ca87d639b8f2b17ec75c1b6093e27.patch";
-      hash = "sha256-V21Bw0xV/E4a9v8Yrt0vZ3AU1LJFHul1k92u+nsp85I=";
-    })
-  ];
-
   extraBuildInputs = [
     boost
     eigen

From 1bb0051667c744a4f91bb3a856619e56cd8969df Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Sat, 1 Aug 2026 10:12:00 -0400
Subject: [PATCH 17/23] incus-compose: init at 1.1.0

Assisted-By: nix-init
---
 pkgs/by-name/in/incus-compose/package.nix | 45 +++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 pkgs/by-name/in/incus-compose/package.nix

diff --git a/pkgs/by-name/in/incus-compose/package.nix b/pkgs/by-name/in/incus-compose/package.nix
new file mode 100644
index 000000000000..aea381597eb3
--- /dev/null
+++ b/pkgs/by-name/in/incus-compose/package.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "incus-compose";
+  version = "1.1.0";
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "lxc";
+    repo = "incus-compose";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-MrVqFs7+0aeOe+SizykVAMkNlrGM/SKWY+GUWHG9xQU=";
+  };
+
+  vendorHash = "sha256-KnQQX66X41cMv3+gu+IsPE5St47SGr6i2Y/gUFpIjmQ=";
+
+  env.CGO_ENABLED = 0;
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X=github.com/lxc/incus-compose/cmd/incus-compose/version.Version=${finalAttrs.version}"
+    "-X=github.com/lxc/incus-compose/cmd/incus-compose/DefaultHealthdImage=ghcr.io/lxc/incus-compose/ic-healthd:${finalAttrs.version}"
+  ];
+
+  # tests need an incus daemon running
+  doCheck = false;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Bring the familiar Docker Compose workflow to Incus — run compose.yaml files natively on Incus";
+    homepage = "https://github.com/lxc/incus-compose";
+    changelog = "https://github.com/lxc/incus-compose/blob/${finalAttrs.src.rev}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    teams = [ lib.teams.lxc ];
+    platforms = lib.platforms.linux;
+    mainProgram = "incus-compose";
+  };
+})

From db3bf894acb6b72c755fa4a49d8efba309c462f3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Aug 2026 21:53:39 +0000
Subject: [PATCH 18/23] tpnote: 1.26.7 -> 1.27.0

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

diff --git a/pkgs/by-name/tp/tpnote/package.nix b/pkgs/by-name/tp/tpnote/package.nix
index de53dd9b68b3..16c95a8b4f3c 100644
--- a/pkgs/by-name/tp/tpnote/package.nix
+++ b/pkgs/by-name/tp/tpnote/package.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tpnote";
-  version = "1.26.7";
+  version = "1.27.0";
 
   src = fetchFromGitHub {
     owner = "getreu";
     repo = "tp-note";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-dg6IFozGnvCOHbqZ9p0Eu7CPAv7W1Yf+MqAAFxghBEg=";
+    hash = "sha256-nef0Gk54UCCT8g/q1Xog+JU26vrBA3MBBSz1sXRDIFE=";
   };
 
-  cargoHash = "sha256-Lu4NBYxplYk5Y3IbfiCv61whW9Dk6fIScZUIB5yBdCk=";
+  cargoHash = "sha256-dv3Y7MP9xWoruY7nO6E4d2eE/zz9yMiRegW+QJ7Lqf4=";
 
   nativeBuildInputs = [
     cmake

From 443a4343930787c9a100f4c959e566944dce4de6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Aug 2026 21:57:15 +0000
Subject: [PATCH 19/23] python3Packages.yalexs-ble: 3.4.2 -> 4.0.0

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

diff --git a/pkgs/development/python-modules/yalexs-ble/default.nix b/pkgs/development/python-modules/yalexs-ble/default.nix
index d4b88a975e73..d784d95c671c 100644
--- a/pkgs/development/python-modules/yalexs-ble/default.nix
+++ b/pkgs/development/python-modules/yalexs-ble/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "yalexs-ble";
-  version = "3.4.2";
+  version = "4.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Yale-Libs";
     repo = "yalexs-ble";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/3OH8MkAs4c5fFP1ickIeurt9SZot03I/ehLpoLr7nY=";
+    hash = "sha256-4tXmSl2y+3VLOTRmlRHij+JCJ16Xr7sEp56URmS5Ne0=";
   };
 
   build-system = [ poetry-core ];

From 4b614e611898fda3f93e41015507c9067ef3ec28 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Aug 2026 23:45:22 +0000
Subject: [PATCH 20/23] fzf-zsh-plugin: 1.0.0-unstable-2026-07-09 ->
 1.0.0-unstable-2026-08-01

---
 pkgs/by-name/fz/fzf-zsh-plugin/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fz/fzf-zsh-plugin/package.nix b/pkgs/by-name/fz/fzf-zsh-plugin/package.nix
index f955a1c27f89..71b3f7e4a3df 100644
--- a/pkgs/by-name/fz/fzf-zsh-plugin/package.nix
+++ b/pkgs/by-name/fz/fzf-zsh-plugin/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation {
   pname = "fzf-zsh-plugin";
-  version = "1.0.0-unstable-2026-07-09";
+  version = "1.0.0-unstable-2026-08-01";
 
   src = fetchFromGitHub {
     owner = "unixorn";
     repo = "fzf-zsh-plugin";
-    rev = "92187cbc8fe91b7c5ab3a186e566682f64286879";
-    hash = "sha256-JedEqrcaJmVL8PF850xP7csgvFzDpcCqW8lJ/5WHklY=";
+    rev = "82c08aa8ed8d3cc2173d8b820af246634519b21d";
+    hash = "sha256-rEd3c2KjmF9TY2jzDV1CI1ku6Hy+zQ8Z41TaYsS+uYc=";
   };
 
   strictDeps = true;

From e7804286db15fd0b296b58e64ed3f181a03f4b44 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 1 Aug 2026 20:28:37 -0400
Subject: [PATCH 21/23] ci/github-script/get-pr-commit-details: output file
 list for merge commits

Fixes a bug that was originally found by Claude and reported to the NixOS
security team by Anthropic as a security issue.

Previously, the file list was never output for merge commits.

This could have allowed someone who buried an edit to a file that shouldn't be
edited manually in a merge commit to not trigger the check.

It isn't a security issue, though, because the manual-file-edits check is not
a security boundary (just a friendly reminder to committers).

Anthropic report ID: ANT-2026-223Q3FSE
---
 ci/github-script/get-pr-commit-details.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ci/github-script/get-pr-commit-details.js b/ci/github-script/get-pr-commit-details.js
index b268e7cf6202..5841bb8177eb 100644
--- a/ci/github-script/get-pr-commit-details.js
+++ b/ci/github-script/get-pr-commit-details.js
@@ -84,6 +84,7 @@ async function getCommitDetailsForPR({ core, pr, repoPath }) {
             'log',
             '--format=%s\t%aN\t%aE\t%cN\t%cE',
             '--name-only',
+            '-m',
             '-1',
             sha,
           ],

From 3f70ca3778027f3715fd3514d4836c90cb14bc92 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Aug 2026 03:32:11 +0000
Subject: [PATCH 22/23] python3Packages.wassima: 2.1.2 -> 2.1.3

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

diff --git a/pkgs/development/python-modules/wassima/default.nix b/pkgs/development/python-modules/wassima/default.nix
index 270fe5121bd6..e41abc7d72d1 100644
--- a/pkgs/development/python-modules/wassima/default.nix
+++ b/pkgs/development/python-modules/wassima/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "wassima";
-  version = "2.1.2";
+  version = "2.1.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jawah";
     repo = "wassima";
     tag = finalAttrs.version;
-    hash = "sha256-19y1dohS1WikfxRGOrgIqwdfBdGe7MDo9MTSXnNjfWA=";
+    hash = "sha256-aIsex/iUoXwBJzSc4wECaHIklXa7jEKVyjUpyOJ0GZM=";
   };
 
   build-system = [ hatchling ];

From 939e08d6b09bdd5227df161c6540444ab900c20f Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 2 Aug 2026 09:06:34 +0800
Subject: [PATCH 23/23] mate-themes: Revert removal and remove GTK2

This mostly reverts commit 55776f4f39d94cc3b9f5e2499cee63b7b4f575a0.
---
 pkgs/by-name/ma/mate-themes/package.nix | 71 +++++++++++++++++++++++++
 pkgs/top-level/aliases.nix              |  1 -
 2 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/by-name/ma/mate-themes/package.nix

diff --git a/pkgs/by-name/ma/mate-themes/package.nix b/pkgs/by-name/ma/mate-themes/package.nix
new file mode 100644
index 000000000000..7da0bbec0dd8
--- /dev/null
+++ b/pkgs/by-name/ma/mate-themes/package.nix
@@ -0,0 +1,71 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  autoreconfHook,
+  pkg-config,
+  gettext,
+  mate-icon-theme,
+  gtk3,
+  gdk-pixbuf,
+  librsvg,
+  gitUpdater,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "mate-themes";
+  version = "3.22.26-unstable-2026-06-25";
+
+  src = fetchFromGitHub {
+    owner = "mate-desktop";
+    repo = "mate-themes";
+    # For `build: add --enable-gtk2 configure flag`
+    # nixpkgs-update: no auto update
+    rev = "3eba5d520b9ae1c64ef6c42ac442a7a97d38f7c7";
+    hash = "sha256-IZc1LxjHnwmvUOqGGnfzFdNI8dfyB3juOgY28xrXf1c=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    gettext
+    gtk3
+  ];
+
+  buildInputs = [
+    mate-icon-theme
+    gdk-pixbuf
+    librsvg
+  ];
+
+  configureFlags = [
+    "--disable-gtk2"
+  ];
+
+  dontDropIconThemeCache = true;
+
+  postInstall = ''
+    gtk-update-icon-cache "$out"/share/icons/ContrastHigh
+  '';
+
+  enableParallelBuilding = true;
+
+  passthru.updateScript = gitUpdater {
+    odd-unstable = true;
+    rev-prefix = "v";
+  };
+
+  meta = {
+    description = "Set of themes from MATE";
+    homepage = "https://mate-desktop.org";
+    license = with lib.licenses; [
+      lgpl21Plus
+      lgpl3Only
+      gpl3Plus
+    ];
+    platforms = lib.platforms.unix;
+    teams = [ lib.teams.mate ];
+  };
+})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 21047e6f24c9..46610dc4cb51 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1562,7 +1562,6 @@ mapAliases {
   massif-visualizer = throw "'massif-visualizer' has been removed due to outdated KF5 dependencies."; # Added 2026-05-01
   mastodon-bot = throw "'mastodon-bot' has been removed because it was archived by upstream in 2021."; # Added 2025-11-07
   matcha-gtk-theme = throw "'matcha-gtk-theme' has been removed because it depended on 'gtk-engine-murrine', which was removed because it was unmaintained upstream and depended on GTK 2."; # Added 2026-07-22
-  mate-themes = throw "'mate-themes' has been removed because it depended on 'gtk-engine-murrine', which was removed because it was unmaintained upstream and depended on GTK 2."; # Added 2026-07-22
   materia-theme = throw "'materia-theme' has been removed because it depended on 'gtk-engine-murrine', which was removed because it was unmaintained upstream and depended on GTK 2."; # Added 2026-07-22
   material-kwin-decoration = throw "'material-kwin-decoration' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   matheria-theme-transparent = throw "'matheria-theme-transparent' has been removed because it depended on 'gtk-engine-murrine', which was removed because it was unmaintained upstream and depended on GTK 2."; # Added 2026-07-22