Merge master into staging-next

2023-08-03 00:01:56 +00:00
parent f4d61a2542 91991a339a
commit 5827446dce
108 changed files with 1409 additions and 6498 deletions
@@ -573,5 +573,6 @@ in with passthru; stdenv.mkDerivation {
    license = licenses.psfl;
    platforms = platforms.linux ++ platforms.darwin;
    maintainers = with maintainers; [ fridh ];
+    mainProgram = "python3";
  };
 }