Merge branch 'master' into x-updates

This commit is contained in:
Vladimír Čunát
2013-08-22 19:29:09 +02:00
615 changed files with 24465 additions and 25888 deletions
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
license = "LGPLv2+";
maintainers = [ stdenv.lib.maintainers.ludo ];
maintainers = [ ];
platforms = stdenv.lib.platforms.gnu; # arbitrary choice
};
}
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
license = "LGPLv2+";
maintainers = with stdenv.lib.maintainers; [ urkud ludo ];
maintainers = with stdenv.lib.maintainers; [ urkud ];
platforms = stdenv.lib.platforms.gnu; # arbitrary choice
};
}