Merge branch 'master' into staging-next

2021-01-10 23:24:33 +01:00
parent 76394e4624 581232454f
commit dd72357155
298 changed files with 746 additions and 415 deletions
@@ -59,7 +59,7 @@ mkDerivation {
    knownVulnerabilities = [ "CVE-2017-1000385" ];

    platforms = ["x86_64-linux" "x86_64-darwin"];
-    license = pkgs.stdenv.lib.licenses.asl20;
-    maintainers = with pkgs.stdenv.lib.maintainers; [ mdaiter ];
+    license = pkgs.lib.licenses.asl20;
+    maintainers = with pkgs.lib.maintainers; [ mdaiter ];
  };
 }