Find a file
Shea Levy fde3526e7d Merge branch 'master' into stdenv-updates
Conflict in kerberos, which was updated both in master and in
stdenv-updates. Kept the stdenv-updates version, except pulled in the
enableParallelBuilding change from master.

Signed-off-by: Shea Levy <shea@shealevy.com>

Conflicts:
	pkgs/development/libraries/kerberos/krb5.nix
2013-05-04 18:28:48 -04:00
doc Lots of Perl package updates 2013-01-19 00:02:51 +01:00
maintainers generate-cpan-package: Don't hard-code Eelco's environment 2013-03-27 16:35:42 -04:00
pkgs Merge branch 'master' into stdenv-updates 2013-05-04 18:28:48 -04:00
.gitignore Add the nix-build `result' symlink and cpan files to gitignore 2013-03-28 09:52:27 -04:00
COPYING
default.nix
VERSION