Remove the v5 testing infrastructure

svanderburg · Jan 12, 2017 · b654593 · b654593
1 parent adc0b94
commit b654593
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 47 deletions.
diff --git a/bootstrap.sh b/bootstrap.sh
@@ -13,7 +13,6 @@
 node bin/node2nix -e nix/node-env.nix
 cd tests
 node ../bin/node2nix -i tests.json -o node-packages-v4.nix -c default-v4.nix -e ../nix/node-env.nix
-node ../bin/node2nix -i tests.json -o node-packages-v5v6.nix -c default-v5.nix -e ../nix/node-env.nix -5
-node ../bin/node2nix -i tests.json -o node-packages-v5v6.nix -c default-v6.nix -e ../nix/node-env.nix -6
+node ../bin/node2nix -i tests.json -o node-packages-v6.nix -c default-v6.nix -e ../nix/node-env.nix -6
 cd grunt
 node ../../bin/node2nix -d -i package.json --supplement-input supplement.json -e ../../nix/node-env.nix
diff --git a/release.nix b/release.nix
@@ -28,10 +28,6 @@ rec {
         pkgs = import nixpkgs { inherit system; };
         inherit system;
       };
-      v5 = import ./tests/override-v5.nix {
-        pkgs = import nixpkgs { inherit system; };
-        inherit system;
-      };
       v6 = import ./tests/override-v6.nix {
         pkgs = import nixpkgs { inherit system; };
         inherit system;
@@ -54,12 +50,6 @@ rec {
       in
       map (name: builtins.getAttr name tests_) (builtins.attrNames tests_)
       ) systems)
-    ++ pkgs.lib.flatten (map (system:
-      let
-        tests_ = tests."${system}".v5;
-      in
-      map (name: builtins.getAttr name tests_) (builtins.attrNames tests_)
-      ) systems)
     ++ pkgs.lib.flatten (map (system:
       let
         tests_ = tests."${system}".v6;

diff --git a/tests/default-v5.nix b/tests/default-v5.nix
diff --git a/tests/default-v6.nix b/tests/default-v6.nix
@@ -10,7 +10,7 @@ let
     inherit nodejs;
   };
 in
-import ./node-packages-v5v6.nix {
+import ./node-packages-v6.nix {
   inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
 }
diff --git a/tests/node-packages-v4.nix b/tests/node-packages-v4.nix
@@ -2271,8 +2271,8 @@ in
     version = "4.17.4";
     src = fetchgit {
       url = "git://github.com/lodash/lodash";
-      rev = "18f5fd9f6a6ab8b28a159e035c796494ca1a09f2";
-      sha256 = "e360372faf7680b81395ff53e35df06116503323b32194d5a35966d771aa782f";
+      rev = "c6854fa8fc77eb0c8a7a461655a9b97391e605fc";
+      sha256 = "70d754a319fcce40d0affc75f3e8d8f2f29a78fc31a0a45f328fbe9f31e28771";
     };
     buildInputs = globalBuildInputs;
     meta = {

diff --git a/tests/node-packages-v5v6.nix → tests/node-packages-v6.nix b/tests/node-packages-v5v6.nix → tests/node-packages-v6.nix
@@ -2150,8 +2150,8 @@ in
     version = "4.17.4";
     src = fetchgit {
       url = "git://github.com/lodash/lodash";
-      rev = "18f5fd9f6a6ab8b28a159e035c796494ca1a09f2";
-      sha256 = "e360372faf7680b81395ff53e35df06116503323b32194d5a35966d771aa782f";
+      rev = "c6854fa8fc77eb0c8a7a461655a9b97391e605fc";
+      sha256 = "70d754a319fcce40d0affc75f3e8d8f2f29a78fc31a0a45f328fbe9f31e28771";
     };
     buildInputs = globalBuildInputs;
     meta = {

diff --git a/tests/override-v5.nix b/tests/override-v5.nix