Merge staging-next into staging

2026-01-16 00:19:26 +00:00
parent 6d321bea20 c7cd41b354
commit 2020bdd060
2 changed files with 6 additions and 2 deletions
@@ -108,7 +108,10 @@ stdenv.mkDerivation (finalAttrs: {

  installCheckPhase =
    let
-      disabledTests = lib.optionalString stdenv.hostPlatform.isDarwin ''
+      disabledTests = ''
+        bigtable_internal_data_connection_impl_test
+      ''
+      + lib.optionalString stdenv.hostPlatform.isDarwin ''
        common_internal_async_connection_ready_test
        bigtable_async_read_stream_test
        bigtable_metadata_update_policy_test
@@ -985,7 +985,8 @@ stdenv.mkDerivation (
      ];
    };

-    doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
+    # tests linking broken with shaderc after https://github.com/NixOS/nixpkgs/pull/477464/changes/5a47b12dfcd1b909ba35778a866394430054319a
+    doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform && !withShaderc;

    # Fails with SIGABRT otherwise FIXME: Why?
    checkPhase =