diff options
| -rw-r--r-- | pkgs/development/libraries/protobuf/generic-v3-cmake.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/development/libraries/protobuf/generic-v3-cmake.nix b/pkgs/development/libraries/protobuf/generic-v3-cmake.nix index 5b5ab87bfcd..27a5b70bddb 100644 --- a/pkgs/development/libraries/protobuf/generic-v3-cmake.nix +++ b/pkgs/development/libraries/protobuf/generic-v3-cmake.nix @@ -83,7 +83,10 @@ stdenv.mkDerivation (finalAttrs: { "-Dprotobuf_BUILD_TESTS=OFF" ]; - doCheck = true; + # FIXME: investigate. 3.24 and 3.25 have different errors. + # At least some of it is not reproduced on some other machine; example: + # https://hydra.nixos.org/build/235677717/nixlog/4/tail + doCheck = !(stdenv.isDarwin && lib.versionAtLeast version "3.24"); passthru = { tests = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2062453ac7f..90f1baa4973 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24740,9 +24740,7 @@ with pkgs; prospector = callPackage ../development/tools/prospector { }; - # 3.24 and 3.23 tests crash on Hydra for *-darwin: - # https://hydra.nixos.org/build/235677717/nixlog/4/tail - protobuf = if stdenv.isDarwin then protobuf3_21 else protobuf3_24; + protobuf = protobuf3_24; protobuf3_24 = callPackage ../development/libraries/protobuf/3.24.nix { }; protobuf3_23 = callPackage ../development/libraries/protobuf/3.23.nix { }; |