ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-28 14:22:50 +03:00
Code Issues 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

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

@ -1,9 +1,9 @@
#!/bin/bash
# construct.sh
# example construction of JRE and JDK directories from the DLJ bundles
#
#
# Copyright © 2006 Sun Microsystems, Inc.
#
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
# "Software"), to deal in the Software without restriction, including
@ -11,10 +11,10 @@
# distribute, sublicense, and/or sell copies of the Software, and to
# permit persons to whom the Software is furnished to do so, subject to
# the following conditions:
#
#
# The above copyright notice and this permission notice shall be
# included in all copies or substantial portions of the Software.
#
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@ -22,7 +22,7 @@
# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
#
# Sun, Sun Microsystems, the Sun logo and Java, Java HotSpot,
# and JVM trademarks or registered trademarks of Sun Microsystems,
# Inc. in the U.S. and other countries.
@ -43,13 +43,13 @@ getargs() {
exit 2
fi
# make sure javahome is the JDK
javahome=`echo $undir/*/demo`
javahome=`echo $undir/*/db/demo`
if [ ! -d $javahome ]; then
echo "${program}: unbundle directory incorrect: $undir"
echo " expecting $undir/jdk1.5.0_xx"
exit 2
else
javahome=`dirname $javahome`
javahome=$(dirname $(dirname $javahome))
fi
# verify JDK dir
jdkdirp=`dirname $jdkdir`
@ -106,7 +106,7 @@ linkrel() {
if [ $m -lt $c ]; then
(( c = m ))
fi
for (( i = 0 ; i < c ; i++ )); do
for (( i = 0 ; i < c ; i++ )); do
if [ ${targetb[$i]} != ${linkb[$i]} ]; then
# echo components differ, stopping
break

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

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