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

protobufc: 1.4.1 -> unstable-2023-07-08 #248306

Merged
merged 2 commits into from
Aug 11, 2023
Merged

protobufc: 1.4.1 -> unstable-2023-07-08 #248306

merged 2 commits into from
Aug 11, 2023

Conversation

tjni
Copy link
Contributor

@tjni tjni commented Aug 10, 2023

Description of changes

I have only built this against the new protobuf in staging on my aarch64-darwin machine, since I had everything built already. I don't have the ability to test it on Linux at the moment.

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.

@NickCao
Copy link
Member

NickCao commented Aug 10, 2023

$ cat /nix/store/hxzd4p4qr4fx3x12vhvv5fxlvzw5wk9f-protobuf-3.23.4/lib/pkgconfig/protobuf.pc
prefix=/nix/store/hxzd4p4qr4fx3x12vhvv5fxlvzw5wk9f-protobuf-3.23.4
exec_prefix=/nix/store/hxzd4p4qr4fx3x12vhvv5fxlvzw5wk9f-protobuf-3.23.4
libdir=/nix/store/hxzd4p4qr4fx3x12vhvv5fxlvzw5wk9f-protobuf-3.23.4/lib
includedir=/nix/store/hxzd4p4qr4fx3x12vhvv5fxlvzw5wk9f-protobuf-3.23.4/include

Name: Protocol Buffers
Description: Google's Data Interchange Format
Version: 23.4.0
Requires: absl_absl_check absl_absl_log absl_algorithm absl_base absl_bind_front absl_bits absl_btree absl_cleanup absl_cord absl_core_headers absl_debugging absl_die_if_null absl_dynamic_annotations absl_flags absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_layout absl_log_initialize absl_log_severity absl_memory absl_node_hash_map absl_node_hash_set absl_optional absl_span absl_status absl_statusor absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant utf8_range
Libs: -L${libdir} -lprotobuf
Cflags: -I${includedir} -DPROTOBUF_USE_DLLS
Conflicts: protobuf-lite

absl is indeed required in protobuf.pc, necessitating its presence in propagatedBuildInputs, would review the protobufc update tomorrow.

@tjni
Copy link
Contributor Author

tjni commented Aug 10, 2023

@ofborg build protobuf protobuf.passthru.tests protobufc protobufc.passthru.tests

@tjni
Copy link
Contributor Author

tjni commented Aug 10, 2023

I do not yet understand these failures on aarch64-linux and x86_64-linux. I initially thought it might be the change to move abseil-cpp to propagatedBuildInputs, but I cherry picked the protobuf + abseil updates by themselves onto master and was not able reproduce. So it's something else, but I don't have a real Linux machine with multiple cores to try building variants. Would anyone be able to help me take a look also?

Copy link
Member

@NickCao NickCao left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed upstream changes, nothing affecting packaging.

@NickCao
Copy link
Member

NickCao commented Aug 11, 2023

And the build failure is on protobuf.passthru.tests.pythonProtobuf, unrelated to protobufc thus this pr.

@NickCao
Copy link
Member

NickCao commented Aug 11, 2023

@ofborg build protobufc unbound ocserv fwupd

@NickCao NickCao merged commit 61fea50 into NixOS:staging Aug 11, 2023
12 checks passed
@tjni tjni deleted the protobufc branch August 11, 2023 06:24
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