Lluís Batlle i Rossell b58780c43d Merge remote-tracking branch 'eelco/master' into stdenv-updates ... Conflicts: pkgs/development/compilers/gcc/4.7/default.nix Trivial solution.		2012-12-28 23:28:16 +01:00
doc	Document that Java packages should install JARs in $out/lib/java	2012-11-08 16:31:08 +01:00
maintainers	Remove support for the obsolete powerpc-darwin and i686-darwin platforms	2012-11-29 14:10:49 +01:00
pkgs	Merge remote-tracking branch 'eelco/master' into stdenv-updates	2012-12-28 23:28:16 +01:00
.gitignore	Tell git to ignore .*.swp - Vim swap files	2012-10-04 11:27:57 +04:00
COPYING
default.nix
VERSION