Merge remote-tracking branch 'origin/master' into staging

2014-09-18 22:28:35 +02:00
parent f32e964cc4 aa67e95bb5
commit 91ec6e0d90
340 changed files with 5242 additions and 1514 deletions
@@ -15,9 +15,9 @@ stdenv.mkDerivation {
      line by line and field by field, ignoring small numeric differences
      or/and different numeric formats.
    '';
-    homepage = "http://www.nongnu.org/numdiff/";
+    homepage = http://www.nongnu.org/numdiff/;
    license = stdenv.lib.licenses.gpl3Plus;
-    maintainers = stdenv.lib.maintainers.bbenoist;
+    maintainers = [ stdenv.lib.maintainers.bbenoist ];
    platforms = stdenv.lib.platforms.gnu;
  };
 }