diff options
| author | Marc Weber <marco-oweber@gmx.de> | 2008-03-09 00:08:45 +0000 |
|---|---|---|
| committer | Marc Weber <marco-oweber@gmx.de> | 2008-03-09 00:08:45 +0000 |
| commit | bad0d45562466014982500c1e94286fd7f88fcc2 (patch) | |
| tree | 82288f3ee01905c9194d1ec598e712544053f9b2 /pkgs/development/compilers/jdk | |
| parent | 7c39433e7bffb052cd27ecd4204ba30ca36d53de (diff) | |
jdk updated to 1.5.0.15
updated bleeding edge stuff (should now work for the bulidfarm as well because dist files are stored on my server) moved experimental my_env into its own file svn path=/nixpkgs/trunk/; revision=11026
Diffstat (limited to 'pkgs/development/compilers/jdk')
| -rw-r--r-- | pkgs/development/compilers/jdk/jdk5-sun-linux.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/development/compilers/jdk/jdk5-sun-linux.nix b/pkgs/development/compilers/jdk/jdk5-sun-linux.nix index 6a15b1f9ec918..a5d6f8bc516f0 100644 --- a/pkgs/development/compilers/jdk/jdk5-sun-linux.nix +++ b/pkgs/development/compilers/jdk/jdk5-sun-linux.nix @@ -10,13 +10,14 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; +let name = "jdk-1_5_0_15"; in stdenv.mkDerivation { - name = "jdk-1.5.0_14"; - filename = "jdk-1_5_0_14"; - dirname = "jdk1.5.0_14"; + inherit name; + filename = "jdk-1_5_0_15"; + dirname = "jdk1.5.0_15"; builder = ./builder.sh; - pathname = if stdenv.system == "x86_64-linux" then "/tmp/jdk-1_5_0_14-linux-amd64.bin" else "/tmp/jdk-1_5_0_14-linux-i586.bin"; - md5 = if stdenv.system == "x86_64-linux" then "9dc74d939dd42988280f2c22ab9521bf" else "32df8f2be09c3a0f39da1b3869164b55"; + 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 "8c560eda470a50926b9e8dab2c806a25" else "6f45ac598a2f6ff73a2429d6a0da2624"; stdenv = stdenv; inherit unzip; |