svn path=/nixpkgs/trunk/; revision=17348
This commit is contained in:
Eelco Dolstra 2009-09-22 09:26:18 +00:00
parent 912e9f2c80
commit 12395c36a9
2 changed files with 3 additions and 3 deletions

View file

@ -244,7 +244,7 @@ rec {
# calls a function (f attr value ) for each record item. returns a list
mapAttrsFlatten = f : r : map (attr: f attr (builtins.getAttr attr r) ) (attrNames r);
mapRecordFlatten = builtins.trace "depreceated usage of mapRecordFlatten, use mapAttrsFlatten instead" mapAttrsFlatten;
mapRecordFlatten = builtins.trace "deprecated usage of mapRecordFlatten, use mapAttrsFlatten instead" mapAttrsFlatten;
# attribute set containing one attribute
nvs = name : value : listToAttrs [ (nameValuePair name value) ];
@ -276,7 +276,7 @@ rec {
# { buildInputs = [a b]; }
# merging buildPhase does'nt really make sense. The cases will be rare where appending /prefixing will fit your needs?
# in these cases the first buildPhase will override the second one
# ! depreceated, use mergeAttrByFunc instead
# ! deprecated, use mergeAttrByFunc instead
mergeAttrsNoOverride = { mergeLists ? ["buildInputs" "propagatedBuildInputs"],
overrideSnd ? [ "buildPhase" ]
} : attrs1 : attrs2 :

View file

@ -3327,7 +3327,7 @@ let
inherit (xorg) libX11 libXv libXext;
inherit (gtkLibs) glib pango gtk;
inherit (gnome) gnomevfs /* <- only passed for the no longer used older versions
it is depreceated and didn't build on amd64 due to samba dependenccy */ gtkdoc;
it is deprecated and didn't build on amd64 due to samba dependenccy */ gtkdoc;
libsoup = gnome26.libsoup;
});