adding two new options:

- system.copySystemConfiguration (requested by Ludovic Courtès)
- system.extraSystemBuilderCmds

svn path=/nixos/trunk/; revision=21406
This commit is contained in:
Marc Weber 2010-04-28 14:55:26 +00:00
parent 835522e40d
commit d1e87dfc86
2 changed files with 37 additions and 0 deletions

View File

@ -1,3 +1,4 @@
# TODO: remove this file. There is lib.maybeEnv now
name: default: name: default:
let value = builtins.getEnv name; in let value = builtins.getEnv name; in
if value == "" then default else value if value == "" then default else value

View File

@ -31,6 +31,36 @@ let
Name of the kernel file to be passed to the bootloader. Name of the kernel file to be passed to the bootloader.
''; '';
}; };
system.copySystemConfiguration = pkgs.lib.mkOption {
default = true;
description = ''
Unless set to false copies the nixos configuration file
<literal>$NIXOS_CONFIG</literal> defaulting to
<filename>/etc/nixos/configuration.nix</filename>
to the system store path.
See <option>extraSystemBuilderCmds</option>
if you want to do add more customized info
to your system storepath.
'';
};
system.extraSystemBuilderCmds = pkgs.lib.mkOption {
default = "";
merge = pkgs.lib.concatStringsSep "\n";
description = ''
This code will be added to the builder creating the system store path.
This use case copies your configuration file into the system derivation:
<command>
cp ${pkgs.lib.maybeEnv "NIXOS_CONFIG" "/etc/nixos/configuration.nix"} $out
</command>
Of course you could add code saving a svn diff or svn revision number
of both nixos and nixpkgs repositories as well. Keep in mind that when
you build in chroots that you have do either copy sources to store or
add them to the chroot somehow.
You still should consider putting your configuration into a VCS.
'';
};
}; };
@ -95,6 +125,8 @@ let
ensureDir $out/bin ensureDir $out/bin
substituteAll ${./switch-to-configuration.sh} $out/bin/switch-to-configuration substituteAll ${./switch-to-configuration.sh} $out/bin/switch-to-configuration
chmod +x $out/bin/switch-to-configuration chmod +x $out/bin/switch-to-configuration
${config.system.extraSystemBuilderCmds}
''; '';
@ -139,5 +171,9 @@ let
in { in {
require = [options]; require = [options];
system.extraSystemBuilderCmds =
pkgs.lib.optionalString
config.system.copySystemConfiguration
"cp ${pkgs.lib.maybeEnv "NIXOS_CONFIG" "/etc/nixos/configuration.nix"} $out";
system.build.toplevel = system; system.build.toplevel = system;
} }