Vladimír Čunát 96cec2a7bd Merge 'staging' into multiple-outputs ... Conflicts: pkgs/applications/audio/flac/default.nix pkgs/build-support/gcc-wrapper/builder.sh pkgs/development/libraries/apr-util/default.nix pkgs/development/libraries/apr/default.nix pkgs/development/libraries/atk/default.nix pkgs/development/libraries/freetype/default.nix pkgs/development/libraries/gdk-pixbuf/default.nix pkgs/development/libraries/glib/default.nix pkgs/development/libraries/glibc/2.17/builder.sh pkgs/development/libraries/glibc/2.17/locales.nix pkgs/development/libraries/libjpeg/default.nix pkgs/development/libraries/libogg/default.nix pkgs/development/libraries/libsamplerate/default.nix pkgs/development/libraries/libtiff/default.nix pkgs/development/libraries/libvorbis/default.nix pkgs/development/libraries/mesa/default.nix pkgs/development/libraries/pango/default.nix pkgs/development/web/nodejs/default.nix pkgs/os-specific/linux/pam/default.nix pkgs/os-specific/linux/systemd/default.nix pkgs/stdenv/generic/setup.sh pkgs/stdenv/linux/default.nix pkgs/top-level/all-packages.nix pkgs/top-level/release-small.nix		2014-08-23 16:04:53 +02:00
..
BerkeleyDB	Move all db4 packages to the default db5	2014-02-15 12:03:02 +01:00
Compress-Raw-Zlib	Partially revert 7a45996 some more.	2014-07-28 20:52:47 +02:00
DB_File	Move all db4 packages to the default db5	2014-02-15 12:03:02 +01:00
DBD-mysql
DBD-Pg	Partially revert 7a45996 some more.	2014-07-28 20:52:47 +02:00
DBD-SQLite	perlPackages.DBDSQLite: update from 1.37 to 1.42	2014-04-08 13:25:16 +02:00
expression-generator
generic
maatkit	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
catalyst-fix-chunked-encoding.patch
catalyst-plugin-static-simple-etag.patch
dbix-class-fix-tests.patch	perl-dbix-class: Fix tests with newer SQLite.	2014-04-22 16:27:28 +02:00
gd-options-passthrough-and-fontconfig.patch
Google-ProtocolBuffers-multiline-comments.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
net-amazon-s3-credentials-provider.patch