From 300dcb9ef35ba89b03f0a01cbefdf299bd5faef2 Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 27 Jul 2015 16:05:41 +0200 Subject: krebs.build.search-domain: s/example/default/ --- 3modules/krebs/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to '3modules/krebs') diff --git a/3modules/krebs/default.nix b/3modules/krebs/default.nix index d32143b..2b20613 100644 --- a/3modules/krebs/default.nix +++ b/3modules/krebs/default.nix @@ -151,8 +151,7 @@ let # TODO search-domains :: listOf hostname search-domain = mkOption { type = types.hostname; - default = ""; - example = "retiolum"; + default = "retiolum"; }; }; -- cgit v1.2.3 From 12fef7dc552c2399d9a54f4ff68b78be6ff812c3 Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 27 Jul 2015 16:26:50 +0200 Subject: krebs.build.script: update system profile --- 3modules/krebs/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to '3modules/krebs') diff --git a/3modules/krebs/default.nix b/3modules/krebs/default.nix index 2b20613..32c9368 100644 --- a/3modules/krebs/default.nix +++ b/3modules/krebs/default.nix @@ -107,15 +107,18 @@ let '') config.deps)} echo build system... + profile=/nix/var/nix/profiles/system NIX_PATH=/root/src \ - nix-build \ + nix-env \ -Q \ + -p "$profile" \ + -f '' \ + --set \ -A system \ - '' \ --argstr user-name ${escapeShellArg cfg.build.user.name} \ --argstr system-name ${escapeShellArg cfg.build.host.name} - exec result/bin/switch-to-configuration switch + exec "$profile"/bin/switch-to-configuration switch EOF ''; }; -- cgit v1.2.3