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.

Sign up for GitHub

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

Jump to bottom

execlineb: change execlineb wrapper to C script #71357

Merged
merged 1 commit into from
Oct 19, 2019
Merged

execlineb: change execlineb wrapper to C script #71357

merged 1 commit into from
Oct 19, 2019
+61 −23

Conversation

Profpatsch
Copy link
Member

Instead of using execlineb to define the execlineb wrapper, we replace
it by a little C wrapper.

This is mainly done because on non-Linux systems (i.e. mainly macOS),
it is impossible for a shebang interpreter to be itself a shebang
script.
It is, however, perfectly fine to have a chain that goes
shebang -> ELF -> shebang -> ELF -> …

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@luke-clifton @pmahoney

Sorry, something went wrong.

@Profpatsch Profpatsch requested a review from alyssais October 18, 2019 19:38
@Profpatsch
Copy link
Member Author

This is a followup to #71129 (comment)

@alyssais
Copy link
Member

I still think this should be the only execline attribute we offer. There’s no need for execline-with-builtins, IMO. But code looks good. Nice thought, using skalibs.

@Profpatsch
Copy link
Member Author

I still think this should be the only execline attribute we offer. There’s no need for execline-with-builtins, IMO.

You mean there is no need to export the unwrapped one?

@Profpatsch Profpatsch force-pushed the execline-rewrite-wrapper-in-c branch 2 times, most recently from 74922e6 to 16be980 Compare October 18, 2019 21:29
@Profpatsch @skarnet
execlineb: change execlineb wrapper to C script
f0d2d9c 
Instead of using execlineb to define the execlineb wrapper, we replace
it by a little C wrapper.

This is mainly done because on non-Linux systems (i.e. mainly macOS),
it is impossible for a shebang interpreter to be itself a shebang
script.
It is, however, perfectly fine to have a chain that goes
shebang -> ELF -> shebang -> ELF -> …

Co-Authored-By: Laurent Bercot <ska-skaware@skarnet.org>
@Profpatsch Profpatsch force-pushed the execline-rewrite-wrapper-in-c branch from 16be980 to f0d2d9c Compare October 18, 2019 23:35
@Profpatsch
Copy link
Member Author

@GrahamcOfBorg build execline

@alyssais
Copy link
Member

alyssais commented Oct 19, 2019 via email

@Profpatsch
Copy link
Member Author

You mean there is no need to export the unwrapped one?
Correct.

Ah, I mean we don’t lose anything and it can be helpful in some situations (e.g. if you want to get rid of the wrapper because you supply the tools manually already).

@Profpatsch Profpatsch merged commit fc62890 into NixOS:master Oct 19, 2019
Profpatsch added a commit to openlab-aux/vuizvui that referenced this pull request Dec 8, 2019
@Profpatsch
machines/profpatsch,pkgs/profpatsch: rm execlineb-with-builtins

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: B5690EEEBB952194
Verified
Learn about vigilant mode
6cd157f 
This has been upstreamed to nixpkgs proper, as a C wrapper script, in
NixOS/nixpkgs#71357

So we don’t even need bash to run execline anymore :P
@purcell purcell mentioned this pull request May 5, 2020
Closed
@Profpatsch Profpatsch mentioned this pull request Jun 9, 2020
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jtojnar jtojnar

@alyssais alyssais

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@Profpatsch @alyssais @jtojnar