Fix deploying Git dependencies that are defined in lock files, make t…

…est suite run again

nix/node-env.nix

@@ -219,7 +219,16 @@ let
                       packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads.
                   }
 
-                  packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories.
+                  if(dependency.resolved) {
+                      packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided
+                  } else {
+                      packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories.
+                  }
+
+                  if(dependency.from !== undefined) { // Adopt from property if one has been provided
+                      packageObj["_from"] = dependency.from;
+                  }
+
                   fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2));
               }
 

release.nix

@@ -35,14 +35,6 @@ rec {
         pkgs = import nixpkgs { inherit system; };
         inherit system;
       };
-      v10 = import ./tests/override-v10.nix {
-        pkgs = import nixpkgs { inherit system; };
-        inherit system;
-      };
-      v12 = import ./tests/override-v12.nix {
-        pkgs = import nixpkgs { inherit system; };
-        inherit system;
-      };
       grunt = import ./tests/grunt/override.nix {
         pkgs = import nixpkgs { inherit system; };
         inherit system;
@@ -74,18 +66,6 @@ rec {
       in
       map (name: builtins.getAttr name tests_) (builtins.attrNames tests_)
       ) systems)
-    ++ pkgs.lib.flatten (map (system:
-      let
-        tests_ = tests."${system}".v10;
-      in
-      map (name: builtins.getAttr name tests_) (builtins.attrNames tests_)
-      ) systems)
-    ++ pkgs.lib.flatten (map (system:
-      let
-        tests_ = tests."${system}".v12;
-      in
-      map (name: builtins.getAttr name tests_) (builtins.attrNames tests_)
-      ) systems)
     ++ map (system: tests."${system}".grunt) systems
     ++ map (system: tests."${system}".lockfile) systems
     ++ map (system: tests."${system}".scoped) systems