Skip to content

nixfmt-rfc-style: 2024-03-01 -> 2024-05-28#317552

Merged
tomberek merged 1 commit intoNixOS:masterfrom
djacu:bump-fix-nixfmt-rfc-style
Jun 6, 2024
Merged

nixfmt-rfc-style: 2024-03-01 -> 2024-05-28#317552
tomberek merged 1 commit intoNixOS:masterfrom
djacu:bump-fix-nixfmt-rfc-style

Conversation

@djacu
Copy link
Member

@djacu djacu commented Jun 5, 2024

Description of changes

Fix the update script so it points at the new nixos/nixfmt repo and bump to the lasest version on master.
Until now the update.sh script was using github.com/piegamesde/nixfmt.
This changes it to github.com/nixos/nixfmt at the master branch.
Finally, the new update script was run to update the date and nix files.

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.

@ofborg ofborg bot requested a review from dasJ June 5, 2024 21:21
@ofborg ofborg bot added 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 Jun 5, 2024
@tomberek
Copy link
Contributor

tomberek commented Jun 6, 2024

Result of nixpkgs-review pr 317552 run on x86_64-linux 1

1 package built:
  • nixfmt-rfc-style

@tomberek tomberek merged commit 455cabf into NixOS:master Jun 6, 2024
@infinisil
Copy link
Member

Oh actually this could've been bad if anything changed regarding the formatting, because of the GitHub action. Since it uses pull_request_target, we would've only found out after merging. This needs some work for #322520

@infinisil
Copy link
Member

Never mind, the Nixpkgs version is pinned:

# fix a commit from nixpkgs-unstable to avoid e.g. building nixfmt
# from staging
nix_path: nixpkgs=https://github.com/NixOS/nixpkgs/archive/4b455dc2048f73a79eb3713f342369ff58f93e0b.tar.gz
:)

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.

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

3 participants