From b6545937592e7e54a14a2df315598570480fee9f Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Thu, 12 Jan 2017 22:03:27 +0100
Subject: [PATCH] Remove the v5 testing infrastructure

---
 bootstrap.sh                                     |  3 +--
 release.nix                                      | 10 ----------
 tests/default-v5.nix                             | 16 ----------------
 tests/default-v6.nix                             |  2 +-
 tests/node-packages-v4.nix                       |  4 ++--
 ...de-packages-v5v6.nix => node-packages-v6.nix} |  4 ++--
 tests/override-v5.nix                            | 14 --------------
 7 files changed, 6 insertions(+), 47 deletions(-)
 delete mode 100644 tests/default-v5.nix
 rename tests/{node-packages-v5v6.nix => node-packages-v6.nix} (99%)
 delete mode 100644 tests/override-v5.nix

diff --git a/bootstrap.sh b/bootstrap.sh
index e7bfb92..13a69a6 100755
--- 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
index 7944573..86178e9 100644
--- 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
deleted file mode 100644
index 0d2233e..0000000
--- a/tests/default-v5.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file has been generated by node2nix 1.1.1. Do not edit!
-
-{pkgs ? import <nixpkgs> {
-    inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-5_x"}:
-
-let
-  nodeEnv = import ../nix/node-env.nix {
-    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
-    inherit nodejs;
-  };
-in
-import ./node-packages-v5v6.nix {
-  inherit (pkgs) fetchurl fetchgit;
-  inherit nodeEnv;
-}
\ No newline at end of file
diff --git a/tests/default-v6.nix b/tests/default-v6.nix
index 9e7c07e..1eafc7c 100644
--- 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;
 }
\ No newline at end of file
diff --git a/tests/node-packages-v4.nix b/tests/node-packages-v4.nix
index 9e9a76d..198c054 100644
--- 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 b/tests/node-packages-v6.nix
similarity index 99%
rename from tests/node-packages-v5v6.nix
rename to tests/node-packages-v6.nix
index 1278ec7..b755ff9 100644
--- a/tests/node-packages-v5v6.nix
+++ b/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
deleted file mode 100644
index 8533ef2..0000000
--- a/tests/override-v5.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{pkgs ? import <nixpkgs> {
-    inherit system;
-}, system ? builtins.currentSystem}:
-
-let
-  nodePackages = import ./default-v5.nix {
-    inherit pkgs system;
-  };
-in
-nodePackages // {
-  floomatic = nodePackages.floomatic.override (oldAttrs: {
-    buildInputs = oldAttrs.buildInputs ++ [ pkgs.pkgconfig pkgs.qt4 ];
-  });
-}
\ No newline at end of file