3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

2583 commits

Author SHA1 Message Date
sternenseemann a6f258f49f Merge remote-tracking branch 'origin/master' into haskell-updates 2021-11-25 09:28:37 +01:00
sternenseemann 156d8d619c haskell.compiler.*: be clear about LLVM build->target role
Since LLVM itself doesn't depend on target at all, this doesn't change
anything *in effect* (i. e. rebuild count should be zero), but it is
more clear about the intention and what LLVM is used for here (i. e. in
depsBuildTarget).
2021-11-24 13:48:37 +01:00
sternenseemann 9e1f438a76 haskell.compiler.*: upgrade to latest supported LLVM version
Source:

* (8.6.5: https://www.haskell.org/ghc/download_ghc_8_6_5.html)
* (8.8.4: https://www.haskell.org/ghc/download_ghc_8_8_4.html)
* (8.10.2: https://www.haskell.org/ghc/download_ghc_8_10_2.html)
* 8.10.7: https://www.haskell.org/ghc/download_ghc_8_10_7.html
* (9.0.1: https://www.haskell.org/ghc/download_ghc_9_0_1.html)
* 9.2.1: https://www.haskell.org/ghc/download_ghc_9_2_1.html
* HEAD: 3ab3631f41/configure.ac (L674)
2021-11-23 16:46:18 +01:00
sternenseemann 5a568ea36f haskell.compiler.ghc901: drop LLVM version to 9
GHC 9.0.1 only supports LLVM 9 and spews a lot of warnings about LLVM 10
when using the LLVM backend atm.

See also: https://www.haskell.org/ghc/download_ghc_9_0_1.html
2021-11-23 16:46:18 +01:00
sternenseemann e191321866 haskell.compiler.ghc865Binary: build with correct LLVM version
See https://gitlab.haskell.org/ghc/ghc/-/wikis/commentary/compiler/backends/llvm/installing#llvm-support
2021-11-23 16:46:13 +01:00
sternenseemann 607dd14964 haskell.compiler.ghcHEAD: bootstrap using 8.10.7 binary
This should shorten the bootstrapping part (not requiring an
intermediate 9.0.1 build). Seems like 8.10.7 is still supported for
bootstrapping for the moment and allows compiling for aarch64-darwin.
2021-11-15 21:01:17 +01:00
Domen Kožar 07715e7876
Merge pull request #145128 from prusnak/ghc-921-aarch64-darwin
haskell.compiler.ghc{901,921,HEAD}: fix aarch64-darwin build
2021-11-14 08:43:48 -06:00
Pavol Rusnak 155b7f0114
haskell.compiler.ghcHEAD: apply autoSignDarwinBinariesHook 2021-11-09 20:30:08 +01:00
Pavol Rusnak 3b9e94dc6c
haskell.compiler.ghc901: fix aarch64-darwin build
by applying autoSignDarwinBinariesHook
2021-11-09 12:23:43 +01:00
Pavol Rusnak 044e860242
haskell.compiler.ghc921: fix aarch64-darwin build
by applying autoSignDarwinBinariesHook
2021-11-09 12:23:43 +01:00
Ellie Hermaszewska 15ae25f36c
haskell: switch from haskell.lib to haskell.lib.compose 2021-11-07 20:18:45 +08:00
sternenseemann 2034c06a0a haskell.compiler.ghc884: revert to reverse bootstraping using 8.10.2
Reverse bootstrapping is not supported by GHC upstream. In the case of
8.8.4 it just happens to work using 8.10.2, with later versions,
specifically 8.10.7 there seems to be some digressions in the generated /
used C code which cause 8.8.4 to fail to compile [1].

Thus we revert to using 8.10.2 for aarch64 and Musl which means: Still
no integer-simple and musl at the same time (however all other GHCs have
it, so it's probably not a problem) and no aarch64-darwin (GHC 8.8.4
can't target that architecture anyways). In short, the situation stays
the same.

[1]: https://github.com/NixOS/nixpkgs/pull/138523#issuecomment-927339953
2021-09-26 19:40:56 +02:00
sternenseemann 628d864ba2 haskell.compiler.ghc8107: always self-bootstrap
Allows us to get rid of the musl special-casing.
2021-09-23 20:38:36 +02:00
Niklas Hambüchen c57ad7ccb9 haskell.compiler.ghc*: Use 8.10.7 bindist for bootstrapping.
This fixes musl+integer-simple, see #130441.

Co-Authored-By: sternenseemann <sternenseemann@systemli.org>
2021-09-23 20:38:36 +02:00
Divam ba25b274f4 ghcjs: init at 8.10.7
The src points to the obsidiansystems repo as it has the ghcjs ported from
8.10.5 to 8.10.7, and a bunch of other fixes (#812, #811, #809)
2021-09-15 12:51:34 +09:00
Domen Kožar 6f1242469a ghc: 8.10.5-binary -> 8.10.7-binary 2021-08-29 15:29:27 +02:00
sternenseemann a008c419dd haskell.compiler.ghc921: provide xattr on darwin
GHC 9.2.1-rc1 needs to run xattr in ghc.mk unconditionally. The fix for
this and support for the XATTR environment variable have only been added
to the GHC 8.10 series so far.
2021-08-28 16:17:21 +02:00
sternenseemann b756d62d8d haskell.compiler.ghcHEAD: provide xattr on darwin
This darwin specific tool is required for GHC on master
nowadays. Unfortunately the XATTR environment variable only works in the
GHC 8.10 series.
2021-08-28 16:17:21 +02:00
sternenseemann a0142cc3cc Merge remote-tracking branch 'origin/master' into haskell-updates 2021-08-28 14:45:41 +02:00
Pavol Rusnak e0b89affa0 haskellPackages: fix ghc build on aarch64-darwin
by adding autoSignDarwinBinariesHook to nativeBuildInputs
2021-08-28 12:54:06 +02:00
sternenseemann 9eca744cc0 ghc: 8.10.6 -> 8.10.7
https://www.haskell.org/ghc/download_ghc_8_10_7.html
2021-08-27 00:42:51 +02:00
Pavol Rusnak 02c5e5173f
haskellPackages: introduce ghc8105Binary to enable aarch64-darwin bootstrap 2021-08-24 18:49:25 +02:00
sternenseemann b83ae81600 haskell.compiler.ghc921: bootstrap using ghc8102BinaryMinimal on arm 2021-08-23 19:12:24 +02:00
Guillaume Bouchard e0f7b04c2e ghc: add 9.2.1 (rc1) 2021-08-23 12:40:11 +02:00
sternenseemann cb330ce4f0 ghc: 8.10.4 -> 8.10.6
The only big change is required for darwin since GHC 8.10.5 now
runs xattr in the install phase on darwin:

* 11e1dcde0d
* ec451cac39

Unfortunately, it uses the host /usr/bin/xattr by default which is
present in the build due to a lack of sandboxing on darwin. That xattr
version however still requires Python 2.7 whereas Python 3.8 is in PATH
in our build. We solve this by setting the XATTR environment variable.

We can't use python3Packages.xattr since GHC expects Apple's fork of
xattr which provides some extra flags to utilize.

Co-authored-by: Cheng Shao <cheng.shao@tweag.io>
2021-08-14 17:12:39 +02:00
sternenseemann 6d4c440f80 Revert "pkgsMusl.haskell.compiler.*: use python38 to unbreak build"
This reverts commit 36628e6e04.

As it turns out this wasn't caused by the update from python 3.8 -> 3.9,
but the underlying issue affects both python version (it seems that LTO
is at fault currently). Will have to be fixed elsewhere, reverting.
2021-07-26 12:33:18 +02:00
sternenseemann 36628e6e04 pkgsMusl.haskell.compiler.*: use python38 to unbreak build
seems like python39 currently fails to build with musl as libc
https://github.com/NixOS/nixpkgs/issues/131557. As a workaround, we can just
build the musl GHCs using python38 like we have been in the past (the python 3.8
-> 3.9 update being a more recent development).
2021-07-26 11:00:52 +02:00
Malte Brandy 264e63477d
pkgs.haskell.package-list: init
This commit introduces a maintainer script to upload our current list of
haskell-packages to hackage.
2021-07-22 23:17:37 +02:00
Niklas Hambüchen 8b15fccf8a pkgsMuslhaskell.compiler.{ghc884,ghc8104}: Use GHC 8.10 as bootstrap compiler.
This addresses the fact that `ghc865Binary` segfaults on musl
(see #118731) because of the glibc+musl mix used in there.

With the previous commits, `ghc8102Binary` was changed to use
the musl-based bindist from GHC HQ instead, which works.

With this change, all nix Haskell compilers builds on musl:

    NIX_PATH=nixpkgs=. nix-build --no-link --expr 'with import <nixpkgs> {}; { inherit (pkgsMusl.haskell.compiler) ghc884 ghc8104 ghc901 ghcHEAD; }'
2021-07-10 02:49:42 +02:00
sternenseemann 29e029da1c haskell.compiler.ghcHEAD: bootstrap using GHC 9.0
They use matching LLVM versions which should alleviate some warnings.
2021-05-17 22:08:56 +02:00
sternenseemann b4c069dc11 haskell.compiler.ghcHEAD: 8.11.20200824 -> 9.3.20210504 2021-05-08 13:03:55 +02:00
sternenseemann 8f07082141 haskell.compiler.ghc901: build using ghc8102BinaryMinimal on arm
ghc8102Binary doesn't build on hydra on arm since it exceeds the maximum
output size. This change works around this issue by using the minimal
version of that compiler instead.
2021-05-07 15:13:37 +02:00
Peter Simons 021b8328ce ghc: drop obsolete compiler version 8.10.3 2021-03-12 21:23:15 +01:00
Peter Simons 822fc150a1 ghc: drop obsolete compiler version 8.10.2 2021-03-12 21:18:48 +01:00
Peter Simons d0ac5c04e0 ghc: drop obsolete compiler version 8.10.1 2021-03-12 21:17:50 +01:00
Peter Simons a7932e3f14 ghc: drop obsolete compiler version 8.8.3 2021-03-12 21:16:35 +01:00
Peter Simons f189465dce ghc: drop obsolete compiler version 8.8.2 2021-03-12 21:16:09 +01:00
Peter Simons 0886f5bad8 ghc: drop unused binary compiler version 8.2.2 2021-03-12 21:10:19 +01:00
Peter Simons cb4346597f ghc: drop obsolete version 8.6.5 2021-03-12 21:05:31 +01:00
(cdep)illabout b0a16b29e2 haskell.compiler.ghc8104: add ghc-8.10.4 2021-02-12 20:35:21 +01:00
Peter Simons 1998b95adc haskellPackages: update default compiler from ghc 8.10.2 to version 8.10.3 2020-12-25 20:41:54 +01:00
Merkhad Luigton 3ebd278b2e ghc8102: bootstrap with ghc8102BinaryMinimal on aarch32
ghc refuses to evaluate on armhf even tho ghc does provide binaries for the arch
2020-11-24 15:30:24 -03:00
Robert Hensing f73df04874 haskell.compiler.integer-simple: Exclude ghc8102Binary*
(cherry picked from commit fc1562695b)
2020-11-04 09:55:56 +01:00
Robert Hensing f8ad73b9d8 haskell.compiler.ghc8102BinaryMinimal: init
To stay within hydra limit of 2^31 output size on aarch64-linux
2020-11-03 12:01:41 +01:00
Will Young 1c2ee215ab ghc:8.10.2Binary bootstrap for 8.8 on aarch64 (NixOS#97407) 2020-10-21 21:13:22 +02:00
Peter Simons 518338f7f7 ghc: add alpha-1 release of version 9.0.1 2020-09-29 12:06:53 +02:00
Richard Marko bcd728c9bf ghc8102Binary: add to integerSimpleExcludes 2020-09-26 12:18:00 -07:00
Richard Marko 0d4f3ef1ab ghc8102Binary: init, enable armv7l 2020-09-24 12:26:35 +02:00
Gabor Greif 621e26fe80 ghc-8.10.x: add v8.10.2
https://mail.haskell.org/pipermail/ghc-devs/2020-August/019131.html
2020-08-08 22:32:58 +02:00
Utku Demir ed1623421f ghcHEAD: 8.11.20200505 -> 8.11.20200731 2020-08-07 20:34:52 +02:00