philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

Fix activation script's merge function.

Browse source 
svn path=/nixos/branches/fix-style/; revision=14199
This commit is contained in:
Nicolas Pierron 2009-02-22 23:33:58 +00:00
parent a3b91410cd
commit 1c66b3e0c0
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
system/activate-configuration.nix
View file

@ -3,7 +3,8 @@
let let
inherit (pkgs.stringsWithDeps) textClosureOverridable noDepEntry; inherit (pkgs.stringsWithDeps) textClosureOverridable noDepEntry;
inherit (pkgs.lib) mkOption mergeTypedOption mergeAttrs mapRecordFlatten mapAttrs; inherit (pkgs.lib) mkOption mergeTypedOption mergeAttrs mapRecordFlatten
mapAttrs addErrorContext fold;
textClosure = steps: textClosure = steps:
textClosureOverridable steps ( textClosureOverridable steps (
@ -44,8 +45,9 @@ in
Activate the new configuration (i.e., update /etc, make accounts, Activate the new configuration (i.e., update /etc, make accounts,
and so on). and so on).
''; '';
merge = mergeTypedOption "script" builtins.isAttrs mergeAttrs; merge = mergeTypedOption "script" builtins.isAttrs (fold mergeAttrs {});
apply = set: let lib = addAttributeName set; in { apply = set:
let lib = addAttributeName set; in {
inherit lib; # used to fetch dependencies. inherit lib; # used to fetch dependencies.
script = aggregateScripts "activationScript" lib; script = aggregateScripts "activationScript" lib;
}; };