Skip to content

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

Merged
infinisil merged 1 commit intoNixOS:masterfrom
tweag:update/nixfmt
Jul 16, 2024
Merged

nixfmt-rfc-style: unstable-2024-07-03 -> unstable-2024-07-12#326622
infinisil merged 1 commit intoNixOS:masterfrom
tweag:update/nixfmt

Conversation

@infinisil
Copy link
Member

@infinisil infinisil commented Jul 12, 2024

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
Merged
8 tasks
Pandapip1
Pandapip1 approved these changes Jul 12, 2024
View reviewed changes
Copy link
Member

@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 0x4A6F, dasJ, piegamesde and tomberek July 12, 2024 21:48
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Jul 12, 2024
@Pandapip1
Copy link
Member

Pandapip1 commented Jul 13, 2024

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

@wegank wegank added the 12.approvals: 2 This PR was reviewed and approved by two persons. label Jul 15, 2024
@infinisil infinisil merged commit 52a4f00 into NixOS:master Jul 16, 2024
@infinisil infinisil deleted the update/nixfmt branch July 16, 2024 14:22
@github-actions
Copy link
Contributor

github-actions bot commented Jul 16, 2024

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

@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

2 more reviewers

@superherointj superherointj superherointj approved these changes

@Pandapip1 Pandapip1 Pandapip1 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 12.approvals: 2 This PR was reviewed and approved by two persons.

Projects

Nix formatting
Status: Done

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@infinisil @Pandapip1 @superherointj @wegank