Merge branch 'origin/master' into stdenv.

This commit is contained in:
Peter Simons
2013-08-17 10:00:16 +02:00
138 changed files with 149 additions and 147 deletions
@@ -135,7 +135,7 @@ stdenv.mkDerivation ({
homepage = "http://gcc.gnu.org/";
license = "GPL/LGPL";
description = "GNU Compiler Collection, 4.3.x";
maintainers = with stdenv.lib.maintainers; [viric ludo];
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
};