Vladimír Čunát 8ba92b8895 Merge master into stdenv-updates ... Conflicts (simple): pkgs/development/tools/misc/binutils/default.nix pkgs/tools/package-management/disnix/default.nix pkgs/top-level/all-packages.nix		2013-07-08 10:48:05 +02:00
doc	nixos.org/tarballs -> tarballs.nixos.org	2013-06-25 14:12:16 +02:00
maintainers	nix-generate-from-cpan: Hack to handle non-UTF-8 META.yml files	2013-06-16 18:34:32 +02:00
pkgs	Merge master into stdenv-updates	2013-07-08 10:48:05 +02:00
.gitignore	Rewrite the CPAN generator to Perl	2013-06-13 15:56:23 +02:00
COPYING
default.nix
VERSION	* Bump version number.	2012-06-04 03:53:25 +00:00