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/powerdns: replace extraConfig with settings option #156111

Closed
wants to merge 1 commit into from

Conversation

aanderse
Copy link
Member

Motivation for this change

#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.05 Release Notes (or backporting 21.11 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: module (update) This PR changes an existing module in `nixos/` labels Jan 22, 2022
@aanderse aanderse requested a review from rnhmjoj January 22, 2022 00:34
@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 Jan 22, 2022
type = types.lines;
default = "launch=bind";
settings = mkOption {
type = with types; attrsOf (oneOf [ bool int str ]);
Copy link
Contributor

@rnhmjoj rnhmjoj Jan 22, 2022

Choose a reason for hiding this comment

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

The type is bit more complex than this: there are options accepting a list of values, for example.
You should be able to reuse the functions I've defined for pdns-recursor, which seems to be using the same syntax. We could move them to a common file and import them in both modules.

Copy link
Member Author

Choose a reason for hiding this comment

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

ping @infinisil - there are several pieces of powerdns related software that all uses the same configuration format. This format is different enough from existing formats (ini) that it doesn't quite match anything we have. Should I add a new pkgs.formats.pdns format, or abstract this somewhere else?

Thanks!

Copy link
Member

Choose a reason for hiding this comment

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

I think unless we have a clear specification or some indication that two programs use the same format, we shouldn't abstract this. In this case it seems to be simple enough that we can just define the formats inline in the modules themselves. I guess we could add a types.oneOrMore at some point though. Fyi I think this should maybe rather be oneOrMore = type: coercedTo type singleton (listOf type), so that merging works between single and multiple elements.

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks for the answer @infinisil.

@stale stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Sep 21, 2022
@aanderse aanderse closed this Apr 12, 2023
@aanderse aanderse deleted the nixos/powerdns branch April 12, 2023 14:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md 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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants