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

josh: cherry-pick upstream patch to fix build with rust 1.73 #266217

Merged
merged 1 commit into from Nov 9, 2023
Merged

josh: cherry-pick upstream patch to fix build with rust 1.73 #266217

merged 1 commit into from Nov 9, 2023

Conversation

ghost
Copy link

@ghost ghost commented Nov 8, 2023

Description of changes

Our josh builds broke on staging with the new rustc 1.73:

https://hydra.nixos.org/build/239619692/log/tail

This commit cherry-picks the fix (already merged upstream)

josh-project/josh#1290

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/)
  • 23.11 Release Notes (or backporting 23.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.

Our josh builds broke on staging with the new rustc 1.73:

  https://hydra.nixos.org/build/239619692/log/tail

This commit cherry-picks the fix (already merged upstream)

  josh-project/josh#1290
@ghost ghost requested a review from sternenseemann November 8, 2023 08:22
@ghost ghost marked this pull request as ready for review November 8, 2023 08:41
@ofborg ofborg bot requested a review from tazjin November 8, 2023 09:17
@ghost ghost added the 0.kind: ZHF Fixes Fixes during the ZHF campaign label Nov 8, 2023
@ghost
Copy link
Author

ghost commented Nov 8, 2023

#265948

@flokli flokli merged commit 00a5a05 into NixOS:master Nov 9, 2023
27 checks passed
@ghost ghost deleted the pr/josh/rustc173 branch November 11, 2023 09:39
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.

2 participants