movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00
Code Activity

Merge remote-tracking branch 'origin/staging-next' into staging

Browse source
This commit is contained in:
Martin Weinelt 2023-02-28 21:17:51 +00:00
commit 3686005e6e
60 changed files with 851 additions and 588 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/virtualisation/docker.nix
View file

@ -100,7 +100,7 @@ in
logDriver =
mkOption {
type = types.enum ["none" "json-file" "syslog" "journald" "gelf" "fluentd" "awslogs" "splunk" "etwlogs" "gcplogs"];
type = types.enum ["none" "json-file" "syslog" "journald" "gelf" "fluentd" "awslogs" "splunk" "etwlogs" "gcplogs" "local"];
default = "journald";
description =
lib.mdDoc ''

2
nixos/modules/virtualisation/multipass.nix
View file

@ -44,7 +44,7 @@ in
serviceConfig = {
ExecStart = "${cfg.package}/bin/multipassd --logger platform --verbosity ${cfg.logLevel}";
SyslogIdentifer = "multipassd";
SyslogIdentifier = "multipassd";
Restart = "on-failure";
TimeoutStopSec = 300;
Type = "simple";