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/dnsmasq: remove deprecated option "extraConfig" #335957

Merged
merged 1 commit into from
Sep 20, 2024

Conversation

rhoriguchi
Copy link
Contributor

Description of changes

Remove deprecated option

- The `dnsmasq` service now takes configuration via the
`services.dnsmasq.settings` attribute set. The option
`services.dnsmasq.extraConfig` will be deprecated when NixOS 22.11 reaches
end of life.

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.

Copy link
Contributor

@KoviRobi KoviRobi left a comment

Choose a reason for hiding this comment

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

Makes sense to me, I had a quick look at discourse in case anyone had popped up saying some odd configuration can't be represented, wrt deprecation. Also I can't think of any, given it's just command line flags, and we have a way of repeating command line flags (i.e. lists).

I can't merge, and honestly I'm sadly not very active in the NixOS community/development to give good code review, but LGTM.

fpletz
fpletz previously requested changes Aug 25, 2024
Copy link
Member

@fpletz fpletz left a comment

Choose a reason for hiding this comment

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

Looks good. But this change needs release notes and a mkRemovedOptionModule definition to inform users.

nixos/modules/services/networking/nixops-dns.nix Outdated Show resolved Hide resolved
Copy link
Member

@Scrumplex Scrumplex left a comment

Choose a reason for hiding this comment

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

Apart from the wording, LGTM

nixos/doc/manual/release-notes/rl-2411.section.md Outdated Show resolved Hide resolved
nixos/modules/services/networking/dnsmasq.nix Outdated Show resolved Hide resolved
@bjornfor
Copy link
Contributor

Looks good. But this change needs release notes and a mkRemovedOptionModule definition to inform users.

@fpletz: That's done now.

@bjornfor bjornfor dismissed fpletz’s stale review September 20, 2024 20:43

Release note and mkRemovedOptionModule added now.

@bjornfor bjornfor merged commit c26ca03 into NixOS:master Sep 20, 2024
23 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants