Skip to content

Update socket2 in (some) packages for Rust 1.64 compatibility#194845

Merged
vcunat merged 9 commits intoNixOS:staging-nextfrom
tjni:socket2
Oct 8, 2022
Merged

Update socket2 in (some) packages for Rust 1.64 compatibility#194845
vcunat merged 9 commits intoNixOS:staging-nextfrom
tjni:socket2

Conversation

@tjni
Copy link
Copy Markdown
Contributor

@tjni tjni commented Oct 7, 2022 •
edited by vcunat
Loading

Description of changes

Updates several packages on staging-next to use socket2 versions >= 0.3.16 so that they compile on Rust 1.64. The root cause is rust-lang/rust#78802. Related to #193494 (comment).

This leaves out several packages, either because I didn't get to them yet, I don't have a Linux machine ready for testing, or because I couldn't operate a part of the toolchain (e.g. habitat, hydra-cli, etc.)

For context, I am linking the PRs and issues opened upstream:

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/)
  • 22.11 Release Notes (or backporting 22.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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@tjni tjni changed the title Update (some) socket2 in packages for Rust 1.64 compatibility Update socket2 in (some) packages for Rust 1.64 compatibility Oct 7, 2022
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Oct 7, 2022
@vcunat
Copy link
Copy Markdown
Member

vcunat commented Oct 7, 2022

If you need to run some one-off linux builds, you can ping me. Though OfBorg can do a lot, too.

@SuperSandro2000
Copy link
Copy Markdown
Member

SuperSandro2000 commented Oct 7, 2022

The beauty of new programming languages and distros. Gotta love it. not

SuperSandro2000
SuperSandro2000 reviewed Oct 7, 2022
View reviewed changes
NilsIrl
NilsIrl reviewed Oct 7, 2022
View reviewed changes
@NilsIrl NilsIrl mentioned this pull request Oct 7, 2022
Closed
@tjni
Copy link
Copy Markdown
Contributor Author

tjni commented Oct 8, 2022

This is ready for review now. There are two remaining packages I can see are broken with this issue:

  • habit: it feels like updating to a new version makes the most sense, but it isn't totally trivial
  • hydra-cli: requires older version of crate2nix to generate its Cargo.nix that I can't get working

I'm not sure at this moment how much time I'll have to work on those, so I'd like to keep them separate from this.

@NilsIrl
Copy link
Copy Markdown
Member

NilsIrl commented Oct 8, 2022

The MozWire part looks good to me 👍👍

@vcunat vcunat merged commit 0d24f16 into NixOS:staging-next Oct 8, 2022
@vcunat
Copy link
Copy Markdown
Member

vcunat commented Oct 8, 2022

All look OK and build for me on x86_64-linux, so let me merge relatively fast. Thanks for all the rust 1.64 fixes.

@tjni tjni deleted the socket2 branch October 8, 2022 15:35
@giggio giggio mentioned this pull request Oct 10, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 left review comments

@astro astro Awaiting requested review from astro

@siraben siraben Awaiting requested review from siraben

@sikmir sikmir Awaiting requested review from sikmir

@legendofmiracles legendofmiracles Awaiting requested review from legendofmiracles

@davidtwco davidtwco Awaiting requested review from davidtwco

@Br1ght0ne Br1ght0ne Awaiting requested review from Br1ght0ne

@figsoda figsoda Awaiting requested review from figsoda

+1 more reviewer

@NilsIrl NilsIrl NilsIrl left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@tjni @vcunat @SuperSandro2000 @NilsIrl