Merge branch 'staging-next' into staging

; Conflicts:
;	pkgs/development/python-modules/fakeredis/default.nix
This commit is contained in:
Jan Tojnar
2022-01-28 14:05:11 +01:00
244 changed files with 2845 additions and 3098 deletions

View File

@@ -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.";
};