diff options
author | Vladimír Čunát <v@cunat.cz> | 2023-09-23 09:57:19 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2023-09-23 10:05:17 +0200 |
commit | 1869818c57d94374101eb8ab8205eac7b5345ee6 (patch) | |
tree | 465d8c3cbd0162f53c32331f57943b53ceb2870b /nixos | |
parent | 45e71a7a99d0678a6694f1bba2c90f256092b01f (diff) | |
download | nixlib-1869818c57d94374101eb8ab8205eac7b5345ee6.tar nixlib-1869818c57d94374101eb8ab8205eac7b5345ee6.tar.gz nixlib-1869818c57d94374101eb8ab8205eac7b5345ee6.tar.bz2 nixlib-1869818c57d94374101eb8ab8205eac7b5345ee6.tar.lz nixlib-1869818c57d94374101eb8ab8205eac7b5345ee6.tar.xz nixlib-1869818c57d94374101eb8ab8205eac7b5345ee6.tar.zst nixlib-1869818c57d94374101eb8ab8205eac7b5345ee6.zip |
nixos/knot: add release notes and partial compatibility
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/doc/manual/release-notes/rl-2311.section.md | 2 | ||||
-rw-r--r-- | nixos/modules/services/networking/knot.nix | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index baf3b4d90220..20a0e53a35da 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -97,6 +97,8 @@ - `pass` now does not contain `password-store.el`. Users should get `password-store.el` from Emacs lisp package set `emacs.pkgs.password-store`. +- `services.knot` now supports `.settings` from RFC42. The change is not 100% compatible with the previous `.extraConfig`. + - `mu` now does not install `mu4e` files by default. Users should get `mu4e` from Emacs lisp package set `emacs.pkgs.mu4e`. - `mariadb` now defaults to `mariadb_1011` instead of `mariadb_106`, meaning the default version was upgraded from 10.6.x to 10.11.x. See the [upgrade notes](https://mariadb.com/kb/en/upgrading-from-mariadb-10-6-to-mariadb-10-11/) for potential issues. diff --git a/nixos/modules/services/networking/knot.nix b/nixos/modules/services/networking/knot.nix index 58ebcb81898b..d98c0ce25bf4 100644 --- a/nixos/modules/services/networking/knot.nix +++ b/nixos/modules/services/networking/knot.nix @@ -188,6 +188,12 @@ in { }; }; }; + imports = [ + # Compatibility with NixOS 23.05. At least partial, as it fails assert if used with keyFiles. + (mkChangedOptionModule [ "services" "knot" "extraConfig" ] [ "services" "knot" "settingsFile" ] + (config: pkgs.writeText "knot.conf" config.services.knot.extraConfig) + ) + ]; config = mkIf config.services.knot.enable { users.groups.knot = {}; |