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

cargo-info: fix build #338155

Merged
merged 1 commit into from
Sep 1, 2024
Merged

cargo-info: fix build #338155

merged 1 commit into from
Sep 1, 2024

Conversation

VuiMuich
Copy link
Contributor

Description of changes

This patches the upstream merge-request (https://gitlab.com/imp/cargo-info/-/merge_requests/9) to make it immediatelly buildable. If the next release happens upstream in the next couple of days this could be changed to a version bump PR ofc.

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.

@matthiasbeyer
Copy link
Contributor

If the next release happens upstream in the next couple of days this could be changed to a version bump PR ofc.

I'd wait for this.

Feel free to ping me after the weekend, or if some other maintainer things this is ok, I am fine with that as well.

@alyssais
Copy link
Member

The underlying problem here is that upstream has set #![deny(warnings)], which doesn't make sense for anybody apart from upstream who might be using a different compiler. RUSTFLAGS = "-A warnings" might work, otherwise a small patch or substitutInPlace to remove that line. Otherwise this is liable to break again with a future compiler upgrade.

@VuiMuich
Copy link
Contributor Author

Changed it as @alyssais suggested to remove #![deny(warnings)] with substituteInPlace --replace-fail

(and rebased to current master)

@alyssais
Copy link
Member

The RUSTFLAGS version didn't work?

@VuiMuich
Copy link
Contributor Author

VuiMuich commented Aug 31, 2024

The RUSTFLAGS version didn't work?

Either this or I am to stupid to set it in the right place... 😇

Edit: I gave it another shot and put the RUSTFLAGS and env.RUSTFLAGS exactly in the same place where I had the postPatch, but in both cases it fails and I cant find the RUSTFLAGS in nix log <the failed drv>

@VuiMuich
Copy link
Contributor Author

Ok, I found this discussion and according to this it needs to be RUSTFLAGS="--cap-lints allow".
With this it builds.. I'll push an update in a minute.

@alyssais alyssais merged commit d82811f into NixOS:master Sep 1, 2024
25 of 26 checks passed
@VuiMuich
Copy link
Contributor Author

VuiMuich commented Sep 1, 2024

Thanks for the merge!

@VuiMuich VuiMuich deleted the fix/cargo-info branch September 4, 2024 12:26
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.

3 participants