-
Notifications
You must be signed in to change notification settings - Fork 449
flake.nix: cleanup, drop flake-utils, stop shadowing pkgs
#12448
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
base: main
Are you sure you want to change the base?
Conversation
pkgs
.pkgs
229ed08
to
99e4c42
Compare
Thanks for the PR. Can we split the first two commits off into a separate PR? |
@Alizter Why does it matter if you avoid a merge commit? They're already separate changes, to show the cause (changing the formatter) and the effect (after formatting). Edit: Though, they should be reversed. |
@spikespaz Its easier for reviewers when PRs are more focused. I asked for the first two commits to be split off because it is uncontroversial and is just a formatting change. The remaining commits will require more attention so it doesn't make sense to tie the first two down. Not sure what you mean about avoiding a merge commit however. |
Signed-off-by: Amaan Qureshi <[email protected]>
Signed-off-by: Amaan Qureshi <[email protected]>
in | ||
|
||
pkgs'.mkShell { | ||
pkgs.mkShell { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does this matter? I think we really wanted to shadow pkgs
here but we can't so we introduced pkgs'
, however I think its quite confusing to mix using the two.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The mkShell
in pkgs
and pkgs'
are the same, so it makes no difference; I'd argue that this is better though because everyone knows pkgs.mkShell
. For pkgs'.mkShell
you'd have to look at pkgs'
first to be 100% sure mkShell
is what you think it is.
It's wise to always keep the scope as minimal as possible for stuff like this.
I can't tell if bumping the flake lockfile caused the issues, but we best do that in a separate PR. There might be unrelated changes that we will have to make and it will cloud this PR. |
Changes done:
pkgs
.flake-utils
, instead opting for iterating over systems using pure Nix functions.Removes
pkgs.ocamlformat
fromtestNativeBuildInputs
, whiletestNativeBuildInputs
uses theocamlformat
versio from.ocamlformat
. If these ever mismatch, this breaks.