-
-
Notifications
You must be signed in to change notification settings - Fork 14.4k
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
emacs: make melpaBuild accept recipe content as a string #334955
Conversation
This is the first part of NixOS#334888.
@@ -98,9 +97,21 @@ libBuildHelper.extendMkDerivation' genericBuild (finalAttrs: | |||
|
|||
preUnpack = '' | |||
mkdir -p "$NIX_BUILD_TOP/recipes" | |||
if [ -n "$recipe" ]; then | |||
cp "$recipe" "$NIX_BUILD_TOP/recipes/$ename" | |||
recipeFile="$NIX_BUILD_TOP/recipes/$ename" |
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 usually treat Bash as a lower level language.
I avoid it when the same thing can be done with Nix/Nixpkgs machinery.
If I understood this correctly, this code tries to detect if the recipe is a file or a string.
If file, pick it as is.
If string, put the string contents into a file.
This is similar to postPatch hook from dwl
:
https://github.com/NixOS/nixpkgs/blob/master/pkgs/by-name/dw/dwl/package.nix#L78-L86
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.
Hmm, the point is to support not using a derivation for recipe, as @adisbladis said in #330589 (comment).
So writing some bash is inevitable, I guess.
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.
Hum, I do not know if this is the idea from adisbladis in that comment.
To me it looked like "the user (whether human or machine) should have the option to pass a file or a string" (and, of course, files can be generated by derivations too).
In this sense the example I provided looks cleaner and reduces the Bash code to a couple lines.
The Nix code receives the recipe in whatever format, and returns a file containing the recipe, so that the Bash code does nothing besides linking that file.
The only advantage of using the Bash code I can think is maybe some micro optimization.
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 the goal to avoid using a derivation for recipe. So in your example, this should be avoided.
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.
It does make any difference? In the end we have a string converted to a file, whether if it is made by Bash or Nix+Nixpkgs.
(Further, if I remember correctly, a raw file is converted to a derivation too.)
I think the Nix code is slightly more readable.
On the other hand, if the Bash code is more efficient (maybe because Nix is slower, or some context in the background has a hidden penalty), then it would be something positive.
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 guess not using a derivation increases performances a bit. To benchmark that, someone needs to make generated melpa packages use recipe content string first.
This is the first part of #334888. (I probably won't do the second part, i.e., changing the code for generating MELPA index).
Presumably, this PR does not change the built packages. I have rebeased the commit onto master and verified that the content of
urweb-mode
(default recipe) andflycheck
(file path as recipe) does not change. However, duo to the limitation of nix, this triggers rebuilds of all packages built withmelpaBuild
.I have also tested three possible branches.
Description of changes
Things done
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)Add a 👍 reaction to pull requests you find important.