Peter Simons
ab7a07f73b
Merge pull request #35321 from ElvishJerricco/fix-haskell-compiler-name-version
...
Fix haskellCompilerName version.
2018-02-25 19:59:51 +01:00
Kosyrev Serge
624366d407
ghc841: bump to 20180224
2018-02-25 06:59:16 +03:00
Will Fancher
a9646b39cf
Fix haskellCompilerName version.
...
This matters for `callCabal2nix`, when the cabal file has something
like `if impl(ghc >= 7.7)`
2018-02-22 03:11:25 -05:00
Shea Levy
7ac6c77323
ghc: Make deterministic profiling patches opt-in.
...
The patch changes some pieces of the exposed API, so we can't have our
default GHC changed in this way.
2018-02-10 18:10:44 +01:00
Shea Levy
69b0bc1bdf
ghc 8.{2,4}: Add patches for deterministic profiling symbols.
...
These are taken from https://phabricator.haskell.org/D4388 (which is
against HEAD) and fix an inconsistency when building profiling
libraries on multiple machines that leads to linking failure.
2018-02-10 18:05:29 +01:00
Kosyrev Serge
6419664793
ghc841: bump to alpha3
2018-02-06 21:58:32 +03:00
Peter Simons
72141a630b
ghc-8.4.1: un-revert "update to 8.4.1-alpha2"
...
This commit undoes the revert from a74b0e717d
.
See https://github.com/NixOS/nixpkgs/issues/34229 and
https://github.com/NixOS/nixpkgs/pull/34232 for further details about why this
build seemed broken.
2018-01-29 13:01:46 +01:00
Peter Simons
a74b0e717d
ghc-8.4.1: revert "update to 8.4.1-alpha2"
...
This reverts commit d232856846
from
https://github.com/NixOS/nixpkgs/pull/34172 . The new version does not compile:
https://nix-cache.s3.amazonaws.com/log/zhxjgmilqh5bnp16rv0fx4b6bcrhxf2a-ghc-61db0b8.drv .
2018-01-26 13:01:12 +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
Kosyrev Serge
d232856846
ghc841: update to 8.4.1-alpha2
2018-01-23 01:40:38 +03:00
Ben Gamari
bf687907d7
haskell lib: Make Cabal compiler names explicit
...
Cabal2nix expects a --compiler flag that contains a Cabal Compiler description.
We used to use the compiler's derivation name for this, but this breaks when
cross-compiling due to the target suffix. Instead we add an explicit
haskellCompilerName attribute to Haskell compiler derivations.
2018-01-21 23:31:05 -05:00
John Ericson
8560c025bc
ghc 8.4.1: Reformat to move rev into src
2018-01-21 23:31:04 -05:00
John Ericson
a2516efb26
ghcHEAD: Bump version ghc-8.5.20180118
2018-01-21 23:31:04 -05:00
John Ericson
23c29ebc90
ghc 8.2.2: Add bgamari's STRIP detection fix
2018-01-21 23:31:04 -05:00
John Ericson
60f45a2af1
ghc 8.0.2: Patch Cabal so --extra-*-dirs works right
2018-01-21 23:31:04 -05:00
Ben Gamari
af03b7746a
ghc 8.2.2 & head: Work around ARM bugs in BFD ld by using gold
2018-01-21 23:31:03 -05:00
Ryan Trinkle
bd0de2f1cb
ghc: Fix env vars and configure flags to be weird
...
GHC currently handles this stuff in a quite non-standard way, basically
taking prog var `FOO` to mean `FOO_FROM_TARGET`. It's because it
(wrongly) thinks from stage 2's perspective.
2018-01-21 23:31:03 -05:00
John Ericson
e760de8108
ghc: Predicate libiconv on not using glibc instead of Darwin
2018-01-21 23:31:03 -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
John Ericson
0eb3acaf38
ghc: echo -n
mk/build.mk to avoid extra line
2018-01-21 23:27:38 -05:00
John Ericson
5a6b6b4ac5
ghc: Normalize derivations a bit before cross
...
These changes will affect the final derivation
2018-01-21 23:27:38 -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
e4f3fe051e
ghc, haskell-modules: ARM cross build fixes.
...
As requested in #33405 .
2018-01-11 10:45:44 -05:00
Drew Hess
8ad5937f90
ghc: 8.2.2 on armv7l doesn't build without explicit use of ld.gold.
2018-01-03 15:59:07 -08:00
Drew Hess
461139e3fa
ghc: ARM builds have an LLVM runtime dependency.
2018-01-03 15:57:23 -08:00
John Ericson
3fb5fd0060
ghc: Normalize derivations in hash-preserving ways
2018-01-03 17:04:19 -05:00
John Ericson
0df29e1259
ghc: Noramlized source URLs
2018-01-03 17:04:19 -05:00
John Ericson
faa4b45a1e
ghc 8.2.2, head: Inline common*
bindings
...
Cross case purposely changed as it will be rewritten anyways. But no
native hashes should be changed.
2018-01-02 21:00:23 -05:00
John Ericson
a5cc983c45
ghc: Clean up, and add passthru.targetPrefix
, in preparation for cross
...
No hashes should be changed.
2018-01-02 19:50:38 -05:00
Drew Hess
1e137832b8
ghc: add ARM variants to meta.platforms for new binary versions.
2018-01-02 03:57:12 -08:00
Drew Hess
9c91d0d63c
ghc: fix armv7l-linux support in new binary versions.
2018-01-02 03:36:42 -08: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
e98e7fb329
haskell: drop obsolete GHC version 7.10.2; we have 7.10.3
2017-12-26 11:35:26 +01:00
Domen Kožar
bd7c8ea255
ghc binaries: compile on darwin
2017-12-25 22:56:32 +00:00
Domen Kožar
e4c05ae25a
ghc binaries: fix eval
2017-12-25 18:16:23 +00:00
Domen Kožar
398061dfc5
prebuilt ghcs: correctly handle rpaths
2017-12-25 17:19:43 +00:00
John Ericson
ed93d2d645
ghc-{7.8.4, 7.10.3, 8.2.1}-binary: Init
2017-12-25 16:36:47 +00:00
John Ericson
b6867f71f4
ghc prebuilt: Simplify and harden Darwin fixup
...
- Patch all executables and libraries, while skipping scripts. Base at
least uses libiconv, so should need this too---I suspect it wasn't a
problem before as we got away with the immpurity.
- Rather than hardcoding the symlinks to add, do one per mach-o as
needed
TEMP no -L no script
2017-12-25 16:36:47 +00:00
John Ericson
150255e318
ghc binary: Fix interpreter than patch RPATH
...
The newer to-be-added binaries have relative RPATHs that we'll break if
we try to `patchelf` before installation. We instead us LD_LOAD_LIBRARY
during the installation, which avoids needing to change the RPATH
temporarily.
2017-12-25 16:36:46 +00:00
John Ericson
26a46295eb
ghc prebuilt: Clean up derivations ever so slightly
...
These changes do break hashes, but are good to have everywhere for
consistency. Plus, changing the bootstrap causes a Haskell mass rebuild
anyways.
2017-12-25 16:36:43 +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
8d8061ec20
Revert "Revive multiple outputs for Haskell packages."
2017-12-05 09:36:08 +01:00
Peter Simons
7993e8790f
Merge pull request #32112 from nc6/hask-split-out
...
Revive multiple outputs for Haskell packages.
2017-12-04 12:36:45 +01:00
Peter Simons
b58cb3fa28
ghc-8.2.2: drop obsolete gold linker patch
...
Pointed out by @basvandijk in b1a0f91afe
.
2017-11-29 10:47:08 +01:00
Nicholas Clarke
d90165c7db
Revert "Revert "Merge pull request #27209 from nc6/nc/haskell-multiple-out""
...
This reverts commit 89f5d52cf4
.
2017-11-27 16:05:22 +00:00
Vaibhav Sagar
b1a0f91afe
ghc: 8.2.2-rc2 -> 8.2.2
2017-11-22 14:38:54 +08:00