-
-
Notifications
You must be signed in to change notification settings - Fork 14.7k
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
sourcehut: fix build #198586
sourcehut: fix build #198586
Conversation
e020370
to
b609d94
Compare
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.
Thank you so much for tracking this down. It makes a lot of sense once I see the change, but it's quite subtle.
# "actual" is a misnomer. We need to pass through these inputs to dependent services but we also don't want | ||
# to pass through hooks, because we don't want hooks to run twice (when it's possible for them to do so). | ||
passthru.actualNativeBuildInputs = [ | ||
sassc | ||
nodejs | ||
]; |
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.
I'm really impressed by the mental leap you took to realize this was the problem.
Have a few suggestions coming from someone who didn't figure this out, which could be more representative of a future reader of this derivation. Nothing mandatory, just opinion.
- What do you think of calling this
coreSrhtNativeBuildInputs
? This emphasizes that the source of the inputs is thecore.sr.ht
repo. Or,sharedSrhtNativeBuildInputs
, which speaks to the purpose of thecore.sr.ht
repo as a container for "code shared among all sr.ht projects" (c.f. the README). - Moving this comment to the definition of
nativeBuildInputs
a few lines above can be better. I feel that, aside from explanation, the main impact of the comment is to discourage depending onnativeBuildInputs
directly, which makes sense when next to the property itself. It could offer a warning to not use it because [insert your explanation of non-idempotent hooks being added more than once].
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.
- What do you think of calling this
coreSrhtNativeBuildInputs
? This emphasizes that the source of the inputs is thecore.sr.ht
repo. Or,sharedSrhtNativeBuildInputs
, which speaks to the purpose of thecore.sr.ht
repo as a container for "code shared among all sr.ht projects" (c.f. the README).
I like the sound of sharedNativeBuildInputs
(which in usage would be srht.sharedNativeBuildInputs
), thanks!
- Moving this comment to the definition of
nativeBuildInputs
a few lines above can be better. I feel that, aside from explanation, the main impact of the comment is to discourage depending onnativeBuildInputs
directly, which makes sense when next to the property itself. It could offer a warning to not use it because [insert your explanation of non-idempotent hooks being added more than once].
I've moved the comment and reworded it a bit -- let me know what you think. (Is the passthru fine where it is, though? They're so far apart, so not sure.)
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.
I think it's fine.
Commit (and PR) message typo: |
b609d94
to
f539a0b
Compare
Fixed, thanks. |
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.
LGTM
f539a0b
to
0abd1d8
Compare
Made lines on the explanation comment more even. |
(Realized I should probably get @ju1m's input as well before merging.) |
I ran these locally, but just to show it here... |
Closing in favor of #198720. |
Description of changes
Fixes #198478.
Things done
sandbox = true
set innix.conf
? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)nixos/doc/manual/md-to-db.sh
to update generated release notes