1 files changed, 81 insertions, 42 deletions
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index ebddd7c18f5..3ac1b4961ba 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -503,44 +503,6 @@ rec {
     inherit fetchurl stdenv;
   };
 
-  saxon = (import ../development/libraries/java/saxon) {
-    inherit fetchurl stdenv unzip;
-  };
-
-  saxonb = (import ../development/libraries/java/saxon/default8.nix) {
-    inherit fetchurl stdenv unzip;
-  };
-
-  sharedobjects = (import ../development/libraries/java/shared-objects) {
-    j2sdk = j2sdk15;
-    inherit fetchurl stdenv;
-  };
-
-  jjtraveler = (import ../development/libraries/java/jjtraveler) {
-    j2sdk = j2sdk15;
-    inherit fetchurl stdenv;
-  };
-
-  atermjava = (import ../development/libraries/java/aterm) {
-    j2sdk = j2sdk15;
-    inherit fetchurl stdenv sharedobjects jjtraveler;
-  };
-
-  jakartaregexp = (import ../development/libraries/java/jakarta-regexp) {
-    inherit fetchurl stdenv;
-  };
-
-  jakartabcel = (import ../development/libraries/java/jakarta-bcel) {
-    regexp = jakartaregexp;
-    inherit fetchurl stdenv;
-  };
-
-  jclasslib = (import ../development/tools/java/jclasslib) {
-    inherit fetchurl stdenv xpf;
-    j2re = j2sdk15;
-    ant = apacheAnt14;
-  };
-
   ocaml = (import ../development/compilers/ocaml) {
     inherit fetchurl stdenv x11;
   };
@@ -598,10 +560,6 @@ rec {
     inherit fetchurl stdenv ghc;
   };
 
-  happy = (import ../development/tools/parsing/happy) {
-    inherit fetchurl stdenv perl ghc;
-  };
-
   harp = (import ../development/compilers/harp) {
     inherit fetchurl stdenv unzip ghc happy;
   };
@@ -610,6 +568,12 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  ### DEVELOPMENT / INTERPRETERS
+
+  happy = (import ../development/tools/parsing/happy) {
+    inherit fetchurl stdenv perl ghc;
+  };
+
   realPerl = (import ../development/interpreters/perl) {
     inherit fetchurl stdenv;
   };
@@ -950,6 +914,81 @@ rec {
     inherit fetchurl stdenv libxml2 openssl;
   };
 
+  ### DEVELOPMENT / LIBRARIES / JAVA
+
+  saxon = (import ../development/libraries/java/saxon) {
+    inherit fetchurl stdenv unzip;
+  };
+
+  saxonb = (import ../development/libraries/java/saxon/default8.nix) {
+    inherit fetchurl stdenv unzip;
+  };
+
+  sharedobjects = (import ../development/libraries/java/shared-objects) {
+    j2sdk = j2sdk15;
+    inherit fetchurl stdenv;
+  };
+
+  jjtraveler = (import ../development/libraries/java/jjtraveler) {
+    j2sdk = j2sdk15;
+    inherit fetchurl stdenv;
+  };
+
+  atermjava = (import ../development/libraries/java/aterm) {
+    j2sdk = j2sdk15;
+    inherit fetchurl stdenv sharedobjects jjtraveler;
+  };
+
+  jakartaregexp = (import ../development/libraries/java/jakarta-regexp) {
+    inherit fetchurl stdenv;
+  };
+
+  jakartabcel = (import ../development/libraries/java/jakarta-bcel) {
+    regexp = jakartaregexp;
+    inherit fetchurl stdenv;
+  };
+
+  jclasslib = (import ../development/tools/java/jclasslib) {
+    inherit fetchurl stdenv xpf;
+    j2re = j2sdk15;
+    ant = apacheAnt14;
+  };
+
+  lucene = import ../development/libraries/java/lucene {
+      inherit stdenv fetchurl;
+  };
+
+  jdom = import ../development/libraries/java/jdom {
+      inherit stdenv fetchurl;
+  };
+
+  javaCup = import ../development/libraries/java/cup {
+      inherit stdenv fetchurl;
+      j2sdk = j2sdk15;
+  };
+
+  jflex = import ../development/libraries/java/jflex {
+      inherit stdenv fetchurl;
+  };
+
+  junit = import ../development/libraries/java/junit {
+      inherit stdenv fetchurl unzip;
+  };
+
+  httpunit = import ../development/libraries/java/httpunit {
+      inherit stdenv fetchurl unzip;
+  };
+
+  mockobjects = import ../development/libraries/java/mockobjects {
+      inherit stdenv fetchurl;
+  };
+
+  commonsFileUpload = import ../development/libraries/java/jakarta-commons/file-upload {
+      inherit stdenv fetchurl;
+  };
+
+  ### DEVELOPMENT / PERL MODULES
+
   perlBerkeleyDB = import ../development/perl-modules/BerkeleyDB {
     inherit fetchurl perl db4;
   };