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/knot: compatibility with 23.05 config #258361

Merged
merged 1 commit into from Oct 8, 2023

Conversation

vcunat
Copy link
Member

@vcunat vcunat commented Oct 1, 2023

Continuation of PR #81460

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/)
  • 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.

@vcunat
Copy link
Member Author

vcunat commented Oct 1, 2023

Still, the warning... maybe using mkChangedOptionModule was a bad idea?

trace: warning: The option services.knot.extraConfig defined in makeTest parameters has been changed to services.knot.settingsFile that has a different type. Please read services.knot.settingsFile documentation and update your configuration accordingly.

- run conf-check iff keyFiles == [] (like in 23.05; this was my bug)
- support extraConfig + keyFiles

- but warning will still be shown if extraConfig is used,
  and it might be slightly confusing
@vcunat vcunat merged commit 2ec9238 into NixOS:master Oct 8, 2023
5 of 6 checks passed
@vcunat
Copy link
Member Author

vcunat commented Oct 8, 2023

I believe this is an improvement, so let me merge now even if it's unclear whether some further improvements should be done.

@vcunat vcunat deleted the p/knot-nixConfig branch October 8, 2023 08:17
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.

None yet

2 participants