Commit Graph

36 Commits

Author SHA1 Message Date
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
Sander van der Burg
d0792fd3bc Added x86_64 version of JDK5
svn path=/nixpkgs/trunk/; revision=10272
2008-01-24 10:14:33 +00:00
Sander van der Burg
12fafd0c7d Added JBoss
svn path=/nixpkgs/trunk/; revision=10259
2008-01-23 12:25:08 +00:00
Marc Weber
16d701c9ab rxvt-unicode and jdk update provided by Tobias Hammerschmidt
svn path=/nixpkgs/trunk/; revision=9561
2007-10-31 12:17:14 +00:00
Eelco Dolstra
41291a5b26 * Fix Mesa-related evaluation errors.
svn path=/nixpkgs/trunk/; revision=8708
2007-05-16 14:49:28 +00:00
Eelco Dolstra
0005a37b8d * In the JDK packages, don't return false if the platform is
unsupported.  This gives a type error ("value is a boolean while 
  an attribute set was expected").

svn path=/nixpkgs/trunk/; revision=8576
2007-04-16 10:07:06 +00:00
Martin Bravenboer
753eae47d1 jdk-without-plugin fix
svn path=/nixpkgs/trunk/; revision=8460
2007-03-28 18:29:26 +00:00
Martin Bravenboer
9d9372cd58 Make jdk plugin support optional to avoid deps on gcc 3.3.6 everywhere.
svn path=/nixpkgs/trunk/; revision=8452
2007-03-28 15:21:43 +00:00
Martin Bravenboer
fb91f1b319 M pkgs/development/compilers/jdk/jdk6-linux.nix
M    pkgs/development/compilers/jdk/dlj-bundle-builder.sh

Various fixes to get javaws and mozillaPlugin to work. Requires gcc3.3
libstdc++ to be in the dynamic library path.


svn path=/nixpkgs/trunk/; revision=8434
2007-03-27 22:02:55 +00:00
Martin Bravenboer
778d516e41 A pkgs/tools/typesetting/pdfjam
A    pkgs/tools/typesetting/pdfjam/builder.sh
A    pkgs/tools/typesetting/pdfjam/default.nix

Added pdfjam, a package with the following tools:

    * pdfnup, which allows PDF files to be "n-upped" in roughly the
      way that psnup does for PostScript files.

    * pdfjoin, which concatenates the pages of multiple PDF files
      together into a single file

    * pdf90, which rotates the pages of one or more PDF files through
      90 degrees (anti-clockwise).

M    pkgs/development/compilers/jdk/jdk6-linux.nix

Typo


svn path=/nixpkgs/trunk/; revision=8404
2007-03-21 12:53:01 +00:00
Martin Bravenboer
d86846bb6a Fixes in x86_64 support for the jdk.
svn path=/nixpkgs/trunk/; revision=8329
2007-03-18 00:33:32 +00:00
Martin Bravenboer
03dbe4cf1f Added x86_64-linux support to the jdk.
svn path=/nixpkgs/trunk/; revision=8326
2007-03-17 14:37:23 +00:00
Martin Bravenboer
c212318239 patch unpack200 before running the construct script
svn path=/nixpkgs/trunk/; revision=8198
2007-03-05 21:33:47 +00:00
Martin Bravenboer
038454978f Use unzip to avoid unpurities
svn path=/nixpkgs/trunk/; revision=8196
2007-03-05 19:54:37 +00:00
Martin Bravenboer
3b1d307518 More deps on xlibs
svn path=/nixpkgs/trunk/; revision=8188
2007-03-05 17:55:17 +00:00
Martin Bravenboer
25e0bf0f49 oops.
svn path=/nixpkgs/trunk/; revision=8187
2007-03-05 17:29:21 +00:00
Martin Bravenboer
6892b99bf6 Update of jdk and jre to jdk-distros, based on Distributor License for Java.
D    pkgs/development/interpreters/jre

Obsolete. jdk and jre are now build by the same expression.

D    pkgs/development/compilers/blackdown

Obsolete. jdk is now downloadable.

D    pkgs/development/compilers/jdk/jdk5-sun-linux.nix

Obsolete

A    pkgs/development/compilers/jdk/dlj-bundle-builder.sh

Build for DLJ bundles.

M    pkgs/top-level/all-packages.nix

Dropped blackdown and ant based on blackdown.

A    pkgs/development/compilers/jdk/jdk6-construct.sh

Copy of DLJ construct script to fix problem with jdk6 bundles.

A    pkgs/development/compilers/jdk/jdk6-linux.nix

New main Nix expression for jdk and jre. Supports mozillaPlugin.

A    pkgs/development/compilers/jdk/dlj-bundle-builder.sh

Include path to libjli in rpath.


svn path=/nixpkgs/trunk/; revision=8186
2007-03-05 17:13:53 +00:00
Eelco Dolstra
b90781ec21 * Renamed orig-glibc -> orig-libc in some places, and in others, use
the new $NIX_GCC/nix-support/dynamic-linker file to locate the
  dynamic linker directly (don't hardcode ld-linux.so.2).

svn path=/nixpkgs/trunk/; revision=6873
2006-10-27 12:43:32 +00:00
Martin Bravenboer
98038f9592 PowerPC environment is not pure, so patching is useless
svn path=/nixpkgs/trunk/; revision=6406
2006-08-31 02:06:31 +00:00
Martin Bravenboer
6bae4d7e4e Prelim. support for JDK on PowerPC using IBM's SDK
svn path=/nixpkgs/trunk/; revision=6405
2006-08-31 01:51:41 +00:00
Martin Bravenboer
0d6c1cb83b Updates of jre and jdk
svn path=/nixpkgs/trunk/; revision=5395
2006-06-06 19:43:31 +00:00
Armijn Hemel
accbe1d1a7 update to jdk-1_5_0_06-linux-i586.bin
svn path=/nixpkgs/trunk/; revision=4618
2006-01-30 14:25:19 +00:00
Eelco Dolstra
b43c421658 * JDK: put the machine-dependent header files in the right place.
* Added SWT for GTK (built from source).
* Added Azureus (a Bittorrent client written in Java).

svn path=/nixpkgs/trunk/; revision=4438
2005-12-26 00:51:24 +00:00
Eelco Dolstra
3c1c258aa5 * Use PatchELF 0.1.
svn path=/nixpkgs/trunk/; revision=4062
2005-10-11 13:31:33 +00:00
Eelco Dolstra
7112b86997 * Export swingSupport attribute.
svn path=/nixpkgs/trunk/; revision=4032
2005-10-08 13:31:39 +00:00
Eelco Dolstra
5b63bb66f7 * Purification of JDK 5. At runtime it now uses the Nix-deployed
Glibc and X11 client libraries.  The latter are actually optional
  dependencies: if the function is called with `swingSupport' set to
  `false', they are not needed.  This is nice for, e.g., server
  environments.

  All hail Patchelf!

svn path=/nixpkgs/trunk/; revision=4030
2005-10-07 22:27:42 +00:00
Eelco Dolstra
881f4b0db1 * Use unzip to unpack the JDK. Then unpack the *.pack files. The
advantage is that we don't have to run the Sun installer (which is
  impure).

  TODO: make sure that all the other JDK versions still work.

svn path=/nixpkgs/trunk/; revision=4029
2005-10-07 14:49:37 +00:00
Martin Bravenboer
4c70ef7e5d Cleaning up the java naming conventions
svn path=/nixpkgs/trunk/; revision=3871
2005-09-17 23:58:51 +00:00
Martin Bravenboer
3919e7593a Naming conventions
svn path=/nixpkgs/trunk/; revision=3870
2005-09-17 23:40:23 +00:00
Martin Bravenboer
a640e2a19a Naming conventions
svn path=/nixpkgs/trunk/; revision=3869
2005-09-17 23:39:03 +00:00
Martin Bravenboer
1122e263ee Cleaning up the java naming conventions
svn path=/nixpkgs/trunk/; revision=3867
2005-09-17 23:24:40 +00:00