public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #16703 from zimbatm/nologin-error

Browse Source 
Nologin error
This commit is contained in:
zimbatm 2016-07-07 22:58:53 +01:00 committed by GitHub
commit 2459ddd4f6
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/lib/utils.nix
View File

@ -12,6 +12,8 @@ rec {
toShellPath = shell: toShellPath = shell:
if types.shellPackage.check shell then if types.shellPackage.check shell then
"/run/current-system/sw${shell.shellPath}" "/run/current-system/sw${shell.shellPath}"
else if types.package.check shell then
throw "${shell} is not a shell package"
else else
shell; shell;
} }

3
pkgs/os-specific/linux/shadow/default.nix
View File

@ -53,8 +53,9 @@ stdenv.mkDerivation rec {
meta = { meta = {
homepage = http://pkg-shadow.alioth.debian.org/; homepage = http://pkg-shadow.alioth.debian.org/;
description = "Suite containing authentication-related tools such as passwd and su"; description = "Suite containing authentication-related tools such as passwd and su";
};
passthru = { passthru = {
shellPath = "/bin/nologin"; shellPath = "/bin/nologin";
}; };
};
} }