diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:31:50 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:32:25 +0100 |
| commit | b7baf40e099b4215181fe7b0c63083b12ef2c7fb (patch) | |
| tree | a6efabd31d05b6d0a36624729e80377bbbfb0149 /nixpkgs/pkgs/pkgs-lib | |
| parent | 710028664e26e85cb831a869b3da9f6993902255 (diff) | |
| parent | 0799f514b1cd74878174939df79ac60ca5036673 (diff) | |
| download | nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.gz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.bz2 nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.lz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.xz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.zst nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/pkgs-lib')
| -rw-r--r-- | nixpkgs/pkgs/pkgs-lib/formats.nix | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/pkgs-lib/formats.nix b/nixpkgs/pkgs/pkgs-lib/formats.nix index 3cbda3a7ebdd..950547c4f001 100644 --- a/nixpkgs/pkgs/pkgs-lib/formats.nix +++ b/nixpkgs/pkgs/pkgs-lib/formats.nix @@ -142,6 +142,20 @@ rec { }; + # As defined by systemd.syntax(7) + # + # null does not set any value, which allows for RFC42 modules to specify + # optional config options. + systemd = let + mkValueString = lib.generators.mkValueStringDefault {}; + mkKeyValue = k: v: + if v == null then "# ${k} is unset" + else "${k} = ${mkValueString v}"; + in ini { + listsAsDuplicateKeys = true; + inherit mkKeyValue; + }; + keyValue = { # Represents lists as duplicate keys listsAsDuplicateKeys ? false, |