Skip to content

[backport 24.05] nixfmt-rfc-style updates#327693

Merged
dasJ merged 3 commits intoNixOS:release-24.05from
tweag:backport-nixfmt-updates
Jul 17, 2024
Merged

[backport 24.05] nixfmt-rfc-style updates#327693
dasJ merged 3 commits intoNixOS:release-24.05from
tweag:backport-nixfmt-updates

Conversation

@infinisil
Copy link
Member

@infinisil infinisil commented Jul 16, 2024 •
edited
Loading

Description of changes

This PR backports these three PRs:

These updates contain only bug-fixes.

Ping @NixOS/nix-formatting for review/merge

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

This work is sponsored by Antithesis ✨

Add a 👍 reaction to pull requests you find important.

djacu and others added 3 commits July 16, 2024 18:18
@infinisil
Copy link
Member Author

infinisil commented Jul 16, 2024

CI failure can be ignored. It occurs because I integrated 755b915 into one of the cherry-picked commits.

@ofborg ofborg bot requested review from 0x4A6F, dasJ, piegamesde and tomberek July 16, 2024 18:04
@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 16, 2024
@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one person. label Jul 16, 2024
@dasJ dasJ merged commit d38b156 into NixOS:release-24.05 Jul 17, 2024
@infinisil infinisil deleted the backport-nixfmt-updates branch July 19, 2024 04:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tomberek tomberek Awaiting requested review from tomberek

@dasJ dasJ Awaiting requested review from dasJ

@piegamesde piegamesde Awaiting requested review from piegamesde

@0x4A6F 0x4A6F Awaiting requested review from 0x4A6F

1 more reviewer

@superherointj superherointj superherointj 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: 1 This PR was reviewed and approved by one person.

Projects

Nix formatting
Status: Done

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@infinisil @superherointj @dasJ @wegank @djacu