Commit graph

2542 commits

Author SHA1 Message Date
John Ericson e6a476c862 ghc, ghcjs: Get rid of extraneous alex, happy, and hscolour args
The compilers themselves can pull them from `bootPkgs`, where they
should always come from anyways. This enforces that, simplifies that
code, and allows use to avoid more `rec { ... }` too.
2018-09-24 20:00:39 -04:00
John Ericson 5779fdb3d0 haskellPackages: Avoid outer rec { .. }
This is much nicer for overlays. For example, if someone binds a new
compiler / package set, its integer-simple variation will automatically
appear.
2018-09-24 18:42:04 -04:00
John Ericson 0828e2d8c3 treewide: Remove usage of remaining redundant platform compatability stuff
Want to get this out of here for 18.09, so it can be deprecated
thereafter.
2018-08-30 17:20:32 -04:00
volth 52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Will Fancher 682ef85c6f Make GHCJS 8.4 the default, in line with LTS 12.x 2018-07-15 22:27:42 -04:00
Will Dietz da1e98d04b haskell: fix package sets based on integer-simple
Fixes mass build failures in these package sets,
due to "unknown pacakge: integer-simple".

Attributes that demonstrate this (see before/after):

* haskell.packages.integer-simple.ghc843.hello
* haskell.packages.integer-simple.ghc802.scientific

The second one is from the NixOS manual, FWIW.
2018-07-11 11:01:35 -05:00
Will Dietz b95e7b1954 ghc861: use llvm6 so we're using supported LLVM version
Otherwise complains that LLVM version used is unsupported
and that LLVM 6.0 is the only supported version.

So, let's use it! :)
2018-07-10 14:26:43 -05:00
Peter Simons 259215a6b3 ghc-8.6.x: create an initial package set configuration 2018-07-04 19:14:18 +02:00
Peter Simons c85f23a82a ghc: add 8.6.1-alpha1 pre-release 2018-07-01 19:22:09 +02:00
Peter Simons b0909cc394 ghc: drop compiler version 8.4.2; we prefer 8.4.3 2018-06-17 10:37:06 +02:00
John Ericson 812decd5c1 ghc: Default integer-simple usage based one whether GNU MP is available
The user's choice is still always respected
2018-06-11 15:51:57 -04:00
Peter Simons deeeb5002c ghc: add version 8.4.3 2018-05-30 03:46:16 +02:00
Peter Simons e168ae6a9d ghc: build version >8.4 with hscolour to enable source links
Fixes https://github.com/NixOS/nixpkgs/issues/41179.
2018-05-30 03:46:16 +02:00
Will Fancher 7a23f1acca GHCJS darwin fixes (#41120)
* GHCJS darwin fixes

* Fix ghcjs 80 and 710 packages

* Add socket-io to ghcjs 82 and 84 passthru
2018-05-29 23:39:21 +02:00
Will Fancher d86edd5161 Dont haddock ghcjs in either version 2018-05-16 03:11:32 -04:00
Will Fancher 64df9b6b89 GHCJS 8.4 2018-05-12 17:48:30 -04:00
Will Fancher c41675bce0 GHCJS 8.2 2018-05-12 01:54:42 -04:00
Will Fancher a33756a866 Use build packages GHC for haskell.packages.integer-simple 2018-05-07 23:57:01 -04:00
Peter Simons afea46bbc0 ghc-8.4.1: drop obsolete version, we have 8.4.2 now 2018-05-03 14:50:00 +02:00
Bas van Dijk bf6d796a27 haskell: allow overriding all package sets at once
Setting haskell.packageOverrides like so:

  haskell = super.haskell // {
    packageOverrides = self: super: {
      my-package = ...;
      my-other-package = ...;
    };
  };

causes all compiler-specific package sets to be overridden with those
overrides.
2018-04-22 10:34:44 +02:00
Peter Simons ed92418b96 ghc: add version 8.4.2-rc1 2018-04-04 15:00:31 +02:00
Peter Simons aa0545130b Configure Haskell bootstrapping package sets to perform minimal builds. 2018-03-17 08:21:23 +01:00
Peter Simons 993bcbb225 ghc: drop all compiler versions prior to 7.10.3
None of these old compilers are used anywhere in Nixpkgs, and keeping those
builds working in the face of regular updates of GCC, binutils, and whatnot is
too much effort for no obvious benefit.
2018-03-17 08:21:22 +01:00
Peter Simons a45dfaa335 Drop broken Haskell compilers.
- ghc versions 6.10.4, 6.12.3, and 7.2.2 are broken, and 6.10.2-binary is no
   longer necessary after those versions have been dropped

 - halvm version 2.4.0 hasn't compiled in a long time

 - uhc version 1.1.9.4 hasn't compiled in a long time
2018-01-26 13:01:11 +01:00
John Ericson 81553124cf haskell infra: nativeGhc != ghc.bootPkgs.ghc
There's no reason to wait for non-binary native to *build* cross ghc,
but we want a nix-built GHC for Setup.hs or things won't work.
2018-01-21 23:31:04 -05:00
John Ericson 398ac54593 ghc: Fix cross compilation to work with new system 2018-01-21 23:31:03 -05:00
John Ericson bc16cfc009 ghc: Remove old cross work
That way the next commit can apply a similar diff to each GHC.
2018-01-21 23:31:02 -05:00
Will Fancher fcc8cae88d Fixed GHCJS 2018-01-20 15:47:59 -05:00
Kosyrev Serge 8d027c1113
ghc841: GHC 8.4.1: nix-shell -p haskell.compiler.ghc841 2018-01-19 16:06:02 +03:00
Drew Hess 9361b7eb85
ghc: bootstrap 8.2.2 with 8.2.1-binary. 2018-01-02 12:15:16 -08:00
Peter Simons f5a501074f Drop Haskell package set for GHC 7.8.4.
We support only the last three major releases, i.e. 7.10.x is the latest
compiler we worry about.

The *compiler* is still there, though; it's just the package set that's been
removed.
2017-12-30 13:51:07 +01:00
Peter Simons af6f4f0849 ghc: drop obsolete version 7.8.3
We have the newer minor release 7.8.4.
2017-12-30 13:51:07 +01:00
Domen Kožar 695a026f5f
ghc: wire up new binary ghc for bootstrapping
This change brings development feedback loop improvement
from a couple of ghc rebuilds to only one for working on generic
builder.

To completely eliminate the rebuilds, use two nixpkgs clones
and point boot packages to the unmodified one.
2017-12-28 15:11:50 +00:00
Peter Simons 63a9142279
Merge pull request #33054 from NixOS/ghc-prebuilt
ghc prebuilt: Add 7.8.4, 7.10.3 and 8.2.1, and make consistent style
2017-12-27 21:31:56 +01:00
Peter Simons b03ac7d22b jhc: drop broken Haskell compiler 2017-12-26 15:12:36 +01:00
Peter Simons eb0da3e8af haskell: drop package sets for GHC 6.12.x, 7.0.x, 7.2.x, 7.4.x, and 7.6.x
These old package sets have been broken and unmaintained for a long time now.
2017-12-26 11:35:26 +01:00
Peter Simons e98e7fb329 haskell: drop obsolete GHC version 7.10.2; we have 7.10.3 2017-12-26 11:35:26 +01:00
John Ericson ed93d2d645
ghc-{7.8.4, 7.10.3, 8.2.1}-binary: Init 2017-12-25 16:36:47 +00:00
Peter Simons dbc55c11f0 ghc: drop 8.2.1 version; we have 8.2.2 already 2017-12-20 09:17:46 +01:00
Matthew Pickering e7a327da5c ghcHEAD: 8.3.20170808 -> 8.5.20171208 2017-12-09 11:04:31 +00:00
Peter Simons a09460b827 ghc: add 8.2.2-rc2 2017-11-04 20:02:31 +01:00
Shea Levy 1a1ad1a17d Revert "Merge branch 'improved-make-overridable' of git://github.com/ElvishJerricco/nixpkgs"
This reverts commit c3af1210b4, reversing
changes made to 49f175cd0c.
2017-09-29 09:11:26 -04:00
Shea Levy d96da5af87 Revert "Avoid polluting lib namespace unncessarily"
Reverting #27319

This reverts commit 01a3f0b8aa.
2017-09-29 09:09:53 -04:00
Shea Levy 01a3f0b8aa Avoid polluting lib namespace unncessarily 2017-09-28 18:51:20 -04:00
Will Fancher dbd5009376 Merge branch 'master' into improved-make-overridable 2017-09-12 17:30:35 -04:00
Peter Simons 398b36431d ghc: remove obsolete 8.0.1 version 2017-09-10 09:47:52 +02:00
Will Fancher 4d860389d8 Merge branch 'master' into improved-make-overridable 2017-08-26 11:39:13 -04:00
Matthew Pickering cf7b262485 Boot ghc HEAD with ghc-8.0.2 2017-08-08 17:21:22 +00:00
John Ericson 74f5fe5068 haskell infra: Misc cleanups
- The haskell lib is very close to not relying on Nixpkgs. I think
   this is good---simpler to think about and matches Nixpkgs's lib.

 - The haskell lib is only imported once

 - stdenv is exposed more shallowly so it can be overriden more easily.
   I'll eventually use this on Darwin to avoid the Sierra shared
   library problems (unless changes are to be made system-wide).

Closes https://github.com/NixOS/nixpkgs/pull/27840.
2017-08-03 13:12:01 +02:00
Will Fancher 05f9db601a Added self views of the interface in makeExtensibleWithInterface
Fixing the `overrideScope` in `haskellpackages`.
2017-07-14 06:43:33 -04:00
Will Fancher e11dbc3710 Update haskellPackages to use new features of makeOverridable
Instead of manually using `makeExtensible`, which broke `override`.

Fixes #26561
2017-07-12 18:36:18 -04:00
Renzo Carbonara 5f94d85e5e ghc821: init at 8.2.1-rc2 (a.k.a., 8.2.0.20170507)
The approach taken to add this package was to port over the definitions
currently existing for HEAD, and making the necessesary changes to get
this building.

The Haskell package set associated with this compiler doesn't yet
guarantee that all or most of the packages successfully build with this
new compiler, but that will improve over time after this GHC 8.2.1
is officially released and the ecosystem catches up.
2017-06-15 19:59:38 +02:00
Peter Simons e749fb1cfd Disable integer-simple variant of GHC 7.6.3 since it does not compile. 2017-03-29 20:30:27 +02:00
Peter Simons 24a69286e9 Merge pull request #23610 from ljli/hs-ghcjs-pkgs-inherit
haskellPackages: apply GHC specific overrides before GHCJS
2017-03-24 23:15:41 +01:00
David Johnson 26623240e9 Init HaLVM at 2.4.0 2017-03-10 19:31:12 -06:00
Leon Isenberg b9c7d291bc haskellPackages: apply GHC specific overrides before GHCJS
GHCJS is effectively a backend for GHC, so all the GHC version specific package set overrides should in
general apply to the GHCJS package sets, too.
2017-03-08 13:10:28 +01:00
Peter Simons 09a593b3de Drop obsolete, unmaintained haskell.packages.lts-x_y package sets.
Stack no longer uses them since a long time: https://github.com/commercialhaskell/stack/issues/2259.
2017-03-03 09:27:32 +01:00
Peter Simons 75a4679548 Recurse from haskell.compiler into haskell.compiler.integer-simple on Hydra.
This ensures that the gmp-free compiler variants are compiled on
hydra.nixos.org, too.
2017-02-02 10:57:00 +01:00
Bas van Dijk dfcc9e2994 ghc: support building with integer-simple and provide package sets for it
If the flag enableIntegerSimple is true GHC will be build with the GPL-free but
slower integer-simple library instead of the faster but GPLed integer-gmp
library.

The attribute `pkgs.haskell.compiler.integer-simple."${ghcVersion}"` provides a
GHC compiler build with `integer-simple`.

Similarly, the attribute `pkgs.haskell.packages.integer-simple."${ghcVersion}"`
provides a package set supporting `integer-simple`.

Closes https://github.com/NixOS/nixpkgs/pull/22121.
Closes https://github.com/NixOS/nixpkgs/issues/5493.
2017-02-02 10:57:00 +01:00
Bas van Dijk 0cbb65c832 ghcjs-HEAD: upgrade to the latest HEAD
It includes the following changes:

* Fixed crash on Safari on iOS

* Make linker write externs for closure compiler ADVANCED_OPTIMIZATIONS

* ghcjs-pkg fixes for ghc 8.0.2

Because of the latter I switched from GHC-8.0.1 to GHC-8.0.2 to build ghcjs-HEAD.
2017-01-27 01:45:50 +01:00
John Ericson a1a798f017 top-level: crossSystem is no longer exposed to packages. Use *Platform. 2017-01-24 11:37:56 -05:00
Peter Simons 494d695b97 Merge pull request #21393 from mpickering/master
Small improvements to development GHC derivations
2017-01-03 14:40:18 +01:00
Laverne Schrock 527468209c ghc-8.0.2: add sphinx to inputs for documentation
Closes https://github.com/NixOS/nixpkgs/pull/21434.
2016-12-28 17:30:16 +01:00
Laverne Schrock 1a78981b2f ghc-8.0.1: switch to sphinx for documentation
Fixes #20281

"Since GHC 8.0, the User’s Guide is authored in ReStructuredText (or ReST
or RST, for short) a rich but light-weight mark-up language aimed at
producing documentation. The Sphinx tool is used to produce the final
PDF and HTML documentation."
- http://ghc.readthedocs.io/en/8.0.1/editing-guide.html
2016-12-28 17:30:16 +01:00
Matthew Pickering 9f7c7405fb Remove nokinds GHC build
This work has since been merged into GHC master branch and is enabled
with the TypeInType extension.
2016-12-26 13:30:07 +00:00
Peter Simons c272c66276 ghc: add release candidate 1 for 8.0.2 2016-11-26 21:24:40 +01:00
Shea Levy 64ec4dd87b Add haskell packages set for cross ghc 2016-11-18 10:44:53 -05:00
Shea Levy 845b56d25a Initial support for cross-compiling ghc 2016-11-15 16:59:09 -05:00
Travis Whitaker c491309d61 ghcjs: add ghcsjHEAD, tracking ghc-8.0 branch
Closes https://github.com/NixOS/nixpkgs/pull/20071.
Closes https://github.com/NixOS/nixpkgs/issues/19905.
2016-11-03 17:37:19 +01:00
Peter Simons 9123a0452d haskell: drop obsolete LTS package set
The default 'haskellPackages' set now corresponds to the latest
available version of LTS 7.x.
2016-09-15 09:12:04 +02:00
Peter Simons f7133e4de6 haskell: define top-level attributes for LTS 6.x and 7.x
These attributes exist only for backwards compatibility with old
versions of Stack and will be removed altogether soon.
2016-09-15 09:12:04 +02:00
Mathieu Boespflug 5f8891153b haskell.compiler.ghcHEAD: update to latest upstream (20160826). 2016-08-26 21:15:04 +02:00
Peter Simons 641fc0e683 haskell: remove all but the latest LTS package sets (version 6.7)
This is the first step towards dropping Stackage support. We keep LTS 6.x
around because I don't want to downgrade our default compiler to GHC 7.x,
but once LTS 7.x comes out we'll switch our main package set to that and
drop Nightly.

More details are at:

  http://permalink.gmane.org/gmane.linux.distributions.nixos/20505

Closes https://github.com/NixOS/nixpkgs/issues/14897.

Also relevant:

 - https://github.com/NixOS/nixpkgs/issues/16130
 - https://github.com/commercialhaskell/stack/issues/2259
2016-07-21 14:41:44 +02:00
Peter Simons 4ba794ed89 Add LTS Haskell 6.6. 2016-07-07 17:19:55 +02:00
Peter Simons ddbf655663 Add LTS Haskell versions 6.4 and 6.5. 2016-07-01 12:01:03 +02:00
Peter Simons bef99f11cb Add LTS Haskell 6.3. 2016-06-13 23:09:55 +02:00
Peter Simons 55ac62c660 Add LTS Haskell 6.2. 2016-06-07 22:02:14 +02:00
Peter Simons c571a08ff1 Add LTS Haskell 6.1. 2016-06-02 09:30:38 +02:00
Peter Simons 577f2b0005 Add LTS Haskell 6.0. 2016-05-31 22:09:54 +02:00
Peter Simons 2a83412f2a Add LTS Haskell 5.16, 5.17, and 5.18. 2016-05-25 12:27:56 +02:00
Peter Simons f6980571ab Add LTS Haskell 5.15. 2016-05-03 10:22:22 +02:00
Peter Simons f622804472 Add LTS Haskell 5.14. 2016-05-03 10:22:22 +02:00
Peter Simons 9aafa07180 Add LTS Haskell 5.13. 2016-04-20 13:46:10 +02:00
Peter Simons 834174bed5 Add LTS Haskell 5.12. 2016-04-14 09:17:55 +02:00
Peter Simons a68e670346 Add LTS Haskell 5.11. 2016-04-04 15:20:37 +02:00
Peter Simons 368324da12 Add LTS Haskell 5.10. 2016-04-04 15:20:36 +02:00
Peter Simons 511edb55bc Add LTS Haskell 5.9. 2016-03-23 18:25:26 +01:00
Peter Simons f519187063 Add LTS Haskell version 5.6, 5.7, and 5.8. 2016-03-15 13:16:54 +01:00
Peter Simons f103e0ac03 Add LTS Haskell version 5.5. 2016-03-04 22:11:25 +01:00
Peter Simons 073dd0c1ba Add LTS Haskell 5.4. 2016-02-28 11:34:59 +01:00
Philipp Hausmann fbd857ab72
uhc: 1.1.9.2 -> 1.1.9.3 2016-02-26 12:12:53 +01:00
Peter Simons 0918c6f08f Add LTS Haskell 5.3. Also add aliases that point to the respective latest LTS version. 2016-02-22 12:45:11 +01:00
John Ericson 114cd6765d haskell: Expose the package set used to build each GHC, where possible
Tested to not change hashes
2016-02-21 10:16:13 -08:00
Peter Simons 31f160e6dd Add LTS Haskell 5.2. 2016-02-09 12:00:15 +01:00
Peter Simons bb94b09f66 Add LTS Haskell 5.1. 2016-02-03 18:51:53 +01:00
Charles Strahan c01eb06954 ghcjs: build with GHC 7.10.3 2016-01-31 20:44:49 -05:00
Philipp Hausmann 22506c7bf3
uhc: Use Stackage LTS 4.1 to build UHC 2016-01-29 19:35:13 +01:00
Peter Simons 4a48931bb7 Add LTS Haskell 5.0. 2016-01-27 00:33:26 +01:00
Peter Simons 203579fb25 Add LTS Haskell 4.2. 2016-01-20 14:33:37 +01:00
Jude Taylor c6ad4841fd clean up GHC expressions 2016-01-13 12:04:18 -08:00