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

svn path=/nixos/branches/modular-nixos/; revision=15670

Browse Source
This commit is contained in:
Eelco Dolstra 2009-05-20 10:18:54 +00:00
parent eb91b27809
commit f99fe41f65
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
default.nix
View File

@ -3,8 +3,10 @@ let
fromEnv = name: default: fromEnv = name: default:
let env = builtins.getEnv name; in let env = builtins.getEnv name; in
if env == "" then default else env; if env == "" then default else env;
configuration = import (fromEnv "NIXOS_CONFIG" /etc/nixos/configuration.nix); configuration = import (fromEnv "NIXOS_CONFIG" /etc/nixos/configuration.nix);
nixpkgs = fromEnv "NIXPKGS" /etc/nixos/nixpkgs;
nixpkgs = fromEnv "NIXPKGS" /etc/nixos/nixpkgs;
system = import system/system.nix { inherit configuration nixpkgs; }; system = import system/system.nix { inherit configuration nixpkgs; };

1
upstart-jobs/sshd.nix
View File

@ -87,6 +87,7 @@ let
sshdUid = (import ../system/ids.nix).uids.sshd; sshdUid = (import ../system/ids.nix).uids.sshd;
# !!! is this assertion evaluated anywhere???
assertion = cfg.permitRootLogin == "yes" || assertion = cfg.permitRootLogin == "yes" ||
cfg.permitRootLogin == "without-password" || cfg.permitRootLogin == "without-password" ||
cfg.permitRootLogin == "forced-commands-only" || cfg.permitRootLogin == "forced-commands-only" ||