movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00
Code Activity

Remove uses of the "merge" option attribute

Browse source 
It's redundant because you can (and should) specify an option type, or
an apply function.
This commit is contained in:
Eelco Dolstra 2013-10-28 16:14:15 +01:00
parent f4a418761b
commit d5047faede
20 changed files with 36 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/system/boot/kernel.nix
View file

@ -117,6 +117,7 @@ in
};
system.modulesTree = mkOption {
type = types.listOf types.path;
internal = true;
default = [];
description = ''
@ -124,7 +125,6 @@ in
built outside of the kernel. Combine these into a single tree of
symlinks because modprobe only supports one directory.
'';
merge = mergeListOption;
# Convert the list of path to only one path.
apply = pkgs.aggregateModules;
};