diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-14 10:57:33 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-14 10:57:33 -0400 |
| commit | 8e891e6ed47c6cffd9ebab6cce0835cb5f0a9b25 (patch) | |
| tree | f6498b73e5b1201d1af141b53913d996d5f187a9 /nixos/modules | |
| parent | 3a4eda2e38fd80e6c9bd36606e9da16a47e41922 (diff) | |
| parent | 640c9779968bb98a047aa2d59770a7d3daa35871 (diff) | |
| download | nixlib-8e891e6ed47c6cffd9ebab6cce0835cb5f0a9b25.tar nixlib-8e891e6ed47c6cffd9ebab6cce0835cb5f0a9b25.tar.gz nixlib-8e891e6ed47c6cffd9ebab6cce0835cb5f0a9b25.tar.bz2 nixlib-8e891e6ed47c6cffd9ebab6cce0835cb5f0a9b25.tar.lz nixlib-8e891e6ed47c6cffd9ebab6cce0835cb5f0a9b25.tar.xz nixlib-8e891e6ed47c6cffd9ebab6cce0835cb5f0a9b25.tar.zst nixlib-8e891e6ed47c6cffd9ebab6cce0835cb5f0a9b25.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'nixos/modules')
4 files changed, 6 insertions, 2 deletions
diff --git a/nixos/modules/services/misc/mesos-slave.nix b/nixos/modules/services/misc/mesos-slave.nix index effa29b64f63..468c7f36ecc5 100644 --- a/nixos/modules/services/misc/mesos-slave.nix +++ b/nixos/modules/services/misc/mesos-slave.nix @@ -187,7 +187,7 @@ in { systemd.services.mesos-slave = { description = "Mesos Slave"; wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; + after = [ "network.target" ] ++ optionals cfg.withDocker [ "docker.service" ] ; path = [ pkgs.runtimeShellPackage ]; serviceConfig = { ExecStart = '' diff --git a/nixos/modules/services/x11/desktop-managers/xterm.nix b/nixos/modules/services/x11/desktop-managers/xterm.nix index 29752ff405e2..6ff1ef0e4c9a 100644 --- a/nixos/modules/services/x11/desktop-managers/xterm.nix +++ b/nixos/modules/services/x11/desktop-managers/xterm.nix @@ -12,6 +12,7 @@ in options = { services.xserver.desktopManager.xterm.enable = mkOption { + type = types.bool; default = true; description = "Enable a xterm terminal as a desktop manager."; }; diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix index 5255f1a1b97a..2cff25a8c854 100644 --- a/nixos/modules/system/boot/systemd-unit-options.nix +++ b/nixos/modules/system/boot/systemd-unit-options.nix @@ -217,7 +217,7 @@ in rec { environment = mkOption { default = {}; - type = with types; attrsOf (nullOr (either str package)); + type = with types; attrsOf (nullOr (either str (either path package))); example = { PATH = "/foo/bar/bin"; LANG = "nl_NL.UTF-8"; }; description = "Environment variables passed to the service's processes."; }; diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index 98da55ed68a7..3d46ba72493c 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/nixos/modules/testing/test-instrumentation.nix @@ -129,6 +129,9 @@ in users.extraUsers.root.initialHashedPassword = mkOverride 150 ""; services.xserver.displayManager.job.logToJournal = true; + + # set default stateVersion to avoid warnings during eval + system.nixos.stateVersion = mkDefault "18.03"; }; } |