Skip to content

nixos/sourcehut: refactor according to coding standards#267900

Merged
AndersonTorres merged 3 commits intoNixOS:masterfrom
nessdoor:nixos/sourcehut-refactor
Nov 27, 2023
Merged

nixos/sourcehut: refactor according to coding standards#267900
AndersonTorres merged 3 commits intoNixOS:masterfrom
nessdoor:nixos/sourcehut-refactor

Conversation

@nessdoor
Copy link
Contributor

Description of changes

Just a light refactor aimed at:

Consider this a prerequisite for more profound and thoughtful refactoring to come in the near future, as this module is bound to be modified following the discussion in #245394.

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/)
  • 23.11 Release Notes (or backporting 23.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.

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Nov 16, 2023
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Nov 16, 2023
Copy link
Contributor

@christoph-heiss christoph-heiss left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

AFAICS this really just replaces the with lib; with appropriate scoped inherits, and otherwise only contains mechanical whitespace changes using nixpkgs-fmt.

Also ran nix-build -A nixosTests.sourcehut to be sure; no changes there either.

@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one person. label Nov 17, 2023
AndersonTorres
AndersonTorres previously approved these changes Nov 26, 2023
Copy link
Member

@AndersonTorres AndersonTorres left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ping me after 24h to merge.

@AndersonTorres
Copy link
Member

@nessdoor please rebase

@nessdoor nessdoor force-pushed the nixos/sourcehut-refactor branch from 9009340 to cbc937c Compare November 27, 2023 02:15
@AndersonTorres AndersonTorres merged commit 9e6f9c6 into NixOS:master Nov 27, 2023
@nessdoor nessdoor deleted the nixos/sourcehut-refactor branch December 25, 2023 15:10
@nessdoor
Copy link
Contributor Author

@AndersonTorres sorry for coming back after all this time, but: is it me or the first commit of this PR didn't get merged?

@AndersonTorres
Copy link
Member

Why? There is no "partial merge" on github interface...

@nessdoor
Copy link
Contributor Author

Sure, actually it was my bad, sorry. Just noticed that the reformatting of an entire file (default.nix) went missing after the forced push. I noticed only now because the auto-formatter triggered while rebasing some other changes...

Sorry to have troubled you, I will amend my mistake in the future.

@tomberek
Copy link
Contributor

@nessdoor @AndersonTorres thank you both for the continued maintenance.

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

Labels

6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants