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

darwin.stdenv: format with nixfmt-rfc-style #333962

Merged
merged 2 commits into from
Aug 12, 2024

Conversation

reckenrode
Copy link
Contributor

@reckenrode reckenrode commented Aug 11, 2024

Description of changes

I’m going to be doing a lot of work on the Darwin stdenv. Rather than risk merge conflicts, I’d like to get it reformatted before I start working. I confirmed with nix-instantiate that the resulting hash for the stdenv is the same, so it should not cause rebuilds. This is targeting staging-next because staging-next will merge in a few days. Currently, staging and staging-next have the same base commit.

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.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added the 6.topic: stdenv Standard environment label Aug 11, 2024
@ofborg ofborg bot added 6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild 10.rebuild-linux: 0 This PR does not cause any packages to rebuild labels Aug 11, 2024
@eclairevoyant eclairevoyant changed the title darwin.stdenv: format with nixfmt-rft-style darwin.stdenv: format with nixfmt-rfc-style Aug 11, 2024
@emilazy
Copy link
Member

emilazy commented Aug 11, 2024

Commit message typo needs fixing. (And darwin.stdenv: update .git-blame-ignore-revs feels backwards to me, though apparently other people are using that style…)

LGTM otherwise, given that ofborg says 0 rebuilds.

@reckenrode
Copy link
Contributor Author

I fixed the typo in the commit message. Once checks are green, I’ll merge.

@reckenrode reckenrode merged commit 09757c3 into NixOS:staging-next Aug 12, 2024
21 checks passed
@reckenrode reckenrode deleted the darwin-stdenv-reformat branch August 12, 2024 05:07
@reckenrode reckenrode mentioned this pull request Aug 12, 2024
16 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: darwin Running or building packages on Darwin 6.topic: stdenv Standard environment 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild 10.rebuild-linux: 0 This PR does not cause any packages to rebuild
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants