Commit Graph

68 Commits

Author SHA1 Message Date
Eelco Dolstra
06fc1ec34d Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/servers/serfdom/default.nix
2014-07-01 11:25:41 +02:00
Eelco Dolstra
40f7b0f9df Another attempt to eradicate ensureDir
See c556a6ea46.
2014-06-30 14:56:10 +02:00
John Wiegley
f9ebbc80a1 haskell-ghc-mod: patch ghc-process.el to avoid hanging
@peti I've determined that the hang which this fixes does not happen all
of the time (in fact, I've been using ghc-mod for weeks without seeing
it once).  But today it happened again, and it made me realize I had
undone this patch locally.  I'm committing it now because it fixes the
problem completely for me, and certainly cannot hurt.
2014-06-26 22:55:25 -07:00
Peter Simons
5b6f3fc7f5 Merge pull request #3017 from ttuegel/wrap-haskell
Wrap Haskell tools to find GHC packages
2014-06-22 15:29:53 +02:00
Peter Simons
191941fc52 haskell-ghc-mod: update to version 4.1.3 2014-06-20 16:55:54 +02:00
Thomas Tuegel
a0aadd7577 Wrap ghc-modi to find GHC packages 2014-06-19 06:36:11 -05:00
John Wiegley
7ebe9b1e16 haskell-ghc-mod: 4.1.1 -> 4.1.2 2014-06-09 21:01:59 -05:00
Peter Simons
9fe86905b5 haskell-ghc-mod: update to version 4.1.1 2014-05-16 21:35:51 +02:00
Peter Simons
9e5f7ada34 haskell-ghc-mod: revert "wrap the newly added ghc-modi executable"
This reverts commit eba689ad05. ghc-modi
stopped working for me after this change.

https://github.com/NixOS/nixpkgs/pull/2490
2014-05-04 14:07:42 +02:00
Peter Simons
eba689ad05 haskell-ghc-mod: wrap the newly added ghc-modi executable
Cherry-picked from <https://github.com/NixOS/nixpkgs/pull/2490>.
2014-05-04 13:03:18 +02:00
Peter Simons
303ddfab4c haskell-ghc-mod: re-generate with cabal2nix 2014-05-01 23:40:13 +02:00
Peter Simons
8b67834bf3 haskell-ghc-mod: make sure GHC <7.8 and >7.8 pick the same datadir install path 2014-05-01 22:57:09 +02:00
Peter Simons
d6dd5688a2 haskell-ghc-mod: disable test suite to fix build with GHC 7.8.2
https://github.com/kazu-yamamoto/ghc-mod/issues/242
2014-05-01 22:56:44 +02:00
Peter Simons
84c41f46f7 haskell-ghc-mod: update to version 4.1.0 2014-05-01 21:57:03 +02:00
Peter Simons
363d62dbfd haskell-ghc-mod: update to version 4.0.2 2014-04-08 21:37:58 +02:00
Mathijs Kwik
b36f6ce3d4 ghc-mod: upgrade to 4.0.1 2014-04-06 11:47:46 +02:00
Peter Simons
6df2b09015 haskell-ghc-mod: revert update to version 4.x
flymake-mode no longer works in the new version. This needs further
testing before we can upgrade.
2014-04-05 00:21:12 +02:00
Peter Simons
9415c34e3d haskell-ghc-mod: update to version 4.0.0 2014-04-02 18:17:02 +02:00
Peter Simons
34b4e5c97a haskell-ghc-mod: update to version 3.1.7 2014-03-17 18:33:55 +01:00
Peter Simons
9eb8b4854c haskell-ghc-mod: update to version 3.1.6 2014-02-10 20:54:53 +01:00
Peter Simons
82cdfe5429 haskell-ghc-mod: update to version 3.1.5 2014-01-14 21:23:36 +01:00
Peter Simons
3b3cc6a4ad haskell-ghc-mod: keep the original 'ghc-mod' binary in $out/bin, not $out 2013-12-15 22:37:41 +01:00
Peter Simons
41f0df1068 haskell-ghc-mod: don't rely on /bin/sh 2013-12-15 22:37:41 +01:00
Peter Simons
66fa31308c haskell-ghc-mod: re-enable the test suite 2013-12-15 22:37:41 +01:00
Peter Simons
c89a375a40 haskell-ghc-mod: update to version 3.1.4 2013-11-26 21:09:19 +01:00
Peter Simons
d64917ad17 Back-port Haskell-related improvements from stdenv-updates.
* There now is full support for building Haskell packages as shared libraries
   for GHC versions 7.4.2 or later. The Cabal builder recognizes the following
   attributes:

    - enableSharedLibraries configures Cabal to build of shared libraries in
      addition to static ones. This option requires that all dependencies of
      the package have been compiled for use in shared libraries, too.

    - enableSharedExecutables configures Cabal to prefer shared libraries when
      linking executables.

   The default values for these attributes are arguments to the haskellPackages
   expression.

 * Haskell builds now run in a LANG="en_US.UTF-8" environment to avoid plenty
   of build and test suite errors. Without this setting, GHC seems unable to
   deal with the UTF-8 character encoding that's generally considered standard
   in the Haskell world.

 * The Cabal builder supports a new attribute 'testTarget' to specify the exact
   set of tests to be run during the check phase.

 * The ghc-wrapper attribute ghcVersion has been removed. Instead, we use the
   ghc.version attribute, which exists in unwrapped GHC derivations, too.
2013-10-27 10:09:36 +01:00
Peter Simons
04440788ad haskell-ghc-mod: update to version 3.1.3 2013-10-10 20:56:36 +02:00
Peter Simons
29f33ae3bb haskell-ghc-mod: update to version 3.1.2 2013-09-28 15:05:12 +02:00
Peter Simons
0b6b0284e4 haskell-ghc-mod: update to version 3.1.1 2013-09-22 13:28:30 +02:00
Peter Simons
53ba62d309 haskell-ghc-mod: update to version 3.1.0 2013-09-22 13:25:09 +02:00
Peter Simons
768146f470 haskell-ghc-mod: update to version 3.0.2 2013-09-18 17:17:30 +02:00
Oliver Charles
ef72e19b27 ghc-mod: Wrap to call ghc-get-packages.sh first 2013-09-08 13:42:12 +01:00
Peter Simons
9e0cacb359 haskell-ghc-mod: update to version 3.0.0 2013-09-06 23:35:11 +02:00
Peter Simons
00162c8279 haskell-ghc-mod: update to version 2.1.2 2013-09-06 23:35:09 +02:00
Peter Simons
8a1d0991b2 haskell-ghc-mod: update to version 2.1.1 2013-09-03 22:48:42 +02:00
Peter Simons
95385a697a haskell-ghc-mod: re-generate expression with recent version of cabal2nix 2013-08-17 11:39:11 +02:00
Peter Simons
13a7b3f969 haskell-ghc-mod: update to version 2.0.3 2013-05-30 12:33:41 +02:00
Peter Simons
4ff031b4ff haskell-ghc-mod: update to version 2.0.2 2013-05-22 10:44:04 +02:00
Peter Simons
a56e1d1756 haskell-ghc-mod: re-enable the haddock phase 2013-05-22 10:21:17 +02:00
Peter Simons
91ea9b9190 haskell-ghc-mod: disable Haddock phase to fix the build
See <https://github.com/kazu-yamamoto/ghc-mod/issues/126> for further details.
2013-05-21 11:42:58 +02:00
Peter Simons
9a422f4ee1 haskell-ghc-mod: update to version 2.0.1 2013-05-21 10:58:34 +02:00
Peter Simons
4d545eddcd haskell-ghc-mod: update to version 1.12.5 2013-05-13 13:43:44 +02:00
Peter Simons
eeeef91f73 haskell-ghc-mod: disable test suite to fix the build
The test suite depends on the ghc-path module, which doesn't work with
ghc-wrapper. Eventually, we'll need a solution for this problem in our Cabal
builds.
2013-04-02 13:05:59 +02:00
Peter Simons
2522d5c8f5 haskell-ghc-mod: update to version 1.12.4 2013-04-02 13:05:59 +02:00
Peter Simons
68ac128d2d haskell-ghc-mod: update to version 1.12.3 2013-03-18 12:17:24 +01:00
Peter Simons
b8550949a8 haskell-ghc-mod: update to version 1.12.2 2013-03-13 13:59:32 +01:00
Peter Simons
9ff74626f9 haskell-ghc-mod: update to version 1.12.1 2013-03-08 13:37:58 +01:00
Eelco Dolstra
674c51af3c Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-03-07 19:33:52 +01:00
Peter Simons
213dcd5843 haskell-ghc-mod: update to version 1.12.1 2013-03-07 17:07:47 +01:00
Peter Simons
53ecc95c72 haskell-ghc-mod: update to version 1.12.0 2013-03-06 11:06:00 +01:00