diff options
author | Alex Berg <chexxor@gmail.com> | 2014-07-03 11:30:11 -0500 |
---|---|---|
committer | Alex Berg <chexxor@gmail.com> | 2014-07-03 11:30:11 -0500 |
commit | 7b768ba2f5fc90663f444348907958abb3146f93 (patch) | |
tree | 438732348dfb8b7638f4784025a076b2a0c9dcad /nixos/tests/login.nix | |
parent | 9af1e2ab516ceac1d4dc100dbf561418bc3d7c13 (diff) | |
parent | a391b55b31989fc90360d76790b72934769b9287 (diff) | |
download | nixpkgs-7b768ba2f5fc90663f444348907958abb3146f93.tar nixpkgs-7b768ba2f5fc90663f444348907958abb3146f93.tar.gz nixpkgs-7b768ba2f5fc90663f444348907958abb3146f93.tar.bz2 nixpkgs-7b768ba2f5fc90663f444348907958abb3146f93.tar.lz nixpkgs-7b768ba2f5fc90663f444348907958abb3146f93.tar.xz nixpkgs-7b768ba2f5fc90663f444348907958abb3146f93.tar.zst nixpkgs-7b768ba2f5fc90663f444348907958abb3146f93.zip |
Merge remote-tracking branch 'nixos/master' into feature/add-znc-module
Conflicts: nixos/modules/misc/ids.nix
Diffstat (limited to 'nixos/tests/login.nix')
-rw-r--r-- | nixos/tests/login.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nixos/tests/login.nix b/nixos/tests/login.nix index 44c53c231c8..e8373219ca6 100644 --- a/nixos/tests/login.nix +++ b/nixos/tests/login.nix @@ -1,6 +1,7 @@ import ./make-test.nix ({ pkgs, latestKernel ? false, ... }: { + name = "login"; machine = { config, pkgs, lib, ... }: |