nixVersions.nix_2_27: init (and refactor _2_26)#394957
Merged
Ericson2314 merged 7 commits intoNixOS:masterfrom Apr 2, 2025
Merged
nixVersions.nix_2_27: init (and refactor _2_26)#394957Ericson2314 merged 7 commits intoNixOS:masterfrom
Ericson2314 merged 7 commits intoNixOS:masterfrom
Conversation
nix-owners
bot
requested review from
Ericson2314,
Mic92,
RaitoBezarius,
edolstra and
tomberek
github-actions
bot
added
10.rebuild-darwin: 101-500
Member
|
Not to be a nit-picker, but since these files were already formatted, I think it would be better if each commit kept it in a formatted state? |
Member
|
Also @roberth I am not sure we should deduplicate this hard? There is no guarantee each Nix version has the exact same components from one release to the next. |
Member
Author
It's marginally harder to review that way. I'd recommend reviewing by commit. |
Member
Author
True, but we can use conditionals on |
Member
|
I do really like the first commit. I agree that we should not attempt to share the dependencies logic between Nix and Nixpkgs, because the dependencies logic in Nix is specific to the Nixpkgs that Nix is using. |
Member
|
OK @roberth and I talked about this some more. I am sad to see the keeping the files in sync go, and I think we should get back to that. On the other hand, I do see the benefit of letting Nixpkgs "go its own way" in terms of figuring out what the package set ought to look like here, just worrying about Nixpkgs conventions and the layering approved in RFCs. After we have two things which we are independently happy with (package set in Nix repo, package set in Nixpkgs repo), we can then re-approach automatically keeping in sync, e.g. for 25.05, knowing that we are reconciling things that people are already on board with. |
Mic92
reviewed
Mar 31, 2025
Member
Author
|
Member
Author
Test failure in
Failure in (and many more lines like that) |
47 tasks
Member
|
Member
|
Have to check x86_64-darwin again. I don't think it's actually broken, but my machine might have been overloaded. |
Member
|
Fixing pkgsStatic.git and disabling static python3 on macOS: #395401 |
Mic92
force-pushed
the
nixVersions.nix_2_27
branch
from
fa3ad85 to
d387ca1
Compare
github-actions
bot
added
the
6.topic: python
github-actions
bot
added
the
6.topic: haskell
Member
|
See also: #395451 |
Mic92
force-pushed
the
nixVersions.nix_2_27
branch
from
9114e47 to
fa56245
Compare
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: |
Member
|
Note that the file itself is still referenced by Lix 2.90.
Mic92
force-pushed
the
nixVersions.nix_2_27
branch
from
fa56245 to
a4f7e16
Compare
github-actions
bot
removed
6.topic: python
Contributor
|
Backport failed for Please cherry-pick the changes locally and resolve any conflicts. git fetch origin release-24.11
git worktree add -d .worktree/backport-394957-to-release-24.11 origin/release-24.11
cd .worktree/backport-394957-to-release-24.11
git switch --create backport-394957-to-release-24.11
git cherry-pick -x 9aa683efe7f6e3fbba92bdace135c837f7355f65 b3e4affac617de7cbcec49d243fb082d9ff362f2 6b1e3742ec7ea8ba091819ecd304097fbd63e4b9 d087e8e79806ce27b8003352757fd96fef0b91b8 f670684a7650720185933df4a7fa26e5604928d3 53fa5868682ec3d5eb7c79487357a61799cf3f31 a4f7e161b380b35b2f7bc432659a95fd71254ad8 |
Member
|
BTW see #393359 (comment) for background info about this |
Member
|
Can you all please pay more attention to our commit guidelines? This isn't the first time a commit literally titled "Format" was merged as is, shit happens, whatever.
|
Member
Author
|
Normally I format my commits as I go, not needing a separate commit, but since some of the files either weren't formatted yet, or a large amount of whitespace-only change was introduced by the formatter, I have kept the irrelevant changes separate, to make them easier to review, and easier for later readers to skip. |
Member
|
I personally think it’s fine to have a separate commit containing all the formatting changes as long as you add it to |
Member
Author
Contributor
|
Backport failed for Please cherry-pick the changes locally and resolve any conflicts. git fetch origin release-24.11
git worktree add -d .worktree/backport-394957-to-release-24.11 origin/release-24.11
cd .worktree/backport-394957-to-release-24.11
git switch --create backport-394957-to-release-24.11
git cherry-pick -x 9aa683efe7f6e3fbba92bdace135c837f7355f65 b3e4affac617de7cbcec49d243fb082d9ff362f2 6b1e3742ec7ea8ba091819ecd304097fbd63e4b9 d087e8e79806ce27b8003352757fd96fef0b91b8 f670684a7650720185933df4a7fa26e5604928d3 53fa5868682ec3d5eb7c79487357a61799cf3f31 a4f7e161b380b35b2f7bc432659a95fd71254ad8 |
Member
|
N.B. I backported this and many other PRs manually. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.