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

resp-app: fix broken build after snappy 1.2.0 upgrade #309874

Merged
merged 1 commit into from
May 8, 2024

Conversation

jmpunkt
Copy link
Contributor

@jmpunkt jmpunkt commented May 7, 2024

Snappy 1.2.0 changes the signature of the 'Compress' interface. The new interface is backwards compatible. However, we pull in Snappy source code via the Git submodules. The submodule provides the old header file for Snappy (pre 1.2.0) and is used during build time. While we provide a newer version of the library (1.2.0) with a different signature of 'Compress'. Since we are using our system library anyway, we just remove the problematic submodule in the patch phase.

The commit in question in the Snappy repository is 766d24c95e345d4d06bfd3cc5787c2da3e025fab.

Description of changes

ZHF: #309482

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 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.

Add a 👍 reaction to pull requests you find important.

Snappy 1.2.0 changes the signature of the 'Compress' interface. The
new interface is backwards compatible. However, we pull in Snappy
source code via the Git submodules. The submodule provides the old
header file for Snappy (pre 1.2.0) and is used during build
time. While we provide a newer version of the library (1.2.0) with a
different signature of 'Compress'. Since we are using our system
library anyway, we just remove the problematic submodule in the patch
phase.

The commit in question in the Snappy repository is
766d24c95e345d4d06bfd3cc5787c2da3e025fab.
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels May 7, 2024
@getchoo
Copy link
Member

getchoo commented May 8, 2024

Result of nixpkgs-review pr 309874 run on aarch64-linux 1

1 package built:
  • resp-app

@getchoo getchoo added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label May 8, 2024
@wegank wegank merged commit 594bfa0 into NixOS:master May 8, 2024
28 checks passed
@jmpunkt jmpunkt deleted the resp-app-fix-snappy branch May 29, 2024 09:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild 10.rebuild-linux: 1-10 10.rebuild-linux: 1 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants