Author: eelco
Date: Fri Sep 10 09:31:31 2010
New Revision: 23709
URL: https://svn.nixos.org/websvn/nix/?rev=23709&sc=1

Log:
* Get rid of the template argument in mkOverride.

Modified:
   nixpkgs/trunk/pkgs/lib/properties.nix

Modified: nixpkgs/trunk/pkgs/lib/properties.nix
==============================================================================
--- nixpkgs/trunk/pkgs/lib/properties.nix       Thu Sep  9 20:05:00 2010        
(r23708)
+++ nixpkgs/trunk/pkgs/lib/properties.nix       Fri Sep 10 09:31:31 2010        
(r23709)
@@ -304,13 +304,12 @@
     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
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to