JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #35844 from adisbladis/jquery-mv

Browse Source 
jquery & jquery-ui: Move to nixos/lib/testing/
This commit is contained in:
adisbladis 2018-03-06 15:34:34 +08:00 committed by GitHub
commit c4c1d979e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nixos/lib/testing.nix
View File

@ -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 =

0
pkgs/development/libraries/javascript/jquery-ui/default.nix → nixos/lib/testing/jquery-ui.nix
View File

0
pkgs/development/libraries/javascript/jquery/default.nix → nixos/lib/testing/jquery.nix
View File

1
pkgs/top-level/aliases.nix
View File

@ -104,7 +104,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

4
pkgs/top-level/all-packages.nix
View File

@ -11935,10 +11935,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)