forked from mirrors/nixpkgs
Updates of jre and jdk
svn path=/nixpkgs/trunk/; revision=5395
This commit is contained in:
parent
1a9b6bb4ad
commit
0d6c1cb83b
|
@ -1,6 +1,6 @@
|
||||||
/**
|
/**
|
||||||
* This Nix expression requires the user to download the jdk
|
* This Nix expression requires the user to download the jdk
|
||||||
* distribution to /tmp. Please obtain jdk-1_5_0_06-linux-i586.bin
|
* distribution to /tmp. Please obtain jdk-1_5_0_07-linux-i586.bin
|
||||||
* from java.sun.com by hand and place it in /tmp. Blame Sun, not me.
|
* 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
|
* Note that this is not necessary if someone has already pushed a
|
||||||
|
@ -19,10 +19,10 @@ assert swingSupport -> libX11 != null && libXext != null;
|
||||||
(stdenv.mkDerivation {
|
(stdenv.mkDerivation {
|
||||||
name = "jdk-1.5.0";
|
name = "jdk-1.5.0";
|
||||||
builder = ./builder.sh;
|
builder = ./builder.sh;
|
||||||
filename = "jdk-1_5_0_06";
|
filename = "jdk-1_5_0_07";
|
||||||
dirname = "jdk1.5.0_06";
|
dirname = "jdk1.5.0_07";
|
||||||
pathname = "/tmp/jdk-1_5_0_06-linux-i586.bin";
|
pathname = "/tmp/jdk-1_5_0_07-linux-i586.bin";
|
||||||
md5 = "3cdad4a383b93680f02f6f06198c2227";
|
md5 = "1325082c36b4adcb71bc5449ae4c68cf";
|
||||||
buildInputs = [unzip];
|
buildInputs = [unzip];
|
||||||
libraries =
|
libraries =
|
||||||
(if swingSupport then [libX11 libXext] else []);
|
(if swingSupport then [libX11 libXext] else []);
|
||||||
|
|
|
@ -4,10 +4,10 @@ assert stdenv.system == "i686-linux";
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "jre-1.5.0";
|
name = "jre-1.5.0";
|
||||||
version = "jre1.5.0_06";
|
version = "jre1.5.0_07";
|
||||||
builder = ./builder.sh;
|
builder = ./builder.sh;
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://jdl.sun.com/webapps/download/AutoDL?BundleId=10336";
|
url = "http://jdl.sun.com/webapps/download/AutoDL?BundleId=10542";
|
||||||
md5 = "e0a88dbec9bfe3195794bb652bfc6516";
|
md5 = "e2ad1c9e47f3e34d1efae059b9e2a2d9";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue