Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Apply nixfmt #12349

Merged
merged 3 commits into from
Jan 24, 2025
Merged

Apply nixfmt #12349

merged 3 commits into from
Jan 24, 2025

Conversation

roberth
Copy link
Member

@roberth roberth commented Jan 24, 2025

Motivation

RFC 166

Now is a good time, because we're pretty much up to speed with backports.

I'll apply it to current maintenance branches as well, so that automated backports remain possible.

I will not add the automation to the maintenance branches though.

Context


Add 👍 to pull requests you find important.

The Nix maintainer team uses a GitHub project board to schedule and track reviews.

@github-actions github-actions bot added documentation new-cli Relating to the "nix" command with-tests Issues related to testing. PRs with tests have some priority fetching Networking with the outside (non-Nix) world, input locking c api Nix as a C library with a stable interface labels Jan 24, 2025
@Mic92 Mic92 enabled auto-merge January 24, 2025 12:48
@edolstra
Copy link
Member

edolstra commented Jan 24, 2025

I do wonder if we should format the lang tests. After all, the parser should also work (and give correct position info) on inputs that aren't formatted correctly. Probably doesn't matter though...

@roberth roberth disabled auto-merge January 24, 2025 14:42
@roberth
Copy link
Member Author

roberth commented Jan 24, 2025

I do wonder if we should format the lang tests.

👍 I've excluded the lang/parse-* tests for this reason.
The other ones generally don't have syntax testing as a goal, but I'll double check.

Leaving them unformatted is annoying for contributors when enable format-on-save in their editor, so I think it's worth doing.

@roberth roberth force-pushed the nixfmt branch 2 times, most recently from 8c89d57 to c0e6692 Compare January 24, 2025 16:19
@roberth
Copy link
Member Author

roberth commented Jan 24, 2025

I've reviewed the formatted lang files as well as some others. Concretely, these are now also excluded:

tests/functional/lang/eval-fail-eol-3.nix
tests/functional/lang/eval-fail-set.nix
tests/functional/lang/eval-okay-comments.nix
tests/functional/lang/eval-okay-backslash-newline-2.nix
tests/functional/lang/eval-okay-ind-string.nix
tests/functional/shell.shebang.nix

@roberth roberth merged commit 85a3071 into master Jan 24, 2025
21 checks passed
@roberth roberth deleted the nixfmt branch January 24, 2025 19:22
roberth added a commit that referenced this pull request Jan 24, 2025
This does not include any automation for the release branch, but
is based on that of #12349
roberth added a commit that referenced this pull request Jan 24, 2025
This does not include any automation for the release branch, but
is based on the configuration of #12349

    pre-commit run -a nixfmt-rfc-style
roberth added a commit that referenced this pull request Jan 24, 2025
is based on the configuration of #12349

    pre-commit run -a nixfmt-rfc-style
roberth added a commit that referenced this pull request Jan 24, 2025
This does not include any automation for the release branch, but
is based on the configuration of #12349

    pre-commit run -a nixfmt-rfc-style
roberth added a commit that referenced this pull request Jan 24, 2025
This does not include any automation for the release branch, but
is based on the configuration of #12349

    pre-commit run -a nixfmt-rfc-style
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
c api Nix as a C library with a stable interface documentation fetching Networking with the outside (non-Nix) world, input locking new-cli Relating to the "nix" command with-tests Issues related to testing. PRs with tests have some priority
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants