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

Update Oracle JDK to 1.6.0u38b04

Browse Source
This commit is contained in:
Rob Vermaas 2012-11-21 21:31:56 +01:00
parent 03abf1abbc
commit ad928fee30
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/jdk/jdk6-construct.sh
View File

@ -43,13 +43,13 @@ getargs() {
exit 2 exit 2
fi fi
# make sure javahome is the JDK # make sure javahome is the JDK
javahome=`echo $undir/*/demo` javahome=`echo $undir/*/db/demo`
if [ ! -d $javahome ]; then if [ ! -d $javahome ]; then
echo "${program}: unbundle directory incorrect: $undir" echo "${program}: unbundle directory incorrect: $undir"
echo " expecting $undir/jdk1.5.0_xx" echo " expecting $undir/jdk1.5.0_xx"
exit 2 exit 2
else else
javahome=`dirname $javahome` javahome=$(dirname $(dirname $javahome))
fi fi
# verify JDK dir # verify JDK dir
jdkdirp=`dirname $jdkdir` jdkdirp=`dirname $jdkdir`

10
pkgs/development/compilers/jdk/jdk6-linux.nix
View File

@ -28,18 +28,18 @@ in
stdenv.mkDerivation { stdenv.mkDerivation {
name = name =
if installjdk then "jdk-1.6.0_32b03" else "jre-1.6.0_32b03"; if installjdk then "jdk-1.6.0_38b04" else "jre-1.6.0_38b04";
src = src =
if stdenv.system == "i686-linux" then if stdenv.system == "i686-linux" then
fetchurl { fetchurl {
url = http://www.java.net/download/jdk6/6u32/promoted/b03/binaries/jdk-6u32-ea-bin-b03-linux-i586-29_feb_2012.bin; url = http://www.java.net/download/jdk6/6u38/promoted/b04/binaries/jdk-6u38-ea-bin-b04-linux-i586-31_oct_2012.bin;
md5 = "7c009afa399476c7d2791386235b8e3b"; md5 = "0595473ad371981c7faa709798a5f78e";
} }
else if stdenv.system == "x86_64-linux" then else if stdenv.system == "x86_64-linux" then
fetchurl { fetchurl {
url = http://www.java.net/download/jdk6/6u32/promoted/b03/binaries/jdk-6u32-ea-bin-b03-linux-amd64-29_feb_2012.bin; url = http://www.java.net/download/jdk6/6u38/promoted/b04/binaries/jdk-6u38-ea-bin-b04-linux-amd64-31_oct_2012.bin;
md5 = "7f1a45531a04c372e5660a55c2dfdad8"; md5 = "b98c80a963915de32b1abe02c50385de";
} }
else else
abort "jdk requires i686-linux or x86_64 linux"; abort "jdk requires i686-linux or x86_64 linux";