Apply dos2unix to script bin files

After we started generating our own bin links, we did not provide the line-ending normalization that npm did. This corrects that to have similar behavior to before for packages with CRLF line-endings.
svanderburg · Feb 16, 2023 · 090516b · 090516b
1 parent 315e1b8
commit 090516b
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 10 deletions.
diff --git a/default.nix b/default.nix
@@ -6,7 +6,7 @@
 
 let
   nodeEnv = import ./nix/node-env.nix {
-    inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
+    inherit (pkgs) stdenv lib python2 dos2unix runCommand writeTextFile writeShellScript;
     inherit pkgs nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };

diff --git a/lib/expressions/CompositionExpression.js b/lib/expressions/CompositionExpression.js
@@ -109,6 +109,7 @@ CompositionExpression.prototype.toNixAST = function() {
                         stdenv: new nijs.NixInherit("pkgs"),
                         lib: new nijs.NixInherit("pkgs"),
                         python2: new nijs.NixInherit("pkgs"),
+                        dos2unix: new nijs.NixInherit("pkgs"),
                         libtool: new nijs.NixIf({
                             ifExpr: new nijs.NixAttrReference({
                                 attrSetExpr: new nijs.NixExpression("pkgs"),

diff --git a/nix/node-env.nix b/nix/node-env.nix
@@ -1,6 +1,6 @@
 # This file originates from node2nix
 
-{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}:
+{lib, stdenv, nodejs, python2, pkgs, dos2unix, libtool, runCommand, writeTextFile, writeShellScript}:
 
 let
   # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master
@@ -498,7 +498,7 @@ let
     in
     stdenv.mkDerivation ({
       name = "${name}${if version == null then "" else "-${version}"}";
-      buildInputs = [ tarWrapper python nodejs ]
+      buildInputs = [ tarWrapper python nodejs dos2unix ]
         ++ lib.optional (stdenv.isLinux) utillinux
         ++ lib.optional (stdenv.isDarwin) libtool
         ++ buildInputs;
@@ -535,6 +535,8 @@ let
             do
                 file="$(readlink -f "$i")"
                 chmod u+rwx "$file"
+                isScript "$file" || continue
+                dos2unix "$file"
                 patchShebangs "$file"
             done
         fi

diff --git a/tests/default-v14.nix b/tests/default-v14.nix
@@ -6,7 +6,7 @@
 
 let
   nodeEnv = import ../nix/node-env.nix {
-    inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
+    inherit (pkgs) stdenv lib python2 dos2unix runCommand writeTextFile writeShellScript;
     inherit pkgs nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };

diff --git a/tests/default-v16.nix b/tests/default-v16.nix
@@ -6,7 +6,7 @@
 
 let
   nodeEnv = import ../nix/node-env.nix {
-    inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
+    inherit (pkgs) stdenv lib python2 dos2unix runCommand writeTextFile writeShellScript;
     inherit pkgs nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };

diff --git a/tests/grunt/default.nix b/tests/grunt/default.nix
@@ -10,7 +10,7 @@ let
     inherit (pkgs) stdenv lib nix-gitignore fetchurl fetchgit;
   });
   nodeEnv = import ../../nix/node-env.nix {
-    inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
+    inherit (pkgs) stdenv lib python2 dos2unix runCommand writeTextFile writeShellScript;
     inherit pkgs nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };

diff --git a/tests/lockfile-v2/default.nix b/tests/lockfile-v2/default.nix
@@ -6,7 +6,7 @@
 
 let
   nodeEnv = import ../../nix/node-env.nix {
-    inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
+    inherit (pkgs) stdenv lib python2 dos2unix runCommand writeTextFile writeShellScript;
     inherit pkgs nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };

diff --git a/tests/lockfile/default.nix b/tests/lockfile/default.nix
@@ -6,7 +6,7 @@
 
 let
   nodeEnv = import ../../nix/node-env.nix {
-    inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
+    inherit (pkgs) stdenv lib python2 dos2unix runCommand writeTextFile writeShellScript;
     inherit pkgs nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };

diff --git a/tests/scoped/default.nix b/tests/scoped/default.nix
@@ -6,7 +6,7 @@
 
 let
   nodeEnv = import ../../nix/node-env.nix {
-    inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
+    inherit (pkgs) stdenv lib python2 dos2unix runCommand writeTextFile writeShellScript;
     inherit pkgs nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };

diff --git a/tests/versionless/default.nix b/tests/versionless/default.nix
@@ -6,7 +6,7 @@
 
 let
   nodeEnv = import ../../nix/node-env.nix {
-    inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
+    inherit (pkgs) stdenv lib python2 dos2unix runCommand writeTextFile writeShellScript;
     inherit pkgs nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };