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

View File

@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
doCheck = false;
meta = {
description = "GMP, the GNU multiple precision arithmetic library";
description = "GNU multiple precision arithmetic library";
longDescription =
'' GMP is a free library for arbitrary precision arithmetic, operating

View File

@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
};
meta = {
description = "GMP, the GNU multiple precision arithmetic library";
description = "GNU multiple precision arithmetic library";
longDescription =
'' GMP is a free library for arbitrary precision arithmetic, operating

View File

@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = "http://gmplib.org/";
description = "GMP, the GNU multiple precision arithmetic library";
description = "GNU multiple precision arithmetic library";
license = licenses.gpl3Plus;
longDescription =