mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-15 15:30:39 +00:00
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.
This commit is contained in:
parent
d4d1e54c49
commit
b7ec621e91
|
@ -3,7 +3,11 @@
|
||||||
with import ./build-vms.nix { inherit system minimal config; };
|
with import ./build-vms.nix { inherit system minimal config; };
|
||||||
with pkgs;
|
with pkgs;
|
||||||
|
|
||||||
rec {
|
let
|
||||||
|
jquery-ui = callPackage ./testing/jquery-ui.nix { };
|
||||||
|
jquery = callPackage ./testing/jquery.nix { };
|
||||||
|
|
||||||
|
in rec {
|
||||||
|
|
||||||
inherit pkgs;
|
inherit pkgs;
|
||||||
|
|
||||||
|
@ -143,8 +147,8 @@ rec {
|
||||||
test = passMeta (runTests driver);
|
test = passMeta (runTests driver);
|
||||||
report = passMeta (releaseTools.gcovReport { coverageRuns = [ test ]; });
|
report = passMeta (releaseTools.gcovReport { coverageRuns = [ test ]; });
|
||||||
|
|
||||||
in (if makeCoverageReport then report else test) // {
|
in (if makeCoverageReport then report else test) // {
|
||||||
inherit nodes driver test;
|
inherit nodes driver test;
|
||||||
};
|
};
|
||||||
|
|
||||||
runInMachine =
|
runInMachine =
|
||||||
|
|
|
@ -103,7 +103,6 @@ mapAliases (rec {
|
||||||
inotifyTools = inotify-tools;
|
inotifyTools = inotify-tools;
|
||||||
joseki = apache-jena-fuseki; # added 2016-02-28
|
joseki = apache-jena-fuseki; # added 2016-02-28
|
||||||
json_glib = json-glib; # added 2018-02-25
|
json_glib = json-glib; # added 2018-02-25
|
||||||
jquery_ui = jquery-ui; # added 2014-09-07
|
|
||||||
kdiff3-qt5 = kdiff3; # added 2017-02-18
|
kdiff3-qt5 = kdiff3; # added 2017-02-18
|
||||||
keepassx2-http = keepassx-reboot; # added 2016-10-17
|
keepassx2-http = keepassx-reboot; # added 2016-10-17
|
||||||
keepassx-reboot = keepassx-community; # added 2017-02-01
|
keepassx-reboot = keepassx-community; # added 2017-02-01
|
||||||
|
|
|
@ -11873,10 +11873,6 @@ with pkgs;
|
||||||
|
|
||||||
### DEVELOPMENT / LIBRARIES / JAVASCRIPT
|
### DEVELOPMENT / LIBRARIES / JAVASCRIPT
|
||||||
|
|
||||||
jquery = callPackage ../development/libraries/javascript/jquery { };
|
|
||||||
|
|
||||||
jquery-ui = callPackage ../development/libraries/javascript/jquery-ui { };
|
|
||||||
|
|
||||||
yuicompressor = callPackage ../development/tools/yuicompressor { };
|
yuicompressor = callPackage ../development/tools/yuicompressor { };
|
||||||
|
|
||||||
### DEVELOPMENT / BOWER MODULES (JAVASCRIPT)
|
### DEVELOPMENT / BOWER MODULES (JAVASCRIPT)
|
||||||
|
|
Loading…
Reference in a new issue