diff options
| author | aszlig <aszlig@nix.build> | 2020-02-10 05:52:18 +0100 |
|---|---|---|
| committer | aszlig <aszlig@nix.build> | 2020-02-10 06:18:51 +0100 |
| commit | 7a2023277da1c362e3fbc0b606e2fbaa5201b12e (patch) | |
| tree | b656d5d5f70fad45c4a6d1b4628aae364c5081eb /tests | |
| parent | 0f0e3cef6297d1334a3b1c27bb125490850be84f (diff) | |
Fix deprecated displayManager.auto.enable option
Since a while[1], the services.xserver.displayManager.auto option is deprecated. Since first of all SLiM got removed and now every display manager supports auto-login, I switched the labtops module to use the LightDM implementation. Since the common x11 test module still exposes a similar interface, we only need to use the same options from the test-support option, which should hopefully be a "sane default" suitable for tests. [1]: https://github.com/NixOS/nixpkgs/commit/c95612a5a2d4bd93011c042066c Signed-off-by: aszlig <aszlig@nix.build> Cc: @Profpatsch
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/aszlig/programs/psi.nix | 3 | ||||
| -rw-r--r-- | tests/programs/gnupg/default.nix | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/tests/aszlig/programs/psi.nix b/tests/aszlig/programs/psi.nix index 5ab34da3..0b6643f8 100644 --- a/tests/aszlig/programs/psi.nix +++ b/tests/aszlig/programs/psi.nix @@ -8,8 +8,7 @@ "${nixpkgsPath}/nixos/tests/common/user-account.nix" "${nixpkgsPath}/nixos/tests/common/x11.nix" ]; - services.xserver.displayManager.auto.enable = true; - services.xserver.displayManager.auto.user = "alice"; + test-support.displayManager.auto.user = "alice"; environment.systemPackages = [ pkgs.vuizvui.aszlig.psi ]; }; diff --git a/tests/programs/gnupg/default.nix b/tests/programs/gnupg/default.nix index 064770c9..504f6e46 100644 --- a/tests/programs/gnupg/default.nix +++ b/tests/programs/gnupg/default.nix @@ -31,7 +31,7 @@ in { ) [ "user-account" "x11" ]; services.openssh.enable = true; - services.xserver.displayManager.auto.user = "alice"; + test-support.displayManager.auto.user = "alice"; vuizvui.programs.gnupg.enable = true; vuizvui.programs.gnupg.agent.enable = true; |