diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-09-22 09:26:18 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-09-22 09:26:18 +0000 |
commit | 12395c36a945f1a7f29554c05a6acd57c604e666 (patch) | |
tree | a1522670ccb342eb6374b2e93e28648d69fa719d | |
parent | 912e9f2c80a11a4eb4549b6aa3bbbcb4c620433b (diff) | |
download | nixpkgs-12395c36a945f1a7f29554c05a6acd57c604e666.tar nixpkgs-12395c36a945f1a7f29554c05a6acd57c604e666.tar.gz nixpkgs-12395c36a945f1a7f29554c05a6acd57c604e666.tar.bz2 nixpkgs-12395c36a945f1a7f29554c05a6acd57c604e666.tar.lz nixpkgs-12395c36a945f1a7f29554c05a6acd57c604e666.tar.xz nixpkgs-12395c36a945f1a7f29554c05a6acd57c604e666.tar.zst nixpkgs-12395c36a945f1a7f29554c05a6acd57c604e666.zip |
* Typos.
svn path=/nixpkgs/trunk/; revision=17348
-rw-r--r-- | pkgs/lib/misc.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/lib/misc.nix b/pkgs/lib/misc.nix index ba276f4ded7..f09ab33f721 100644 --- a/pkgs/lib/misc.nix +++ b/pkgs/lib/misc.nix @@ -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 : diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 953b8907a64..3bed28f678d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; }); |