Shea Levy acd4299e75 Merge branch 'master' into stdenv-updates ... Conflicts: pkgs/applications/networking/browsers/chromium/default.nix pkgs/top-level/all-packages.nix Merge conflicts seemed trivial, but a look from viric and aszlig would be nice.		2013-02-21 11:13:30 -05: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 'master' into stdenv-updates	2013-02-21 11:13:30 -05: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