From df1d0752ebf91603f792c42080c2233cae548973 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 10 Sep 2010 09:31:31 +0000 Subject: [PATCH] * Get rid of the template argument in mkOverride. svn path=/nixpkgs/trunk/; revision=23709 --- pkgs/lib/properties.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/lib/properties.nix b/pkgs/lib/properties.nix index 592dc9c4bcb..4fa1b00a411 100644 --- a/pkgs/lib/properties.nix +++ b/pkgs/lib/properties.nix @@ -304,13 +304,12 @@ rec { inherit content; }; - # Currently an alias, but sooner or later the template argument should be - # removed. - mkOverride = mkOverrideTemplate; + # Like mkOverrideTemplate, but without the template argument. + mkOverride = priority: content: mkOverrideTemplate priority {} content; # Sugar to override the default value of the option by making a new # default value based on the configuration. - mkDefaultValue = content: mkOverride 1000 {} content; + mkDefaultValue = content: mkOverride 1000 content; # Make the template traversal in function of the property traversal. If # the template define a non-empty attribute set, then the property is