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

* Put strings-with-deps in lib.

Browse Source 
svn path=/nixpkgs/trunk/; revision=15729
This commit is contained in:
Eelco Dolstra 2009-05-25 18:22:19 +00:00
parent fb9b06d694
commit 1635ec4bdf
4 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/lib/attrsets.nix
View File

@ -21,6 +21,7 @@ rec {
then attrByPath (tail attrPath) default (getAttr attr e) then attrByPath (tail attrPath) default (getAttr attr e)
else default; else default;
/* Backwards compatibility hack: lib.attrByPath used to be called /* Backwards compatibility hack: lib.attrByPath used to be called
lib.getAttr, which was confusing given that there was also a lib.getAttr, which was confusing given that there was also a
builtins.getAttr. Eventually we'll drop this hack and builtins.getAttr. Eventually we'll drop this hack and

7
pkgs/lib/default.nix
View File

@ -3,6 +3,7 @@ let
trivial = import ./trivial.nix; trivial = import ./trivial.nix;
lists = import ./lists.nix; lists = import ./lists.nix;
strings = import ./strings.nix; strings = import ./strings.nix;
stringsWithDeps = import ./strings-with-deps.nix;
attrsets = import ./attrsets.nix; attrsets = import ./attrsets.nix;
sources = import ./sources.nix; sources = import ./sources.nix;
options = import ./options.nix; options = import ./options.nix;
@ -11,8 +12,8 @@ let
misc = import ./misc.nix; misc = import ./misc.nix;
in 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 # !!! don't include everything at top-level; perhaps only the most
# commonly used functions. # commonly used functions.
// trivial // lists // strings // attrsets // sources // options // trivial // lists // strings // stringsWithDeps // attrsets // sources
// meta // debug // misc // options // meta // debug // misc

6
pkgs/lib/strings-with-deps.nix
View File

@ -40,9 +40,9 @@ Usage:
[1] maybe this behaviour should be removed to keep things simple (?) [1] maybe this behaviour should be removed to keep things simple (?)
*/ */
{stdenv, lib}: with import ./lists.nix;
with import ./attrsets.nix;
with lib; with import ./strings.nix;
rec { rec {

9
pkgs/top-level/all-packages.nix
View File

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