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

rathole: 0.5.0 -> 0.5.0-unstable-2024-06-06 #337095

Merged
merged 3 commits into from
Aug 27, 2024

Conversation

xokdvium
Copy link
Contributor

Description of changes

Fixes build failure introduced with Rust 1.80. See tracking issue: #332957.
The necessary time crate bump is already in main: rapiz1/rathole#380

  • Move to pkgs/by-name
  • Update to be14d12, which has Rust 1.80 fixes
  • Re-enable doCheck
  • Add myself as maintainer
  • Sort meta attributes
  • Remove with lib; usage
  • Drop changelog for unstable version, since upstream does not track unreleased changes

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.11 Release Notes (or backporting 23.11 and 24.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
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

Copy link
Member

@alyssais alyssais left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please split this into multiple commits.

@xokdvium xokdvium force-pushed the dev/fix-rathole-rust branch 2 times, most recently from 9f3136e to cdb86bd Compare August 25, 2024 10:43
@xokdvium
Copy link
Contributor Author

@ofborg eval

Copy link
Member

@alyssais alyssais left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In future when fixing a broken package, it'd be better to focus on just fixing the breakage, as it takes longer to find the time to review and merge a PR that makes a lot of changes.

@@ -30,18 +30,20 @@ rustPlatform.buildRustPackage rec {

__darwinAllowLocalNetworking = true;

doCheck = false; # https://github.com/rapiz1/rathole/issues/222
doCheck = true;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the default.

- Update to [be14d12](rapiz1/rathole@be14d12),
  which has Rust 1.80 fixes
- Re-enable doCheck
- Add myself as maintainer
- Sort meta attributes
- Remove with lib; usage
- Drop changelog for unstable version, since upstream
  does not track unreleased changes
@alienzj
Copy link

alienzj commented Aug 27, 2024

Hi, may I know can you all merge it?

@SuperSandro2000 SuperSandro2000 merged commit 8aa6fbd into NixOS:master Aug 27, 2024
24 of 26 checks passed
@xokdvium xokdvium deleted the dev/fix-rathole-rust branch August 27, 2024 22:20
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