JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
42,447 Commits 2 Branches 0 Tags 13 GiB
625d7b9043
Commit Graph

205 Commits

Author SHA1 Message Date
Peter Simons
7848756283 Parallel building is enabled again in GHC 7.6.2, because we hope the issues 
we've had with earlier versions have been remedied. If anyone experiences build
errors with this package, please file issue at Github!
 2013-01-30 17:30:25 +01:00
Peter Simons
75fcdfbb9e ghc-head: update to snapshot version 7.7.20121213 2013-01-30 12:25:38 +01:00
Aristid Breitkreuz
3a68505c6e GHC 7.6.2 2013-01-29 20:42:28 +01:00
Andres Loeh
d068aa9861 Patch ghc-paths to interact better with ghcWithPackages. 
When the ghc-paths library is compiled, the paths of the
compiler it is compiled with are being hardcoded in the
library (and can then be queried from other applications
using the library).

But on Nix, packages are compiled with ghc-wrapper, and
subsequently possibly used with a special version of ghc
generated for a particular environment of packages. So
one version of ghc-paths may potentially end up being
used by lots of different instances of ghc. The hardcoding
approach fails.

As a work-around, we now patch ghc-paths so that it allows
setting the paths that can be queried via environment
variables. Specific GHC environments can then set these
environment variables in the wrapper shell script that
invokes GHC.

This should at least partially solve issue #213.
 2012-12-16 14:25:15 +01:00
Andres Loeh
8c4f5d02aa Updating ghc HEAD snapshot. 2012-11-07 14:45:32 +01:00
Peter Simons
b1169e5509 ghc-*-binary: remove redundant assertion 
Any attempt to instantiate these expressions on an unsupported platform is
going to 'throw' an error. The call to 'assert' doesn't add any value to
that (and generates less readable error messages, too). Further details are
available at <https://github.com/NixOS/nix/issues/56>.
 2012-10-12 15:23:05 +02:00
Peter Simons
3a34ac175f pkgs/development/compilers/ghc/with-packages.nix: include bash completion files in the generated environment 2012-09-25 15:05:49 +02:00
Peter Simons
33e67e8394 ghc-head: update to version 7.7.20120912 2012-09-13 15:50:15 +02:00
Peter Simons
52454d7593 ghc-7.4.2: add binary snapshot required for bootstrapping ghc 7.7.x 2012-09-13 15:49:42 +02:00
Peter Simons
eb288cf12e ghc-wrapper: choose '-package-conf' or '-package-db' flag depending on the version of GHC that's being wrapped 2012-09-13 15:13:00 +02:00
Peter Simons
13be1ff86e ghc-wrapper.nix: cosmetic 2012-09-13 15:12:43 +02:00
Peter Simons
15df3d131a ghc-7.6.1: parallel builds of this package fail 
I got the following error in 4 consecutive attempts:

  building rts/dist/build/AutoApply.debug_o
  building rts/dist/build/AutoApply.thr_o
    rts_dist_HC rts/dist/build/AutoApply.debug_o
  /nix/store/1iigiim5855m8j7pmwf5xrnpf705s4dh-binutils-2.21.1a/bin/ld: cannot find libraries/integer-gmp/dist-install/build/cbits/gmp-wrappers_o_split/gmp-wrappers__1.o
  collect2: ld returned 1 exit status
  make[1]: *** [libraries/integer-gmp/dist-install/build/cbits/gmp-wrappers.p_o] Error 1
 2012-09-10 12:28:25 +02:00
Peter Simons
64c0d7a490 ghc: bump 7.6.1-rc1 to version 7.6.1 2012-09-10 11:30:12 +02:00
Andres Loeh
e093d7ea38 ghc-7.6.1-rc1: Add release candidate. 2012-08-13 16:29:01 +02:00
Andres Loeh
83505f15b2 ghc-head: bump snapshot version 2012-07-18 11:02:00 +02:00
Andres Loeh
945a3480d4 ghc-HEAD: update to a new snapshot 2012-07-11 20:04:15 +02:00
Peter Simons
09321105f1 ghc: added version 7.4.2 
svn path=/nixpkgs/trunk/; revision=34460
 2012-06-11 16:25:45 +00:00
Andres Löh
789df7619e Updated GHC HEAD snapshot. 
svn path=/nixpkgs/trunk/; revision=34379
 2012-06-08 08:25:30 +00:00
Andres Löh
e5e2432277 Upgrade ghc stable snapshot to 7.4.2rc1. 
svn path=/nixpkgs/trunk/; revision=34137
 2012-05-16 12:00:05 +00:00
Ludovic Courtès
d44d30b0ba GHC 7.4.2: Remove `darwinInstallNameToolUtility'. 
svn path=/nixpkgs/trunk/; revision=33897
 2012-04-23 16:28:10 +00:00
Ludovic Courtès
04600bbec1 Darwin: Add mig', lipo', etc. to `stdenvNative'. 
Consequently, remove `darwinLipoUtility', `darwinArchUtility', etc.

svn path=/nixpkgs/trunk/; revision=33893
 2012-04-23 15:47:31 +00:00
Andres Löh
1a355ca2ea Updated the GHC HEAD snapshot. 
svn path=/nixpkgs/trunk/; revision=33879
 2012-04-22 16:31:21 +00:00
Peter Simons
f412a1fbe7 development/compilers/ghc/head.nix: fixed sha256 hash 
svn path=/nixpkgs/trunk/; revision=33863
 2012-04-20 20:17:07 +00:00
Andres Löh
8915da0a6b New GHC snapshots. 
svn path=/nixpkgs/trunk/; revision=33858
 2012-04-20 12:22:23 +00:00
Peter Simons
3fbeca3ebc pkgs/development/compilers/ghc/wrapper.nix: removed extraneous closing bracket that broke the script 
svn path=/nixpkgs/trunk/; revision=33371
 2012-03-23 11:26:28 +00:00
Shea Levy
6aa06a6699 ghc-packages: Darwin's native readlink doesn't support -f 
svn path=/nixpkgs/trunk/; revision=33366
 2012-03-23 03:01:58 +00:00
Peter Simons
115b3d943a pkgs/development/compilers/ghc/with-packages.nix: renamed this expression from "ghc-${ghc.version}-linkdir" to "haskell-env-${ghc.name}" 
This change allows use of the with-packages wrapper in user profiles that are
being updated with "nix-env -u \*". The previous name this expression generated
was considered by Nix to be an older version of "ghc-7.0.4-wrapper", because
that name has a higher priority.

svn path=/nixpkgs/trunk/; revision=33325
 2012-03-21 11:46:15 +00:00
Peter Simons
d8e65ee71d pkgs/development/compilers/ghc/with-packages.nix: trivial changes to fix syntax highlighting in Emacs 
svn path=/nixpkgs/trunk/; revision=33324
 2012-03-21 11:46:12 +00:00
Andres Löh
ec99325d80 Explicitly set platforms for 7.4.1 rather than inheriting them. 
I hope this will enable darwin builds for 7.4.1 on Hydra.

svn path=/nixpkgs/trunk/; revision=32903
 2012-03-08 16:22:01 +00:00
Yury G. Kudryashov
215a07c1a9 svn merge ^/nixpkgs/trunk 
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)

The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
 2012-02-06 23:03:12 +00:00
Andres Löh
b66db5ca13 Add ghc-7.4.1. Remove Hydra building for the 7.2.* series. 
svn path=/nixpkgs/trunk/; revision=31989
 2012-02-02 21:08:30 +00:00
Andres Löh
a819ccf030 Updated GHC snapshot to ghc-7.4.1-rc2. 
svn path=/nixpkgs/trunk/; revision=31910
 2012-01-28 15:34:53 +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
Andres Löh
8af094c99f Updated ghc HEAD snapshot to ghc-7.4.1-rc1. 
svn path=/nixpkgs/trunk/; revision=31066
 2011-12-25 00:12:52 +00:00
Andres Löh
c11749dcd6 Updated the GHC HEAD snapshot. 
svn path=/nixpkgs/trunk/; revision=30937
 2011-12-16 18:11:23 +00:00
Andres Löh
64c0b00bbd Linking the complete topdir of GHC in ghc-with-packages. 
svn path=/nixpkgs/trunk/; revision=30826
 2011-12-11 17:19:36 +00:00
Andres Löh
de5d98eff8 Prevent link collisions by linking only Haskell packages. 
svn path=/nixpkgs/trunk/; revision=30727
 2011-12-04 17:45:12 +00:00
Andres Löh
f237a3a418 Extended ghcWithPackages to link binaries. 
svn path=/nixpkgs/trunk/; revision=30726
 2011-12-04 16:07:39 +00:00
Andres Löh
ecf037f2f7 Added a wrapper function to produce a GHC with a predefined set of packages. 
svn path=/nixpkgs/trunk/; revision=30716
 2011-12-03 16:19:43 +00:00
Peter Simons
66bd9580f0 Added GHC 7.2.2. 
svn path=/nixpkgs/trunk/; revision=30398
 2011-11-12 22:19:03 +00:00
Andres Löh
829a5e3209 Bump GHC HEAD snapshot. 
svn path=/nixpkgs/trunk/; revision=29164
 2011-09-11 09:14:22 +00:00
Andres Löh
51124b08b5 Bumping the GHC HEAD snapshot. 
svn path=/nixpkgs/trunk/; revision=29026
 2011-09-05 13:29:33 +00:00
Peter Simons
feff68214e pkgs/development/compilers/ghc/7.0.4.nix: hard-code list of supported platforms 
I assumed that Hydra would arrive at that result anyway, but apparently
it doesn't: no x86_64-darwin builds have occurred despite the fact that
we can bootstrap on that architecture now.

svn path=/nixpkgs/trunk/; revision=28882
 2011-08-29 20:09:57 +00:00
Shea Levy
3fe371b856 ghc/7.0.4-binary.nix: Remove comments about wrapper scripts 
svn path=/nixpkgs/trunk/; revision=28869
 2011-08-29 08:09:27 +00:00
Shea Levy
9381f1a419 ghc-7.0.4-binary.nix: don't wrap the binaries on darwin 
ghc-7.0.4 fails at configure with the wrapped binaries and builds fine with the unwrapped binaries.

svn path=/nixpkgs/trunk/; revision=28868
 2011-08-29 08:00:55 +00:00
Peter Simons
f990dd30f7 pkgs/development/compilers/ghc/7.0.4-binary.nix: added (untested) support for i686-darwin 
svn path=/nixpkgs/trunk/; revision=28866
 2011-08-29 07:49:35 +00:00
Peter Simons
8286d30453 pkgs/development/compilers/ghc/7.0.4.nix: add myself as a maintainer 
svn path=/nixpkgs/trunk/; revision=28863
 2011-08-29 07:39:29 +00:00
Peter Simons
33597eee35 pkgs/development/compilers/ghc/7.0.4-binary.nix: pass "$@" in double quotes to avoid issues with arguments that contain whitespace 
svn path=/nixpkgs/trunk/; revision=28861
 2011-08-29 07:32:37 +00:00
Peter Simons
e9c8a9307b pkgs/development/compilers/ghc/7.0.4-binary.nix: support linux, too 
svn path=/nixpkgs/trunk/; revision=28860
 2011-08-29 07:25:56 +00:00
Shea Levy
346481f483 Add GHC 7.0.4 binary for x86_64-darwin 
svn path=/nixpkgs/trunk/; revision=28859
 2011-08-29 01:20:12 +00:00
Peter Simons
c6f12a23e6 pkgs/development/compilers/ghc/wrapper.nix: stripped trailing whitespace 
svn path=/nixpkgs/trunk/; revision=28609
 2011-08-16 13:03:38 +00:00
Peter Simons
611501c349 pkgs/development/compilers/ghc/7.2.1.nix: updated to the final release version 
svn path=/nixpkgs/trunk/; revision=28463
 2011-08-10 16:55:54 +00:00
Peter Simons
9502aedde3 pkgs/development/compilers/ghc/6.10.2-binary.nix: we have no binary for Darwin 
svn path=/nixpkgs/trunk/; revision=28414
 2011-08-09 08:17:39 +00:00
Peter Simons
d3df8772c1 pkgs/development/compilers/ghc: changed all GHC versions to use re-use the meta.platforms attribute of their bootstrap compiler 
svn path=/nixpkgs/trunk/; revision=28409
 2011-08-09 07:42:05 +00:00
Peter Simons
0be3dae42f pkgs/development/compilers/ghc/*-binary.nix: added a meta.platforms attribute to all ghc bootstrap versions 
svn path=/nixpkgs/trunk/; revision=28408
 2011-08-09 07:41:10 +00:00
Peter Simons
98b321e99b pkgs/development/compilers/ghc: strip trailing whitespace 
svn path=/nixpkgs/trunk/; revision=28402
 2011-08-08 19:47:31 +00:00
Peter Simons
e2cfe51f21 pkgs/development/compilers/ghc: move the homepage attribute into the meta section 
svn path=/nixpkgs/trunk/; revision=28401
 2011-08-08 19:47:21 +00:00
Andres Löh
1e5a711f96 Updating ghc-7.2.1 to rc2. 
svn path=/nixpkgs/trunk/; revision=28185
 2011-08-05 22:11:30 +00:00
Andres Löh
25e212ac0e Bumping the GHC HEAD snapshot. 
svn path=/nixpkgs/trunk/; revision=28166
 2011-08-05 13:30:42 +00:00
Andres Löh
7f71e44d8e Fix sha256 sums for ghc-6.12.1 binaries. 
svn path=/nixpkgs/trunk/; revision=28165
 2011-08-05 11:03:16 +00:00
Andres Löh
8fdb3c9e63 Make ghc-7.0.4 the default. Add experimental ghc-7.2.1rc1. 
svn path=/nixpkgs/trunk/; revision=28163
 2011-08-05 08:52:35 +00:00
Peter Simons
66dbd40cb7 ghc: build GHC on haskellPlatforms instead of linux++darwin to avoid evaluation errors on Hydra because x86_64-darwin is unsupported 
svn path=/nixpkgs/trunk/; revision=27799
 2011-07-15 12:53:21 +00:00
Peter Simons
78ccc14e3e ghc-6.10.1-binary: revert blind attempt to bootstrap GHC on x86_64-darwin with the i686 version of this compiler 
Hydra says that we can *not* use the i686 compiler to bootstrap x86_64 on Darwin. Duh.

svn path=/nixpkgs/trunk/; revision=27753
 2011-07-13 12:00:19 +00:00
Peter Simons
ce11df9d80 ghc-6.10.1-binary: blind attempt to bootstrap GHC on x86_64-darwin with the i686 version of this compiler 
I have no idea whether that's going to work, and I can't test it for
lack of access to a MacOS X machine, but think chances are pretty good
that this is going to succeed.

svn path=/nixpkgs/trunk/; revision=27751
 2011-07-13 11:09:06 +00:00
Andres Löh
a1cd10cfe2 Adding ghc-7.0.4. 
svn path=/nixpkgs/trunk/; revision=27492
 2011-06-18 12:31:16 +00:00
Andres Löh
f9c356ad17 Adding ghc-7.0.3. 
svn path=/nixpkgs/trunk/; revision=26588
 2011-03-28 21:33:21 +00:00
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