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

@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
postFixup = "ln -s $out/bin $dev/bin"; # tools needed for development
meta = {
description = "GNU Binutils, tools for manipulating binaries (linker, assembler, etc.)";
description = "Tools for manipulating binaries (linker, assembler, etc.)";
longDescription = ''
The GNU Binutils are a collection of binary tools. The main