swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 04:49:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove name argument of merge functions.

Browse source 
svn path=/nixos/branches/fix-style/; revision=13860
This commit is contained in:
Nicolas Pierron 2009-01-25 15:49:23 +00:00
parent dcc981840e
commit ecc761543c
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
upstart-jobs/xserver/desktopManager/default.nix
View file

@ -56,8 +56,8 @@ in
description = " description = "
Default desktop manager loaded if none have been chosen. Default desktop manager loaded if none have been chosen.
"; ";
merge = name: list: merge = list:
let defaultDM = mergeOneOption name list; in let defaultDM = mergeOneOption list; in
if any (w: w.name == defaultDM) cfg.session.list then if any (w: w.name == defaultDM) cfg.session.list then
defaultDM defaultDM
else else

4
upstart-jobs/xserver/windowManager/default.nix
View file

@ -45,8 +45,8 @@ in
description = " description = "
Default window manager loaded if none have been chosen. Default window manager loaded if none have been chosen.
"; ";
merge = name: list: merge = list:
let defaultWM = mergeOneOption name list; in let defaultWM = mergeOneOption list; in
if any (w: w.name == defaultWM) cfg.session then if any (w: w.name == defaultWM) cfg.session then
defaultWM defaultWM
else else