Merge master into staging-next

2021-01-28 12:23:51 +00:00
parent 99c044f4e2 b43756e22b
commit 2e6c34fd11
29 changed files with 423 additions and 297 deletions
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
    '';
    homepage = "http://www.nta-monitor.com/wiki/index.php/Arp-scan_Documentation";
    license = licenses.gpl3;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ bjornfor mikoim ];
+    platforms = platforms.linux ++ platforms.darwin;
+    maintainers = with maintainers; [ bjornfor mikoim r-burns ];
  };
 }