Commit graph

234 commits

Author SHA1 Message Date
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 279c1e343e * ghc-pkg wrapper: remove --global; it's not needed and it causes
problems (e.g., with ghc-pkg -s PKGNAME).

svn path=/nixpkgs/trunk/; revision=7790
2007-01-24 14:26:50 +00:00
Eelco Dolstra f861c8b66c * makeFlags -> buildFlags in a few places.
svn path=/nixpkgs/trunk/; revision=7503
2006-12-27 18:34:35 +00:00
Arie Middelkoop afde8e6270 Added GHC 6.6.
note: the old GHC 6.4(.2?) version is still there. I reused the bootstrap-version to bootstrap GHC-6.6. And some other packages depend on the old GHC 
version as well.

note: only use this package for building other packages. If you install it as an end-user, you'll only be able to use the default GHC libraries, 
because other libraries are only privately registered to this GHC version during a nix-build by hooks (which are not executed when you run GHC 
yourself as an end-user).

Consequently, also added a newer version of uulib and uuagc.

svn path=/nixpkgs/trunk/; revision=7346
2006-12-15 13:32:55 +00:00
Eelco Dolstra 711bb9b56a * Fix GCC 3.3.
svn path=/nixpkgs/trunk/; revision=6904
2006-10-30 11:58:24 +00:00
Eelco Dolstra 0b78c04601 * Fix gcc 3.3.
svn path=/nixpkgs/trunk/; revision=6898
2006-10-28 23:41:45 +00:00
Eelco Dolstra 3a6754f6bb * gcc-4.1-temp -> gcc-4.1.
* Use real URLs.

svn path=/nixpkgs/trunk/; revision=6884
2006-10-27 23:14:41 +00:00
Eelco Dolstra b7a96d74e2 svn path=/nixpkgs/trunk/; revision=6883 2006-10-27 23:13:44 +00:00
Eelco Dolstra 3ea7d9d272 * Fix static linking in gcc.
* Use the coreutils in dietlibc.
* Add objdump to the binutils static tarball.

svn path=/nixpkgs/trunk/; revision=6879
2006-10-27 20:08: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
Eelco Dolstra 2d3cfb2058 * Put back in the code to do a profiled GCC build, but turn in off
(build ICEs).

svn path=/nixpkgs/trunk/; revision=6861
2006-10-26 20:23:49 +00:00
Eelco Dolstra eb4584c0cb * Merge the gcc-4.1 changes into 3.4.
svn path=/nixpkgs/trunk/; revision=6855
2006-10-26 11:25:29 +00:00
Eelco Dolstra 4be38f2f31 * No longer needed.
svn path=/nixpkgs/trunk/; revision=6851
2006-10-25 16:32:33 +00:00
Eelco Dolstra 7f9a2ecc16 * Fix building in an impure environment.
svn path=/nixpkgs/trunk/; revision=6841
2006-10-25 09:50:58 +00:00
Eelco Dolstra 1a7576f193 * Get the g++ tarball unconditionally, otherwise the patch won't apply.
svn path=/nixpkgs/trunk/; revision=6840
2006-10-25 09:23:20 +00:00
Eelco Dolstra 69ee353dc7 * glibc-2.5 is the default now.
* Remove gcc-static-3.4.

svn path=/nixpkgs/trunk/; revision=6831
2006-10-24 22:23:20 +00:00
Eelco Dolstra b342dcb13b * gcc-wrapper: separately store the flags necessary to find GCC and
Glibc.  This is useful when building GCC.
* gcc-wrapper: the dynamic linker has a different name on x86_64 and
  powerpc.
* gcc-wrapper: "glibc" -> "libc", because someday we might support
  different C libraries.
* gcc: don't do a multilib build (e.g., 32-bit support on x86_64),
  don't need it.
* gcc: merge in support for static builds.
* gcc: various simplifications in the compiler/linker flags, hope they
  work.

svn path=/nixpkgs/trunk/; revision=6823
2006-10-24 18:26:23 +00:00
Eelco Dolstra 0cf5154681 * Build a static GCC, properly. (Reminder: when building GCC on an
impure x86_64 environment, make sure that the 32-bit GCC / Glibc
  libraries are installed, such as /usr/lib/crti.o.)

svn path=/nixpkgs/trunk/; revision=6818
2006-10-24 11:36:19 +00:00
Eelco Dolstra c466083d3f * Don't build unnecessary libraries.
svn path=/nixpkgs/trunk/; revision=6812
2006-10-23 21:51:08 +00:00
Eelco Dolstra b495d3f65e * Trying to get gcc-static to build on x86_64. Still doesn't work though.
svn path=/nixpkgs/trunk/; revision=6809
2006-10-23 18:56:43 +00:00
Eelco Dolstra 6aefff0061 * Fix for NIXPKGS-30: make libstdc++'s configure script correctly
identify the features of the compiler / C library.  Specifically, it
  should find out that functions like floorf() are available and not
  substitute its own versions that have the unfortunate tendency of
  going off into an infinite recursion.

svn path=/nixpkgs/trunk/; revision=6738
2006-10-16 07:05:36 +00:00
Eelco Dolstra ef9b025dbe * Remove a bunch of unused Nix expressions.
svn path=/nixpkgs/trunk/; revision=6716
2006-10-12 15:43:01 +00:00
Eelco Dolstra ad897a7c96 * Update more URLs.
svn path=/nixpkgs/trunk/; revision=6713
2006-10-12 14:53:45 +00:00
Eelco Dolstra d030e2fdd7 * Removed Harp.
svn path=/nixpkgs/trunk/; revision=6712
2006-10-12 14:29:05 +00:00
Eelco Dolstra 1442e8ec22 * Copy a bunch of files to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=6711
2006-10-12 13:50:54 +00:00
Eelco Dolstra 368c196a62 * More descriptions.
svn path=/nixpkgs/trunk/; revision=6709
2006-10-12 10:53:16 +00:00
Eelco Dolstra 6006d61835 * Added a bunch of descriptions.
svn path=/nixpkgs/trunk/; revision=6705
2006-10-11 16:45:55 +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 80e695bfca PKG_CONFIG_PATH no longer required
svn path=/nixpkgs/trunk/; revision=6268
2006-08-27 12:52:56 +00:00
Martin Bravenboer 9706572beb Hack hack
svn path=/nixpkgs/trunk/; revision=6264
2006-08-27 03:50:20 +00:00
Martin Bravenboer eac3336cd6 Hack hack
svn path=/nixpkgs/trunk/; revision=6263
2006-08-27 03:49:09 +00:00
Martin Bravenboer 0ff3af3d00 Hack hack
svn path=/nixpkgs/trunk/; revision=6262
2006-08-27 03:45:51 +00:00
Martin Bravenboer 961b20c1b7 Added pre release of stratego libraries, fixed support for configureFlags in MinGW, add binary pkg-config distribution for bootstrapping. Optionally use pkgconfig from the stdenv (again, for bootstrapping)
svn path=/nixpkgs/trunk/; revision=6253
2006-08-26 20:11:31 +00:00
Armijn Hemel 6c7ea78070 fix compilation so we can build a statically linked gcc with an impure environment. Needs "noSysDirs = false" passed as a parameter in all-packages.nix, or whatever.
svn path=/nixpkgs/trunk/; revision=6247
2006-08-25 23:24:41 +00:00
Armijn Hemel b6811b43f1 pass noSysDirs for static gcc
svn path=/nixpkgs/trunk/; revision=6246
2006-08-25 22:19:16 +00:00
Armijn Hemel 1a2f1130cb 3.4.2 -> 3.4.6
We should update the whole Nix "static baseline" soon...ish

svn path=/nixpkgs/trunk/; revision=6244
2006-08-25 21:20:04 +00:00
Armijn Hemel 1b17f45ef5 add a statically linked gcc-4.1
svn path=/nixpkgs/trunk/; revision=6056
2006-08-05 13:50:42 +00:00
Martin Bravenboer 799e451a26 Updated abc to version 1.2.0
svn path=/nixpkgs/trunk/; revision=6021
2006-08-02 17:27:42 +00:00
Martin Bravenboer 6fa02079b8 Update of aspectj to 1.5.2
svn path=/nixpkgs/trunk/; revision=6019
2006-08-02 16:42:52 +00:00
Eelco Dolstra 3defd9a3d3 * On Darwin, use Apple's gcc fork.
svn path=/nixpkgs/trunk/; revision=5715
2006-07-14 22:34:24 +00:00
Eelco Dolstra 4d7f947bcb * GCC 4.0.3.
svn path=/nixpkgs/trunk/; revision=5676
2006-07-11 07:55:38 +00:00
Eelco Dolstra 1165fdd247 * More fixes.
svn path=/nixpkgs/trunk/; revision=5513
2006-06-24 11:16:29 +00:00
Eelco Dolstra 7682bf3d1e * Make it easier to override parts of stdenv (like gcc or make) per
package using the `overrideGCC' and `overrideInStdenv' functions.

svn path=/nixpkgs/trunk/; revision=5505
2006-06-23 20:11:36 +00:00
Eelco Dolstra 45e1edfda8 * Give the GHC builder a temporary $HOME.
svn path=/nixpkgs/trunk/; revision=5504
2006-06-23 20:08:48 +00:00
Eelco Dolstra 3042581b2a * Disable some stuff.
* Use GNU make 3.80 for StrategoXT.
* Updated octave.

svn path=/nixpkgs/trunk/; revision=5502
2006-06-23 14:04:32 +00:00
Eelco Dolstra fc37dbc487 * GCC 3.4.6.
svn path=/nixpkgs/trunk/; revision=5496
2006-06-23 11:09:07 +00:00
Eelco Dolstra 2bbb426a7d * GHC 6.4.2.
svn path=/nixpkgs/trunk/; revision=5493
2006-06-22 15:22:55 +00:00
Eelco Dolstra 9af9b95298 * Make GCC 4.1.1 the default compiler for Nixpkgs.
svn path=/nixpkgs/trunk/; revision=5481
2006-06-21 15:54:18 +00:00
Martin Bravenboer 0d6c1cb83b Updates of jre and jdk
svn path=/nixpkgs/trunk/; revision=5395
2006-06-06 19:43:31 +00:00
Eelco Dolstra 1a9b6bb4ad * Microsoft Windows SDK, purified. Small problem: building the SDK
takes huge amounts of temporary disk space (almost 2 GB).  Oh well.

svn path=/nixpkgs/trunk/; revision=5386
2006-06-05 22:03:52 +00:00
Eelco Dolstra fef1bdfad1 * Make it work.
svn path=/nixpkgs/trunk/; revision=5385
2006-06-05 20:23:24 +00:00
Eelco Dolstra d571eaafb3 * Started adding the Windows SDK.
svn path=/nixpkgs/trunk/; revision=5384
2006-06-05 19:40:14 +00:00
Eelco Dolstra 588383905a * Download and unpack Visual C++ 2005 Express Edition.
svn path=/nixpkgs/trunk/; revision=5383
2006-06-05 19:26:11 +00:00
Eelco Dolstra 51640ca1ab * Oops.
svn path=/nixpkgs/trunk/; revision=5371
2006-06-02 12:05:03 +00:00
Eelco Dolstra 08d3840c94 * A Hello World GUI application compiled with VC++.
svn path=/nixpkgs/trunk/; revision=5370
2006-06-02 10:09:19 +00:00
Eelco Dolstra 91aebd8616 * A wrapper around the Visual C++ compiler and the Windows SDK.
TODO: download and unpack into the Nix store Visual C++ (either from
  Visual C++ Express Edition or from the .NET 2.0 Framework SDK) and
  the Windows Platform SDK.  The command line tools don't seem to need
  any registry settings...

svn path=/nixpkgs/trunk/; revision=5369
2006-06-02 09:56:10 +00:00
Martin Bravenboer 8dbf2c38fb * Update of jre
* Added aspectj-1.5.0


svn path=/nixpkgs/trunk/; revision=5110
2006-03-26 03:52:55 +00:00
Martin Bravenboer d88e2ea70f Added abc 1.1.1.
svn path=/nixpkgs/trunk/; revision=5109
2006-03-26 03:21:32 +00:00
Eelco Dolstra 09a9cae715 * Merged the usability branch (from trunk@4749 to branches/usability@5087).
svn path=/nixpkgs/trunk/; revision=5088
2006-03-24 12:25:19 +00:00
Eelco Dolstra baec8f5b38 * stdenv.mkDerivation now takes an optional attribute "meta" that
contains arbitrary information about a package, like this:

  meta = {
    homepage = "http://gcc.gnu.org/";
    license = "GPL/LGPL";
    description = "GNU Compiler Collection, 4.0.x";
  };

  The "meta" attribute is not passed to the actual derivation
  operation, so it's not a dependency --- changes to "meta" attributes
  don't trigger a recompilation.

  Now we have to standardise some useful attributes ;-)

svn path=/nixpkgs/branches/usability/; revision=5024
2006-03-10 16:12:46 +00:00
Eelco Dolstra 4c63a4a97a * Don't pass Blackdown to firefox-wrapper unless it is actually built.
svn path=/nixpkgs/branches/usability/; revision=4999
2006-03-08 16:03:47 +00:00
Armijn Hemel 6bec50fda1 add gcc-4.1. The no-sys-dirs.patch had to be regenerated because a lot of stuff had been reworked in the Makefiles for 4.1.
svn path=/nixpkgs/trunk/; revision=4961
2006-03-01 19:09:53 +00:00
Merijn de Jonge ebe59d3d21 fixed ocaml/qcmm problem:
-created separate nix expressions for ocaml-3.08.0 and ocaml 3.09.1
-ocam-3.09.1 is standard/default ocaml version (included by ocaml/default.nix)
-created ocaml3080 in all-packages-generic.nix
-qcmm now uses ocaml3080 instead of ocaml


svn path=/nixpkgs/trunk/; revision=4935
2006-03-01 09:18:22 +00:00
Merijn de Jonge 90666e6eff Updated ocaml to version 3.09.1
svn path=/nixpkgs/trunk/; revision=4882
2006-02-23 09:30:40 +00:00
Christof Douma 3c68c34ee7 build native qc-- version only (with ocamlopt). This removes the runtime dependency on ocaml.
svn path=/nixpkgs/trunk/; revision=4682
2006-02-02 20:14:11 +00:00
Christof Douma 1fa4c66b73 added version to uuagc
added: noweb, lua-5.x, lua-4.x, mk, qc-- (as qcmm)

svn path=/nixpkgs/trunk/; revision=4681
2006-02-02 17:07:07 +00:00
Andres Löh 51e287469c * ghc should call the gcc instance it's been built with (to compile Haskell code)
svn path=/nixpkgs/trunk/; revision=4658
2006-01-31 23:58:32 +00:00
Eelco Dolstra 3389f4bc36 * Copy lots of files to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=4623
2006-01-30 16:04:03 +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
Christof Douma 8d4e61d096 change uulib to store all dependencies to package.conf
added ghc-wrapper to use a generated global package.conf
added uuagc

svn path=/nixpkgs/trunk/; revision=4608
2006-01-27 10:16:15 +00:00
Armijn Hemel 7625850ab3 a patch which defines FLAGS_FOR_TARGET. This patch is not enabled by default
svn path=/nixpkgs/trunk/; revision=4585
2006-01-23 11:53:33 +00:00
Eelco Dolstra 57315e624d * Fix the gcc-4.0.2 build. It was impure: it used /lib/cpp during the
building of libstdc++.
* Add gcc-4.0.2 to the channel.  

svn path=/nixpkgs/trunk/; revision=4583
2006-01-20 17:27:53 +00:00
Armijn Hemel 560a2d3c10 make a symlink to an existing "ar"
svn path=/nixpkgs/trunk/; revision=4468
2005-12-31 15:56:07 +00:00
Armijn Hemel 2f3dfaa5b9 make our cross compiler a lot more generic.
svn path=/nixpkgs/trunk/; revision=4464
2005-12-31 14:09:44 +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
Martin Bravenboer 83afd0c173 Added Transformers 0.4
svn path=/nixpkgs/trunk/; revision=4405
2005-12-22 07:39:06 +00:00
Eelco Dolstra 94fe7734fa * Glibc 2.3.6.
* GCC 3.4.5.
* Updated several other stdenv packages.
* Modified the builders of several packages to use the generic
  builder.

svn path=/nixpkgs/trunk/; revision=4336
2005-12-06 00:12:45 +00:00
Eelco Dolstra 82e678362f * "." -> "source".
svn path=/nixpkgs/trunk/; revision=4335
2005-12-05 14:11:09 +00:00
Eelco Dolstra b6befed50e * Updated SDL, NASM and Generator to the latest versions.
* Moved Generator to the misc/emulators directory.

svn path=/nixpkgs/trunk/; revision=4330
2005-12-03 01:33:18 +00:00
Armijn Hemel 3f3636a403 we need this patch (the famous "-Dinhibit_libc hack") to get stuff compiled
properly

svn path=/nixpkgs/trunk/; revision=4315
2005-11-28 21:58:24 +00:00
Armijn Hemel 2748236699 add cross compilers for ARM, only able to compile C code
svn path=/nixpkgs/trunk/; revision=4313
2005-11-28 11:20:59 +00:00
Martin Bravenboer 9da2209bf0 Update of strategoxt-utils
svn path=/nixpkgs/trunk/; revision=4236
2005-11-04 19:20:51 +00:00
Martin Bravenboer 50a2b624f7 fix
svn path=/nixpkgs/trunk/; revision=4223
2005-11-04 13:38:29 +00:00
Martin Bravenboer e45e5c724d Upgrade of strategoxt to 0.16
svn path=/nixpkgs/trunk/; revision=4222
2005-11-04 13:34:35 +00:00
Martin Bravenboer 4ba92bbd4e * Added unstable pre release of Stratego/XT 0.16
* Upgraded bibtex-tools to latest unstable release.


svn path=/nixpkgs/trunk/; revision=4176
2005-10-31 14:28:11 +00:00
Martin Bravenboer 2c6d747823 Update to 4.0.2
svn path=/nixpkgs/trunk/; revision=4170
2005-10-30 23:58:42 +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
Eelco Dolstra 45f652ce1b * Pass readline and ncurses to the source-built ghc as well.
svn path=/nixpkgs/trunk/; revision=4013
2005-10-04 20:16:33 +00:00
Eelco Dolstra efdb847441 * Use the new patchelf to build GHC in a fully pure way. Should be
checked on NixOS.

svn path=/nixpkgs/trunk/; revision=3993
2005-10-02 18:48:08 +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
Martin Bravenboer a7eba5ec59 Added the Eclipse JDT SDK
svn path=/nixpkgs/trunk/; revision=3785
2005-09-07 10:08:00 +00:00
Martin Bravenboer 7e75cb7cc4 Added ecj (The Eclipse Compiler for Java) to Nix. This means that Java
5.0 code can now be compiled and run in Nix (the J2RE 5.0 was already
available without deployment problems).

Also, I need ecj to checkout its behaviour and warnings as a second
reference (javac).


svn path=/nixpkgs/trunk/; revision=3783
2005-09-06 00:00:22 +00:00