3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

80 commits

Author SHA1 Message Date
Benno Fünfstück 9d15c568d8 Fix whitespace 2014-04-26 21:15:06 +02:00
Benno Fünfstück a2de61e2b6 jdk7: update patchversion 51 -> 55. 2014-04-25 12:29:25 +02:00
Gergely Risko 44190ff1b9 Update ffmpeg dependency in oraclejdk7 2014-04-02 23:36:47 +02:00
Benno Fünfstück 303c418035 Workaround for relocation error
This works around "java: relocation error: java: symbol , version GLIBC_2.2.5 not defined in file libc.so.6 with link time reference"
2014-02-07 15:07:12 +01:00
Benno Fünfstück 264dcdddf1 Fixes 2014-01-30 19:40:42 +01:00
Benno Fünfstück 5d6fdd8abb oraclejdk7: add missing dependencies 2014-01-30 18:24:58 +01:00
Shea Levy 3b20a10ae9 Fix tarball
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-22 15:54:40 -05:00
Benno Fünfstück 42fb68d6a9 java: Update to version 7u51 2014-01-22 21:22:18 +01:00
Rob Vermaas 96a51da082 Oraclejdk7: Fix hash and extracted path for jce_policy.zip. Add extra rpath. 2013-12-30 12:39:48 +01:00
Shea Levy ac21aa9a82 Unpacking jce requires zip
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-12-09 13:25:07 -05:00
Shea Levy 088f472fe5 Add oracle jdk 7
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-12-09 11:37:40 -05:00
Rob Vermaas 2066508131 Add argument to oraclejdk to allow installation of Java Cryptography Extension with unlimited strength. User needs to download these themselves, and need to accept a license agreement (Java SE BCL License Agreement) 2013-10-08 11:31:12 +02:00
Gergely Risko 51c69ea60e oracle jdk/jre: use requireFile instead of fetchurl (merge #537)
The user has to accept the EULA nowadays on the oracle website.
2013-05-16 10:58:08 +02:00
Rob Vermaas a24458c219 Update oracle jdk to 1.6.0_45b06 2013-04-18 20:18:09 +02:00
Eelco Dolstra 5553546c21 Remove a bunch of unreferenced files
Plus a small number of obsolete packages (like old versions of qemu).
2012-11-29 13:43:37 +01:00
Rob Vermaas ad928fee30 Update Oracle JDK to 1.6.0u38b04 2012-11-21 21:31:56 +01:00
Eelco Dolstra 2bc9508034 Prevent the JDK from appearing in the Nixpkgs channel 2012-08-22 15:43:19 -04:00
Eelco Dolstra 8020c37f55 Remove obsolete JDK versions
These are the JDK 5 on powerpc-linux (no longer a maintained Nixpkgs
platform), JDK 1.4 (required a manual download) and JDK 5 on Linux
(idem).
2012-08-22 15:43:19 -04:00
Lluís Batlle i Rossell 3551d159d8 Updating the JDK6 to u32b03 due to some important security fix.
http://www.h-online.com/open/news/item/Critical-Java-hole-being-exploited-on-a-large-scale-1485681.html


svn path=/nixpkgs/trunk/; revision=33460
2012-03-28 20:42:54 +00:00
Rob Vermaas 5a3a3a4e17 * Fix JDK/JRE error: /nix/store/.../jre/lib/i386/xawt/libmawt.so: file not recognized: File format not recognized.
Patch provided by Ambrus Kaposi.


svn path=/nixpkgs/trunk/; revision=33439
2012-03-27 11:19:00 +00:00
Eelco Dolstra c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Rob Vermaas 50d0535b45 update jdk to jdk-1.6.0_24
svn path=/nixpkgs/trunk/; revision=26849
2011-04-15 07:56:09 +00:00
Michael Raskin c9c133ab11 Use requireFile for the form-hidden download of JDK 5 (or 1.5, who cares)
svn path=/nixpkgs/trunk/; revision=24972
2010-12-05 11:42:24 +00:00
Michael Raskin c2a8d34118 Add a note about chroot builds
svn path=/nixpkgs/trunk/; revision=24968
2010-12-04 13:07:10 +00:00
Tobias Hammerschmidt b9a1196479 jdk5 updated to 1.5.22
svn path=/nixpkgs/trunk/; revision=24802
2010-11-22 08:58:00 +00:00
Lluís Batlle i Rossell d0b42b2927 Making the firefox java plugin work in i686-linux and x86_64-linux.
It should work for both firefox 3.6 and firefox 3.5 (said roconnor on irc).

Thanks to the wiki page http://wiki.nixos.org/wiki/Java_in_Firefox which explained
why what we had did not work.

svn path=/nixpkgs/trunk/; revision=23801
2010-09-14 15:14:18 +00:00
Lluís Batlle i Rossell 7471ffb76d Fixing the plugin directory for the jdk6 i686-linux
svn path=/nixpkgs/trunk/; revision=23799
2010-09-14 14:47:12 +00:00
Rob Vermaas 41aa02a8b4 inital try with jdk6 on cygwin
svn path=/nixpkgs/trunk/; revision=22000
2010-05-27 11:04:45 +00:00
Sander van der Burg 3921737991 Upgraded jdk to 1.6.0_20
svn path=/nixpkgs/trunk/; revision=21180
2010-04-20 11:29:40 +00:00
Lluís Batlle i Rossell 507f7fb86e Updating sun java jdk. I expected some problems to be solved, but they work the same
way in this new version. But an update should not annoy.

svn path=/nixpkgs/trunk/; revision=17794
2009-10-13 21:45:20 +00:00
Marc Weber e932a5c6d6 jdk 1.5.0_19
svn path=/nixpkgs/trunk/; revision=16476
2009-07-27 16:05:20 +00:00
Marc Weber 75244dffaf update jdk because jdk-1.6.0_13 provides a mozilla plugin for x86_64
svn path=/nixpkgs/trunk/; revision=15422
2009-05-01 19:34:56 +00:00
Michael Raskin 9dcefd67ec Fix hash for JDK: was duplicate
svn path=/nixpkgs/trunk/; revision=13950
2009-02-02 12:42:00 +00:00
Marc Weber f47649b3db update jre/jdk to 1.6.0_11 cause _6 has known bugs (-> Eclipse FAQ)
svn path=/nixpkgs/trunk/; revision=13924
2009-01-31 22:03:18 +00:00
Marc Weber 839be39796 updated jdk5-sun to 1_5_0_16
svn path=/nixpkgs/trunk/; revision=13016
2008-10-09 09:49:17 +00:00
Eelco Dolstra faba06ce54 * firefox-wrapper: plugins no longer have to declare additional
LD_LIBRARY_PATH elements, since they can use patchelf --rpath if
  necessary.
* Flashplayer / JRE: do just that.
* JRE: libstdcpp5 no longer seems to be necessary for the plugin.

svn path=/nixpkgs/trunk/; revision=12094
2008-06-14 21:42:07 +00:00
Eelco Dolstra fc5eebdf8b * Merged the stdenv branch
(https://svn.nixos.org/repos/nix/nixpkgs/branches/stdenv-updates
  -r10966:12061).

svn path=/nixpkgs/trunk/; revision=12073
2008-06-13 11:46:39 +00:00
Tobias Hammerschmidt 1ad80e8dbc java 6 update 6
svn path=/nixpkgs/trunk/; revision=11723
2008-04-25 21:49:54 +00:00
Eelco Dolstra 09ab596e0f * Remove calls to fail().
svn path=/nixpkgs/branches/stdenv-updates/; revision=11690
2008-04-23 07:34:20 +00:00
Tobias Hammerschmidt d62d2eea35 doh!
svn path=/nixpkgs/trunk/; revision=11595
2008-04-11 22:13:51 +00:00
Tobias Hammerschmidt d5d1cd93de added scala an object oriented and functional programming language
svn path=/nixpkgs/trunk/; revision=11593
2008-04-11 22:06:32 +00:00
Eelco Dolstra 64425af409 * Glibc must be in Java's RPATH.
svn path=/nixpkgs/trunk/; revision=11544
2008-04-10 12:11:53 +00:00
Tobias Hammerschmidt 87176f8dd3 doh
svn path=/nixpkgs/trunk/; revision=11321
2008-03-28 12:00:48 +00:00
Tobias Hammerschmidt ff2fe8dce9 version update
svn path=/nixpkgs/trunk/; revision=11319
2008-03-28 11:58:36 +00:00
Marc Weber bad0d45562 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
2008-03-09 00:08:45 +00:00
Eelco Dolstra 46e26d7a9b * Fix the JDK build on x86_64.
svn path=/nixpkgs/trunk/; revision=10871
2008-02-27 11:27:22 +00:00
Eelco Dolstra 72e947949d svn path=/nixpkgs/trunk/; revision=10864 2008-02-26 15:33:23 +00:00
Eelco Dolstra 65dcf5ffa4 * Fix jre, and some cleanups.
svn path=/nixpkgs/trunk/; revision=10863
2008-02-26 15:24:33 +00:00
Eelco Dolstra 2763f4d08c * Workaround for this bug:
http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6532373.

svn path=/nixpkgs/trunk/; revision=10862
2008-02-26 14:56:22 +00:00
Tobias Hammerschmidt 182d10bca9 java 6 update 4, can someone confirm that amd64 works properly?
svn path=/nixpkgs/trunk/; revision=10770
2008-02-20 11:34:48 +00:00