* Put strings-with-deps in lib.

svn path=/nixpkgs/trunk/; revision=15729

pkgs/lib/attrsets.nix

@@ -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

pkgs/lib/default.nix

@@ -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

pkgs/lib/strings-with-deps.nix

@@ -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 {
 

pkgs/top-level/all-packages.nix

@@ -165,9 +165,7 @@ let
 
   builderDefsPackage = builderDefs.builderDefsPackage builderDefs;
 
-  stringsWithDeps = import ../lib/strings-with-deps.nix {
-    inherit stdenv lib;
-  };
+  stringsWithDeps = lib.stringsWithDeps;
 
   # Call a specific version of a Nix expression, that is,
   # `selectVersion ./foo {version = "0.1.2"; args...}' evaluates to
@@ -7232,10 +7230,7 @@ let
     inherit stdenv fetchurl mesa;
     wxGTK = wxGTK28deps {unicode = false;};
     inherit (xlibs) libX11 xproto;
-    stringsWithDeps = import ../lib/strings-with-deps.nix {
-      inherit stdenv lib;
-    };
-    inherit builderDefs;
+    inherit stringsWithDeps builderDefs;
   };
 
   gemrb = import ../games/gemrb {