From 66e1828f09fd9141046710f79b2c6950aa6feb96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E5=9D=82=E9=9B=85?=
 <23130178+ShadowRZ@users.noreply.github.com>
Date: Tue, 14 Jul 2026 10:02:57 +0800
Subject: [PATCH 1/2] nixVersions.latest: 2.34.8 -> 2.35.1

Changelog: https://github.com/NixOS/nix/releases/tag/2.35.1

(cherry picked from commit f6ec6d2e354033a69bd661551aa941b7a284eef8)

Backport note: dropped the removeFunctionalTests/commonDisabledTests
wrapper around src, since these darwin test-disabling helpers do not
exist on release-26.05.

Assisted-by: Claude Code (claude-opus-5)
---
 pkgs/tools/package-management/nix/default.nix | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 2a633bdf0e22..f3239665104e 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -211,6 +211,22 @@ lib.makeExtensible (
 
       nix_2_34 = addTests "nix_2_34" self.nixComponents_2_34.nix-everything;
 
+      nixComponents_2_35 =
+        (nixDependencies.callPackage ./modular/packages.nix rec {
+          version = "2.35.1";
+          inherit teams;
+          otherSplices = generateSplicesForNixComponents "nixComponents_2_35";
+          src = fetchFromGitHub {
+            owner = "NixOS";
+            repo = "nix";
+            tag = version;
+            hash = "sha256-ldhnx4+Ya3OfRT9Sh7Nzk+H+9D3CjonomPBjGSfXdJk=";
+          };
+        }).appendPatches
+          [ ];
+
+      nix_2_35 = addTests "nix_2_35" self.nixComponents_2_35.nix-everything;
+
       nixComponents_git =
         (nixDependencies.callPackage ./modular/packages.nix rec {
           version = "2.35pre20260504_${lib.substring 0 8 src.rev}";
@@ -227,7 +243,7 @@ lib.makeExtensible (
 
       git = addTests "git" self.nixComponents_git.nix-everything;
 
-      latest = self.nix_2_34;
+      latest = self.nix_2_35;
 
       # Read ./README.md before bumping a major release
       stable = addFallbackPathsCheck self.nix_2_34;

From 1e888ea7c309b5c5240e40ae349d2754bda1b521 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 13 Aug 2026 10:47:54 +1000
Subject: [PATCH 2/2] nixVersions.nix_2_35: 2.35.1 -> 2.35.2

Diff: https://github.com/NixOS/nix/compare/2.35.1...2.35.2
(cherry picked from commit 9b88fef0ad376b5c08854c771cd28242f1b76df2)

Assisted-by: Claude Code (claude-opus-5)
---
 pkgs/tools/package-management/nix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index f3239665104e..3c4e8b9e450c 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -213,14 +213,14 @@ lib.makeExtensible (
 
       nixComponents_2_35 =
         (nixDependencies.callPackage ./modular/packages.nix rec {
-          version = "2.35.1";
+          version = "2.35.2";
           inherit teams;
           otherSplices = generateSplicesForNixComponents "nixComponents_2_35";
           src = fetchFromGitHub {
             owner = "NixOS";
             repo = "nix";
             tag = version;
-            hash = "sha256-ldhnx4+Ya3OfRT9Sh7Nzk+H+9D3CjonomPBjGSfXdJk=";
+            hash = "sha256-C/YEm/5IPiAMxQH5aHlkwgQMkLqK7NVsudEWdlzBZAA=";
           };
         }).appendPatches
           [ ];