Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[staging-next] google-cloud-cpp: 2.4.0 -> 2.14.0 #248536

Merged
merged 2 commits into from
Aug 15, 2023

Conversation

tobim
Copy link
Contributor

@tobim tobim commented Aug 11, 2023

Description of changes

Fixes the build after the protobuf bump.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@tobim tobim mentioned this pull request Aug 11, 2023
2 tasks
@marsam
Copy link
Contributor

marsam commented Aug 12, 2023

@GrahamcOfBorg eval

@tobim
Copy link
Contributor Author

tobim commented Aug 13, 2023

This fails because grpc currently pins an older version of abseil. Just unpinning solves the immediate problem, but we still end up with 2 copies of abseil because of the cxxStandard override used for grpc. The problem would go away with #196718, but that PR seems to have little hope.

@tobim tobim force-pushed the pkgs/google-cloud-cpp-2.14.0 branch from 1cdf148 to 101d8fc Compare August 14, 2023 09:08
GRPC is less aggressive in overriding `CMAKE_CXX_STANDARD` nowadays.
This allows us to take a less invasive approach to ensure that the
provided abseil package is configured with the same implementation
for the provided c++17 compatibility shims.
Instead of always setting `CMAKE_CXX_STANDARD`, we only do it to
override hard-coded downgrade on darwin. With that, we can use the
default configuration for abseil-cpp, reducing the number of instances
of that library in the build closure to one.
@marsam marsam merged commit 08287aa into NixOS:staging-next Aug 15, 2023
11 checks passed
@tobim tobim deleted the pkgs/google-cloud-cpp-2.14.0 branch August 15, 2023 07:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants