Unverified Commit 2020bdd0 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge staging-next into staging

parents 6d321bea c7cd41b3

pkgs/by-name/go/google-cloud-cpp/package.nix

+4 −1
Original line number Diff line number Diff line
@@ -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

pkgs/development/libraries/ffmpeg/generic.nix

+2 −1
Original line number Diff line number Diff line
@@ -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 =