Commit graph

554 commits

Author SHA1 Message Date
Ludovic Courtès
89fa345b84 GCC 4.4: Make sure $PWD is not in $CPATH and $LIBRARY_PATH.
svn path=/nixpkgs/trunk/; revision=16520
2009-07-30 12:25:07 +00:00
Ludovic Courtès
33c6204f95 GCC 4.4: Don't expect zlib when `langJava' is false.
svn path=/nixpkgs/trunk/; revision=16518
2009-07-30 10:31:04 +00:00
Ludovic Courtès
0b46ac126b GCJ 4.4: More X dependencies.
svn path=/nixpkgs/trunk/; revision=16516
2009-07-30 08:32:43 +00:00
Ludovic Courtès
2e8e54fbbc GCJ 4.4: More X dependencies.
svn path=/nixpkgs/trunk/; revision=16513
2009-07-29 22:55:16 +00:00
Ludovic Courtès
a2e9613540 GCJ 4.4: More X dependencies (soon it will be all over, well I hope soon).
svn path=/nixpkgs/trunk/; revision=16512
2009-07-29 20:47:12 +00:00
Ludovic Courtès
6e75b20d46 GCJ 4.4: More X dependencies (it's never enough).
svn path=/nixpkgs/trunk/; revision=16510
2009-07-29 19:33:45 +00:00
Ludovic Courtès
cf229e4156 GCJ 4.4: More X dependencies.
svn path=/nixpkgs/trunk/; revision=16503
2009-07-29 16:18:31 +00:00
Ludovic Courtès
9ddd85f356 GCJ 4.4: Add libXrender; work around glitches in the Java/AWT build system.
svn path=/nixpkgs/trunk/; revision=16502
2009-07-29 15:13:01 +00:00
Ludovic Courtès
be4437bed0 GCJ 4.4: Provide xproto; move CPATH/LIBRARY_PATH compuation to `default.nix'.
svn path=/nixpkgs/trunk/; revision=16501
2009-07-29 13:57:11 +00:00
Ludovic Courtès
0b235f3ec5 GCJ 4.4: Tell GCC about the path to the X libs.
svn path=/nixpkgs/trunk/; revision=16500
2009-07-29 08:48:09 +00:00
Ludovic Courtès
a63eefa27f GCJ 4.4: Require some more X libraries.
svn path=/nixpkgs/trunk/; revision=16493
2009-07-28 17:49:47 +00:00
Ludovic Courtès
992045830e GCJ 4.4: Require various X libraries.
svn path=/nixpkgs/trunk/; revision=16492
2009-07-28 12:02:51 +00:00
Ludovic Courtès
86ad964255 GCJ 4.4: Require libXtst.
svn path=/nixpkgs/trunk/; revision=16491
2009-07-28 10:29:18 +00:00
Ludovic Courtès
a5a5cbe93d GCJ 4.4: Require libart.
svn path=/nixpkgs/trunk/; revision=16490
2009-07-28 09:23:40 +00:00
Ludovic Courtès
1228ff02b7 GCC 4.4: Improve `meta'.
svn path=/nixpkgs/trunk/; revision=16489
2009-07-28 08:44:41 +00:00
Ludovic Courtès
f9f44ed564 GCJ 4.4: Build the GTK+ AWT peer.
svn path=/nixpkgs/trunk/; revision=16487
2009-07-28 08:11:10 +00:00
Ludovic Courtès
032c603c8b GCJ 4.4: Try to avoid FastJar since it appears to be broken.
svn path=/nixpkgs/trunk/; revision=16486
2009-07-27 23:09:04 +00:00
Marc Weber
58239ae82a ghc: add ghc-packages returning list of package databases so that you
can define GHC_PACKAGE_PATH=`ghc-packgaes` easily. Required for scion

svn path=/nixpkgs/trunk/; revision=16481
2009-07-27 16:05:44 +00:00
Marc Weber
e932a5c6d6 jdk 1.5.0_19
svn path=/nixpkgs/trunk/; revision=16476
2009-07-27 16:05:20 +00:00
Ludovic Courtès
35b5686ad4 GCJ 4.4: Provide InfoZIP; remove FastJar hack; don't build C; provide which(1).
svn path=/nixpkgs/trunk/; revision=16475
2009-07-27 15:40:01 +00:00
Ludovic Courtès
7583ac7638 GCJ 4.4: Don't build the `configure-gcc' target; use FastJar; make zlib/BDW-GC visible.
Building the `configure-gcc' target early on (in `preConfigure') was a big mistake as
the build woud just go haywire after that (e.g., trying and failing to build `jvgenmain'
in stage 1).


svn path=/nixpkgs/trunk/; revision=16472
2009-07-27 13:50:19 +00:00
Ludovic Courtès
8feb395f42 GCJ 4.4: Depend on FastJar, needed during the bootstrap phase.
svn path=/nixpkgs/trunk/; revision=16470
2009-07-27 10:46:23 +00:00
Ludovic Courtès
292a191f70 GCC 4.4: Fewer $NIX_ variables.
svn path=/nixpkgs/trunk/; revision=16458
2009-07-24 21:56:58 +00:00
Ludovic Courtès
fc6b794f33 GCC 4.4.1.
svn path=/nixpkgs/trunk/; revision=16454
2009-07-24 13:34:57 +00:00
Rob Vermaas
b05906055a * gcc-apple fixes for darwin
svn path=/nixpkgs/trunk/; revision=16452
2009-07-24 12:28:39 +00:00
Rob Vermaas
ab9eca5868 removed debug stuff
svn path=/nixpkgs/trunk/; revision=16444
2009-07-23 20:49:38 +00:00
Rob Vermaas
ded5f74bc4 svn path=/nixpkgs/trunk/; revision=16443 2009-07-23 19:32:53 +00:00
Rob Vermaas
ac67112c3f * first try to fix darwin gcc +libstdcxx
svn path=/nixpkgs/trunk/; revision=16441
2009-07-23 19:13:34 +00:00
Ludovic Courtès
279a94a637 GCJ 4.4: Pass ecj.jar' using --with-ecj-jar'.
svn path=/nixpkgs/trunk/; revision=16434
2009-07-20 15:34:10 +00:00
Andres Löh
8c6bef0bb0 Version bump to ghc-6.10.4.
svn path=/nixpkgs/trunk/; revision=16430
2009-07-20 13:02:56 +00:00
Ludovic Courtès
34bd10567b GCC 4.4: Enable Graphite by building against PPL and GLooG.
svn path=/nixpkgs/trunk/; revision=16424
2009-07-18 21:37:23 +00:00
Ludovic Courtès
161c18b075 GCC 4.4: Use GCC documented variables instead of $NIX_EXTRA_CFLAGS and $NIX_EXTRA_LDFLAGS.
svn path=/nixpkgs/trunk/; revision=16418
2009-07-18 12:37:48 +00:00
Ludovic Courtès
8cbb8848a9 GCJ 4.4: Move ecj.jar' out of the src' attribute.
svn path=/nixpkgs/trunk/; revision=16417
2009-07-17 18:06:28 +00:00
Ludovic Courtès
1dfef78633 GCJ 4.4: Provide `ecj.jar' (Eclipse Java Compiler).
svn path=/nixpkgs/trunk/; revision=16416
2009-07-17 17:20:07 +00:00
Ludovic Courtès
deb63071d7 GCC 4.4: Don't use the included Gettext.
svn path=/nixpkgs/trunk/; revision=16415
2009-07-17 16:14:28 +00:00
Marc Weber
eccd5d5a41 ghc-get-packages.sh no array at all: roughly 20% faster
svn path=/nixpkgs/trunk/; revision=16399
2009-07-16 15:18:21 +00:00
Michael Raskin
81d09cd1f3 Use GTK2 for Lazarus and get Unicode support
svn path=/nixpkgs/trunk/; revision=16363
2009-07-14 20:31:11 +00:00
Michael Raskin
cf03c27fb7 Update FPC and Lazarus
svn path=/nixpkgs/trunk/; revision=16343
2009-07-14 09:08:05 +00:00
Andres Löh
059b912b27 Efficiency fix for ghc-get-packages script.
svn path=/nixpkgs/trunk/; revision=16326
2009-07-10 19:36:50 +00:00
Peter Simons
356791ea62 The ghc binary distribution contains a 'pwd' binary that's broken on systems running a Red Hat kernel and causes the build to fail. To remedy that problem, we replace that binary with Nix's 'pwd' program before running configure.
Unfortunately, the same problem occurs again with 'installPackage', so as of
now, GHC cannot be installed on Red Hat.

svn path=/nixpkgs/trunk/; revision=16314
2009-07-10 12:26:18 +00:00
Rob Vermaas
22557d5e1f update mono to 2.4.2.1
svn path=/nixpkgs/trunk/; revision=16311
2009-07-10 11:49:32 +00:00
Rob Vermaas
471518d65b typo
svn path=/nixpkgs/trunk/; revision=16302
2009-07-10 08:40:04 +00:00
Rob Vermaas
297f0127aa java-front 0.9, compile with -O2 for cygwin
svn path=/nixpkgs/trunk/; revision=16301
2009-07-10 08:05:23 +00:00
Rob Vermaas
99afadc21f java-front 0.9
svn path=/nixpkgs/trunk/; revision=16300
2009-07-10 07:57:26 +00:00
Marc Weber
25a1533d9a removing old haskell stuff. I was using my own branch for a long time.
It will be replaced by something else anyway.
Some of those patches may still be of interest (?)

svn path=/nixpkgs/trunk/; revision=16298
2009-07-09 22:24:08 +00:00
Rob Vermaas
ccc059b201 * changed stacksize for sdf2-bundle on cygwin
svn path=/nixpkgs/trunk/; revision=16277
2009-07-09 14:15:36 +00:00
Michael Raskin
dd89941fb2 Added myself as the maintainer of some packages
svn path=/nixpkgs/trunk/; revision=16221
2009-07-07 15:05:15 +00:00
Michael Raskin
b02a08a022 SBCL now works fine. added hacks and workarounds for store mono-timestamp handling
svn path=/nixpkgs/trunk/; revision=16219
2009-07-07 14:50:37 +00:00
Rob Vermaas
0aeeaafa55 * going even further back for gcc darwin
svn path=/nixpkgs/trunk/; revision=16189
2009-07-06 12:00:06 +00:00
Rob Vermaas
a30efafa57 * back to old gcc version for darwin, will make new version in different tree
svn path=/nixpkgs/trunk/; revision=16182
2009-07-06 07:39:38 +00:00
Ludovic Courtès
63393ce174 GCC 4.4.0: Fix compilation (for C and C++, at least).
svn path=/nixpkgs/trunk/; revision=16177
2009-07-05 14:15:44 +00:00
Ludovic Courtès
85d950b8fb Add GCC 4.4.0 (and hope for the best).
svn path=/nixpkgs/trunk/; revision=16168
2009-07-03 18:54:28 +00:00
Ludovic Courtès
5ed15d55ba GCJ 4.3: Fix the Java patch.
svn path=/nixpkgs/trunk/; revision=16164
2009-07-03 14:13:58 +00:00
Ludovic Courtès
5964e20243 GCJ 4.3: Try to incrementally fix things.
svn path=/nixpkgs/trunk/; revision=16163
2009-07-03 13:30:25 +00:00
Rob Vermaas
7d5a3a1933 * strategoxt-0.17
svn path=/nixpkgs/trunk/; revision=16154
2009-07-03 05:01:04 +00:00
Rob Vermaas
d2419bccee * bumped gcc 4.2.1 build 5531 for apple again
svn path=/nixpkgs/trunk/; revision=16092
2009-06-30 09:24:53 +00:00
Marc Weber
6bc07c8e68 fix my wrong opplication of the patch
svn path=/nixpkgs/trunk/; revision=16062
2009-06-26 17:00:02 +00:00
Marc Weber
f316832e3a update default ocmal to 3.11.1. patch provided by olegfink
svn path=/nixpkgs/trunk/; revision=16061
2009-06-26 16:53:02 +00:00
Rob Vermaas
1c3f49e06f * Changed version of gcc to 4.0.1 - 5484 on darwin
* Added dsymutil to gcc wrapper env on darwin
 * turned off make check for gnugrep on darwin
 * added --enable-bsd=libs configure flag for gnugrep on darwin 


svn path=/nixpkgs/trunk/; revision=16014
2009-06-21 18:37:54 +00:00
Rob Vermaas
ee88032be9 * bumped gcc to 4.2.1 build 5531 on darwin
svn path=/nixpkgs/trunk/; revision=15920
2009-06-10 11:08:57 +00:00
Michael Raskin
e9eea90443 Compile SBCL with sb-thread enabled..
svn path=/nixpkgs/trunk/; revision=15835
2009-06-03 07:07:01 +00:00
Michael Raskin
526f6f63c7 Updating CLisp and adding SBCL. SBCL currently has to be symlinked to a writable directory (I am investigating a fix). CLisp 2.47 is somewhat incompatible with lots of software, so I added 2.44.1 as preserved version
svn path=/nixpkgs/trunk/; revision=15806
2009-05-31 06:07:25 +00:00
Andres Löh
2c096bf75f Fix the ghc-wrapper in order to enable runghc/runhaskell.
svn path=/nixpkgs/trunk/; revision=15774
2009-05-28 19:06:29 +00:00
Marc Weber
52647ea3b0 FullDepEntry -> fullDepEntry, PackEntry -> packEntry
svn path=/nixpkgs/trunk/; revision=15662
2009-05-19 23:25:58 +00:00
Eelco Dolstra
6b611bc0f1 svn path=/nixpkgs/trunk/; revision=15605 2009-05-14 14:43:50 +00:00
Eelco Dolstra
120a82d7b9 * NASM: updated to the latest version.
* eduke: needs NASM on i686-linux.

svn path=/nixpkgs/trunk/; revision=15604
2009-05-14 14:42:20 +00:00
Andres Löh
677f91a6d1 Added Idris and updated fetchdarcs.
svn path=/nixpkgs/trunk/; revision=15595
2009-05-13 19:02:23 +00:00
Andres Löh
61a000b056 Added ghc-6.10.3.
svn path=/nixpkgs/trunk/; revision=15541
2009-05-10 21:04:58 +00:00
Michael Raskin
2a82c141ec An attempt to add gcj-4.3. It fails not finding some GC-related symbols. I failed to understand the reason - for now
svn path=/nixpkgs/trunk/; revision=15523
2009-05-10 09:11:41 +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
Eelco Dolstra
210ba6316e * Urgh. Some files that had been deleted in the trunk came back
through the stdenv-updates merge (probably because they had been
  modified in the branch).

svn path=/nixpkgs/trunk/; revision=15403
2009-04-29 16:19:57 +00:00
Eelco Dolstra
5a2284ac61 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15313
2009-04-25 22:45:32 +00:00
Andres Löh
66f3af0bdd ghc-wrapper now detects installed pkgs automatically.
svn path=/nixpkgs/trunk/; revision=15301
2009-04-25 14:23:00 +00:00
Eelco Dolstra
7689a348c4 * Got rid of a lot of "postInstall=postInstall" and similar lines in
builders.  These are redundant now.
* Inlined some trivial builders.
* Removed a few explicit setup-hook creations.  This is done
  automatically now if setupHook is set.
* Deleted the initscripts package.  NixOS doesn't use it anymore.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15276
2009-04-23 13:31:10 +00:00
Eelco Dolstra
f762b50991 * Another sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15269
2009-04-23 11:59:43 +00:00
Eelco Dolstra
94d7d1fdbb * Got rid of all --disable-static flags; they're redundant now.
* Also a bunch of style cleanups (tabs, with args, ...).

svn path=/nixpkgs/branches/stdenv-updates/; revision=15235
2009-04-21 23:18:09 +00:00
Rob Vermaas
a00ef2d247 updated strategoxt 0.17pre to bootstrap build
svn path=/nixpkgs/trunk/; revision=15188
2009-04-20 14:49:51 +00:00
Eelco Dolstra
35e42d3e5c * Fix missing description errors.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15157
2009-04-19 16:00:46 +00:00
Eelco Dolstra
5cfba3ac68 * Added GHC 6.10.1.
svn path=/nixpkgs/trunk/; revision=15147
2009-04-19 11:43:38 +00:00
Eelco Dolstra
1c1967a9a1 * Call the wrapper "ghc-wrapper".
svn path=/nixpkgs/trunk/; revision=15143
2009-04-19 10:26:45 +00:00
Andres Löh
1643888f80 Added cabalized darcs-2 and associated Haskell libs.
svn path=/nixpkgs/trunk/; revision=15141
2009-04-19 10:07:41 +00:00
Eelco Dolstra
ffcd38403e * Install the package config files under
$out/lib/ghc-pkgs/ghc-<version>/<package>.conf instead of under
  $out/nix-support/ghc-package.conf.  This makes them visible in the
  user's profile when installed with nix-env.

svn path=/nixpkgs/trunk/; revision=15135
2009-04-18 20:24:36 +00:00
Eelco Dolstra
4ce5419f17 * Remove bad backslashes.
svn path=/nixpkgs/trunk/; revision=15134
2009-04-18 20:22:47 +00:00
Eelco Dolstra
ca8b45d441 * Cabal builder: put the GHC version in the default name attribute to
disambiguate between package instances built with different GHCs.

svn path=/nixpkgs/trunk/; revision=15132
2009-04-18 16:21:59 +00:00
Eelco Dolstra
baad5d7cb4 * GHC setup hook: don't generate wrappers around ghc etc., instead
set GHC_PACKAGE_PATH.
* Let Cabal generate a package configuration file
  ($out/nix-support/ghc-package.conf) instead of a registration
  script.

svn path=/nixpkgs/trunk/; revision=15127
2009-04-18 15:23:00 +00:00
Eelco Dolstra
cee387e845 * Move the composition of Haskell packages out of all-packages.nix
into haskell-packages.nix, which depends on an instance of GHC.
  This allows a consistent set of packages to be built with the same
  GHC.  For instance,

  $ nix-build -A haskellPackages_ghc683.xmonad

  builds xmonad and all its dependencies with GHC 6.8.3, while

  $ nix-build -A haskellPackages_ghc6102.xmonad

  does the same with GHC 6.10.2.  This is the same technique used with
  kernelPackages.  It also means that we don't need things like
  "cabal682" and "cabal683" anymore.

* The setup hook is now in a separate wrapper package so that we don't
  have to recompile all of GHC every time we want to make a small
  change.

* cinelerra: this package appears to have an accidental dependency on
  the "X11" Haskell package.

svn path=/nixpkgs/trunk/; revision=15125
2009-04-18 12:47:11 +00:00
Eelco Dolstra
95a472cd55 * Doh.
svn path=/nixpkgs/trunk/; revision=15121
2009-04-17 19:46:28 +00:00
Eelco Dolstra
6f2da398be * Revert to GHC 6.10.1 binary for bootstrapping GHC 6.10.2 at Andres'
suggestion.  It's good to use an older GHC for bootstrapping because
  old versions can build newer versions but not vice versa.

svn path=/nixpkgs/trunk/; revision=15120
2009-04-17 19:43:05 +00:00
Eelco Dolstra
ad07109bba * Added GHC 6.10.2.
svn path=/nixpkgs/trunk/; revision=15106
2009-04-16 22:00:41 +00:00
Eelco Dolstra
dae40d9c62 * GHC apparently works with Perl 5.10 now.
svn path=/nixpkgs/trunk/; revision=15101
2009-04-16 19:59:41 +00:00
Eelco Dolstra
902cf75ca6 * The wrapper to set LDPATH to $gmp/lib no longer seems necessary (but
the package.conf fixup is).

svn path=/nixpkgs/trunk/; revision=15100
2009-04-16 19:48:11 +00:00
Eelco Dolstra
7bb9c71aee * Doh.
svn path=/nixpkgs/trunk/; revision=15096
2009-04-16 19:27:14 +00:00
Eelco Dolstra
79cb8d11a6 * editline: renamed to libedit (which seems to be the proper name for
the package).
* Removed the old ghc-wrapper, which hasn't been used for a long time.
* Renamed the "boot" GHC to "binary", which is more descriptive.
  (They *can* be used for other things than bootstrapping a GHC
  source build.)
* Updated the GHC 6.10.1 binary to 6.10.2.

svn path=/nixpkgs/trunk/; revision=15095
2009-04-16 19:25:22 +00:00
Eelco Dolstra
d182df5526 * Disable the GHC setup hook. It's kind of annoying to have to
rebuild all of GHC every time the setup hook changes.  Thus its
  better to factor it out.  (After all, the setup hook doesn't have to
  be provided by the GHC package proper; it can also be provided by
  some helper package.)

svn path=/nixpkgs/trunk/; revision=15094
2009-04-16 18:38:41 +00:00
Eelco Dolstra
405f746280 * More GHC cleanup.
svn path=/nixpkgs/trunk/; revision=15093
2009-04-16 18:21:03 +00:00
Eelco Dolstra
27855da0d9 * Put all the GHCs in one directory.
svn path=/nixpkgs/trunk/; revision=15092
2009-04-16 18:12:59 +00:00
Eelco Dolstra
49e5575268 * Started cleaning up the GHC support.
svn path=/nixpkgs/trunk/; revision=15091
2009-04-16 18:08:09 +00:00
Lluís Batlle i Rossell
3569572ce4 Fixing the name of iasl.
svn path=/nixpkgs/trunk/; revision=15072
2009-04-16 07:19:31 +00:00
Eelco Dolstra
a4c304ef84 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15065
2009-04-15 13:25:01 +00:00
Sander van der Burg
96010823a7 Stole a patch from the cross-lfs project in order to compile dev86 on x86-64 linux
svn path=/nixpkgs/trunk/; revision=15056
2009-04-15 09:36:17 +00:00