public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix some typos in comments

Browse Source 
svn path=/nixpkgs/trunk/; revision=17708
This commit is contained in:
Marc Weber 2009-10-08 00:54:26 +00:00
parent 49a1368712
commit 0e6c476d60
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/lib/properties.nix
View File

@ -21,9 +21,9 @@ rec {
mkNotdef = {_type = "notdef";}; mkNotdef = {_type = "notdef";};
# General property type, it has a property attribute and a content # General property type, it has a property attribute and a content
# attribute. The property attribute refer to an attribute set which # attribute. The property attribute refers to an attribute set which
# contains a _type attribute and a list of functions which are used to # contains a _type attribute and a list of functions which are used to
# evaluate this property. The content attribute is used to stack property # evaluate this property. The content attribute is used to stack properties
# on top of each other. # on top of each other.
# #
# The optional functions which may be contained in the property attribute # The optional functions which may be contained in the property attribute
@ -188,7 +188,7 @@ rec {
inherit content; inherit content;
}; };
# Create a "ThenElse" property which contains choices which can choosed by # Create a "ThenElse" property which contains choices being chosen by
# the evaluation of an "If" statement. # the evaluation of an "If" statement.
isThenElse = attrs: (typeOf attrs) == "then-else"; isThenElse = attrs: (typeOf attrs) == "then-else";
mkThenElse = attrs: mkThenElse = attrs:
@ -202,7 +202,7 @@ rec {
content = mkNotdef; content = mkNotdef;
}; };
# Create an "Always" property remove ignore all "If" statement. # Create an "Always" property removing/ ignoring all "If" statement.
isAlways = attrs: (typeOf attrs) == "always"; isAlways = attrs: (typeOf attrs) == "always";
mkAlways = value: mkAlways = value:
mkProperty { mkProperty {
@ -222,8 +222,8 @@ rec {
) id; ) id;
# Evaluate the "If" statements when either "ThenElse" or "Always" # Evaluate the "If" statements when either "ThenElse" or "Always"
# statement is encounter. Otherwise it remove multiple If statement and # statement is encountered. Otherwise it removes multiple If statements and
# replace them by one "If" staement where the condition is the list of all # replaces them by one "If" statement where the condition is the list of all
# conditions joined with a "and" operation. # conditions joined with a "and" operation.
onIfGlobalDelay = name: content: onIfGlobalDelay = name: content:
let let
@ -281,9 +281,9 @@ rec {
/* mkOverride */ /* mkOverride */
# Create an "Override" statement which allow the user to define # Create an "Override" statement which allow the user to define
# prioprities between values. The default priority is 100 and the lowest # priorities between values. The default priority is 100. The lowest
# priorities are kept. The template argument must reproduce the same # priorities are kept. The template argument must reproduce the same
# attribute set hierachy to override leaves of the hierarchy. # attribute set hierarchy to override leaves of the hierarchy.
isOverride = attrs: (typeOf attrs) == "override"; isOverride = attrs: (typeOf attrs) == "override";
mkOverride = priority: template: content: mkProperty { mkOverride = priority: template: content: mkProperty {
property = { property = {
@ -319,7 +319,8 @@ rec {
else else
p; p;
# Ignore all values which have a higher value of the priority number. # Keep values having lowest priority numbers only throwing away those having
# a higher priority assigned.
onOverrideGlobalEval = valList: onOverrideGlobalEval = valList:
let let
defaultPrio = 100; defaultPrio = 100;
@ -368,4 +369,4 @@ rec {
mkNotdef mkNotdef
) prioValList; ) prioValList;
} }