Merge branch 'staging' into modular-stdenv

Conflicts:
	pkgs/development/interpreters/perl/5.10/setup-hook.sh
	pkgs/development/interpreters/perl/5.8/setup-hook.sh
	pkgs/stdenv/linux/default.nix
This commit is contained in:
Vladimír Čunát
2014-09-08 18:24:58 +02:00
1452 changed files with 35052 additions and 23463 deletions
@@ -65,7 +65,7 @@
meta = {
description = "GNU Guile 2.0, an embeddable Scheme implementation";
description = "Embeddable Scheme implementation";
homepage = http://www.gnu.org/software/guile/;
license = stdenv.lib.licenses.lgpl3Plus;
maintainers = with stdenv.lib.maintainers; [ ludo lovek323 ];