Commit Graph

27 Commits

Author SHA1 Message Date
John Ericson
a8bd27b454 Merge branch 'ghcjs-cross-without-cc-common' into ghcjs-cross-without-cc 2019-12-25 01:31:35 -05:00
John Ericson
c3c245dcda ghcjs: get socket.io from pkgsHostHost
This is a bit dubvious, but the alternative of making nodejs a
nativeBuildInput for node packages is worse. In general the cross story
for interpreted languages is murky, and this fits that pattern.
2019-12-24 19:52:36 -05:00
Travis Whitaker
5641dedb3a GHCJS: Build on Hydra 2019-09-25 17:03:40 -07:00
Travis Whitaker
348656cea8 haskell.compiler.ghcjs86: Bump ghc-8.6 branch, fix build. 2019-09-22 13:43:08 +02:00
Vaibhav Sagar
e4975aac68 ghcjs-ng: unbreak 2019-03-23 22:47:06 -04:00
Peter Simons
c3f38ddd8b ghcjs: disable Hydra builds while the build is marked as broken 2019-02-24 10:14:29 +01:00
Peter Simons
6f5d2f4611 ghcjs: mark build as broken
Build errors are at:

 - https://hydra.nixos.org/build/89288500
 - https://hydra.nixos.org/build/89286604
2019-02-22 10:35:00 +01:00
Will Fancher
96360a3a49 GHCJS: Add elvishjerricco as maintainer 2019-01-30 03:24:15 -05:00
Peter Simons
3b1158c8dd ghcjs: mark compiler builds as broken
These builds have been failing for a long time ...
2019-01-29 20:19:54 +01:00
John Ericson
d892f1aa90 ghcjs-*: Expose the version of GHC used
This is more meaningful than the GHCJS version for most tasks.
2018-09-28 12:06:31 -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
John Ericson
2c2f1e37d4 reewide: Purge all uses stdenv.system and top-level system
It is deprecated and will be removed after 18.09.
2018-08-30 17:20:32 -04:00
Will Fancher
ff83aca511 Added ghcjs-base to GHCJS 8.4 / 8.2 2018-07-15 23:47:47 -04:00
Matthew Bauer
e01db49bfa ghcjs-ng: Move to $out/lib/ghcjs-8.4
This is standard for ghc compilers & much more convenient. This seems
to fix the issues we have been having in ghcjs pkgs.

Fixes #42032
Fixes #42617
2018-06-26 17:43:58 -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
Matthew Justin Bauer
30913cc998
ghcjs: remove phases
We can just disable each one we don't want manually.
2018-06-18 15:44:23 -04:00
Matthew Bauer
a9400e64e7 ghcjs: add version to haskellCompilerName
This is needed for some cabal2nix stuff in getting the version.
Previously we had left out the version but apparently this can cause
problems in some scenarios.

/cc @elvishjerricco @peti @ericson2314
2018-06-14 11:38:13 -04:00
Matthew Justin Bauer
45c70e496f
ghcjs-ng: add haskellCompilerName attribute
This is needed by some old code in Nixpkgs. Adding it here will fix some eval errors.

/cc @ElvishJerricco

Fixes #41943
2018-06-13 16:34:50 -04:00
Matthew Justin Bauer
1aaab72291
ghcjs-ng: fixup system tuple
on i686-linux, the libexec dir should be /libexec/i386-linux-ghc-8.2.2 not /libexec/i686-linux-ghc-8.2.2
2018-06-09 19:45:46 -04:00
Will Fancher
ea52ca64e8 Fix GHCJS 8.4/8.2 in sandboxed builds (#41411) 2018-06-03 23:28:17 +02:00
Will Fancher
7a23f1acca GHCJS darwin fixes (#41120)
* GHCJS darwin fixes

* Fix ghcjs 80 and 710 packages

* Add socket-io to ghcjs 82 and 84 passthru
2018-05-29 23:39:21 +02:00
Will Fancher
4eb49533cb Work around GHCJS bug with ghcjs-boot -j1 2018-05-17 05:27:38 -04:00
Will Fancher
7b405d3564 Remove -dcore-lint from GHCJS wrapper 2018-05-17 05:27:19 -04:00
Will Fancher
9c6e63ffda Expose bootGhcjs for convenience's sake 2018-05-17 05:27:03 -04:00
Will Fancher
2f6c9947fe Add pkgconfig to ghcjs boot 2018-05-17 05:26:48 -04:00
Will Fancher
2a32834ad9 Factor out bootGhcjs for justStaticExecutables sake 2018-05-16 03:11:33 -04:00
Will Fancher
c41675bce0 GHCJS 8.2 2018-05-12 01:54:42 -04:00