Skip to content

nixfmt: unstable-2024-05-28 -> unstable-2024-07-03#324192

Merged
0x4A6F merged 1 commit intoNixOS:masterfrom
infinisil:update-nixfmt
Jul 3, 2024
Merged

nixfmt: unstable-2024-05-28 -> unstable-2024-07-03#324192
0x4A6F merged 1 commit intoNixOS:masterfrom
infinisil:update-nixfmt

Conversation

@infinisil
Copy link
Member

Description of changes

Updates nixfmt to include NixOS/nixfmt#210, needed to unblock #322537

Ping @NixOS/nix-formatting for review and merge

Things done

  • Built on x86_64-linux

Add a 👍 reaction to pull requests you find important.

@ofborg ofborg bot requested review from 0x4A6F, dasJ, piegamesde and tomberek July 3, 2024 02:29
@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 3, 2024
infinisil added a commit to NixOS/nixfmt that referenced this pull request Jul 3, 2024
@0x4A6F 0x4A6F merged commit 3281224 into NixOS:master Jul 3, 2024
@kirillrdy
Copy link
Member

should commit message be nixfmt-rfc-style: unstable-2024-05-28 -> unstable-2024-07-03 otherwise ofborg will build old nifxmt ?

@kirillrdy
Copy link
Member

ah didn't make it in time :-)

@infinisil infinisil deleted the update-nixfmt branch July 3, 2024 08:55
@infinisil
Copy link
Member Author

infinisil commented Jul 4, 2024

Thanks, good point, will do that next time!

@github-actions
Copy link
Contributor

github-actions bot commented Jul 4, 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-324192-to-release-24.05 origin/release-24.05
cd .worktree/backport-324192-to-release-24.05
git switch --create backport-324192-to-release-24.05
git cherry-pick -x 72ae7e0c8aa68a24c6002d40bc450ae5d3e6534b

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

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.

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

4 participants