Merge master into staging

2018-04-05 19:25:05 +02:00
parent a137be5590 c45eadf31d
commit a9f37d1c25
87 changed files with 1145 additions and 589 deletions
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
    homepage = http://bashdb.sourceforge.net/remake/;
    license = stdenv.lib.licenses.gpl3;
    description = "GNU Make with comprehensible tracing and a debugger";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = with stdenv.lib.platforms; linux ++ darwin;
    maintainers = with stdenv.lib.maintainers; [ bjornfor ];
  };
 }