Merge remote-tracking branch 'origin/master' into staging-next

Conflicts:
- pkgs/development/python-modules/deebot-client/default.nix
- pkgs/development/python-modules/pytest-examples/default.nix
- pkgs/development/python-modules/w3lib/default.nix
This commit is contained in:
Martin Weinelt
2024-07-05 13:04:01 +02:00
92 changed files with 4257 additions and 357 deletions

View File

@@ -701,6 +701,7 @@ in stdenv.mkDerivation {
maintainers = with lib.maintainers; [ dtzWill trepetti dduan trundle stephank ];
license = lib.licenses.asl20;
platforms = with lib.platforms; linux ++ darwin;
broken = stdenv.isDarwin;
# Swift doesn't support 32-bit Linux, unknown on other platforms.
badPlatforms = lib.platforms.i686;
timeout = 86400; # 24 hours.