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
..
cert-file-path-max.patch	OpenSSL: Fix compilation on GNU/Hurd.	2012-01-05 23:46:17 +00:00
cert-file.patch	* OpenSSL: Allow the location of the X509 certificate file (the CA	2011-09-12 16:57:34 +00:00
darwin-arch.patch	* Fix the Darwin patch for OpenSSL.	2012-01-23 12:59:18 +00:00
default.nix	Merge branch 'master' into stdenv-updates.	2012-11-21 16:20:36 +01:00
gnu.patch	OpenSSL: Further fix `Configure' for GNU builds.	2012-01-06 14:07:02 +00:00
hurd-target.patch	openssl: Fix target settings when building for GNU/hurd	2011-11-16 19:03:52 +00:00
kfreebsd-gnu.patch	openssl: fix GNU/kFreeBSD builds	2012-08-13 14:12:54 +02:00