* Put strings-with-deps in lib.
svn path=/nixpkgs/trunk/; revision=15729
This commit is contained in:
@@ -21,6 +21,7 @@ rec {
|
||||
then attrByPath (tail attrPath) default (getAttr attr e)
|
||||
else default;
|
||||
|
||||
|
||||
/* Backwards compatibility hack: lib.attrByPath used to be called
|
||||
lib.getAttr, which was confusing given that there was also a
|
||||
builtins.getAttr. Eventually we'll drop this hack and
|
||||
|
||||
@@ -3,6 +3,7 @@ let
|
||||
trivial = import ./trivial.nix;
|
||||
lists = import ./lists.nix;
|
||||
strings = import ./strings.nix;
|
||||
stringsWithDeps = import ./strings-with-deps.nix;
|
||||
attrsets = import ./attrsets.nix;
|
||||
sources = import ./sources.nix;
|
||||
options = import ./options.nix;
|
||||
@@ -11,8 +12,8 @@ let
|
||||
misc = import ./misc.nix;
|
||||
|
||||
in
|
||||
{ inherit trivial lists strings attrsets sources options meta debug; }
|
||||
{ inherit trivial lists strings stringsWithDeps attrsets sources options meta debug; }
|
||||
# !!! don't include everything at top-level; perhaps only the most
|
||||
# commonly used functions.
|
||||
// trivial // lists // strings // attrsets // sources // options
|
||||
// meta // debug // misc
|
||||
// trivial // lists // strings // stringsWithDeps // attrsets // sources
|
||||
// options // meta // debug // misc
|
||||
|
||||
@@ -40,9 +40,9 @@ Usage:
|
||||
[1] maybe this behaviour should be removed to keep things simple (?)
|
||||
*/
|
||||
|
||||
{stdenv, lib}:
|
||||
|
||||
with lib;
|
||||
with import ./lists.nix;
|
||||
with import ./attrsets.nix;
|
||||
with import ./strings.nix;
|
||||
|
||||
rec {
|
||||
|
||||
|
||||
Reference in New Issue
Block a user