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
+1 -1
View File
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
to use Bison.
'';
maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ];
maintainers = [ stdenv.lib.maintainers.simons ];
platforms = stdenv.lib.platforms.unix;
};
+1 -1
View File
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
to use Bison.
'';
maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ];
maintainers = [ stdenv.lib.maintainers.simons ];
platforms = stdenv.lib.platforms.unix;
};