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.

Sign up for GitHub

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

Jump to bottom

nixfmt-rfc-style: unstable-2024-07-03 -> unstable-2024-07-12 #326622

Merged
merged 1 commit into from
Jul 16, 2024
Merged

nixfmt-rfc-style: unstable-2024-07-03 -> unstable-2024-07-12 #326622

merged 1 commit into from
Jul 16, 2024

Conversation

infinisil
Copy link
Member

Description of changes

Notably includes NixOS/nixfmt#219 and NixOS/nixfmt#220. This is needed for #322537.

Ping @NixOS/nix-formatting

Things done

  • Built on x86_64-linux and tested the binary

Add a 👍 reaction to pull requests you find important.

@infinisil infinisil mentioned this pull request Jul 12, 2024
Draft
10 tasks
Pandapip1
Pandapip1 approved these changes Jul 12, 2024
View reviewed changes
Copy link
Contributor

@Pandapip1 Pandapip1 left a comment

Choose a reason for hiding this comment

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

Diff LGTM

@ofborg ofborg bot requested review from dasJ, piegamesde, 0x4A6F and tomberek July 12, 2024 21:48
@Pandapip1 Pandapip1 added the backport release-24.05 Backport PR automatically label Jul 13, 2024
@Pandapip1
Copy link
Contributor

I'm pretty sure this is suitable for backporting, since this is just bug fixes.

@infinisil infinisil merged commit 52a4f00 into NixOS:master Jul 16, 2024
33 checks passed
@infinisil infinisil deleted the update/nixfmt branch July 16, 2024 14:22
@github-actions GitHub Actions
Copy link
Contributor

Backport failed for release-24.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-24.05
git worktree add -d .worktree/backport-326622-to-release-24.05 origin/release-24.05
cd .worktree/backport-326622-to-release-24.05
git switch --create backport-326622-to-release-24.05
git cherry-pick -x 8058a2a484ada8ac539a9e67f52e9f6ccd67bcee

@infinisil infinisil mentioned this pull request Jul 16, 2024
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@superherointj superherointj superherointj approved these changes

@Pandapip1 Pandapip1 Pandapip1 approved these changes

@dasJ dasJ Awaiting requested review from dasJ

@piegamesde piegamesde Awaiting requested review from piegamesde

@0x4A6F 0x4A6F Awaiting requested review from 0x4A6F

@tomberek tomberek Awaiting requested review from tomberek

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1 11.by: package-maintainer 12.approvals: 2 backport release-24.05 Backport PR automatically
Projects
Nix formatting
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@infinisil @Pandapip1 @superherointj @wegank