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

snappy: 1.1.9 -> 1.1.10 #221215

Merged
merged 1 commit into from
Mar 15, 2023
Merged

snappy: 1.1.9 -> 1.1.10 #221215

merged 1 commit into from
Mar 15, 2023

Conversation

samuela
Copy link
Member

@samuela samuela commented Mar 14, 2023

snappy: fix build on aarch64-darwin

Description of changes

Upgrade snappy. For context, see #219778 and jax-ml/jax#14795.

This commit was co-authored with @uri-canva.

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.05 Release Notes (or backporting 22.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.

@mweinelt mweinelt merged commit f2499cd into NixOS:staging Mar 15, 2023
@samuela samuela deleted the samuela/snappy branch March 15, 2023 17:18
@vcunat
Copy link
Member

vcunat commented Mar 24, 2023

FYI, this broke x86_64-darwin build:
https://hydra.nixos.org/build/213305017

It's part of PR #221461

@samuela samuela restored the samuela/snappy branch March 24, 2023 17:14
@samuela
Copy link
Member Author

samuela commented Mar 24, 2023

Sorry about that @vcunat! I don't have an x86_64-darwin machine to test on so I wasn't aware of this. They're all errors like

/tmp/nix-build-snappy-1.1.10.drv-0/source/snappy.cc:1293:37: error: comparison of integers of different signs: 'unsigned long' and 'ptrdiff_t' (aka 'long') [-Werror,-Wsign-compare]
             (op + deferred_length) < op_limit_min_slop);
              ~~~~~~~~~~~~~~~~~~~~  ^ ~~~~~~~~~~~~~~~~~
/tmp/nix-build-snappy-1.1.10.drv-0/source/snappy.cc:1293:37: error: comparison of integers of different signs: 'unsigned long' and 'ptrdiff_t' (aka 'long') [-Werror,-Wsign-compare]
             (op + deferred_length) < op_limit_min_slop);
              ~~~~~~~~~~~~~~~~~~~~  ^ ~~~~~~~~~~~~~~~~~

so should be pretty easy to fix. Looks related to #219778 (comment).

samuela pushed a commit to samuela/nixpkgs that referenced this pull request Mar 24, 2023
@samuela
Copy link
Member Author

samuela commented Mar 24, 2023

@vcunat Ok created a fix in samuela@3313572. I can cherry pick onto #221461 if you'd like.

vcunat pushed a commit that referenced this pull request Mar 24, 2023
@vcunat
Copy link
Member

vcunat commented Mar 24, 2023

OK. I would've seen this if only I read this whole thread. Pushed as 2a21328

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.

4 participants