[release-24.05] Treewide Nix reformat pass 1 [skip treewide] #327796
Merged
Conversation
This file contains 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
8 tasks
infinisil
force-pushed
the
backport-treewide-format
branch
from
00c7763 to
8785524
Compare
wegank
added
the
2.status: merge conflict
infinisil
changed the title
infinisil
force-pushed
the
backport-treewide-format
branch
3 times, most recently
from
e339aaf to
7126090
Compare
After final improvements to the official formatter implementation,
this commit now performs the first treewide reformat of Nix files using it.
This is part of the implementation of RFC 166.
Only "inactive" files are reformatted, meaning only files that
aren't being touched by any PR with activity in the past 2 months.
This is to avoid conflicts for PRs that might soon be merged.
Later we can do a full treewide reformat to get the rest,
which should not cause as many conflicts.
A CI check has already been running for some time to ensure that new and
already-formatted files are formatted, so the files being reformatted here
should also stay formatted.
This commit was automatically created and can be verified using
nix-build https://github.com/infinisil/treewide-nixpkgs-reformat-script/archive/a08b3a4d199c6124ac5b36a889d9099b4383463f.tar.gz \
--argstr baseRev f84e54a
result/bin/apply-formatting $NIXPKGS_PATH
infinisil
force-pushed
the
backport-treewide-format
branch
from
7126090 to
776b0b4
Compare
nix-owners
bot
requested review from
aanderse,
adamcstephens,
adisbladis,
ajs124,
alyssais,
arianvp,
bendlas,
cole-h,
corngood,
drupol,
edolstra,
edwtjo,
ehmry,
ElvishJerricco and
emilylange
|
I believe this merge blocked the |
|
Maybe it would've been easier to wait a couple weeks and omit 24.05, but I haven't been watching your overall strategy with the reformat project. |
|
Yeah in hindsight that probably would've been a bit better, doesn't matter much though |
|
We'll know next time when we change the format |
(just kidding)
1 task
|
So, any plans what to do about this blocker? Should I simply revert this PR? |
|
@vcunat Ahh sorry I somehow overlooked your comment pointing that out, thanks for the reminder. I'll make a PR today to fix it, it's an easy fix |
1 task
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Note
This depends on #364004
This is the 24.05 "backport" of #322537, see its description for more info. These PRs will be merged together to avoid backporting problems.
Note
While 24.05 doesn't have the CI action enforcing formatting on new/already-formatted files, this is okay, because nobody's actively developing on 24.05, and the main reason we're doing this is to avoid backporting problems.
Verification
The reformatting commit is fully auto-generated by the code in https://github.com/infinisil/treewide-nixpkgs-reformat-script, see the commit message on how to do a complete verification.
This work is funded by Tweag and Antithesis ✨
Add a 👍 reaction to pull requests you find important.