Vladimír Čunát 0d72174dbd Merge branch stdenv-updates into x-updates ... x-updates is supposed to merge after stdenv-updates, so let's test it Conflicts: pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer) pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)		2013-02-21 12:43:00 +01:00
doc	Lots of Perl package updates	2013-01-19 00:02:51 +01:00
maintainers	Add very hacky script to generate Perl packages	2013-01-28 12:11:32 +01:00
pkgs	Merge branch stdenv-updates into x-updates	2013-02-21 12:43:00 +01:00
.gitignore	Tell git to ignore .*.swp - Vim swap files	2012-10-04 11:27:57 +04: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