Commit Graph

239 Commits

Author SHA1 Message Date
Peter Simons
cec39fe1a8 ghc-7.0.2: moved 'homepage' setting into the meta section
svn path=/nixpkgs/trunk/; revision=26514
2011-03-25 12:55:42 +00:00
Peter Simons
b579f4fd5c ghc-7.0.2: fix build on Darwin
There were two problems preventing GHC 7.0.2 from being built on MacOS. For
one, the 'configure' script automatically added the flag

  -isysroot /Developer/SDKs/MacOSX10.5.sdk

to the command-line that's being passed to GCC. This setting doesn't work with
our GCC, and resulted in build errors because standard headers like <stdargs.h>
could no longer be found.

Secondly, the build depends on install_name_tool, which has been added as a
buildInput.

These changes trigger a re-build on all platforms, not just on Darwin. I
realize that this could have been avoided by adding some cruft. However, I
didn't want to add cruft, so there you are.

svn path=/nixpkgs/trunk/; revision=26513
2011-03-25 12:55:37 +00:00
Andres Löh
92db39f586 Added ghc-7.0.2.
This is supposed to become the new default version of GHC once
the new Haskell Platform is released (but only then).

svn path=/nixpkgs/trunk/; revision=26217
2011-03-09 08:29:12 +00:00
Andres Löh
b13e4ebdef Updated ghc HEAD expression to 7.0.2-rc2.
svn path=/nixpkgs/trunk/; revision=26127
2011-03-01 11:56:41 +00:00
Andres Löh
d233819021 Bumped ghc-7.0.1 from rc2 to released version.
svn path=/nixpkgs/trunk/; revision=24770
2010-11-19 13:05:39 +00:00
Andres Löh
6c5c9fc17c Updated GHC 7.0.1 release candidate.
svn path=/nixpkgs/trunk/; revision=24583
2010-11-03 13:52:20 +00:00
Andres Löh
f6e3110b74 Preliminarily added ghc-7.0.1-rc1 and current HEAD.
svn path=/nixpkgs/trunk/; revision=23985
2010-09-28 13:48:22 +00:00
Andres Löh
eb2cb9afd4 Added ghc-6.12.3. Does not build yet for me -- still have to figure out why.
svn path=/nixpkgs/trunk/; revision=22525
2010-07-08 11:43:06 +00:00
Andres Löh
7d2ae46bce Add missing binaries to the GHC wrapper.
svn path=/nixpkgs/trunk/; revision=21434
2010-04-29 17:35:05 +00:00
Andres Löh
8bf3f76256 Let GHC wrapper inherit meta from the wrapped expression.
svn path=/nixpkgs/trunk/; revision=21330
2010-04-26 20:39:51 +00:00
Andres Löh
b48dfda990 Added ghc-6.12.2.
svn path=/nixpkgs/trunk/; revision=21303
2010-04-25 17:27:21 +00:00
Andres Löh
776d8267c6 Added a couple of comments to ghc expression and myself as maintainer,
in preparation for adding ghc-6.12.2 ...

svn path=/nixpkgs/trunk/; revision=21268
2010-04-23 12:38:34 +00:00
Rob Vermaas
9308f0465f set meta.platforms to get rid of hydra evaluation errors (assertions)
svn path=/nixpkgs/trunk/; revision=20300
2010-03-01 12:21:12 +00:00
Lluís Batlle i Rossell
a21df5e172 I'll try to remove the hydra evaluation errors (throws) about ghc bootstrapping.
svn path=/nixpkgs/trunk/; revision=19981
2010-02-13 16:48:12 +00:00
Eelco Dolstra
631ea03875 * Fix / disable some packages that give evaluation errors in Hydra.
svn path=/nixpkgs/trunk/; revision=19833
2010-02-05 14:13:25 +00:00
Marc Weber
2eb0633c5f fix ghc package versions
svn path=/nixpkgs/trunk/; revision=19367
2010-01-12 10:34:14 +00:00
Peter Simons
ad0b6441f8 pkgs/development/compilers/ghc/ghc-get-packages.sh: append global "package.conf" to the list of package config files
The wrapper script for ghc-pkg changes the command's default behavior such that
global packages -- i.e. packages that are part of GHC itself -- are no longer
found:

  $ ghc-pkg describe base
  ghc-pkg: cannot find package base

This patch remedies the problem.

svn path=/nixpkgs/trunk/; revision=19256
2010-01-06 12:55:25 +00:00
Marc Weber
c62430f6a6 ghc version bump to latest stable release 6.12.1
make cabal expression add etxra library paths only if they exist.
Adding myself as maintainer so that the buildfarm builds ghc.

svn path=/nixpkgs/trunk/; revision=19198
2010-01-04 07:44:32 +00:00
Marc Weber
78a1418e6d ghcs: provide list of core packages. Required by solver of thE haskell-nix-overlay
svn path=/nixpkgs/trunk/; revision=18896
2009-12-11 13:58:29 +00:00
Marc Weber
173bdf6d2f fix ghc-get-packages
svn path=/nixpkgs/trunk/; revision=18331
2009-11-12 07:11:03 +00:00
Peter Simons
6b28b25453 ghc-6.10: fix build on Darwin
The initial MacOS X binaries have been linked to libgmp.dylib using some
mad path in /opt that's now hard-coded into the program. Consequently,
$DYLD_LIBRARY_PATH must contain the place where libgmp really is for
those binaries to run correctly. Tested on i386-apple-darwin9.7.0.

svn path=/nixpkgs/trunk/; revision=17873
2009-10-19 09:17:40 +00:00
Andres Löh
947c5029d7 Added ghc-6.12.1 release candidate.
svn path=/nixpkgs/trunk/; revision=17824
2009-10-15 12:49:37 +00:00
Andres Löh
ea843fa435 Added GHC HEAD snapshot.
svn path=/nixpkgs/trunk/; revision=17227
2009-09-17 11:45:20 +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
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
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
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
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
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
Andres Löh
61a000b056 Added ghc-6.10.3.
svn path=/nixpkgs/trunk/; revision=15541
2009-05-10 21:04:58 +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
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
Andres Löh
77d9eec2a1 Changed the bootstrapping version of ghc-6.10.1.
Several binaries (except for ghc itself, for which there was a
workaround) were broken before because they were stripped
during installation. Now, all binaries should work, in particular
ghc-pkg ...

svn path=/nixpkgs/trunk/; revision=13717
2009-01-06 16:29:49 +00:00
Marc Weber
ce242a0bd8 ghc-6.10 binary
svn path=/nixpkgs/trunk/; revision=13345
2008-11-19 21:46:19 +00:00
Eelco Dolstra
aa84bce64d * Get rid of all references to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=13299
2008-11-14 16:57:19 +00:00
Eelco Dolstra
8b458f246f * Fixed ghc-pkg in ghcboot on Darwin (it doesn't like the -framework flag).
This is needed to get haddockboot to build.

svn path=/nixpkgs/trunk/; revision=13031
2008-10-09 16:08:48 +00:00
Marc Weber
5f5fb2ce5d exposing /bin/* as well because of helper applications such as hsc2hs
svn path=/nixpkgs/trunk/; revision=11636
2008-04-15 17:05:28 +00:00
Marc Weber
b40945afba still missing piece
svn path=/nixpkgs/trunk/; revision=11566
2008-04-11 10:25:28 +00:00
Marc Weber
772fd74b99 Updated my ghc stuff.
New is the file containing executables (such as alex/ happy)
some new libraries
The wrapper no longer installs tags by default. You have to add it to your config
So I'm ready to start merging

svn path=/nixpkgs/trunk/; revision=11554
2008-04-11 00:40:10 +00:00
Marc Weber
68e08a006a updated ghc pakcages (now contains gtk2hs and hdbc-postgresql)
introduced .meta.sourceWithTags (insteod of .passthru.sourceWithTags)
hack to get back all tags :-)

svn path=/nixpkgs/trunk/; revision=11092
2008-03-13 09:46:12 +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
Marc Weber
ddda0112e5 renamed bleeding_edge_* and createGhcWrapper -> ghc-wrapper
svn path=/nixpkgs/trunk/; revision=11001
2008-03-06 19:48:55 +00:00
Marc Weber
1b51b70317 - fetchdarcs supports now partial
- fetchdarcs_2pre added
- flapjax added
- no longer used : annotatedDerivations
- added bleeding edge repos with a tiny nix repository manager which dowloads and
  updates repostiries, then creates tar.gz dist files which are used by bleeding_edge_source
  (darcs tested only by now)
- added experimental my_environment with example

svn path=/nixpkgs/trunk/; revision=10974
2008-03-06 02:46:29 +00:00
Eelco Dolstra
59d88c1772 * Revert r10833, it doesn't really work. Instead build ghcboot
with Perl 5.8.

svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10834
2008-02-22 14:43:00 +00:00
Eelco Dolstra
d2d8d83f37 * A clever hack (due to Audrey Tang, see
http://consttype.blogspot.com/2007_07_01_archive.html) around the 
  fact that Perl 5.10 no longer supports the $* variable, which GHC's
  evil mangler requires.

svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10833
2008-02-22 14:09:29 +00:00
Eelco Dolstra
3e72751bd9 * ghcboot was broken: the combination of patchelf and strip -S generates
broken binaries (NIXPKGS-85).  Worked around by not stripping.

svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10831
2008-02-22 12:25:00 +00:00
Marc Weber
260c0c9c96 new version - annotated derivation proposal - used to install addtiontal /src
and /tag/ source code which to build up develop environments more easily ( TODO
make this optional for ghcWrapper )

svn path=/nixpkgs/trunk/; revision=10648
2008-02-12 16:24:02 +00:00
Eelco Dolstra
ab5a39d40b * Doh.
svn path=/nixpkgs/trunk/; revision=9954
2007-12-19 11:19:02 +00:00
Eelco Dolstra
e9536180f1 * Doh.
svn path=/nixpkgs/trunk/; revision=9941
2007-12-14 17:53:38 +00:00
Eelco Dolstra
65c1809b67 * Support for building a bootstrap GHC (ghcboot) on i686-darwin.
Building of the bootstrapped compiler isn't tested yet.

svn path=/nixpkgs/trunk/; revision=9940
2007-12-14 17:51:11 +00:00
Marc Weber
fff1ba967e New proposal on howto library dependencies could be handled.
Just install ghc68_wrapper which will install the required dependencies ghc
(and libraries) itself.
The list libraries given in the wrapper attribute set can be user tuned in the future ?
An alternative would be creating something similar to the gcc/g++ include/ lib/ scheme which
is could be used by ghc to find installed packages..

svn path=/nixpkgs/trunk/; revision=9581
2007-11-05 09:27:36 +00:00
Eelco Dolstra
a0159dee8e * Reverted r6713, r6711, r4623, r3660, r2237. There rewrote fetchurl
URLs to http://nix.cs.uu.nl/dist/tarballs.  With content-addressable
  mirror support (r9190, NIXPKGS-70) this is no longer necessary:
  fetchurl will try to download from that location automatically.  So
  we can keep the original URLs.

svn path=/nixpkgs/trunk/; revision=9192
2007-08-24 12:32:36 +00:00
Andres Löh
920ce3551d * make ghc use the nix-provided gmp
- this fixes ghc on x86_64 and hopefully doesn't break 32-bit
  - ghc-6.6.1 and -6.6 are tested on 64-bit, 6.4.2 might fail

svn path=/nixpkgs/trunk/; revision=9132
2007-08-15 11:25:20 +00:00
Andres Löh
6710a5e02f * make ghcboot work on 64-bit
svn path=/nixpkgs/trunk/; revision=9067
2007-08-07 23:59:08 +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
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
6006d61835 * Added a bunch of descriptions.
svn path=/nixpkgs/trunk/; revision=6705
2006-10-11 16:45:55 +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
2bbb426a7d * GHC 6.4.2.
svn path=/nixpkgs/trunk/; revision=5493
2006-06-22 15:22:55 +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
Eelco Dolstra
3c1c258aa5 * Use PatchELF 0.1.
svn path=/nixpkgs/trunk/; revision=4062
2005-10-11 13:31:33 +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
Eelco Dolstra
454707da23 * catamaran.labs.cs.uu.nl -> nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=3660
2005-08-22 08:39:27 +00:00
Eelco Dolstra
e42507d182 * Move tarballs to catamaran so that we are no longer dependent on a
gazillion different servers.  Resurrected some 25 missing files.

svn path=/nixpkgs/trunk/; revision=2237
2005-02-15 14:44:19 +00:00
Eelco Dolstra
02ec562596 * GHC now works again.
svn path=/nixpkgs/trunk/; revision=925
2004-04-07 14:16:57 +00:00
Eelco Dolstra
12ae5363ea * Remove trivial builders.
* Make builders unexecutable by removing the hash-bang line and
  execute permission.
* Convert calls to `derivation' to `mkDerivation'.
* Remove `system' and `stdenv' attributes from calls to
  `mkDerivation'.  These transformations were all done automatically,
  so it is quite possible I broke stuff.
* Put the `mkDerivation' function in stdenv/generic.

svn path=/nixpkgs/trunk/; revision=874
2004-03-29 17:23:01 +00:00
Eelco Dolstra
191a465665 * Added GHC and Helium. Note that GHC is built using a pre-built GHC
for Linux/x86, which is not pure and doesn't work on other
  platforms!

svn path=/nixpkgs/trunk/; revision=776
2004-02-12 13:18:24 +00:00