Merge master into staging-next

2021-03-10 00:39:07 +00:00
parent cf320b516a 6bd4e08c34
commit 149a81c88d
65 changed files with 1235 additions and 376 deletions
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
    description = "Small utilities that are useful in advanced password cracking";
    homepage = "https://github.com/hashcat/hashcat-utils";
    license = licenses.mit;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
    maintainers = with maintainers; [ fadenb ];
  };
 }
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
    description = "Secure file wiping utility";
    homepage    = "http://wipe.sourceforge.net/";
    license     = licenses.gpl2;
-    platforms   = platforms.linux;
+    platforms   = platforms.all;
    maintainers = [ maintainers.abbradar ];
  };
 }