Commit graph

273 commits

Author SHA1 Message Date
William A. Kennington III
ae28ff8b91 Merge branch 'master.upstream' into staging.upstream 2015-07-06 17:15:11 -07:00
Kosyrev Serge
5fee7af3ba ghc: add haskell.compiler.ghcNokinds, for Richard Eisenberg's 'nokinds' branch 2015-07-06 11:09:28 +03:00
William A. Kennington III
d605663ae2 Merge branch 'master.upstream' into staging.upstream 2015-07-05 13:06:02 -07:00
Mateusz Kowalczyk
2b833d5297 haskell-ghc: update head to 20150705 2015-07-05 21:01:37 +01:00
Peter Simons
df4fb819be ghc: add release candidate 2 for compiler version 7.10.2 2015-07-05 20:56:29 +02:00
Peter Simons
85ae0cb070 ghc: move gcc-clang-wrapper.sh script into the ghc directory tree since it's the only user of that script 2015-06-12 10:54:02 +02:00
Jude Taylor
b9de32de5b update GHC HEAD and configuration 2015-06-08 00:48:34 -07:00
Peter Simons
2e24bef56f ghc-6.x: enable builds again now that 5a89a87cc5 is in master
Resolves https://github.com/NixOS/nixpkgs/issues/7810.
2015-05-30 19:54:42 +02:00
Joel Taylor
24be3cfcff ghc: add Darwin patch for #10322 2015-05-19 09:56:15 -07:00
Peter Simons
54db9d427d ghc-6.x: mark broken because of https://github.com/NixOS/nixpkgs/issues/7810
6.10.4 and 6.12.3 are broken because they need 6.10.2-binary for bootstrapping.
2015-05-18 18:04:37 +02:00
Joel Taylor
c714842d9f patch GHC 7.8.4 on darwin to fix template haskell + hpc 2015-05-17 14:31:24 -07:00
Charles Strahan
9a658d340f ghc-7.10.1: fix user pkg db location for GHCJS
This cherry picks the commit referenced on the associated trac ticket:
https://ghc.haskell.org/trac/ghc/ticket/10232
2015-05-05 20:48:27 -04:00
Peter Simons
acb628a07f Drop obsolete pkgs/development/compilers/ghc/wrapper.nix.
Resolves https://github.com/NixOS/nixpkgs/issues/6575.
2015-05-04 12:27:03 +02:00
Peter Simons
fc36141267 ghc-head: update to current git HEAD 2015-04-03 00:50:44 +02:00
Charles Strahan
981dbc35d1 ghc-7.10.1: cherry-pick Cabal bugfix for GHCJS 2015-03-29 12:20:02 -04:00
Charles Strahan
d590a0f4b6 ghcjs: support for Haskell-NG
closes #5828
closes #6786
2015-03-29 03:34:04 +02:00
Peter Simons
64a4fab42b ghc: bump version to 7.10.1 release 2015-03-27 15:33:53 +01:00
Peter Simons
eb4f75a868 ghc: remove obsolete "i686-darwin" from meta.platforms 2015-03-26 11:29:05 +01:00
Peter Simons
6bd48cbfef Enable Darwin builds of Haskell packages again.
Hopefully, issues like https://github.com/NixOS/nixpkgs/issues/2689 are
all remedied by now.
2015-03-26 11:29:05 +01:00
Peter Simons
93bd02a6aa ghc: versions prior to 7.4.x currently don't work on Darwin
db4cb021c0 (commitcomment-10320216)
2015-03-26 11:29:05 +01:00
Mateusz Kowalczyk
d56831a9af ghc: update link and version of 7.10 RC3 2015-03-19 12:33:11 +00:00
Peter Simons
04611ab692 ghc: update 7.10.1 to rc3 2015-03-17 11:40:51 +01:00
Peter Simons
3f712f8448 ghc-6.10.4: cosmetic clean up 2015-03-15 11:00:11 +01:00
Peter Simons
26223831dc ghc-6.12.3: cosmetic clean up 2015-03-15 11:00:11 +01:00
Peter Simons
e2b033cad9 ghc: re-instate code that configures statically linked builds by default
The compiler should not expect to have dynamic versions of all libraries
available, because that configuration doesn't play along nicely with statically
linked libraries.

Fixes https://github.com/NixOS/nixpkgs/issues/6399.
2015-03-09 15:55:24 +01:00
Joel Taylor
4b6d83199a Fix temp directory paths for GHC 7.0.4 on Darwin
This is a remnant of https://github.com/NixOS/nixpkgs/pull/6268
2015-02-16 23:42:59 -08:00
Peter Simons
155e926274 ghc: disable parallel building for older versions again
This change accidentally crept in with the recent Darwin changes.
2015-02-14 19:41:49 +01:00
Joel Taylor
fd18936a32 Add purity to GHC builds on Darwin 2015-02-14 19:41:49 +01:00
Peter Simons
54ce1a1810 Merge remote-tracking branch 'origin/master' into staging.
Conflicts:
      pkgs/development/compilers/ghc/head.nix
      pkgs/top-level/haskell-ng.nix
2015-02-13 22:13:25 +01:00
Joel Taylor
2a5dacbf6b patch shebangs in boot script 2015-02-13 10:37:47 +01:00
Joel Taylor
dcafdf47ea Revert "Revert "Build GHC HEAD from git checkout"."
This reverts commit 15416dd2ec.
2015-02-13 10:37:47 +01:00
Peter Simons
15416dd2ec Revert "Build GHC HEAD from git checkout".
This reverts commit 52c8d7c4ab. The new
expression doesn't compile: http://hydra.nixos.org/build/19594431/nixlog/1/raw.
2015-02-12 20:15:56 +01:00
Joel Taylor
52c8d7c4ab Build GHC HEAD from git checkout 2015-02-11 14:32:54 -08:00
Joel Taylor
db4cb021c0 Add purity to GHC builds on Darwin. 2015-02-10 22:08:01 +01:00
Peter Simons
f637b5368b ghc-head: re-use the $version attribute in the URL to prevent mismatches 2015-02-03 17:01:09 +01:00
Peter Simons
86753ed326 ghc-7.10.1: fix misspelled version number in build expression 2015-02-03 17:01:09 +01:00
Cray Elliott
a9b774204b Update GHC 7.10.1 expression to RC2 2015-01-26 22:41:27 -08:00
Peter Simons
134d1a80c6 Add a package set for GHC 7.10.1-rc1 and bump GHC HEAD to 7.11.x.
Fixes https://github.com/NixOS/nixpkgs/issues/5836.
2015-01-19 13:55:31 +01:00
Peter Simons
20560e667a Remove obsolete, broken, and unnecessary versions of GHC.
These versions have been removed:

 - 6.4.2-binary.nix
 - 6.4.2.nix
 - 6.6.1.nix
 - 6.8.2.nix
 - 6.8.3.nix
 - 6.10.1-binary.nix
 - 6.10.1.nix
 - 6.10.2.nix
 - 6.10.3.nix
 - 6.11.nix
 - 6.12.1-binary.nix
 - 6.12.1.nix
 - 6.12.2.nix
 - 7.0.1.nix
 - 7.0.2.nix
 - 7.0.3.nix
 - 7.2.1.nix
 - 7.4.1.nix
 - 7.6.1.nix
 - 7.6.2.nix
 - 7.8.3-binary.nix

As a rule of thumb, we keep the latest version in every major release. If
someone feels up to the task of fixing versions 6.4.x, 6.6.x, and 6.8.x, then
please don't hesitate to revive those builds.

Fixes https://github.com/NixOS/nixpkgs/issues/5630.
2015-01-17 20:29:00 +01:00
Peter Simons
d1fc5370e9 ghc: pass explicit 'ncurses' path to ./configure instead of finding through the environment
Fixes https://github.com/NixOS/nixpkgs/issues/5616. For real this time!
2015-01-17 20:29:00 +01:00
Peter Simons
1912736a86 ghc-7.8.4: re-implement "fix build on Darwin" to avoid re-builds on Linux
Originally, I thought that I can commit a "clean" patch -- even if it
triggers re-builds -- because those re-builds were triggered by the
ncurses patch to GHC anyway . That patch had to be reverted, though, so
now I'm rewriting this patch to avoid re-builds on Linux.

What a mess. :-(
2015-01-15 00:06:06 +01:00
Peter Simons
df76eb1268 ghc: revert "propagate 'gmp' and 'ncurses' to ensure users can link the 'haskeline' library, etc."
I thought that [1] could be fixed by ensuring that ncurses is available in the
environment (because ghc exports it as a propagateBuildInput), and indeed that
change fixed *some* build failures we've had before. However, the same error
still occurs with other packages, like hledger [2] and Agda [3]. Frankly, I
have no idea why those packages fail and others don't. But clearly the fix was
inadequate, so I'm reverting commit a8076c76.

[1] https://github.com/NixOS/nixpkgs/issues/5616
[2] http://hydra.cryp.to/build/372451/nixlog/1/raw
[2] http://hydra.cryp.to/build/373161/nixlog/1/raw
2015-01-14 22:24:33 +01:00
Peter Simons
a8076c7654 ghc: propagate 'gmp' and 'ncurses' to ensure users can link the 'haskeline' library, etc.
Fixes https://github.com/NixOS/nixpkgs/issues/5616.
2015-01-14 11:24:59 +01:00
Eric Seidel
a92afcd34a ghc-7.8.4: fix build on Darwin
https://github.com/NixOS/nixpkgs/pull/5746
2015-01-14 11:24:59 +01:00
Peter Simons
ddf0804a87 ghc-7.8.3-binary: remove broken platforms
The source tarballs URLs and hashes for everything but x86_64-darwin
were just copied from the 7.0.4 binaries. That's not going to work. :-(
2015-01-13 21:25:14 +01:00
Peter Simons
c1c0b4bbfd ghc: bump HEAD compiler to 7.10.1-rc1 2015-01-07 23:58:23 +01:00
John Wiegley
28b6fb61e6 Change occurrences of gcc to the more general cc
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
2014-12-26 11:06:21 -06:00
Peter Simons
157e63c6e6 Update default Haskell compiler from GHC 7.8.3 to 7.8.4. 2014-12-24 09:56:31 +01:00
Peter Simons
8311973759 Add GHC 7.8.4 and create haskellPackages_ghc784 package set. 2014-12-23 20:44:49 +01:00
Peter Simons
f9580894f2 ghc-head: bump version to most recent snapshot 2014-12-18 19:03:28 +01:00