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

nixos/systemd-tmpfiles: use types.attrsWith for settings #363939

Merged
merged 1 commit into from
Dec 12, 2024

Conversation

Ma27
Copy link
Member

@Ma27 Ma27 commented Dec 10, 2024

That way it's way easier to derive from the manual which key is used for what exactly.

This is possible now that #295872 is fixed.

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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

@Ma27 Ma27 requested a review from WilliButz December 10, 2024 14:53
@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/` 6.topic: systemd labels Dec 10, 2024
@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Dec 10, 2024
@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Dec 11, 2024
Copy link
Member

@WilliButz WilliButz left a comment

Choose a reason for hiding this comment

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

I'm very much in favor of giving those attributes proper names in the docs, but I'm not sure about the first one being called "rule-name". Since the corresponding manpage tmpfiles.d(5) does not mention "rule", I imagine this may cause some confusion for first time users of the module. I'd suggest naming it something like "config-name" or "package-name".

@Ma27
Copy link
Member Author

Ma27 commented Dec 12, 2024

but I'm not sure about the first one being called "rule-name".

Good idea :)
Wasn't sure how to name it either, so I just made something up, but I like your suggestion better ;-)

That way it's way easier to derive from the manual which key is used for
what exactly.
@Ma27 Ma27 force-pushed the named-attrsOf-tmpfiles branch from 6a8db3d to 2be50b1 Compare December 12, 2024 12:48
@Ma27 Ma27 requested a review from WilliButz December 12, 2024 12:49
@WilliButz WilliButz merged commit 58df438 into NixOS:master Dec 12, 2024
20 of 21 checks passed
@Ma27 Ma27 deleted the named-attrsOf-tmpfiles branch December 12, 2024 15:52
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 6.topic: systemd 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 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants