Merge master into staging-next

2025-08-31 18:04:38 +00:00
parent b6e3a2d6af 2e6aeede9c
commit 28a77664bb
211 changed files with 4332 additions and 1515 deletions
@@ -410,6 +410,10 @@ let
              # Those are annoyingly flaky, but not enough to be marked as such upstream.
              "test-wasi"
            ]
+            ++ lib.optionals stdenv.hostPlatform.isMusl [
+              # Doesn't work in sandbox on x86_64.
+              "test-dns-set-default-order"
+            ]
            ++ lib.optionals (stdenv.buildPlatform.isDarwin && stdenv.buildPlatform.isx86_64) [
              # These tests fail on x86_64-darwin (even without sandbox).
              # TODO: revisit at a later date.