Peter Simons f67d5a9a39 Merge branch 'master' into stdenv-updates. ... Conflicts have been resolved in: pkgs/tools/misc/file/default.nix pkgs/top-level/all-packages.nix pkgs/top-level/python-packages.nix		2012-11-21 16:20:36 +01:00
..
BerkeleyDB
Compress-Raw-Bzip2	IO::Compress: Update to fix the build	2012-09-24 17:43:47 -04:00
Compress-Raw-Zlib	IO::Compress: Update to fix the build	2012-09-24 17:43:47 -04:00
DB_File	perl-DB_File: update to version 1.826	2012-07-29 20:54:45 +02:00
DBD-mysql
DBD-Pg	Add some packages to the channel	2012-07-31 19:26:35 -04:00
DBD-SQLite	DBD::SQLite: Don't link against /usr/lib/libsqlite3.dylib on Darwin	2012-09-12 12:33:03 -04:00
expression-generator
generic
maatkit
catalyst-fix-chunked-encoding.patch
gd-options-passthrough-and-fontconfig.patch
lwp-protocol-https-cert-file.patch
module-pluggable.patch
net-amazon-ec2-ipv6.patch
net-amazon-ec2-nova-compat.patch
net-amazon-mechanicalturk.patch
starman-dont-change-name.patch
template-toolkit-nix-store.patch