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

Improve flake #123

Merged
merged 9 commits into from
Jan 11, 2024
Merged

Improve flake #123

merged 9 commits into from
Jan 11, 2024

Conversation

TornaxO7
Copy link
Contributor

@TornaxO7 TornaxO7 commented Dec 18, 2023

this makes the flake.nix file a bit more readable in my opinion :)

The changes are:

  • Replacing flake-utils with flake-parts because flake-parts is "syntax-friendlier"
  • making use of oxalica/rust-overlay in order to load the given rust-toolchain
  • added weekly CI to keep flake.lock up to date
  • I'd also volunteer to maintain the flake.nix
  • updated flake.lock with nix flake update

@Toqozz

@TornaxO7 TornaxO7 marked this pull request as draft December 18, 2023 17:22
@TornaxO7
Copy link
Contributor Author

Hm.. actually... I'm rethinking this a bit.

@TornaxO7 TornaxO7 closed this Jan 9, 2024
@TornaxO7 TornaxO7 reopened this Jan 9, 2024
@TornaxO7 TornaxO7 marked this pull request as ready for review January 9, 2024 00:57
@Toqozz
Copy link
Owner

Toqozz commented Jan 9, 2024

Thanks!

I'd love for any of the other nix contributors to have a look at this since I don't use nix personally. @SignalWalker

If nobody gets to this within a week I'll try to take a look myself. Could you briefly explain the improvements?

@TornaxO7
Copy link
Contributor Author

TornaxO7 commented Jan 9, 2024

Could you briefly explain the improvements?

  • (Subjective improvement): Switching from flake-utils to flake-parts which has a cleaner structure for multiple systems
  • updated the flake.lock with nix flake update (you can't currently run cargo check because it's version is too old)
  • added rust-overlay so the nix-dev-shells are loading the tools from the given rust-toolchain.toml

Copy link
Contributor

@SignalWalker SignalWalker left a comment

Choose a reason for hiding this comment

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

Looks good to me, though you might want to keep Alejandra or get some other formatter.

@TornaxO7
Copy link
Contributor Author

though you might want to keep Alejandra or get some other formatter.

Fixed, I added the nixpkgs-fmt :)

@TornaxO7 TornaxO7 requested a review from SignalWalker January 10, 2024 11:00
@Toqozz
Copy link
Owner

Toqozz commented Jan 11, 2024

Awesome, thanks so much you guys.

@Toqozz Toqozz merged commit 8e5632d into Toqozz:master Jan 11, 2024
3 checks passed
@TornaxO7
Copy link
Contributor Author

peepoAwesome

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.

3 participants