Merge master into staging-next

2021-04-17 00:15:03 +00:00
parent 6a0f49f240 2d5ea25167
commit f620e30ca4
53 changed files with 2364 additions and 1112 deletions
@@ -47,6 +47,6 @@ stdenv.mkDerivation rec {
      url = "https://www.eecis.udel.edu/~mills/ntp/html/copyright.html";
    };
    maintainers = with maintainers; [ eelco thoughtpolice ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
  };
 }