summary refs log tree commit diff
path: root/pkgs/top-level/build-for-release.nix
diff options
context:
space:
mode:
authorMartin Bravenboer <martin.bravenboer@logicblox.com>2007-03-05 17:13:53 +0000
committerMartin Bravenboer <martin.bravenboer@logicblox.com>2007-03-05 17:13:53 +0000
commit6892b99bf6db5e520058a879d082367d906fb8fd (patch)
treebe55d4b8614b0a653631e13cdc1e0775f50023cc /pkgs/top-level/build-for-release.nix
parent12b6b77f966b7b17a531295829460ae47b4f8b54 (diff)
downloadnixlib-6892b99bf6db5e520058a879d082367d906fb8fd.tar
nixlib-6892b99bf6db5e520058a879d082367d906fb8fd.tar.gz
nixlib-6892b99bf6db5e520058a879d082367d906fb8fd.tar.bz2
nixlib-6892b99bf6db5e520058a879d082367d906fb8fd.tar.lz
nixlib-6892b99bf6db5e520058a879d082367d906fb8fd.tar.xz
nixlib-6892b99bf6db5e520058a879d082367d906fb8fd.tar.zst
nixlib-6892b99bf6db5e520058a879d082367d906fb8fd.zip
Update of jdk and jre to jdk-distros, based on Distributor License for Java.
D    pkgs/development/interpreters/jre

Obsolete. jdk and jre are now build by the same expression.

D    pkgs/development/compilers/blackdown

Obsolete. jdk is now downloadable.

D    pkgs/development/compilers/jdk/jdk5-sun-linux.nix

Obsolete

A    pkgs/development/compilers/jdk/dlj-bundle-builder.sh

Build for DLJ bundles.

M    pkgs/top-level/all-packages.nix

Dropped blackdown and ant based on blackdown.

A    pkgs/development/compilers/jdk/jdk6-construct.sh

Copy of DLJ construct script to fix problem with jdk6 bundles.

A    pkgs/development/compilers/jdk/jdk6-linux.nix

New main Nix expression for jdk and jre. Supports mozillaPlugin.

A    pkgs/development/compilers/jdk/dlj-bundle-builder.sh

Include path to libjli in rpath.


svn path=/nixpkgs/trunk/; revision=8186
Diffstat (limited to 'pkgs/top-level/build-for-release.nix')
-rw-r--r--pkgs/top-level/build-for-release.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/top-level/build-for-release.nix b/pkgs/top-level/build-for-release.nix
index 9248c8262c92..707b4052d45c 100644
--- a/pkgs/top-level/build-for-release.nix
+++ b/pkgs/top-level/build-for-release.nix
@@ -6,7 +6,7 @@ let {
     MPlayer
     MPlayerPlugin
     #abc
-    apacheAntBlackdown14
+    apacheAnt
     apacheHttpd
     aspectj
     aterm
@@ -17,7 +17,6 @@ let {
     binutils
     bison23
     bittorrent
-    blackdown
     bmp
     bmp_plugin_musepack
     bmp_plugin_wma
@@ -67,6 +66,7 @@ let {
     hello
     iputils
     jakartaregexp
+    jdk
     jetty
     jikes
     jing_tools