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.

Sign up for GitHub

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

Jump to bottom

nixos/kubo: convert to RFC42-style settings #197104

Merged
merged 1 commit into from
Oct 27, 2022
Merged

nixos/kubo: convert to RFC42-style settings #197104

merged 1 commit into from
Oct 27, 2022

Conversation

Luflosi
Copy link
Contributor

@Luflosi Luflosi commented Oct 21, 2022

Description of changes

Update the module to use RFC42-style settings and formatters.

The migration of NixOS configurations should be very easy as it just requires renaming four options:
services.kubo.extraConfig -> services.kubo.settings
services.kubo.gatewayAddress -> services.kubo.settings.Addresses.Gateway
services.kubo.apiAddress -> services.kubo.settings.Addresses.API
services.kubo.swarmAddress -> services.kubo.settings.Addresses.Swarm
Since I renamed the options with mkRenamedOptionModule old configurations should continue to work without any changes.

I also added a changelog entry, a link to the upstream configuration documentation and I changed the way the configuration for autoMount is applied.

I tested this by using the updated module on my own server and by executing the kubo NixOS test.

Related: #144575

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 22.11 Release Notes (or backporting 22.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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • 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: changelog 8.has: documentation 8.has: module (update) This PR changes an existing module in `nixos/` labels Oct 21, 2022
@Luflosi Luflosi mentioned this pull request Oct 21, 2022
Merged
13 tasks
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Oct 21, 2022
@fabianhjr
Copy link
Member

LGTM, will test later

fabianhjr
fabianhjr approved these changes Oct 22, 2022
View reviewed changes
Copy link
Member

@fabianhjr fabianhjr left a comment

Choose a reason for hiding this comment

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

Changes LGTM, built and running on x86_64-linux

@fabianhjr fabianhjr added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Oct 22, 2022
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/657

@SuperSandro2000 SuperSandro2000 merged commit 432e5e6 into NixOS:master Oct 27, 2022
@Luflosi Luflosi deleted the kubo-RFC42 branch October 27, 2022 22:11
@matthiasbeyer matthiasbeyer mentioned this pull request Aug 6, 2023
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fabianhjr fabianhjr fabianhjr approved these changes

Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: changelog 8.has: documentation 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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Luflosi @fabianhjr @nixos-discourse @SuperSandro2000