Skip to content

[Backport staging-26.05] nixVersions.nix_2_35: init at 2.35.2 - #553577

Merged
Mic92 merged 2 commits into
NixOS:staging-26.05from
Mic92:backport-nix-2.35-to-release-26.05
Aug 23, 2026
Merged

[Backport staging-26.05] nixVersions.nix_2_35: init at 2.35.2#553577
Mic92 merged 2 commits into
NixOS:staging-26.05from
Mic92:backport-nix-2.35-to-release-26.05

Conversation

@Mic92

@Mic92 Mic92 commented Aug 17, 2026

Copy link
Copy Markdown
Member

I dropped the removeFunctionalTests/commonDisabledTests wrapper around src, since these helpers do not exist on release-26.05 and set nixVersions.latest to 2.35.

Needs staging because of boost patches.

PRs backported

Things done

Built nixVersions.nix_2_35 on x86_64-linux

Automation disclosure

Backport prepared with Claude Code (claude-opus-5): cherry-picks, conflict resolution.

@nixpkgs-commit-check nixpkgs-commit-check Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This report is automatically generated by the PR / Check / cherry-pick CI workflow.

Some of the commits in this PR require the author's and reviewer's attention.

Sometimes it is not possible to cherry-pick exactly the same patch.
This most frequently happens when resolving merge conflicts.
The range-diff will help to review the resolution of conflicts.

If you need to merge this PR despite the warnings, please dismiss this review shortly before merging.

Warning

Difference between 66e1828 and original f6ec6d2 may warrant inspection.

Show diff
@@ Metadata
  ## Commit message ##
     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 ##
 @@ pkgs/tools/package-management/nix/default.nix: lib.makeExtensible (
  
@@ pkgs/tools/package-management/nix/default.nix: lib.makeExtensible (
 +          version = "2.35.1";
 +          inherit teams;
 +          otherSplices = generateSplicesForNixComponents "nixComponents_2_35";
-+          src = removeFunctionalTests commonDisabledTests (fetchFromGitHub {
++          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 =
-         let
-           src = fetchFromGitHub {
+         (nixDependencies.callPackage ./modular/packages.nix rec {
+           version = "2.35pre20260504_${lib.substring 0 8 src.rev}";
 @@ pkgs/tools/package-management/nix/default.nix: lib.makeExtensible (
  
        git = addTests "git" self.nixComponents_git.nix-everything;

Hint: The full diffs are also available in the runner logs with slightly better highlighting.

@Mic92

Mic92 commented Aug 17, 2026

Copy link
Copy Markdown
Member Author

This report is automatically generated by the PR / Check / cherry-pick CI workflow.

Some of the commits in this PR require the author's and reviewer's attention.

Sometimes it is not possible to cherry-pick exactly the same patch. This most frequently happens when resolving merge conflicts. The range-diff will help to review the resolution of conflicts.

Read PR description for reasoning

@Mic92
Mic92 force-pushed the backport-nix-2.35-to-release-26.05 branch from 96a95bb to da59a27 Compare August 17, 2026 09:19

@nixpkgs-branch-check nixpkgs-branch-check Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The PR's base branch is set to release-26.05, but this PR causes 25408 rebuilds.
It is therefore considered a mass rebuild.
Please change the base branch to the right base branch for your changes (probably staging-26.05).

ShadowRZ and others added 2 commits August 17, 2026 11:23
Changelog: https://github.com/NixOS/nix/releases/tag/2.35.1

(cherry picked from commit f6ec6d2)

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)
Diff: NixOS/nix@2.35.1...2.35.2
(cherry picked from commit 9b88fef)

Assisted-by: Claude Code (claude-opus-5)
@Mic92
Mic92 force-pushed the backport-nix-2.35-to-release-26.05 branch from da59a27 to 1e888ea Compare August 17, 2026 09:23
@Mic92
Mic92 changed the base branch from release-26.05 to staging-26.05 August 17, 2026 09:23
@Mic92 Mic92 changed the title [Backport release-26.05] nixVersions.nix_2_35: init at 2.35.2 [Backport staging-26.05] nixVersions.nix_2_35: init at 2.35.2 Aug 17, 2026
@nixpkgs-ci nixpkgs-ci Bot closed this Aug 17, 2026
@nixpkgs-ci nixpkgs-ci Bot reopened this Aug 17, 2026
@nixpkgs-ci nixpkgs-ci Bot added 8.has: package (update) This PR updates a package to a newer version 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. llm-assisted Contributions that include code generation with LLMs 4.workflow: backport This targets a stable branch labels Aug 17, 2026
@xokdvium

Copy link
Copy Markdown
Contributor

Staging branch is because we need the boost patches?

@Mic92

Mic92 commented Aug 17, 2026

Copy link
Copy Markdown
Member Author

Staging branch is because we need the boost patches?

Exactly, otherwise tests fail.

@Mic92
Mic92 added this pull request to the merge queue Aug 23, 2026
Merged via the queue into NixOS:staging-26.05 with commit caab7a3 Aug 23, 2026
45 of 50 checks passed
@Mic92
Mic92 deleted the backport-nix-2.35-to-release-26.05 branch August 23, 2026 09:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4.workflow: backport This targets a stable branch 8.has: package (update) This PR updates a package to a newer version 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. llm-assisted Contributions that include code generation with LLMs

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants