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
John Ericson
8d2ce113d5
ghc: Handle flavors better
2018-05-21 15:11:12 -04:00
John Ericson
6f2f081b90
ghc: Normalize derivations
2018-05-21 15:11:12 -04:00
Vladimír Čunát
392e6de7d0
Merge branch 'master' into staging
2018-05-20 13:20:53 +02:00
Jack Cummings
2fe842a200
fix ghc bootstrap on non-nixos nonstd-storepath
...
Something goes amiss in the configurePhase and binaries start picking up
system binaries and everything falls apart. Patch the configure script
to use a bourne shell out of the store, and things are happier.
Closes https://github.com/NixOS/nixpkgs/pull/40691 .
2018-05-19 22:24:31 +02:00
John Ericson
5e17335bd7
Merge remote-tracking branch 'upstream/staging' into strictDeps
2018-05-14 23:33:03 -04:00
John Ericson
330ca731e8
treewide: Get rid of all uses of crossConfig
...
The hack of using `crossConfig` to enforce stricter handling of
dependencies is replaced with a dedicated `strictDeps` for that purpose.
(Experience has shown that my punning was a terrible idea that made more
difficult and embarrising to teach teach.)
Now that is is clear, a few packages now use `strictDeps`, to fix
various bugs:
- bintools-wrapper and cc-wrapper
2018-05-14 23:30:37 -04:00