Commit Graph

763 Commits

Author SHA1 Message Date
Utku Demir
fae83ef189
ghcHEAD: 8.11.20200731 -> 8.11.20200824 2020-08-24 11:06:36 +12:00
Jan Tojnar
58377555ed
Merge branch 'staging-next' into staging 2020-08-23 02:18:27 +02:00
Domen Kožar
f9b57fd66a
#95747: fix build of GHC 8.10.2 2020-08-18 15:56:45 +02:00
Matthew Bauer
c5617381bc ghc: document Stage1Only setting 2020-08-17 23:51:59 -05:00
Matthew Bauer
0be29459d6 ghc: set Stage1Only = YES on iOS
We want stage1Only here even if system == system, since we can’t run
the native arch simulator binaries locally.
2020-08-17 23:51:59 -05:00
Divam Narula
818d24c9db
Merge branch 'staging' into upstream-wasm-cross-nixpkgs-4 2020-08-16 10:13:57 +05:30
Gabor Greif
ca9e5d0bb1 ghc-{8.8.2, 8.10.1}: make download URL consistent with other versions 2020-08-08 22:32:58 +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
Gabor Greif
b18829ff92 Disable profiling builds for AArch64
see also 1353355a63
2020-08-07 20:53:37 +02:00
Utku Demir
ed1623421f ghcHEAD: 8.11.20200505 -> 8.11.20200731 2020-08-07 20:34:52 +02:00
Gabor Greif
7b3dbe3dd3 ghc-{8.8.3, 8.8.4, 8.10.1}: fix typos 2020-08-07 20:34:42 +02:00
Divam
95a5a19658 Enable dontStrip for wasm 2020-08-05 20:17:14 +09:00
Divam
a9ac31c299 Set the STRIP_CMD to ':' for dontStrip
(as mentioned in mk/build.mk.sample)
2020-08-05 20:08:37 +09:00
Domen Kožar
1353355a63
ghc 8.8.4/8.10.1: fix PEBKAC 2020-08-01 16:27:12 +02:00
Domen Kožar
6d54b2f918 ghc 8.8.4, 8.10.1: disable profiled builds on aarch64 to avoid 2GB output limit 2020-07-24 13:07:34 +02:00
Peter Simons
f1182ecc91 ghc: drop obsolete 8.4.x version
We generally keep only the last 3 major releases of GHC.
2020-07-24 13:02:55 +02:00
Gabor Greif
dd6ce8c879 ghc: add new version 8.8.4 2020-07-24 13:02:55 +02:00
Domen Kožar
1f6f0c9b3a
ghc: don't build with profiling on aarch64 #66277
This makes ghc output be lower than 2GB limit.

Also enable aarch64 build parallelism now that it's fixed in GHC 8.6
2020-07-21 20:23:07 +02:00
Domen Kožar
b930b2df8a
haskell.compiler.ghc865-binary: strip to fix aarch64 2020-06-23 14:59:07 +02:00
Gabor Greif
d4d7223eb0 Nail a few typos 2020-05-08 21:11:46 +02:00
Gabor Greif
dec283b463 ghcHEAD: 20200403 -> 20200505 2020-05-08 21:11:46 +02:00
Gabor Greif
a634bd0fd7 ghc: drop 8.8.1 2020-04-24 21:48:28 +02:00
Gabor Greif
daf79ea7c7 compilers/ghc: apply structuredAttrs patch to other ghcs
Ported from:

> [haskell-updates c8aa986440] ghc883: fix structuredAttrs build
>  Author: Robin Gloster <mail@glob.in>
>  Date: Sat Apr 4 19:21:31 2020 +0200
>  1 file changed, 3 insertions(+), 3 deletions(-)
2020-04-24 21:48:28 +02:00
Gabor Greif
0e82313c07 compilers/ghc: fix a few typos 2020-04-24 21:48:28 +02:00
Vladimír Čunát
d96487b9ca
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1582510
2020-04-18 07:42:26 +02:00
Gabor Greif
7932fb22cb ghcHEAD: bump to 8.11.20200403 (#84217)
* ghcHEAD: bump to 8.11.20200403

* ghcHead: reduce diff vs. 8.10.1

dontAddExtraLibs was removed by accident (IMO) in ea19a8ed1e

* ghcHEAD: add ability to use system libffi

- enable nixpkgs' libffi
- minimise diffs against 8.10.1
- remove patching

* remove configure warning about --with-curses-includes

configure: WARNING: unrecognized options: --with-curses-includes
2020-04-17 20:50:48 +02:00
Jan Tojnar
a04625379a
Merge branch 'master' into staging-next 2020-04-13 18:50:35 +02:00
Adam Sandberg Ericsson
08a9d51699 ghc: mention why ld.gold is disabled for musl libc 2020-04-10 20:56:39 +02:00
Adam Sandberg Ericsson
4675649d9c ghc: don't use ld.gold with musl libc (fixes #84670)
ld.gold doesn't play well with musl as is documented in #49071 and
https://sourceware.org/bugzilla/show_bug.cgi?id=23856
2020-04-10 20:56:38 +02:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Robin Gloster
fb015f809a ghc883: fix structuredAttrs build 2020-04-05 13:06:57 +02:00
Joachim Breitner
29ca177c68 Use .diff, not .patch, and fix sha hashes 2020-03-29 21:07:48 +02:00
Joachim Breitner
b872b8a200 ghc-8.4.4.nix: Do not use git.haskell.org
which was deprecated in 2018 and is now gone for good. I guess many
won’t notice because the nix-cache kept the files around?

This fetches the patches from github. Unfortunately it seems that the
sha256 hashes (calculated with `nix-prefetch-url`) have been modified.

Alternatively, if someone has the old patches around they could arguably
be added to `tarballs.nixos.org` (it seems they are not there right
now).
2020-03-29 18:52:41 +02:00
Andrew Childs
5180ec3506 ghc865Binary: aarch64 support 2020-03-27 20:56:52 +01:00
Gabor Greif
f6d2dce2bf ghc-8.10.1: reformat to minimize diff with 8.8.3.nix 2020-03-27 20:56:41 +01:00
Andrew Childs
3c7ef6bcd8 ghc: 8.6.3-binary -> 8.6.5-binary 2020-03-27 20:54:27 +01:00
Domen Kožar
59c58f3360
ghc: 8.10.0.20200123 -> 8.10.1 2020-03-26 17:47:06 +01:00
Domen Kožar
00373dacd3
Merge pull request #80355 from thefloweringash/ghc-aarch64-llvm
haskell.compiler.ghc822Binary: propagate llvm dependency
2020-03-26 15:18:30 +01:00
Andrew Childs
31f557c88f haskell.compiler.ghc822Binary: propagate llvm dependency
Fixes the following error when attempting to build packages using this
compiler:

  <no location info>: error:
      Warning: Couldn't figure out LLVM version!
               Make sure you have installed LLVM 3.9

  <no location info>: error: ghc: could not execute: opt
2020-03-21 21:27:23 +09:00
Benjamin Hipple
072a3bda78 ghc: consistent downloads.haskell.org src URLs
Consistency is good in general and these seem to work just as well as the
others, but it also helps with blacklisting package updates, as in:
https://github.com/ryantm/nixpkgs-update/pull/160
2020-03-07 10:28:06 -05:00
Gabor Greif
ff6aeefb91 ghc-8.8.3: really use ld.gold (port #80466) 2020-02-28 21:17:10 +01:00
Gabor Greif
c8554c0574 ghc: add 8.8.3
https://mail.haskell.org/pipermail/ghc-devs/2020-February/018643.html
2020-02-28 20:42:25 +01:00
Adam Sandberg Ericsson
9a5ecf1212 ghc: really use ld.gold 2020-02-28 20:29:33 +01:00
Gabor Greif
6bedeceb8a ghc: update 8.10.1 pre-release to announced rc1
https://mail.haskell.org/pipermail/ghc-devs/2020-January/018530.html

The version previously fetched was `8.10.0.20200108`.
2020-01-31 21:05:55 +01:00
Luka Blaskovic
b57464448b haskell.compiler.ghc863Binary: remove llvm from buildInput
Aarch64 binary is not used.
2020-01-30 18:35:29 -05:00
Luka Blaskovic
f6160bc6eb haskell.compiler.ghc822Binary: use default llvm version on aarch64 2020-01-30 18:35:29 -05:00
Gabor Greif
42fd1d0727 ghc: 8.8.2-rc1 -> 8.8.2
https://www.haskell.org/ghc/blog/20200116-ghc-8.8.2-released.html
2020-01-18 22:32:24 +01:00
Frederik Rietdijk
ed1b0d0bac Merge master into staging-next 2020-01-13 16:08:59 +01:00
Peter Simons
74e5314b29 ghc: update 8.10.1 pre-release from alpha2 to rc1 2020-01-13 10:28:51 +01:00
Matthew Bauer
04000331c1
Merge pull request #74284 from matthewbauer/ios-with-xcode-11
Update iOS for XCode 11
2020-01-03 15:35:41 -05:00
Matthew Bauer
9c1a2ac51e Merge remote-tracking branch 'origin/master' into ios-with-xcode-11 2020-01-03 15:34:20 -05:00
Matthew Bauer
036cef9473 ghc: always use llvm with iOS
Even when building for the simulator.
2020-01-03 15:19:37 -05:00
Robin Gloster
f6a3f5af36
treewide: structured-attrs fixes 2019-12-31 01:39:53 +01:00
Maximilian Bosch
15468f9a4b
ghc*: fix for structured attrs
configureFlags must be a flat list.
2019-12-31 01:31:19 +01:00
Robin Gloster
006242fd5a
treewide: fix types for mkDerivation params 2019-12-31 01:23:19 +01:00
Robin Gloster
760e23136a
treewide: *inputs are lists 2019-12-31 01:09:25 +01:00
Robin Gloster
8a227a2341
treewide: fix nested lists in *buildInputs 2019-12-31 00:57:57 +01:00
Peter Simons
525b8cd3f6 ghc: add 8.10.1-alpha2 2019-12-27 20:58:23 +01:00
Peter Simons
56f1127a42 ghc: add 8.8.2-rc1 2019-12-27 20:43:35 +01:00
John Ericson
9a080ceff2
Merge pull request #74922 from matthewbauer/ghc-no-gold-with-llvm
ghc: don’t use gold when useLLVM = true
2019-12-03 17:35:57 -05:00
Matthew Bauer
00cdf80d6a ghc: don’t use gold when useLLVM = true
When using the llvm-based linker, we don’t have a .gold flavor to
pick. So just fall back to the normal “ld” command.
2019-12-03 11:15:20 -05:00
Domen Kožar
7217090464
ghc: compile with DWARF support by default
This allows our GHCs to build programs with DWARF debug information
when -g is passed, see https://ghc.haskell.org/trac/ghc/wiki/DWARF.

Compiling with debug symbols is off by default until GHC ticket
https://gitlab.haskell.org/ghc/ghc/issues/15960
(Using -g causes differences in generated core) is fixed.
2019-11-20 15:35:25 +01:00
John Ericson
b55854c0b4 ghcHEAD: 8.9.20190601 -> 8.9.20190924
Also close pointless diff with 8.8.1.
2019-09-27 17:00:59 +00:00
Peter Simons
8dcaebfe3b ghc: drop unused abi-depends-determinism.nix patch 2019-09-18 18:30:31 +02:00
Peter Simons
1f157b8cf8 ghc: drop obsolete 8.2.2 version
We keep the last 3 major releases of GHC around, which are
versions 8.8.1, 8.6.5, and 8.4.4.
2019-09-18 18:28:11 +02:00
Peter Simons
ddb77f3437 ghc: drop obsolete 8.6.4 version
The latest version in the 8.6.x branch is 8.6.5.
2019-09-18 18:24:42 +02:00
Peter Simons
2c70934263 ghc: revert "compile with DWARF support by default"
This reverts commits 2021578686 and
f4316473d9.

Fixes https://github.com/NixOS/nixpkgs/issues/69023.
2019-09-18 15:18:20 +00:00
Matthew Bauer
2021578686 ghc: don’t use dwarf on windows
elfutils don’t work on windows

https://hydra.nixos.org/eval/1541857#tabs-removed

/cc @domenkozar
2019-09-13 16:00:30 -04:00
Domen Kožar
f4316473d9 ghc: compile with DWARF support by default
This allows our GHCs to build programs with DWARF debug information
when -g is passed, see https://ghc.haskell.org/trac/ghc/wiki/DWARF.

Compiling with debug symbols is off by default until GHC ticket #15960
(Using -g causes differences in generated core) is fixed.
2019-09-11 10:52:04 +02:00
Frederik Rietdijk
66bc7fc1b3 Merge master into staging-next 2019-09-06 22:46:05 +02:00
Vladimír Čunát
4179ba049c
ghc on aarch64: try to work around #66277 2019-09-06 22:32:40 +02:00
volth
08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
Frederik Rietdijk
5061fe0c2c Merge staging-next into staging 2019-08-28 08:26:42 +02:00
volth
35d68ef143 treewide: remove redundant quotes 2019-08-26 21:40:19 +00:00
Peter Simons
7bf8d783f8 The proper release of ghc-8.8.1 is out. 2019-08-26 14:30:38 +02:00
Peter Simons
f10881af6b ghc-8.8.1: update alpha-2 to rc-1 2019-08-15 16:04:33 +02:00
Mario Rodas
639c8c1f6a
ghc: use ld.gold only on Linux
partly reverts commit 29f2f04ded.
2019-08-07 22:05:26 -05:00
Alp Mestanogullari
29f2f04ded ghc: always use ld.gold
gold is known to speed up GHC builds considerably, saving up to many seconds
when linking large Haskell applications, so this patch configures all
non-binary GHC derivations to use gold.
2019-08-05 07:50:26 +02:00
Peter Simons
895fb1629d
Merge pull request #64371 from mpickering/strip-ghc
ghc: Don't strip compilers
2019-07-06 12:54:31 +02:00
Matthew Pickering
b1e3d0737a ghc: Don't strip compilers
To test this I built a version of the compiler with `dontStrip = True`
and the vanilla version. The size of the result is both 1.4gb which
indicates that the stripping doesn't do anything meaningful.

Not stripping means that the debug rts is properly packages as it
contains DWARF information and unused debugging symbols.

Fixes #63511
2019-07-06 10:02:03 +01:00
Peter Simons
52b3ae8cb8 ghc-8.8.x: bump version to alpha 2 2019-06-19 17:19:48 +02:00
volth
f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
Silvan Mosberger
c382915e28
haskell.compiler.ghcHEAD: 20190115 -> 20190601 2019-06-12 00:20:35 +02:00
Matthew Bauer
48ba8a4fb5 ghc: add bash to buildInputs
Fixes #62417.
Closes #62553.
2019-06-07 10:07:39 +02:00
Matthew Bauer
8a52658918 ghc: use ncg for cross buildsystem
We can use ncg for all x86 builds.

Fixes #61262
2019-05-12 00:22:01 -04:00
Peter Simons
894e102c84 ghc: add alpha-1 pre-release for version 8.8.1
The patches for https://phabricator.haskell.org/D5123 and
https://github.com/haskell/haddock/issues/900 no longer
apply and have been dropped.
2019-04-30 11:43:44 +00:00
Peter Simons
ceb9440dfb ghc: update 8.6.5-rc1 to 8.6.5 2019-04-30 11:43:44 +00:00
Peter Simons
66c25cff94 ghc: add release candidate for 8.6.5 and a corresponding package set 2019-04-13 12:16:34 +02:00
Nathan van Doorn
a184604edf ghc-8.6.4: patch to fix haddock bug with typechecker plugins
Closes https://github.com/NixOS/nixpkgs/pull/59317.
2019-04-13 12:16:33 +02:00
rnhmjoj
5ea4160b33
treewide: fixup bcf54ce
fix the executable bit for scripts installed with substituteAll
and some remaining shebangs.
2019-04-12 09:09:22 +02:00
Matthew Bauer
6da1a83d4d ghc8.6.4: use targetPackages for getting libffi 2019-04-03 16:45:59 -04:00
Luis Pedro Coelho
da402892dc ghc: make disableLargeAddressSpace configurable
Even on Linux/NixOS, it can be useful to have a compiler without the
large address space as it creates issues in some contexts.
2019-04-02 09:52:47 +02:00
John Ericson
655a29ff9c ghc, go, guile: Use new pkgs*
`pkgsBuildTarget` allows us to avoid repeated and confusing conditions.
The others merely provide clarity for one the foreign package set's
target platform matters.
2019-03-24 22:12:15 -04:00
Will Dietz
93e3eecdb3 ghc*Binary: use $OBJCOPY when invoking objcopy (touchup musl fix) 2019-03-18 02:00:39 -05:00
Will Dietz
9a10434f4d ghc{822,863}Binary: fix to work w/musl again, __strdup -> strdup 2019-03-17 05:23:11 -05:00
Peter Simons
93e4a90502 ghc: switch our default compiler to version 8.6.4
Also, drop obsolete 8.6.x minor releases 8.6.1, 8.6.2, and 8.6.3.

(cherry picked from commit 7fde42b8eb)
2019-03-16 20:30:58 +01:00
Peter Simons
68be6bbc31 ghc: add new 8.6.4 version 2019-03-06 08:13:56 +01:00
Peter Simons
456f09d76f ghc: Drop outdated compiler versions 8.6.1 and 8.6.2. We have 8.6.3. 2019-03-05 11:13:52 +01:00
Matthew Bauer
1f212565d2 ghc863: dont add extra libs
Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.

Merged in pull request #56795 from @matthewbauer.
2019-03-05 11:13:52 +01:00
Sebastian Graf
cbaec5abc9 Fix include path of libffi used in GHC build 2019-03-01 11:30:05 +01:00