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

De-couple atuin nix build from nixpkgs rustc version #2123

Merged
merged 1 commit into from
Jun 13, 2024

Conversation

Sciencentistguy
Copy link
Contributor

Closes #2089

This PR moves the nix flake to using a rust toolchain provided by fenix (https://github.com/nix-community/fenix), which downloads the toolchain declared in ./rust-toolchain.toml, removing the requirement on nixpkgs to update rustc for us to bump MSRV.

When the value in ./rust-toolchain.toml is changed, the nix build must be run locally once (with nix build -L). This will print the new sha256 hash for the new rust toolchain, that must then be inserted into flake.nix before the build will succeed. This may be automatable via a github action - that is not included in this PR.

Checks

  • I am happy for maintainers to push small adjustments to this PR, to speed up the review cycle
  • I have checked that there are no existing pull requests for the same thing

Copy link
Member

@ellie ellie left a comment

Choose a reason for hiding this comment

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

nice! thanks for sorting this out :D

@ellie ellie merged commit 4ee7db5 into atuinsh:main Jun 13, 2024
19 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Rust 1.78 in nix
2 participants