Lluís Batlle i Rossell 6d88da9a23 Merging from trunk (conflict on glibc, I think I resolved it) ... svn path=/nixpkgs/branches/stdenv-updates/; revision=21879		2010-05-19 15:26:00 +00:00
..
applications	Merging from trunk (conflict on glibc, I think I resolved it)	2010-05-19 15:26:00 +00:00
build-support	Merging from trunk (conflict on glibc, I think I resolved it)	2010-05-19 15:26:00 +00:00
configs/etc	d'oh, don't actually gzip it	2006-03-08 19:25:44 +00:00
data	man-pages-3.24	2010-04-12 08:57:45 +00:00
desktops	pkgs/desktops/gnome-2.28/default.nix: strip trailing white space	2010-05-19 12:25:41 +00:00
development	Merging from trunk (conflict on glibc, I think I resolved it)	2010-05-19 15:26:00 +00:00
games	Three Games and Perl Support for Irssi	2010-05-17 09:21:42 +00:00
lib	* The old evaluator segfaults if the `outPath' attribute is missing.	2010-05-12 13:24:09 +00:00
misc	remove duplication in derivation adding tags to source	2010-05-09 14:17:24 +00:00
os-specific	Merging from trunk (conflict on glibc, I think I resolved it)	2010-05-19 15:26:00 +00:00
servers	* Revert to Samba 3.3.3 because never versions (including 3.3.12)	2010-05-04 15:26:34 +00:00
shells	Add GNU SASL, GNU GSS-API, and GNU Rush.	2010-04-26 08:59:25 +00:00
stdenv	Merging from trunk (conflict on glibc, I think I resolved it)	2010-05-19 15:26:00 +00:00
test	Add a new way to handle option sets.	2008-08-05 17:16:35 +00:00
tools	Merging from trunk (conflict on glibc, I think I resolved it)	2010-05-19 15:26:00 +00:00
top-level	Merging from trunk (conflict on glibc, I think I resolved it)	2010-05-19 15:26:00 +00:00