From ecc761543ced38cdef4d521e1af14966a23b00c7 Mon Sep 17 00:00:00 2001 From: Nicolas Pierron Date: Sun, 25 Jan 2009 15:49:23 +0000 Subject: [PATCH] Remove name argument of merge functions. svn path=/nixos/branches/fix-style/; revision=13860 --- upstart-jobs/xserver/desktopManager/default.nix | 4 ++-- upstart-jobs/xserver/windowManager/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/upstart-jobs/xserver/desktopManager/default.nix b/upstart-jobs/xserver/desktopManager/default.nix index 05f82dd3e6c..ab1271e69ae 100644 --- a/upstart-jobs/xserver/desktopManager/default.nix +++ b/upstart-jobs/xserver/desktopManager/default.nix @@ -56,8 +56,8 @@ in description = " Default desktop manager loaded if none have been chosen. "; - merge = name: list: - let defaultDM = mergeOneOption name list; in + merge = list: + let defaultDM = mergeOneOption list; in if any (w: w.name == defaultDM) cfg.session.list then defaultDM else diff --git a/upstart-jobs/xserver/windowManager/default.nix b/upstart-jobs/xserver/windowManager/default.nix index 14f06b62b03..cb5a1b674e0 100644 --- a/upstart-jobs/xserver/windowManager/default.nix +++ b/upstart-jobs/xserver/windowManager/default.nix @@ -45,8 +45,8 @@ in description = " Default window manager loaded if none have been chosen. "; - merge = name: list: - let defaultWM = mergeOneOption name list; in + merge = list: + let defaultWM = mergeOneOption list; in if any (w: w.name == defaultWM) cfg.session then defaultWM else