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

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

Merged
merged 9 commits into from
Oct 8, 2022

Conversation

tjni
Copy link
Contributor

@tjni tjni commented Oct 7, 2022

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
@tjni tjni force-pushed the socket2 branch 2 times, most recently from c98d66a to 4aa5845 Compare October 7, 2022 06:57
@vcunat
Copy link
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
Member

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

pkgs/misc/cliscord/default.nix Outdated Show resolved Hide resolved
pkgs/servers/geospatial/martin/default.nix Show resolved Hide resolved
pkgs/tools/networking/mozwire/default.nix Outdated Show resolved Hide resolved
@tjni tjni force-pushed the socket2 branch 2 times, most recently from b8e12f7 to e62bbcf Compare October 7, 2022 15:36
This fixes the build on Rust 1.64 since it contains an update of socket2
to a version greater than 0.3.16.
@tjni
Copy link
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
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
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.

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