Remove obsolete JDK versions

These are the JDK 5 on powerpc-linux (no longer a maintained Nixpkgs
platform), JDK 1.4 (required a manual download) and JDK 5 on Linux
(idem).
This commit is contained in:
Eelco Dolstra 2012-08-22 15:24:04 -04:00
parent bf2b75ca7e
commit 8020c37f55
11 changed files with 7 additions and 182 deletions

View File

@ -1,34 +0,0 @@
buildInputs="$unzip"
source $stdenv/setup
unzip $src || true
mkdir -p $out
mv $dirname/* $out/
# Remove crap in the root directory.
for file in $out/*
do
if test -f $file ; then
rm $file
fi
done
# Set the dynamic linker.
rpath=
for i in $libraries; do
rpath=$rpath${rpath:+:}$i/lib
done
find $out -type f -perm +100 \
-exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
--set-rpath "$rpath" {} \;
# Unpack .pack files.
for i in $(find $out -name "*.pack"); do
echo "unpacking $i..."
$out/bin/unpack200 "$i" "$(dirname $i)/$(basename $i .pack).jar"
rm "$i"
done
# Put the *_md.h files in the right place.
cd $out/include && ln -s */*_md.h .

View File

@ -1,9 +0,0 @@
{stdenv, fetchurl}:
if stdenv.system == "i686-linux"
then
(import ./j2sdk-1.4.x-sun-linux.nix) {
inherit stdenv fetchurl;
}
else
abort "the Java 2 SDK is not supported on this platform"

View File

@ -1,9 +0,0 @@
{stdenv, fetchurl, unzip, requireFile}:
if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"
then
(import ./jdk5-oracle-linux.nix) {
inherit stdenv fetchurl unzip requireFile;
}
else
abort "the Java 5 SDK is not supported on this platform"

View File

@ -2,8 +2,6 @@ args:
if args.stdenv.system == "i686-linux" || args.stdenv.system == "x86_64-linux" then
(import ./jdk6-linux.nix) ( removeAttrs args ["cabextract"] )
else if args.stdenv.system == "powerpc-linux" then
(import ./jdk5-ibm-powerpc-linux.nix) (removeAttrs args ["pluginSupport" "xlibs" "installjdk" "cabextract"])
else if args.stdenv.system == "i686-cygwin" then
(import ./jdk6-cygwin.nix) (removeAttrs args ["pluginSupport" "xlibs" "installjdk" "xlibs"])
else

View File

@ -1,29 +0,0 @@
source $stdenv/setup
if ! test -e "$pathname"; then
echo ""
echo "SORRY!"
echo "You should download \`$(basename $pathname)' from IBM and place it in $(dirname $pathname)."
echo "Blame IBM, not us."
echo ""
exit 1
fi
actual=$(md5sum -b $pathname | cut -c1-32)
if test "$actual" != "$md5"; then
echo "hash is $actual, expected $md5"
exit 1
fi
tar zxf $pathname || true
mkdir -p $out
mv $dirname/* $out/
# Remove crap in the root directory.
for file in $out/*
do
if test -f $file ; then
rm $file
fi
done

View File

@ -1,24 +0,0 @@
/**
* This Nix expression requires the user to download the j2sdk
* distribution to /tmp. Please obtain j2sdk-1_4_2_03-linux-i586.bin
* from java.sun.com by hand and place it in /tmp. Blame Sun, not me.
*
* Note that this is not necessary if someone has already pushed a
* binary.
*
* @author Martin Bravenboer <martin@cs.uu.nl>
*/
{stdenv, fetchurl}:
assert stdenv.system == "i686-linux";
derivation {
name = "j2sdk-1.4.2";
filename = "j2sdk-1.4.2_05";
dirname = "j2sdk1.4.2_05";
system = stdenv.system;
builder = ./builder.sh;
pathname = "/tmp/j2sdk-1_4_2_05-linux-i586.bin";
md5 = "825ff134f3e370f6e677638d32962082";
stdenv = stdenv;
}

View File

@ -1,17 +0,0 @@
{ swingSupport ? true
, stdenv, fetchurl, unzip, makeWrapper, libX11 ? null, libXext ? null
}:
assert stdenv.system == "powerpc-linux";
assert swingSupport -> libX11 != null && libXext != null;
(stdenv.mkDerivation {
name = "jdk-1.5.0";
builder = ./ibm-builder.sh;
dirname = "ibm-java2-ppc-50";
pathname = "/tmp/ibm-java2-sdk-50-linux-ppc.tgz";
md5 = "6bed4ae0b24d3eea2914f2f6dcc0ceb4";
libraries =
(if swingSupport then [libX11 libXext] else []);
} // {inherit swingSupport;})

View File

@ -1,36 +0,0 @@
/**
* This Nix expression requires the user to download the Java 5.0 JDK
* distribution to /tmp. Please obtain jdk-1_5_0_22-linux-i586.bin for
* 32-bit systems or jdk-1_5_0_22-linux-amd64.bin for 64-bit systems
* from java.sun.com (look for archived software downloads)
* by hand and place it in /tmp. Blame Oracle, not me.
*
* Note that this is not necessary if someone has already pushed a
* binary.
*/
{stdenv, fetchurl, unzip, requireFile}:
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
stdenv.mkDerivation rec {
name = "jdk-1_5_0_22";
dirname = "jdk1.5.0_22";
builder = ./builder.sh;
src = requireFile {
message = ''
SORRY!
We may not download the needed binary distribution automatically.
You should download ${distfilename} from Sun and add it to store.
For example, "nix-prefetch-url file:///\$PWD/${distfilename}" in the
directory where you saved it is OK.
Blame Sun, not us.
'';
name = distfilename;
sha256 = if stdenv.system == "x86_64-linux" then
"1h63gigvg8id95igcj8xw7qvxs4p2y9hvx4xbvkwg8bji3ifb0sk"
else "0655n2q1y023zzwbk6gs9vwsnb29jc0m3bg3x3xdw623qgb4k6px";
};
distfilename = if stdenv.system == "x86_64-linux" then "${name}-linux-amd64.bin" else "${name}-linux-i586.bin";
inherit unzip stdenv;
}

View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
name = "jdk-1.6.0_20";
src = fetchurl {
url = file:///tmp/jdk-6u20-windows-i586.exe ;
url = file:///tmp/jdk-6u20-windows-i586.exe;
sha256 = "0w4afz8a9gi1iyhh47gvhiy59dfrzx0fnmywdff3v5cx696w25fh";
};

View File

@ -55,7 +55,7 @@ stdenv.mkDerivation {
inherit installjdk;
buildInputs = [unzip makeWrapper];
/**
* libXt is only needed on amd64
*/

View File

@ -2352,18 +2352,8 @@ let
jreOnly = true;
};
j2sdk14x = (
assert system == "i686-linux";
import ../development/compilers/jdk/default-1.4.nix {
inherit fetchurl stdenv;
});
jdk5 = (
assert system == "i686-linux" || system == "x86_64-linux";
callPackage ../development/compilers/jdk/default-5.nix { });
jdk = if stdenv.isDarwin then openjdk else jdkdistro true false;
jre = jdkdistro false false;
jdk = if stdenv.isDarwin then openjdk else jdkdistro true false;
jre = jdkdistro false false;
jdkPlugin = lowPrio (jdkdistro true true);
jrePlugin = lowPrio (jdkdistro false true);
@ -2371,8 +2361,7 @@ let
supportsJDK =
system == "i686-linux" ||
system == "x86_64-linux" ||
system == "i686-cygwin" ||
system == "powerpc-linux";
system == "i686-cygwin";
jdkdistro = installjdk: pluginSupport:
(assert supportsJDK;
@ -2883,8 +2872,6 @@ let
apacheAntOpenJDK = apacheAnt.override { jdk = openjdk; };
apacheAnt14 = apacheAnt.override { jdk = j2sdk14x; };
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
@ -5033,9 +5020,7 @@ let
javasvn = callPackage ../development/libraries/java/javasvn { };
jclasslib = callPackage ../development/tools/java/jclasslib {
ant = apacheAnt14;
};
jclasslib = callPackage ../development/tools/java/jclasslib { };
jdom = callPackage ../development/libraries/java/jdom { };
@ -5304,7 +5289,7 @@ let
rpcbind = callPackage ../servers/rpcbind { };
monetdb = callPackage ../servers/sql/monetdb { };
#monetdb = callPackage ../servers/sql/monetdb { };
mongodb = callPackage ../servers/nosql/mongodb {
boost = boost149;