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.

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

[Backport release-22.11] node2nix: pull in patch to fix bin scripts with crlf line-endings #220268

Merged
merged 2 commits into from
Mar 10, 2023

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Mar 9, 2023

Bot-based backport to release-22.11, triggered by a label in #216728.

  • Before merging, ensure that this backport complies with the Criteria for Backporting.
    • Even as a non-commiter, if you find that it does not comply, leave a comment.

This is minor fallout from svanderburg/node2nix#302 which made node2nix
handle installing script bins itself (since npm stopped doing that
correctly).

It seems npm was doing line-ending normalization when installing these
files itself, so in addition to making all bins executable we now also
do a crlf to lf conversion on them if they are a script with a shebang.

(cherry picked from commit b85c1e3)
(cherry picked from commit 0835e5a)
@ofborg ofborg bot requested review from teutat3s, winterqt and Luflosi March 9, 2023 04:30
@marsam marsam merged commit b0d16b7 into release-22.11 Mar 10, 2023
@marsam marsam deleted the backport-216728-to-release-22.11 branch March 10, 2023 05:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants