Skip to content

snappy: 1.1.9 -> 1.1.10#221215

Merged
mweinelt merged 1 commit intoNixOS:stagingfrom
samuela:samuela/snappy
Mar 15, 2023
Merged

snappy: 1.1.9 -> 1.1.10#221215
mweinelt merged 1 commit intoNixOS:stagingfrom
samuela:samuela/snappy

Conversation

@samuela
Copy link
Copy Markdown
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.

@samuela samuela mentioned this pull request Mar 14, 2023
Merged
12 tasks
@ofborg ofborg bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. labels Mar 14, 2023
@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
Copy Markdown
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
Copy Markdown
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
snappy: fix x86_64-darwin build
3313572 
See NixOS#221215 (comment).
@samuela
Copy link
Copy Markdown
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
snappy: fix x86_64-darwin build
2a21328 
See #221215 (comment).
@vcunat
Copy link
Copy Markdown
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

Reviewers

@r-burns r-burns Awaiting requested review from r-burns

@Artturin Artturin Awaiting requested review from Artturin

1 more reviewer

@uri-canva uri-canva uri-canva approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@samuela @vcunat @uri-canva @mweinelt