From c2be87e1324a1689425843f67604d46b4912aeb6 Mon Sep 17 00:00:00 2001 From: Nicolas Pierron Date: Sun, 25 Jan 2009 21:23:47 +0000 Subject: [PATCH] Remove support for merge function with name argument. svn path=/nixpkgs/trunk/; revision=13869 --- pkgs/lib/default.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/lib/default.nix b/pkgs/lib/default.nix index c6ea78adfee..b14632b2fb3 100644 --- a/pkgs/lib/default.nix +++ b/pkgs/lib/default.nix @@ -556,25 +556,14 @@ rec { # function of each option to get the result. mergeOptionSets = noOption: newMergeOptionSets; # ignore argument newMergeOptionSets = - let - # handle merge functions with & without name argument. - mergeWrapper = merge: name: values: - let - newMerge = merge values; - oldMerge = builtins.trace - "obsolete: Merge function of ${name} option has name argument." - (merge name values); - in - if __isFunction newMerge then oldMerge else newMerge; - in handleOptionSets { export = opt: values: opt.apply ( if values == [] then if opt ? default then opt.default else throw "Not defined." - else mergeWrapper opt.merge opt.name values - ); + else opt.merge values + )); notHandle = throw "Used without option declaration."; };