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
@@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
license = "GPLv2+";
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.ludo ];
maintainers = [ ];
};
}
+1 -1
View File
@@ -14,6 +14,6 @@ stdenv.mkDerivation rec {
homepage = http://www.gnu.org/software/mtools/;
description = "GNU mtools, utilities to access MS-DOS disks";
platforms = stdenv.lib.platforms.gnu; # arbitrary choice
maintainers = [ stdenv.lib.maintainers.ludo ];
maintainers = [ ];
};
}