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
arcanist: copy directly from $PWD to pick up any applied patches #95879
Conversation
cc @Ekleog |
Are you sure this is correct? I just compiled before and after merging this, and get this diff, where $ diff -r result-2 result
diff -r result-2/bin/arc result/bin/arc
3c3
< exec /nix/store/5i9100265z0rdfvny48xz72kxnl141pc-php-with-extensions-7.4.8/bin/php /nix/store/bzvx97n5rjkvnj21gyiff1b4zx8knay1-arcanist-20200711/libexec/arcanist/bin/arc "$@"
---
> exec /nix/store/5i9100265z0rdfvny48xz72kxnl141pc-php-with-extensions-7.4.8/bin/php /nix/store/jj7qnd9dgwkin3kzhbqb29vxzqvl5f25-arcanist-20200711/libexec/arcanist/bin/arc "$@"
diff -r result-2/bin/phage result/bin/phage
3c3
< exec /nix/store/5i9100265z0rdfvny48xz72kxnl141pc-php-with-extensions-7.4.8/bin/php /nix/store/bzvx97n5rjkvnj21gyiff1b4zx8knay1-arcanist-20200711/libexec/arcanist/bin/phage "$@"
---
> exec /nix/store/5i9100265z0rdfvny48xz72kxnl141pc-php-with-extensions-7.4.8/bin/php /nix/store/jj7qnd9dgwkin3kzhbqb29vxzqvl5f25-arcanist-20200711/libexec/arcanist/bin/phage "$@"
Only in result/libexec/arcanist/src/parser/xhpast/bin: xhpast
Only in result/libexec/arcanist/support/xhpast: libxhpast.a
Only in result/libexec/arcanist/support/xhpast: node_names.hpp
Only in result/libexec/arcanist/support/xhpast: parser.yacc.o
Only in result/libexec/arcanist/support/xhpast: scanner.lex.o
Only in result/libexec/arcanist/support/xhpast: xhpast This looks to me as though it were a regression, putting |
yeah xhpast is built and installed a line above. We def don't wanna intermediate build artifacts in the output. |
Oh, I just understood the objective of this diff: to make |
Darn, ok. I'll put up a fix later this evening. |
@Ekleog Would you mind reviewing this again? I've removed the artifacts from the install output. Thanks! |
Looks great to me! Actually, Thank you! :D |
As for backports, this is along the fine line of whether it's a bug important enough to warrant backporting and the associated risks… I'd say it probably is not, and people who want it should probably import from unstable, so unless I hear an objecting voice I'm not going to backport to stable :) |
IMO no urgent need for a backport. |
Then again I live on unstable so perhaps I am not the best person to make that call |
Motivation for this change
The
arcanist
recipe should copy from$PWD
instead of$src
which appears to not contain the patched sources.
cc @nagisa
Things done
sandbox
innix.conf
on non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
./result/bin/
)nix path-info -S
before and after)