summary refs log tree commit diff
path: root/nixos/modules/system/activation/top-level.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2013-10-28 16:14:15 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2013-10-28 22:45:56 +0100
commitd5047faedef254d01a21618224698c190bb67e5b (patch)
tree42a43de15611b5e35b2888f02fb940365edb1402 /nixos/modules/system/activation/top-level.nix
parentf4a418761b481b15900c78b8086e7be58b0afe4e (diff)
downloadnixlib-d5047faedef254d01a21618224698c190bb67e5b.tar
nixlib-d5047faedef254d01a21618224698c190bb67e5b.tar.gz
nixlib-d5047faedef254d01a21618224698c190bb67e5b.tar.bz2
nixlib-d5047faedef254d01a21618224698c190bb67e5b.tar.lz
nixlib-d5047faedef254d01a21618224698c190bb67e5b.tar.xz
nixlib-d5047faedef254d01a21618224698c190bb67e5b.tar.zst
nixlib-d5047faedef254d01a21618224698c190bb67e5b.zip
Remove uses of the "merge" option attribute
It's redundant because you can (and should) specify an option type, or
an apply function.
Diffstat (limited to 'nixos/modules/system/activation/top-level.nix')
-rw-r--r--nixos/modules/system/activation/top-level.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index a04914bedaf7..7b1c7d611d35 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -172,9 +172,9 @@ in
     };
 
     system.extraSystemBuilderCmds = mkOption {
+      type = types.lines;
       internal = true;
       default = "";
-      merge = concatStringsSep "\n";
       description = ''
         This code will be added to the builder creating the system store path.
       '';