From b7ec621e91b2653d8ddb72cc8bb8e5972d30717d Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Tue, 27 Feb 2018 20:07:35 +0800
Subject: [PATCH] jquery & jquery-ui: Move to nixos/lib/testing/

These (outdated) derivations are only used by nixos/lib/testing.nix.

If we want to provide jquery & jquery-ui packages this is better done
in nodePackages.
---
 nixos/lib/testing.nix                                  | 10 +++++++---
 .../default.nix => nixos/lib/testing/jquery-ui.nix     |  0
 .../jquery/default.nix => nixos/lib/testing/jquery.nix |  0
 pkgs/top-level/aliases.nix                             |  1 -
 pkgs/top-level/all-packages.nix                        |  4 ----
 5 files changed, 7 insertions(+), 8 deletions(-)
 rename pkgs/development/libraries/javascript/jquery-ui/default.nix => nixos/lib/testing/jquery-ui.nix (100%)
 rename pkgs/development/libraries/javascript/jquery/default.nix => nixos/lib/testing/jquery.nix (100%)

diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix
index efcafbaa555..d990a5f8b6a 100644
--- a/nixos/lib/testing.nix
+++ b/nixos/lib/testing.nix
@@ -3,7 +3,11 @@
 with import ./build-vms.nix { inherit system minimal config; };
 with pkgs;
 
-rec {
+let
+  jquery-ui = callPackage ./testing/jquery-ui.nix { };
+  jquery = callPackage ./testing/jquery.nix { };
+
+in rec {
 
   inherit pkgs;
 
@@ -143,8 +147,8 @@ rec {
       test = passMeta (runTests driver);
       report = passMeta (releaseTools.gcovReport { coverageRuns = [ test ]; });
 
-    in (if makeCoverageReport then report else test) // { 
-      inherit nodes driver test; 
+    in (if makeCoverageReport then report else test) // {
+      inherit nodes driver test;
     };
 
   runInMachine =
diff --git a/pkgs/development/libraries/javascript/jquery-ui/default.nix b/nixos/lib/testing/jquery-ui.nix
similarity index 100%
rename from pkgs/development/libraries/javascript/jquery-ui/default.nix
rename to nixos/lib/testing/jquery-ui.nix
diff --git a/pkgs/development/libraries/javascript/jquery/default.nix b/nixos/lib/testing/jquery.nix
similarity index 100%
rename from pkgs/development/libraries/javascript/jquery/default.nix
rename to nixos/lib/testing/jquery.nix
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 06da21813ae..c65d3efb368 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -103,7 +103,6 @@ mapAliases (rec {
   inotifyTools = inotify-tools;
   joseki = apache-jena-fuseki; # added 2016-02-28
   json_glib = json-glib; # added 2018-02-25
-  jquery_ui = jquery-ui;  # added 2014-09-07
   kdiff3-qt5 = kdiff3; # added 2017-02-18
   keepassx2-http = keepassx-reboot; # added 2016-10-17
   keepassx-reboot = keepassx-community; # added 2017-02-01
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1ba3e8f2979..9708a5bf856 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11873,10 +11873,6 @@ with pkgs;
 
   ### DEVELOPMENT / LIBRARIES / JAVASCRIPT
 
-  jquery = callPackage ../development/libraries/javascript/jquery { };
-
-  jquery-ui = callPackage ../development/libraries/javascript/jquery-ui { };
-
   yuicompressor = callPackage ../development/tools/yuicompressor { };
 
   ### DEVELOPMENT / BOWER MODULES (JAVASCRIPT)