Commit Graph

179 Commits

Author SHA1 Message Date
Robin Gloster
006242fd5a
treewide: fix types for mkDerivation params 2019-12-31 01:23:19 +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
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
volth
08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00: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
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
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
Kosyrev Serge
ea19a8ed1e ghcHEAD: update to 8.7 2019-01-27 10:26:07 +01: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
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
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
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
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
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
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
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
John Ericson
30ea1bfd22 ghc-*: Tool env vars no longer need to be made full paths 2018-08-08 17:16:16 -04:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00: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
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
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
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
57fed4f5b5 haskell.compiler.ghcHEAD: 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
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
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
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