Merge master into staging-next

2021-03-16 12:25:48 +00:00
parent f72d4dfbe1 f0b078ef9d
commit 974e83db9a
50 changed files with 317 additions and 132 deletions
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
    homepage = "https://github.com/foldex/r2mod_cli";
    license = licenses.gpl3Only;
    maintainers = [ maintainers.reedrw ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
  };
 }