node2nix: pull in patch to fix bin scripts with crlf line-endings #216728
Conversation
|
Works for |
|
@tfc @RaitoBezarius Can you take a look here or do know the right person to push this over the finishing line? :) |
There was a problem hiding this comment.
Diff looks good, I would wait for @winterqt as she's the Node expert. :-)
figsoda
added
the
12.approvals: 1
|
@winterqt Do you have some time to look into this? :) |
|
I may actually switch this to not use dos2unix, if I can, to avoid having to redo all of the import sites (I originally used it because it had script detection but now that this uses See @marsam's review item at svanderburg/node2nix#314 (review) I'll mark this as draft, and I plan to update this sometime today |
lilyinstarlight
force-pushed
the
fix/node2nix-bin-crlf
branch
2 times, most recently
from
df97fbc to
06ed810
Compare
|
I've checked the updated PR and it works. 👍 |
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.
lilyinstarlight
force-pushed
the
fix/node2nix-bin-crlf
branch
from
06ed810 to
4df1c39
Compare
lilyinstarlight
force-pushed
the
fix/node2nix-bin-crlf
branch
from
4df1c39 to
0835e5a
Compare
|
Successfully created backport PR for |
Description of changes
Pull in fix from svanderburg/node2nix#314
This is minor fallout from #193337 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 conversionon on them if they are a script with a shebang
This is rather hacky, but hopefully we'll be able to support most Node.js packages with more modern tooling soon and can use node2nix less in the future
Fixes #216306
cc: @winterqt
Things done
sandbox = trueset 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/)nixpkgs-review
Result of
nixpkgs-review pr 216728run on x86_64-linux 17 packages marked as broken and skipped:
1 package blacklisted:
5 packages failed to build: (note: failures exist on master too)
207 packages built: