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

Merge pull request #1572 from bennofs/update-java7

Browse Source 
java: Update to version 7u51
This commit is contained in:
Michael Raskin 2014-01-22 12:29:23 -08:00
commit 77fa75b1ba
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/development/compilers/jdk/jdk7-linux.nix
View File

@ -35,22 +35,25 @@ let
""; "";
in in
stdenv.mkDerivation { stdenv.mkDerivation rec {
patchversion = 51;
name = name =
if installjdk then "jdk-1.7.0_45" else "jre-1.7.0_45"; if installjdk then "jdk-1.7.0_${patchversion}" else "jre-1.7.0_${patchversion}";
src = src =
if stdenv.system == "i686-linux" then if stdenv.system == "i686-linux" then
requireFile { requireFile {
name = "jdk-7u45-linux-i586.tar.gz"; name = "jdk-7u${patchversion}-linux-i586.tar.gz";
url = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html; url = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html;
sha256 = "1q0nw2rwmavcrssyigq76p1h00hm8kd3rhb5bdv7rbdcs0jxrjsa"; sha256 = "1ks2zyx88bxdjcbdgg40mh1i9a83ll9ymxr79rplfvj48ig9d8mk";
} }
else if stdenv.system == "x86_64-linux" then else if stdenv.system == "x86_64-linux" then
requireFile { requireFile {
name = "jdk-7u45-linux-x64.tar.gz"; name = "jdk-7u${patchversion}-linux-x64.tar.gz";
url = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html; url = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html;
sha256 = "06jbz536zycqkdpc7zriay0jidmj9nriqva60afsgpv93kcf9spj"; sha256 = "0p7mfjj8fxlghvhcqhwgrifzb32b9y143yw962zk02bfycz7qdkp";
} }
else else
abort "jdk requires i686-linux or x86_64 linux"; abort "jdk requires i686-linux or x86_64 linux";