* Synced with trunk @ 13663

svn path=/nixos/branches/modular-nixos/; revision=14945
2009-04-08 13:32:37 +00:00
parent d745c21aab d8c1734b99
commit bb24373197
19 changed files with 361 additions and 82 deletions
--- a/default.nix
+++ b/default.nix
@@ -1,6 +1,6 @@
 let

-  fromEnv = name : default :
+  fromEnv = name: default:
    let env = builtins.getEnv name; in
    if env == "" then default else env;
  configuration = import (fromEnv "NIXOS_CONFIG" /etc/nixos/configuration.nix);