diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2022-01-28 14:05:11 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2022-01-28 14:05:11 +0100 |
| commit | 2da5ce4ab3e11c318e14a0f6f3f953d5ab05e91c (patch) | |
| tree | a65b24393dab9684b5c0cb1be078ab8b58bdb045 /nixos/lib | |
| parent | b7c57ee12180d671a6eb5d476c5119ead51c0ea1 (diff) | |
| parent | c256c4599c907c3f661211cc05e74fc2a5907ddf (diff) | |
| download | nixlib-2da5ce4ab3e11c318e14a0f6f3f953d5ab05e91c.tar nixlib-2da5ce4ab3e11c318e14a0f6f3f953d5ab05e91c.tar.gz nixlib-2da5ce4ab3e11c318e14a0f6f3f953d5ab05e91c.tar.bz2 nixlib-2da5ce4ab3e11c318e14a0f6f3f953d5ab05e91c.tar.lz nixlib-2da5ce4ab3e11c318e14a0f6f3f953d5ab05e91c.tar.xz nixlib-2da5ce4ab3e11c318e14a0f6f3f953d5ab05e91c.tar.zst nixlib-2da5ce4ab3e11c318e14a0f6f3f953d5ab05e91c.zip | |
Merge branch 'staging-next' into staging
; Conflicts: ; pkgs/development/python-modules/fakeredis/default.nix
Diffstat (limited to 'nixos/lib')
| -rw-r--r-- | nixos/lib/systemd-unit-options.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/lib/systemd-unit-options.nix b/nixos/lib/systemd-unit-options.nix index 01f954a4d3e0..832a33d64290 100644 --- a/nixos/lib/systemd-unit-options.nix +++ b/nixos/lib/systemd-unit-options.nix @@ -98,7 +98,7 @@ in rec { description = mkOption { default = ""; - type = types.str; + type = types.singleLineStr; description = "Description of this unit used in systemd messages and progress indicators."; }; |