colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
591,091 Commits 126 Branches 0 Tags 3.1 GiB
460374eb04
Commit Graph

959 Commits

Author SHA1 Message Date
sternenseemann
118b28a127 haskell.compiler.*: pull in unwrapped bintools for darwin 
GHC calls otool on darwin which is contained in the
stdenv.cc.bintools.bintools derivation and thus needs adding to the
runtime PATH of GHC. Since this is toolchain specific technically, we
check for cctools instead of darwin (although I don't know if GHC
or nixpkgs work on macOS without cctools).

This fixes usage of GHC in an environment where otool is not available
and more specifically in stdenvNoCC which is used by writers.writeHaskell.
Resolves #123228.
 2021-06-08 14:20:09 +02:00
Guillaume Bouchard
81c8d158a8 ghc: add missing meta data 
`haskellCompilerName` in cabal2nix and hence ghc 8.10.2 and 8.6.5
"-binary" were not working correctly in this context.
 2021-06-01 12:46:55 +02:00
(cdep)illabout
721c8ab307
haskell.compiler.ghcHEAD: disable Hydra build on aarch64-linux 2021-05-19 10:30:23 +09:00
sternenseemann
f90244c970 haskell.compiler.ghcHEAD: disable DWARF on non x86 
The broken build of ghcHEAD on aarch64-linux results from rts/Libdw.c
not supporting that platform. Seemingly this particular file is only
relevant for DWARF support in GHC, so we disable that on unsupported
platforms.
 2021-05-17 17:22:47 +02:00
(cdep)illabout
d1de348fdc
haskell.compiler.ghcHEAD: mark broken on aarch64 2021-05-16 16:52:08 +09:00
sternenseemann
b4c069dc11 haskell.compiler.ghcHEAD: 8.11.20200824 -> 9.3.20210504 2021-05-08 13:03:55 +02:00
Silvan Mosberger
08d94fd2b0
Merge pull request #114374 from oxalica/lib/platform-support-check 
lib.meta: introduce `availableOn` to check package availability on given platform
 2021-05-08 03:54:36 +02:00
maralorn
8b7d34d89e
Merge pull request #122026 from sternenseemann/ghc-binary-no-aarch64-hydra 
haskell.compiler: misc cleanups for hydra aarch64 builds
 2021-05-07 20:15:44 +02:00
sternenseemann
355b55d00b ghc8102Binary, ghc865Binary: don't build aarch64 on hydra 
Unfortunately these compiler's normal binary versions exceed the maximum
output size on hydra and thus can't be built on there.

See also https://gitlab.haskell.org/ghc/ghc/-/issues/17051
 2021-05-07 15:09:08 +02:00
sternenseemann
952a2866a2 haskell.compiler.ghc*Binary: update source URLs 
The tarball download URLs seem to have changed, so we adjust them in
case anyone wants to reproduce the source of ghc8102Binary and
ghc865Binary.

Tested for x86_64-linux, i686-linux, aarch64-linux, x86_64-darwin.

Resolves #121804.
 2021-05-07 11:20:19 +02:00
oxalica
354d262db8
lib.meta: introduce availableOn 2021-04-02 19:20:23 +08: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
0b626654ad ghc: update the 9.0.1 version to the official release tarball 2021-02-05 23:05:20 +01:00
Peter Simons
b1d2e3b10f ghc-8.10.3: don't use obsolete stdenv.lib 
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
 2021-02-05 23:04:46 +01:00
Cheng Shao
643169bbb4 Fix ar command path in GHC. 
Previously, the "ar command" in the global config of GHC in nixpkgs is
simply "ar" instead of a proper absolute path in the nix store. This
will result in an "ar: command not found" error when using GHC and cabal
in a pure nix shell. This commit adds the patch and applies to all
pre-9.0 versions.

See output of ghc --info for "ar command" value.
 2021-02-05 22:54:09 +01:00
Ben Siraphob
acc5f7b18a pkgs/development/compilers: stdenv.lib -> lib 2021-01-23 08:57:37 +07:00
zowoq
31f5dd3f36 treewide: editorconfig fixes 
- remove trailing whitespace
- use spaces for indentation
 2021-01-20 09:11:11 +10:00
Peter Simons
8a21e02e31 ghc-9.0.1: set utf-8 locale during the build so that Haddock succeeds 2021-01-02 19:58:19 +01:00
Peter Simons
bf5e99fc7a ghc-9.0.1: avoid use of tabs in the expression 2021-01-02 19:58:19 +01:00
Peter Simons
61a785ccd9 ghc: update 9.0.1 compiler from alpha-1 to rc-1 2021-01-02 19:58:19 +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
Joe Hermaszewski
15b3bc3306 ghc865-binary: Use binary distribution which links against ncurses6 for 
x86_64-linux

Ben Gamari's patch from #85924.

Fixes #85924, allowing one to bootstrap GHC in `pkgsMusl`

`nix-build -A pkgsMusl.haskellPackages.hello` succeeds with this patch.
 2020-11-28 20:19:05 +08:00
Frederik Rietdijk
587538d087 Merge staging-next into staging 2020-11-23 18:10:33 +01:00
Mario Rodas
888b9587ed haskellPackages.ghc8102: add patch to allow Block.h compile with c++ compilers 2020-11-22 04:20:00 +00:00
Scott Worley
5354cd0a16 ghc: Use a real URL for D5123.diff 
Please do not use tarballs.nixos.org in src URLs.  tarballs.nixos.org is
a cache, not an authority.

This patch differs from the one in tarballs.nixos.org only in source code
comments.
 2020-11-19 20:12:32 +01:00
Frederik Rietdijk
8aaf2e60e5 Merge staging-next into staging 2020-11-09 14:49:10 +01:00
Robert Hensing
7ac71d78a3 ghc8102: Fix whitespace 2020-11-06 11:35:19 +01:00
Robert Hensing
6057cb9786 ghc*: Increase build timeout to 1 day 
The default of 10 hours is insufficient for some of the slower
platforms like macOS and aarch64.
 2020-11-06 11:07:48 +01:00
Robert Hensing
6b377f2968 ghc8102Binary*: simplify meta 
Not distributing dependencies via hydraPlatforms does not work,
so we keep meta simple.

(cherry picked from commit 4643796794897f2baa3a8015de5a9c9fd416f1ae)
 2020-11-04 23:47:38 +01:00
Robert Hensing
dda47e489a ghc8102BinaryMinimal: Re-add docs, remove more profiling files 
(cherry picked from commit 7bd21d3e2da8b9ae394258cef9f18bf0a8dd2d47)
 2020-11-04 23:47:38 +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
73825262f9 Revert "haskell.ghc8102Binary: fix extra inputs" 
This reverts commit fb719d957f.
 2020-09-26 12:18:00 -07:00
Richard Marko
b9377e0950 ghc8102Binary: add numactl to libPath on aarch64 
Fixes:

utils/ghc-cabal/dist-install/build/tmp/ghc-cabal:
  error while loading shared libraries: libnuma.so.1:
    cannot open shared object file: No such file or directory
 2020-09-26 18:04:31 +02:00
Jonathan Ringer
fb719d957f haskell.ghc8102Binary: fix extra inputs 2020-09-25 15:22:54 -07:00
Richard Marko
0d4f3ef1ab ghc8102Binary: init, enable armv7l 2020-09-24 12:26:35 +02:00
Matthew Bauer
d0e52b6b32
Merge pull request #95309 from obsidiansystems/mobile-fixes 
Support Android 29 in cross-compilation
 2020-08-28 14:59:37 -05:00
Peter Simons
24cd70f14a Merge remote-tracking branch 'origin/master' into haskell-updates 2020-08-27 14:26:14 +02:00
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 c8aa9864405] 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 7fde42b8ebddbd673342b98d9d7c892a0c521583)
 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
Frederik Rietdijk
7257dedd7c Merge master into staging-next 2019-02-13 12:33:29 +01:00
Guillaume Bouchard
a7c774300b ghc-8.6.3: use system libffi 
Use the system `libffi` (`ie` nixpkgs's) instead of built-in libffi
from ghc source tree.

This will prevent library conflict when ghc dynamically links haskell
packages (linked with ghc built-in libffi) and any external library
which uses nixpkgs `libffi`.

Closes https://github.com/NixOS/nixpkgs/pull/55208.
 2019-02-12 13:40:59 +01:00
Vladimír Čunát
8ba516664b
Merge branch 'staging-next' into staging 2019-02-01 09:42:53 +01:00
Kosyrev Serge
ea19a8ed1e ghcHEAD: update to 8.7 2019-01-27 10:26:07 +01:00
Kosyrev Serge
c92101bc32 ghc-8.6.3-binary 2019-01-27 10:26:07 +01:00
rnhmjoj
bcf54ce5bb
treewide: use ${stdenv.shell} instead of /bin/sh where possible 2019-01-16 20:37:15 +01:00
Yegor Timoshenko
bb1cb2a332
ghc844: update hash for d8495549ba9d194815c2d0eaee6797fc7c00756a patch 2019-01-11 20:06:22 +03:00
Jörg Thalheim
1b146a8c6f
treewide: remove paxutils from stdenv 
More then one year ago we removed grsecurity kernels from nixpkgs:
https://github.com/NixOS/nixpkgs/pull/25277

This removes now also paxutils from stdenv.
 2018-12-22 12:55:05 +01:00
Frederik Rietdijk
df304abd27 Merge staging-next into staging 2018-12-08 12:50:38 +01:00
Peter Simons
c37ae1dcf6 ghc: add new compiler version 8.6.3 2018-12-08 11:46:20 +01:00
Matthew Bauer
7a00e80329 ghc: don’t add libiconv automatically 
ghc needs it to fail to correctly detect it for later.
 2018-12-05 13:17:40 -06:00
John Ericson
62a1bc0031
Merge pull request #51307 from expipiplus1/ghc-arm 
ghc-8.4: fix build targeting arm
 2018-12-01 02:23:43 -05:00
Joe Hermaszewski
7fa0befcc7 ghc-8.4: fix build targeting arm 
Fixes https://ghc.haskell.org/trac/ghc/ticket/15780
 2018-12-01 12:09:05 +08:00
Craig Younkins
a655fb9fbd ghc: Adding sphinx as build dependency to build man pages 
Fixes https://github.com/NixOS/nixpkgs/issues/49627.
Closes https://github.com/NixOS/nixpkgs/pull/50920.
 2018-11-25 09:43:34 +01:00
Benjamin Hipple
a4758050a3 ghc bootstrap binary: 8.2.1 -> 8.2.2 
If the nix store lives on NFS, `ghc 8.2.1` is unable to build a package
database. This bug was fixed by @bgamari in `ghc 8.2.2` here:
https://ghc.haskell.org/trac/ghc/ticket/13945

This commit upgrades the unpacked bootstrap GHC version, so that we can build
newer versions of GHC even if the store is on NFS.
 2018-11-21 16:06:22 +01:00
Matthew Bauer
5f575e7339 ghc: perl is needed at runtime 
ghc-split is a script that is written in perl. We need to have a perl interpreter around to use it.

Fixes #50569
 2018-11-18 18:47:02 -06:00
Will Dietz
6ebb2c385b ghc: disable pie, for now limit to musl since not default yet elsewhere 2018-11-15 21:55:08 -06:00
Peter Simons
357554ae89 ghc: drop unused 7.10.3-binary compiler 2018-11-08 17:39:13 +01:00
Peter Simons
8d81cf6201 ghc: add new version 8.6.2 2018-11-06 10:35:02 +01:00
Renato Alves
3bcdb3945a ghc-8.2.1-binary: Patch shebang causing failures in Centos 6 2018-11-05 14:05:50 +01:00
Peter Simons
2f0de54ddb Drop obsolete GHC versions 7.10.3, 8.0.2, and 8.4.3. 
We keep the latest minor release of each one of the last 3 major releases,
which currently are GHC versions 8.2.2, 8.4.4, and 8.6.1. We also have
ghc-HEAD, but this doesn't count.

Dropping these compilers implied that we have to drop the corresponding
versions of ghcjs, too. We can also drop a shitload of obsolete compiler
patches that newer versions no longer need.

At some point, we can probably simplify the generic builder, too.
 2018-11-02 20:13:55 +01:00
Guillaume Bouchard
55a82ffcd3
ghc: fix typo in 8.6.1 compiler name 2018-10-24 21:29:15 +02:00
Peter Simons
069bf7aee3 ghc: add new 8.4.4 version 2018-10-15 11:55:19 +02:00
Drew Hess
a1600d0aa8
ghc: enable parallel building of GHC on aarch64. 
Note: this only affects GHC, not haskellPackages, which still suffers
from https://ghc.haskell.org/trac/ghc/ticket/15449.
 2018-10-14 18:00:06 -04:00
Drew Hess
4babe7f799
haskell: re-enable aarch64, but disable parallel builds on that arch. 
This is a workaround for unreliable parallel Haskell builds on
aarch64. See https://ghc.haskell.org/trac/ghc/ticket/15449
 2018-10-05 01:28:42 -04:00
John Ericson
e1605d9b21
Merge pull request #47647 from obsidiansystems/ghc-8.2.2-change-patch 
ghc-8.2.2: Oops, added adjacent patch to the one I wanted for master
 2018-10-02 01:47:53 -04:00
John Ericson
bfef8113f6 ghc-8.2.2: Oops, added adjacent patch the one I wanted 2018-10-02 05:41:54 +00:00
John Ericson
e231a374b8
Merge pull request #47644 from obsidiansystems/ghc-8.2-hsc2hs 
ghc-8.2.2: Fix which hsc2hs is installed on cross
 2018-10-02 01:10:47 -04:00
John Ericson
4f5d9996a6 ghc-8.2.2: Fix which hsc2hs is installed on cross 
These commits all ended up on later GHCs, and are already being patched
in for ghc-8.4.3 in nixpkgs.
 2018-10-02 00:33:30 -04:00
John Ericson
a3d86b49b4
Merge pull request #47626 from obsidiansystems/ghc-cross-fixes 
ghc: Misc cross fixes
 2018-10-01 17:19:31 -04:00
John Ericson
b19113380f ghc 8.2.2: Backport cross fixes from 8.4.3 
Other patches are also needed for a working build, but that doesn't mean
these patches are any less necessary.
 2018-10-01 20:54:21 +00:00
John Ericson
cb442d9345 ghcHEAD: Copy android hack that other GHCs have 
Not sure why this one doesn't
 2018-10-01 20:53:46 +00:00
John Ericson
d4b5df711a ghcHEAD: Force INTEGER_LIBRARY like the other GHCs 
We really need to abstract to avoid these copy-paste errors.
 2018-10-01 20:50:58 +00:00
Tuomas Tynkkynen
f4dd2fed7f ghc: Replace meta.available checks for enableIntegerSimple 
This sort of code breaks config.{allowBroken, allowUnsupportedSystem} =
true by making them do unpredictable things.
 2018-09-28 15:01:00 +03:00
John Ericson
4adf621798 Merge remote-tracking branch 'upstream/master' into haskell-no-rec 2018-09-24 20:09:25 -04:00
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
Peter Simons
2ffcbeda13 ghc: add release version for 8.6.1 2018-09-22 13:26:33 +02:00
Shea Levy
cd41cad074 haskell.compiler.ghc861: Apply fix to abi-hash with backpack. 
See https://phabricator.haskell.org/D5123.
 2018-09-12 10:31:10 +02:00
Shea Levy
e6e56bbe32 ghc: Apply fix to abi-hash with backpack. 
See https://phabricator.haskell.org/D5123.
 2018-09-12 10:31:10 +02: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
Matthew Bauer
13c8acc3db Revert "Merge pull request #44767 from obsidiansystems/wrapper-env-var-path" 
This reverts commit 89efc27f57, reversing
changes made to d0f11020ca.
 2018-08-22 01:14:53 +02:00
Shea Levy
28e51c7cea
ghc: Use stable URL for deterministic profiling patch. 2018-08-21 14:58:14 -04:00
John Ericson
89efc27f57
Merge pull request #44767 from obsidiansystems/wrapper-env-var-path 
{cc,bintools}-wrapper, ghc, libgcc: Define wrapper env vars as full paths
 2018-08-17 16:12:26 -04:00
Shea Levy
429131ac79
Add back (optional) deterministic profiling patch for GHC 8.4 2018-08-16 11:37:24 -04:00
Vaibhav Sagar
c7596ef742 ghc861: 8.6.1-alpha2 -> 8.6.1-beta1 (#44891) 2018-08-11 19:06:36 +01:00
John Ericson
30ea1bfd22 ghc-*: Tool env vars no longer need to be made full paths 2018-08-08 17:16:16 -04:00
Matthew Bauer
406914934d
Merge pull request #43711 from angerman/feature/ghc-gmp 
Feature/ghc gmp
 2018-07-23 11:01:56 -04:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Moritz Angermann
c034dea090
Update 8.4.3.nix 2018-07-18 12:04:39 +08:00
Moritz Angermann
3f762923aa
[ghc] Backport gmp stuff 2018-07-18 10:21:38 +08:00
Moritz Angermann
b84ac074fc
[ghc] proper handling of integer libraries 2018-07-18 10:13:28 +08:00
Moritz Angermann
ad8c10e246
[ghc] assert gmp 2018-07-18 10:13:27 +08:00
Vaibhav Sagar
3c3c11031f ghc: 8.6.1-alpha1 -> 8.6.1-alpha2 2018-07-16 15:13:26 +08:00
Will Dietz
2996d29f71 ghc: don't use LLVM w/musl on non-cross 
Doesn't appear to be needed on musl-native on x86_64,
and on non-x86(-64) it's included anyway.
 2018-07-11 21:34:47 -05:00
Will Dietz
e065779af1 ghc821-binary: avoid mass-rebuild by using old dynamic linker string 2018-07-11 11:16:13 -05:00
Will Dietz
b4c91a3e1a ghc821-binary: disable ld override w/musl 
Fixes conftest failure that I believe ends up
using the wrong dynamic linker.
 2018-07-11 11:14:18 -05:00
Will Dietz
4a1d311c49 ghc821-binary: use glibc on musl 
These prebuilt binaries need to be used with glibc,
it doesn't matter what we're using otherwise.

This may seem a bit strange but has the huge advantage
of not needing to create/host/download musl-specific variants,
and instead continue to use the official ones from upstream.
 2018-07-11 11:06:20 -05:00
Will Dietz
773ae700b7 ghc{843,861}: keep '-musleabi' in targets like w/'-gnueabi' 2018-07-10 19:08:56 -05:00
Will Dietz
894f313e3c ghc{843,861}: clone linux-gnu targets so musl variants are available 
Fixes build with "muslpi" (armv6l-unknown-linux-musleabihf).

This was done via patch at first but it wouldn't apply to both at once,
and it's probably best to stick to just having musl clones for now
(instead of patching 8.6.1 targets into 8.4.3 and hoping that's okay).
 2018-07-10 14:57:41 -05:00
Jude Taylor
6084eacc66 remove redundant patch from GHC 8.6.1 for darwin 2018-07-06 12:00:09 -07:00
Peter Simons
c85f23a82a ghc: add 8.6.1-alpha1 pre-release 2018-07-01 19:22:09 +02:00
Matthew Justin Bauer
09c66f4045
Merge pull request #42412 from obsidiansystems/even-more-android-fixes 
Even more android fixes
 2018-06-25 19:09:29 -04:00
Matthew Bauer
69cad91b5c ghc843: don’t apply stripping in android 
This breaks some library symbols apparently. ARM symbols must be
incorrectly stripped. Also some very weird issues with patchelf.
 2018-06-25 17:13:02 -04:00
Matthew Bauer
2c2169c881 ghc: build shared on android 
We run into issues otherwise
 2018-06-25 17:12:02 -04:00
Will Dietz
0e40e0cc7d ghcHEAD: useLLVM needed for musl here as well 2018-06-25 15:50:36 -05:00
Will Dietz
61e3bd20a0 ghcHEAD: move hardeningDisable definition for cleaner diff against 8.4.3 
NFCI (no functionality change intendend)
 2018-06-25 15:50:36 -05:00
Will Dietz
449fbec9be ghcHEAD: add musl and cross fixes recently applied to 8.4.3 and 8.2.2 2018-06-25 15:50:27 -05:00
Will Dietz
2052323a78 ghc-8.4.3: minor fixes for cross-musl, same as used with 8.2.2 
Patches are no longer needed, seem to be more or less upstreamed.
 2018-06-25 13:19:49 -05:00
Will Dietz
3e49430922 ghc822: useLLVM when building against musl too 2018-06-23 12:53:45 -05:00
Will Dietz
ffdf8192b3 ghc843: apparently need LLVM when building against musl too 2018-06-23 12:20:02 -05:00
Frederik Rietdijk
48110c1295 Merge staging into master 2018-06-22 13:20:37 +02:00
John Ericson
e050011aa3
Merge pull request #42311 from obsidiansystems/haskell-enable-shared-defaults 
haskell: make generic builder follow compiler’s shared config
 2018-06-21 18:07:11 -04:00
Matthew Bauer
9e4aebdd7b ghc8.4: add android triple 
The triple is needed for armv7a-android-prebuilt to work (partly) with
GHC.

- also set EXTRA_CC_OPTS for ghc8.2
 2018-06-20 22:03:59 -04:00
Matthew Bauer
fd7a6ea0af haskell: make generic builder follow compiler’s shared config 
enableShared in generic-builder.nix should default to what the GHC
compiler was compiled with. Add a passthru to all of the GHC compilers
to hold the value of enableShared. If enableShared is not set in the
GHC we just use false as the default value for enableSharedLibraries.

Note: I may have missed some compilers. Only GHC & GHCJS are covered
by this commit but this shouldn’t break evaluation of anything else.
 2018-06-20 18:40:53 -04:00
Vladimír Čunát
5039d6ed1f
Merge branch 'master' into staging 
~6k rebuilds per platform (mainly haskellPackages, I think).
 2018-06-20 18:17:18 +02:00
John Ericson
07ff2c27f1
Merge pull request #37598 from dtzWill/feature/ghc-cross-musl 
ghc-{8.2.2,8.4.1}: fixups mostly for 2-stage cross, musl
 2018-06-18 17:01:31 -04:00
Peter Simons
b0909cc394 ghc: drop compiler version 8.4.2; we prefer 8.4.3 2018-06-17 10:37:06 +02:00
Matthew Justin Bauer
493ce3b2c4
Merge pull request #42050 from obsidiansystems/fix-ios-ghc 
ghc8.4: build statically on prebuilt iOS
 2018-06-14 17:37:06 -04:00
Matthew Bauer
3d811ff18b ghc8.4: build statically on prebuilt iOS 
Otherwise we run into issues in stage 1 with libffi.dylib unable to be
built. It is probably a similar case to the prebuilt Android.

/cc @ericson2314
 2018-06-14 17:31:06 -04:00
Matthew Bauer
7bc2024fb7 ghc8.4.3: add gmp available check 
This was left out in 812decd5c1 & should
be therer.
 2018-06-14 15:54:25 -04:00
Will Dietz
6cc5483b5e ghc-{8.2.2,8.4.1}: fixups mostly for 2-stage cross, musl 
* grab patches from gentoo to fix various 2-stage cross build system
  bugs
* explicitly set CrossCompilePrefix to the expected targetPrefix
  -- ensures everything has expected name and location
  -- fixes lack of prefix'ing when doing glibc -> musl "cross"
* Stage1Only: only set if doing "true" cross
* don't try to specify include/lib dirs for ncurses on cross
  -- only used by terminfo which actually removed the include option,
  and the lib option doesn't seem to do anything other than
  confuse the situation re:cross.

Fixes #37522
 2018-06-13 14:41:12 -04: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
57fed4f5b5 haskell.compiler.ghcHEAD: disable format hardening 2018-05-30 03:46:16 +02:00
Peter Simons
31706eeb93 haskell.compiler.ghc7103: disable format hardening 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
Jan Malakhovski
29757f3790 haskell.compiler.ghc842: disable format hardening 2018-05-29 07:35:46 +00:00
Jan Malakhovski
ee5660e7f6 haskell.compiler.ghc802: disable format hardening, else tests will fail 2018-05-29 07:35:39 +00:00
Jan Malakhovski
ad35019501 Merge branch 'master' into staging 
Fixed conflicts:
- lib/systems/for-meta.nix: in favor of staging
- pkgs/os-specific/darwin/xcode/default.nix: in favor of master
 2018-05-26 00:20:17 +00:00
Robin Gloster
33b8830a85
ghc: disable format hardening 2018-05-24 03:42:43 +02:00
Moritz Angermann
fe1eec9e24 ghc 8.4.2, head: Drop libiconv on windows. 
nixpkgs#37012 and  nixpkgs#37707 introduces the setup-hooks for libiconv, which inject `-liconv` into the `NIX_LDFLAGS`. This breaks horribly on windows where the linker end up having no idea how to linke `-liconv`. The configure.ac file specifically ignores libiconv on windows.
 2018-05-23 10:41:17 -04:00
John Ericson
c7458ded5c ghc 8.4.2, head: Adjust enableShared enableTerminfo for windows 2018-05-23 10:41:17 -04:00
Moritz Angermann
10b76a4cab ghc: paxmark all unwraped executables across the board 
Shell glob works even as the exact set of executable (filenames) varries
beween configuations. Need to skip non ELFs (e.g. shell scripts),
however.
 2018-05-23 10:41:15 -04:00
John Ericson
1978115c3b ghc: Handle flavors better 2018-05-23 10:27:42 -04:00
John Ericson
9ce15ea60c ghc: Normalize derivations 2018-05-23 10:27:42 -04:00
John Ericson
18742471af Merge remote-tracking branch 'upstream/master' into staging 
Use newer vagrant from master
 2018-05-23 09:40:37 -04:00
Peter Simons
5db3a9df5e
Revert "ghc, haskell infra: #40642 direct to master" 2018-05-23 09:36:16 +02:00
Peter Simons
0e35858252
Merge pull request #40929 from obsidiansystems/cross-ghc-for-master 
ghc, haskell infra: #40642 direct to master
 2018-05-22 20:37:45 +02:00
Tuomas Tynkkynen
f9feacfc7c Merge remote-tracking branch 'upstream/master' into staging 2018-05-22 17:48:29 +03:00
Moritz Angermann
4b2eceaa35 ghc: fix dylib load command limits in compiler version 8.x 
See https://phabricator.haskell.org/D4714 for the full details.
This will be part of ghc 8.6.

Closes https://github.com/NixOS/nixpkgs/pull/40877.
 2018-05-22 10:32:17 +02:00
John Ericson
d6ecbbe921
Merge branch 'staging' into feature/clean-ghc 2018-05-21 17:43:30 -04:00
Moritz Angermann
4b48094285 ghc 8.4.2, head: Drop libiconv on windows. 
nixpkgs#37012 and  nixpkgs#37707 introduces the setup-hooks for libiconv, which inject `-liconv` into the `NIX_LDFLAGS`. This breaks horribly on windows where the linker end up having no idea how to linke `-liconv`. The configure.ac file specifically ignores libiconv on windows.
 2018-05-21 15:11:12 -04:00
John Ericson
03602f8162 ghc 8.4.2, head: Adjust enableShared enableTerminfo for windows 2018-05-21 15:11:12 -04:00
Moritz Angermann
6af0c192d1 ghc: paxmark all unwraped executables across the board 
Shell glob works even as the exact set of executable (filenames) varries
beween configuations.
 2018-05-21 15:11:12 -04:00