- Fix critical bug with downloading tarballs from arbitrary HTTP URLs

- Bootstrap against Node.js 6 - Update versions of dependencies
svanderburg · Aug 16, 2017 · f1f1692 · f1f1692
1 parent 1ae1e9c
commit f1f1692
Show file tree

Hide file tree

Showing 10 changed files with 527 additions and 728 deletions.
diff --git a/bootstrap.sh b/bootstrap.sh
@@ -10,7 +10,7 @@
 #
 # $ nix-shell -A shell
 
-node bin/node2nix -e nix/node-env.nix --no-copy-node-env
+node bin/node2nix -e nix/node-env.nix -6 --no-copy-node-env
 cd tests
 node ../bin/node2nix -i tests.json -o node-packages-v4.nix -c default-v4.nix -e ../nix/node-env.nix --no-copy-node-env
 node ../bin/node2nix -i tests.json -o node-packages-v6.nix -c default-v6.nix -e ../nix/node-env.nix -6 --no-copy-node-env

diff --git a/default.nix b/default.nix
@@ -2,7 +2,7 @@
 
 {pkgs ? import <nixpkgs> {
     inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-4_x"}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}:
 
 let
   nodeEnv = import ./nix/node-env.nix {

diff --git a/lib/packagefetcher/http.js b/lib/packagefetcher/http.js
@@ -94,6 +94,10 @@ function fetchMetaDataFromHTTP(baseDir, dependencyName, versionSpec, callback) {
                             finish();
                         }
                     });
+                } else {
+                    // For other files, simply skip them. We need these dummy callbacks because there is some kind of quirk in the API that terminates the program.
+                    entry.on("data", function() {});
+                    entry.on("end", function() {});
                 }
             });
 

diff --git a/lib/packagefetcher/npmregistry.js b/lib/packagefetcher/npmregistry.js
@@ -117,7 +117,7 @@ function fetchMetaDataFromNPMRegistry(baseDir, dependencyName, versionSpec, regi
                                     }
                                 });
                             } else {
-                                paramExpr.sha1 = packageObj.dist.shasum; // SHA1 hashes are in hexadecimal notation which we can just adopt
+                                paramExpr.sha1 = packageObj.dist.shasum; // SHA1 hashes are in hexadecimal notation which we can just adopt verbatim
                                 callback();
                             }
                         },
@@ -129,7 +129,7 @@ function fetchMetaDataFromNPMRegistry(baseDir, dependencyName, versionSpec, regi
                                 packageObj: packageObj,
                                 identifier: dependencyName + "-" + packageObj.version,
                                 src: new nijs.NixFunInvocation({
-                                funExpr: new nijs.NixExpression("fetchurl"),
+                                    funExpr: new nijs.NixExpression("fetchurl"),
                                     paramExpr: paramExpr
                                 }),
                                 baseDir: path.join(baseDir, dependencyName)