Merge branch 'staging' into v/modular

Conflicts (easy):
	pkgs/development/interpreters/perl/5.10/setup-hook.sh
	pkgs/development/interpreters/perl/5.8/setup-hook.sh
	pkgs/development/libraries/gtk+/2.x.nix
This commit is contained in:
Vladimír Čunát
2014-08-31 12:23:18 +02:00
767 changed files with 19114 additions and 13711 deletions
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
buildInputs = [ unzip jdk makeWrapper ];
meta = {
description = "Gradle is an enterprise-grade build system";
description = "Enterprise-grade build system";
longDescription = ''
Gradle is a build system which offers you ease, power and freedom.
You can choose the balance for yourself. It has powerful multi-project