diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-11-19 19:09:10 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-11-19 19:09:10 +0000 |
| commit | e85500987b7df503b37a127a5ea49a07f92e70f0 (patch) | |
| tree | 5f66b5de9aadaf0ff3ba52c394dc0066114e11e2 /pkgs/lib/default.nix | |
| parent | 7ade207f6b75da0fde94cec621ac6d8fa6c3e586 (diff) | |
| parent | 58f543f19f1a2eed8a46202b36a855836cfc9e0f (diff) | |
| download | nixlib-e85500987b7df503b37a127a5ea49a07f92e70f0.tar nixlib-e85500987b7df503b37a127a5ea49a07f92e70f0.tar.gz nixlib-e85500987b7df503b37a127a5ea49a07f92e70f0.tar.bz2 nixlib-e85500987b7df503b37a127a5ea49a07f92e70f0.tar.lz nixlib-e85500987b7df503b37a127a5ea49a07f92e70f0.tar.xz nixlib-e85500987b7df503b37a127a5ea49a07f92e70f0.tar.zst nixlib-e85500987b7df503b37a127a5ea49a07f92e70f0.zip | |
Merging from trunk. I had to do two manual merges, quite trivial I think.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18472
Diffstat (limited to 'pkgs/lib/default.nix')
| -rw-r--r-- | pkgs/lib/default.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/lib/default.nix b/pkgs/lib/default.nix index 86c45fe83340..6276009ec190 100644 --- a/pkgs/lib/default.nix +++ b/pkgs/lib/default.nix @@ -16,6 +16,7 @@ let maintainers = import ./maintainers.nix; platforms = import ./platforms.nix; systems = import ./systems.nix; + customisation = import ./customisation.nix; in { inherit trivial lists strings stringsWithDeps attrsets sources options @@ -26,3 +27,4 @@ in // trivial // lists // strings // stringsWithDeps // attrsets // sources // properties // options // types // meta // debug // misc // modules // systems + // customisation |