Vladimír Čunát 625f40151b Merge branch 'master' into x-updates ... Conflicts (a little tricky, I did some cleanup of interacting changes): pkgs/development/compilers/llvm/default.nix pkgs/development/libraries/libpng/default.nix pkgs/tools/package-management/nixops/default.nix pkgs/top-level/all-packages.nix		2013-08-02 18:30:53 +02:00
doc	nixos.org/tarballs -> tarballs.nixos.org	2013-06-25 14:12:16 +02:00
maintainers	nixpkgs-lint: Warn against capitalised package names and missing versions	2013-07-30 16:52:12 +02:00
pkgs	Merge branch 'master' into x-updates	2013-08-02 18:30:53 +02:00
.gitignore	Rewrite the CPAN generator to Perl	2013-06-13 15:56:23 +02:00
COPYING	* Applying an MIT-style license to Nixpkgs.	2006-04-25 16:50:34 +00:00
default.nix	* For convenience, provide a top-level Nix expression that simply	2007-04-26 14:32:57 +00:00
VERSION	* Bump version number.	2012-06-04 03:53:25 +00:00