jdk5 updated to 1.5.22
svn path=/nixpkgs/trunk/; revision=24802
This commit is contained in:
parent
6a9414d938
commit
b9a1196479
3 changed files with 27 additions and 25 deletions
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"
|
if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"
|
||||||
then
|
then
|
||||||
(import ./jdk5-sun-linux.nix) {
|
(import ./jdk5-oracle-linux.nix) {
|
||||||
inherit stdenv fetchurl unzip;
|
inherit stdenv fetchurl unzip;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
26
pkgs/development/compilers/jdk/jdk5-oracle-linux.nix
Normal file
26
pkgs/development/compilers/jdk/jdk5-oracle-linux.nix
Normal file
|
@ -0,0 +1,26 @@
|
||||||
|
/**
|
||||||
|
* 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}:
|
||||||
|
|
||||||
|
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
|
||||||
|
|
||||||
|
let name = "jdk-1_5_0_22"; in
|
||||||
|
stdenv.mkDerivation {
|
||||||
|
inherit name;
|
||||||
|
filename = "jdk-1_5_0_22";
|
||||||
|
dirname = "jdk1.5.0_22";
|
||||||
|
builder = ./builder.sh;
|
||||||
|
pathname = if stdenv.system == "x86_64-linux" then "/tmp/${name}-linux-amd64.bin" else "/tmp/${name}-linux-i586.bin";
|
||||||
|
md5 = if stdenv.system == "x86_64-linux" then "b62abcaf9ea8617c50fa213bbc88824a" else "df5dae6d50d2abeafb472dde6d9a17f3";
|
||||||
|
|
||||||
|
stdenv = stdenv;
|
||||||
|
inherit unzip;
|
||||||
|
}
|
|
@ -1,24 +0,0 @@
|
||||||
/**
|
|
||||||
* This Nix expression requires the user to download the j2sdk
|
|
||||||
* distribution to /tmp. Please obtain jdk-1_5_0_14-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.
|
|
||||||
*/
|
|
||||||
{stdenv, fetchurl, unzip}:
|
|
||||||
|
|
||||||
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
|
|
||||||
|
|
||||||
let name = "jdk-1_5_0_19"; in
|
|
||||||
stdenv.mkDerivation {
|
|
||||||
inherit name;
|
|
||||||
filename = "jdk-1_5_0_19";
|
|
||||||
dirname = "jdk1.5.0_19";
|
|
||||||
builder = ./builder.sh;
|
|
||||||
pathname = if stdenv.system == "x86_64-linux" then "/tmp/${name}-linux-amd64.bin" else "/tmp/${name}-linux-i586.bin";
|
|
||||||
md5 = if stdenv.system == "x86_64-linux" then "28095941e14669d5025f66260e7b61e7" else "0d082a0c9f5a79b0895b3317c9590ec5";
|
|
||||||
|
|
||||||
stdenv = stdenv;
|
|
||||||
inherit unzip;
|
|
||||||
}
|
|
Loading…
Reference in a new issue