diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-01-13 13:16:17 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-01-13 13:16:17 +0100 |
commit | 6fb27abf3330139b7f5a868ae988fcf04284a1ca (patch) | |
tree | 4e5772e2bf7b785413ea69d15deb38e53925cf6e /pkgs/top-level | |
parent | 78d3180dbe8896500a35a848675462aeafe6f1b9 (diff) | |
parent | cf4acab5670e9c04cbd924ad0835ba5a5219b296 (diff) | |
download | nixlib-6fb27abf3330139b7f5a868ae988fcf04284a1ca.tar nixlib-6fb27abf3330139b7f5a868ae988fcf04284a1ca.tar.gz nixlib-6fb27abf3330139b7f5a868ae988fcf04284a1ca.tar.bz2 nixlib-6fb27abf3330139b7f5a868ae988fcf04284a1ca.tar.lz nixlib-6fb27abf3330139b7f5a868ae988fcf04284a1ca.tar.xz nixlib-6fb27abf3330139b7f5a868ae988fcf04284a1ca.tar.zst nixlib-6fb27abf3330139b7f5a868ae988fcf04284a1ca.zip |
Merge branch 'java'
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 75 | ||||
-rw-r--r-- | pkgs/top-level/release-python.nix | 8 |
2 files changed, 16 insertions, 67 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f27fb717aae0..662027059c85 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -392,6 +392,8 @@ let platforms = import ./platforms.nix; + setJavaClassPath = makeSetupHook { } ../build-support/setup-hooks/set-java-classpath.sh; + ### TOOLS @@ -407,7 +409,7 @@ let aegisub = callPackage ../applications/video/aegisub { wxGTK = wxGTK29; - lua = lua5_1; + lua = lua5_1; }; aespipe = callPackage ../tools/security/aespipe { }; @@ -2856,19 +2858,12 @@ let callPackage ../development/compilers/openjdk-darwin { } else let - openjdkBootstrap = callPackage ../development/compilers/openjdk/bootstrap.nix {}; - openjdkStage1 = callPackage ../development/compilers/openjdk { - jdk = openjdkBootstrap; - ant = pkgs.ant.override { jdk = openjdkBootstrap; }; - }; + openjdkBootstrap = callPackage ../development/compilers/openjdk/bootstrap.nix { }; in callPackage ../development/compilers/openjdk { - jdk = openjdkStage1; - ant = pkgs.ant.override { jdk = openjdkStage1; }; + jdk = openjdkBootstrap; }; - openjre = pkgs.openjdk.override { - jreOnly = true; - }; + openjre = pkgs.openjdk.jre; jdk = if stdenv.isDarwin || stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then pkgs.openjdk @@ -3222,19 +3217,7 @@ let clojure = callPackage ../development/interpreters/clojure { }; - clojureUnstable = callPackage ../development/interpreters/clojure { version = "1.5.0-RC1"; }; - - clojure_binary = callPackage ../development/interpreters/clojure/binary.nix { }; - - clojure_wrapper = callPackage ../development/interpreters/clojure/wrapper.nix { - #clojure = clojure_binary; - }; - - clooj_standalone_binary = callPackage ../development/interpreters/clojure/clooj.nix { }; - - clooj_wrapper = callPackage ../development/interpreters/clojure/clooj-wrapper.nix { - clooj = clooj_standalone_binary; - }; + clooj = callPackage ../development/interpreters/clojure/clooj.nix { }; erlangR14B04 = callPackage ../development/interpreters/erlang/R14B04.nix { }; erlangR15B03 = callPackage ../development/interpreters/erlang/R15B03.nix { }; @@ -3260,8 +3243,6 @@ let jmeter = callPackage ../applications/networking/jmeter {}; - kaffe = callPackage ../development/interpreters/kaffe { }; - kona = callPackage ../development/interpreters/kona {}; love = callPackage ../development/interpreters/love {lua=lua5;}; @@ -3506,14 +3487,6 @@ let apacheAnt = callPackage ../development/tools/build-managers/apache-ant { }; - apacheAntOpenJDK = apacheAnt.override { jdk = openjdk; }; - apacheAntOracleJDK = ant.override { jdk = pkgs.oraclejdk; }; - - apacheAntGcj = callPackage ../development/tools/build-managers/apache-ant/from-source.nix { - # must be either pre-built or built with GCJ *alone* - gcj = gcj.gcc; # use the raw GCJ, which has ${gcj}/lib/jvm - }; - astyle = callPackage ../development/tools/misc/astyle { }; autobuild = callPackage ../development/tools/misc/autobuild { }; @@ -4604,14 +4577,6 @@ let hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { }; - icedtea = callPackage ../development/libraries/java/icedtea { - ant = apacheAntGcj; - xerces = xercesJava; - xulrunner = icecatXulrunner3; - inherit (xlibs) libX11 libXp libXtst libXinerama libXt - libXrender xproto; - }; - icu = callPackage ../development/libraries/icu { }; id3lib = callPackage ../development/libraries/id3lib { }; @@ -5641,7 +5606,6 @@ let redland = pkgs.librdf_redland; rhino = callPackage ../development/libraries/java/rhino { - ant = apacheAntGcj; javac = gcj; jvm = gcj; }; @@ -5700,7 +5664,7 @@ let SDL2_gfx = callPackage ../development/libraries/SDL2_gfx { }; serd = callPackage ../development/libraries/serd {}; - + serf = callPackage ../development/libraries/serf {}; silgraphite = callPackage ../development/libraries/silgraphite {}; @@ -5969,12 +5933,6 @@ let xercesc = callPackage ../development/libraries/xercesc {}; - xercesJava = callPackage ../development/libraries/java/xerces { - ant = apacheAntGcj; # for bootstrap purposes - javac = gcj; - jvm = gcj; - }; - xlibsWrapper = callPackage ../development/libraries/xlibs-wrapper { packages = [ freetype fontconfig xlibs.xproto xlibs.libX11 xlibs.libXt @@ -6065,13 +6023,6 @@ let v8 = callPackage ../development/libraries/v8 { inherit (pythonPackages) gyp; }; - xalanj = xalanJava; - xalanJava = callPackage ../development/libraries/java/xalanj { - ant = apacheAntGcj; # for bootstrap purposes - javac = gcj; - jvm = gcj; - xerces = xercesJava; }; - xmlsec = callPackage ../development/libraries/xmlsec { }; zziplib = callPackage ../development/libraries/zziplib { }; @@ -6081,20 +6032,26 @@ let jquery_ui = callPackage ../development/libraries/javascript/jquery-ui { }; + ### DEVELOPMENT / LISP MODULES asdf = callPackage ../development/lisp-modules/asdf { texLive = null; }; + clwrapperFunction = callPackage ../development/lisp-modules/clwrapper; - wrapLisp = lisp: clwrapperFunction {lisp=lisp;}; - lispPackagesFor = clwrapper: callPackage ../development/lisp-modules/lisp-packages.nix{ + + wrapLisp = lisp: clwrapperFunction { inherit lisp; }; + + lispPackagesFor = clwrapper: callPackage ../development/lisp-modules/lisp-packages.nix { inherit clwrapper; }; + lispPackagesClisp = lispPackagesFor (wrapLisp clisp); lispPackagesSBCL = lispPackagesFor (wrapLisp sbcl); lispPackages = recurseIntoAttrs lispPackagesSBCL; + ### DEVELOPMENT / PERL MODULES buildPerlPackage = import ../development/perl-modules/generic perl; diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index b56c7af6e037..aecb3c85aee8 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -59,8 +59,6 @@ let antlr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; antlr3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; apacheAntGcj = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - apacheAntOpenJDK = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - apacheAntOracleJDK = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; apparmor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; aqbanking = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; arb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; @@ -162,8 +160,6 @@ let clisp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; clisp_2_44_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; clojure = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - clojure_wrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - clooj_wrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; clucene_core_2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; clutter = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; clutter_gtk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; @@ -676,7 +672,6 @@ let icecat3Wrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; icecat3Xul = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; icecatXulrunner3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - icedtea = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; icewm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; idutils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; ikiwiki = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; @@ -725,7 +720,6 @@ let julia = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; jwm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; k3d = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kaffe = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; kde3 = { arts = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; kdelibs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; @@ -1760,7 +1754,6 @@ let x11vnc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; x2vnc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; x2x = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xalanJava = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; xaos = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; xapianBindings = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; xapianBindings10 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; @@ -1779,7 +1772,6 @@ let xdaliclock = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; xdotool = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; xen = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xercesJava = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; xf86_input_mtrack = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; xf86_input_multitouch = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; xf86_input_wacom = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; |