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

polkadot: fix compilation with rust 1.80 #334414

Merged
merged 1 commit into from
Aug 14, 2024

Conversation

andresilva
Copy link
Member

Description of changes

Needed to build with Rust 1.80 (#332957).

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.

@andresilva
Copy link
Member Author

It's targeting master but I tested this on staging-next to build with rust 1.80.

# NOTE: bump `time` dependency to be able to build with rust 1.80
# should be removed on the next release
(fetchpatch {
url = "https://github.com/paritytech/polkadot-sdk/pull/5149.patch";
Copy link
Contributor

Choose a reason for hiding this comment

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

This should link to the commit's patch, since this PR is merged.

Suggested change
url = "https://github.com/paritytech/polkadot-sdk/pull/5149.patch";
url = "https://github.com/paritytech/polkadot-sdk/commit/326342fe63297668d74fc69095090e53d43a2b0a.patch";

Copy link
Member

Choose a reason for hiding this comment

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

If the PR is merged, this makes no difference. We only must fetch a commit if the PR is not merged.

@SuperSandro2000 SuperSandro2000 merged commit 53ef6da into NixOS:master Aug 14, 2024
30 of 31 checks passed
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