[Backport staging-26.05] nixVersions.nix_2_35: init at 2.35.2 - #553577
Conversation
There was a problem hiding this comment.
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.
Read PR description for reasoning |
96a95bb to
da59a27
Compare
There was a problem hiding this comment.
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).
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)
da59a27 to
1e888ea
Compare
|
Staging branch is because we need the boost patches? |
Exactly, otherwise tests fail. |
caab7a3
I dropped the
removeFunctionalTests/commonDisabledTestswrapper aroundsrc, since these helpers do not exist on release-26.05 and setnixVersions.latestto 2.35.Needs staging because of boost patches.
PRs backported
nixVersions.latest: 2.34.8 -> 2.35.1) and nixVersions.nix_2_35: 2.35.1 -> 2.35.2 #552079 (nixVersions.nix_2_35: 2.35.1 -> 2.35.2)Things done
passthru.tests.nixpkgs-reviewon this PR. See nixpkgs-review usage../result/bin/.Built
nixVersions.nix_2_35on x86_64-linuxAutomation disclosure
Backport prepared with Claude Code (claude-opus-5): cherry-picks, conflict resolution.