pkgs-lib/formats/systemd: make format a function (#448460)

This commit is contained in:
Arian van Putten
2025-10-13 11:16:24 +00:00
committed by GitHub
4 changed files with 19 additions and 5 deletions

View File

@@ -275,6 +275,8 @@
- The `boot.readOnlyNixStore` has been removed. Control over bind mount options on `/nix/store` is now offered by the `boot.nixStoreMountOpts` option. - The `boot.readOnlyNixStore` has been removed. Control over bind mount options on `/nix/store` is now offered by the `boot.nixStoreMountOpts` option.
- Direct use of `pkgs.formats.systemd` has been deprecated, and should now be instantiated with `pkgs.formats.systemd { }` similarly to other items in `pkgs.formats`.
- The Postfix module has been updated and likely requires configuration changes: - The Postfix module has been updated and likely requires configuration changes:
- The `services.postfix.sslCert` and `sslKey` options were removed and you now need to configure - The `services.postfix.sslCert` and `sslKey` options were removed and you now need to configure
- [services.postfix.settings.main.smtpd_tls_chain_files](#opt-services.postfix.settings.main.smtpd_tls_chain_files) for server certificates, - [services.postfix.settings.main.smtpd_tls_chain_files](#opt-services.postfix.settings.main.smtpd_tls_chain_files) for server certificates,

View File

@@ -7,7 +7,7 @@
let let
cfg = config.services.journald.remote; cfg = config.services.journald.remote;
format = pkgs.formats.systemd; format = pkgs.formats.systemd { };
cliArgs = lib.cli.toGNUCommandLineShell { } { cliArgs = lib.cli.toGNUCommandLineShell { } {
inherit (cfg) output; inherit (cfg) output;

View File

@@ -7,7 +7,7 @@
let let
cfg = config.services.journald.upload; cfg = config.services.journald.upload;
format = pkgs.formats.systemd; format = pkgs.formats.systemd { };
in in
{ {
meta.maintainers = [ lib.maintainers.raitobezarius ]; meta.maintainers = [ lib.maintainers.raitobezarius ];

View File

@@ -425,10 +425,22 @@ optionalAttrs allowAliases aliases
let let
mkValueString = mkValueStringDefault { }; mkValueString = mkValueStringDefault { };
mkKeyValue = k: v: if v == null then "# ${k} is unset" else "${k} = ${mkValueString v}"; mkKeyValue = k: v: if v == null then "# ${k} is unset" else "${k} = ${mkValueString v}";
rawFormat = ini {
listsAsDuplicateKeys = true;
inherit mkKeyValue;
};
in in
ini { rawFormat
listsAsDuplicateKeys = true; // {
inherit mkKeyValue; generate =
name: value:
lib.warn
"Direct use of `pkgs.formats.systemd` has been deprecated, please use `pkgs.formats.systemd { }` instead."
rawFormat.generate
name
value;
__functor = self: { }: rawFormat;
}; };
keyValue = keyValue =