synchronize with trunk

svn path=/nixpkgs/branches/stdenv-updates/; revision=30186
This commit is contained in:
Peter Simons
2011-11-02 10:28:32 +00:00
110 changed files with 830 additions and 520 deletions
-1
View File
@@ -148,7 +148,6 @@ rec {
}
;
uniq = elemType: mkOptionType {
inherit (elemType) name check iter fold docPath hasOptions;
merge = list: