Commit Graph

183 Commits

Author SHA1 Message Date
Peter Simons
fae8fd8ef1 ghc-wrapper: rename 'ghcVersion' attribute to 'version' for consistency 2013-10-20 15:40:36 +02:00
Peter Simons
e9163ad4c9 ghc: configure RPATH that allows ghc's shared libraries to find each other
Prior to this patch, libHSrts.so didn't know how to load libffi.so.
See issue #1081 for further details.
2013-10-18 18:39:04 +02:00
Peter Simons
f998111d2c ghc-7.6.3: undo commit 7c8ba75
The change was supposed to trigger a re-build to fix a broken GHC binary
on the Hydra build farm, but now it turns out that the cause for the
errors we're seeing isn't GHC: all kinds of (non-Haskell) packages are
broken.
2013-09-21 09:51:35 +02:00
Peter Simons
7c8ba7557c ghc-7.6.3: cosmetic change to force a re-build 2013-09-20 19:27:22 +02:00
Peter Simons
0d7118814b Merge branch 'origin/master' into stdenv. 2013-08-17 10:00:16 +02:00
Peter Simons
898348a80d ghc-head: update to version 7.7.20130816 2013-08-16 23:47:59 +02:00
Peter Simons
76244ac2e2 Merge branch 'master' into stdenv-updates
Conflicts:
	pkgs/development/compilers/ghc/with-packages.nix
2013-08-16 22:51:13 +02:00
Peter Simons
bb312b77b5 ghc-head: update to version 7.7.20130811 2013-08-11 23:50:05 +02:00
Gergely Risko
de35a6dbb9 Export ghci config files for ghc-vis and ghc-heap-view 2013-08-11 23:50:04 +02:00
Vladimír Čunát
8ba92b8895 Merge master into stdenv-updates
Conflicts (simple):
	pkgs/development/tools/misc/binutils/default.nix
	pkgs/tools/package-management/disnix/default.nix
	pkgs/top-level/all-packages.nix
2013-07-08 10:48:05 +02:00
Eelco Dolstra
acba9240cd nixos.org/tarballs -> tarballs.nixos.org
It's currently the same machine, but tarballs.nixos.org should become
an S3/CloudFront site eventually.
2013-06-25 14:12:16 +02:00
Shea Levy
fde3526e7d Merge branch 'master' into stdenv-updates
Conflict in kerberos, which was updated both in master and in
stdenv-updates. Kept the stdenv-updates version, except pulled in the
enableParallelBuilding change from master.

Signed-off-by: Shea Levy <shea@shealevy.com>

Conflicts:
	pkgs/development/libraries/kerberos/krb5.nix
2013-05-04 18:28:48 -04:00
Peter Simons
e0b57c9fb9 ghc: bump HEAD compiler to version 7.7 2013-04-24 13:21:05 +02:00
Peter Simons
fdf1d45a38 ghc: add version 7.6.3 (and a corresponding package set) 2013-04-21 20:10:27 +02:00
Peter Simons
431b774cc0 ghc: greatly simplify the GHC compiler wrapper
The wrapper script accumulated some cruft over the last couple of months
because we did changes in freaky ways to avoid triggering re-builds of all
Haskell packages. Most of these kludges have been thrown out now.

This patch doesn't change the behavior of the wrapper except for one thing: the
internal helper scripts "ghc-get-packages.sh" and "ghc-packages.sh" are no
longer installed in the bin directory of the generated derivation.
2013-04-20 23:28:53 +02:00
Peter Simons
4dd05a51ed ghc-binary: don't refer to /bin/sh 2013-04-20 23:28:11 +02:00
Peter Simons
2ffd0b6dac Merge changes from branch 'origin/master' into stdenv-updates. 2013-04-20 22:19:39 +02:00
Patrick John Wheeler
3bf0d2b960 ghc-wrapper: install the GHC documentation into the user's profile
The freaky implementation was done that way in order to avoid unnecessary
re-builds of all Haskell packages by changing the wrapper script used
internally in those builds.

See <https://github.com/NixOS/nixpkgs/pull/466> for further details.
2013-04-20 22:14:44 +02:00
Peter Simons
0823aea0a6 Merge branch 'master' into stdenv-updates.
Conflicts:
	pkgs/development/libraries/libxslt/default.nix

Commit 1764ea2b0a introduced changes to libxslt
in an awkward way to avoid re-builds on Linux. This patch has been simplified
during this merge.
2013-03-25 13:43:45 +01:00
Peter Simons
83d0a3a37c ghc: add meta.license attribute to all compiler versions 2013-03-23 15:58:14 +01:00
Peter Simons
264ac17a0f ghc-with-packages: set NIX_GHC_XXX variables for runhaskell and runghc, too 2013-03-21 16:26:18 +01:00
Peter Simons
459234db20 ghc-with-packages: include only derivations in the generated environment that have a ghc attribute
This predicate filters out packages that weren't created by the Cabal builder.
Doing that greatly reduces the likelihood of file collisions in the generated
environment, because Haskell packages tend to have a lot of propagated build
inputs.

For example, both zeromq 2.x and 3.x use the same names for their header files.
Users of haskell-zeromq don't need those headers, so we just don't include them
in the generated environment to avoid the collision that would otherwise occur
when haskell-zeromq 2.x and 3.x are installed into the same environment.
2013-03-21 16:25:50 +01:00
Peter Simons
90fc42c2f2 pkgs/development/compilers/ghc/with-packages.nix: simply this wrapper on top of buildenv 2013-03-15 21:11:31 +01:00
Peter Simons
d09269a22e Use the same directory layout for user-installed Haskell libraries that GHC
uses for its core libraries, so that these files integrate seamlessly into one
profile, living right next to each other. This change is eventually going to
simply our with-packages wrapper quite a bit.
2013-03-15 20:38:15 +01:00
Peter Simons
893c684e99 pkgs/development/compilers/ghc/with-packages.nix: include share/emacs/site-lisp in the generated environment
This change allows 'ghc-mod' to be included in such a GHC environment,
which is important because the tool is GHC version-specific.
2013-03-15 19:58:08 +01:00
Andres Loeh
54e0fe3ec1 ghc: update HEAD snapshot 2013-03-10 21:14:45 +01:00
Peter Simons
97faa4c319 ghc-with-packages.nix: include man pages in the generated profile 2013-02-11 23:26:06 +01:00
Peter Simons
f929eecfa7 ghc-7.6.2: cosmetic, no functional change 2013-01-30 17:30:51 +01:00
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