Commit Graph

47 Commits

Author SHA1 Message Date
Leon Isenberg
7a08e57b9e haskell: ghcjs packages: Break dependency cycle less invasive
Between cabal and hscolour.
2017-04-07 19:02:52 +02:00
Leon Isenberg
2553ceb982 haskell: use GHCJS to build Setup.hs for GHCJS packages
Closes https://github.com/NixOS/nixpkgs/pull/23614.
2017-03-29 20:30:28 +02:00
Peter Simons
24a69286e9 Merge pull request #23610 from ljli/hs-ghcjs-pkgs-inherit
haskellPackages: apply GHC specific overrides before GHCJS
2017-03-24 23:15:41 +01:00
Leon Isenberg
07905c8f93 haskell: ghcjs packages: fix ghcjs-dom-jsffi with newer Cabal 2017-03-08 16:28:54 +01:00
Leon Isenberg
b9c7d291bc haskellPackages: apply GHC specific overrides before GHCJS
GHCJS is effectively a backend for GHC, so all the GHC version specific package set overrides should in
general apply to the GHCJS package sets, too.
2017-03-08 13:10:28 +01:00
Leon Isenberg
691b3bcd77 haskellPackages: fix dangling references
haskeline_0_7_2_1 -> haskline_0_7_3_1
terminfo_0_4_0_1 -> terminfo_0_4_0_2
2017-03-05 16:45:31 +01:00
Profpatsch
5373ca9712 haskell/ghcjs: fix ghcjs-ffiqq, add ghcjs-vdom (#20614)
Both experimental libraries that are in the ghcjs GitHub organization, but are
not yet officially released on hackage.
2016-12-06 23:24:42 +01:00
Rodney Lorrimar
de2f9d6719 haskellPackages.ghcjs-dom: Add overrides (#20474) 2016-11-21 20:51:59 +01:00
Profpatsch
06e0bac814 haskell/ghcjs: sort ghcjs packages alphabetically 2016-11-18 16:38:04 +01:00
Profpatsch
a7043808dd haskell/ghcjs: patch Safe out of fast-logger 2016-11-18 16:24:37 +01:00
Profpatsch
247d7c88d2 haskell.packages.ghcjs: fix entropy (#20446) 2016-11-18 16:17:14 +01:00
Bas van Dijk
79f6e39b93 cereal: fix build on ghcjs 2016-10-14 00:35:01 +02:00
Profpatsch
308cd1abad packages.ghcjs: fix a few packages
dependencies for http2 & semigroups
jailbreak for protolude
no docs for wai
2016-09-28 15:51:53 +02:00
Ryan Trinkle
5a622db103 ghcjs: move list of stage 1 packages into ghcjs derivation
This makes it easier to ensure that the list of stage 1 packages accurately matches the given version of ghcjs, and makes it possible for this list to be overridden
2016-07-27 14:28:31 -04:00
Ryan Trinkle
c564997ba0 ghcjs: refactor stage2 handling
Previously, the stage2 information was stored in haskell-modules, and imported directly from there.  However, the correct stage2 information is determined by the version of ghcjs-boot repository.  This commit makes the stage2 information part of the ghcjs derivation, which improves organization and makes it possible to override stage2 when overriding ghcjs.
2016-07-26 16:58:56 -04:00
Ryan Trinkle
440b301d0a Merge pull request #13931 from mightybyte/unix-compat-needs-libiconv
ghcjs: on Darwin, build unix-compat with libiconv
2016-03-15 01:11:02 -04:00
Doug Beardsley
a0ecf9cee2 ghcjs: on Darwin, build unix-compat with libiconv 2016-03-15 12:07:59 +08:00
John Ericson
e4abe06b8a ghcjs: Use bootpkgs to override build tools, not hardcoded compiler's pgks 2016-03-06 12:39:12 -08:00
Jude Taylor
bd9f128cc2 add darwin.libiconv to ghcjs packages 2016-02-24 13:33:16 -08:00
Charles Strahan
516057ffa9 ghcjs: replace integer-simple with integer-gmp
GHCJS uses integer-gmp, but cabal2nix generates a dependency list that
includes integer-simple instead. This tweaks the stage2 generator to
replace any instance of integer-simple with integer-gmp.

Things currently still work without this change (assuming
integer-simple is defined as null), as ghcjs includes integer-gmp in
its stage1 packages - so it's always available.

However, this change makes things a bit more explicit, rather than
leaving things to chance. If at any point the stage1 packages are also
split up into separate derivations, the integer-gmp package will need to
be passed along to the packages that depend on it. This change should
prevent some confusion going forward.
2016-02-18 18:32:58 -05:00
Charles Strahan
e6e9970891 ghcjs: don't propagate Cabal to all packages
Previously, we were compiling Setup.hs with ghcjs (instead of  ghc),
and that required that Cabal be available, otherwise the Setup.hs would
fail to compile.

Now that we are compiling Setup.hs with ghc, it's no longer necessary
to add Cabal as a dependency to all ghcjs packages.
2016-02-18 15:00:34 -05:00
Charles Strahan
bbce88302a ghcjs: fix building with cabal-install-1.22.8.0 2016-02-18 03:15:59 -05:00
Charles Strahan
fdd54a9434 ghcjs-ffiqq: init at rev da31b1858 (Oct 12, 2015) 2016-02-01 02:13:45 -05:00
Charles Strahan
c01eb06954 ghcjs: build with GHC 7.10.3 2016-01-31 20:44:49 -05:00
Charles Strahan
cb6beb1eb3 ghcjs: build haddock documentation
From building reflex-dom (which has quite a few dependencies), it would
appear that building the documentation no longer fails.
2016-01-25 20:16:12 -05:00
Charles Strahan
95d892ec26 ghcjs: update and fix ghcjs/reflex libs
Set dontStrip when building ghcjs libs, which fixes the ghcjs-dom lib
and also makes the logs cleaner.
2016-01-24 17:13:45 -05:00
Charles Strahan
700e4aebdc ghcjs: fix the build 2016-01-24 13:28:24 -05:00
John Ericson
53e43204f9 ghcjs: update comment on generating built-in pkg list
Should we do `import (runCommand ...)` to automate this?
2015-11-12 16:47:41 -08:00
Peter Simons
8e07d5d77c haskell: update lists of core and non-core packages for older compilers 2015-10-18 22:01:09 +02:00
Renzo Carbonara
5ed4e0c2fd pkgs bumps: ghcjs, ghcjs-boot, ghcjs-shims, ghcjs-dom 2015-10-05 01:20:22 -03:00
Renzo Carbonara
431507d11a ghcjs packages: reflex, reflex-dom, dependent-sum_0_2_0_1, dependent-map_0_1_1_3, dependent-sum-template 2015-09-25 08:46:42 +02:00
Renzo Carbonara
f546d389b6 bump ghcjs-dom 2015-09-25 08:46:41 +02:00
Peter Simons
6be6397aa1 ghcjs: import gtk2hs-buildtools from the regular Haskell package set
The tool is required for ghcjs builds, but ghcjs cannot compile it itself,
obviously, because it's written in C.
2015-09-14 16:43:31 +02:00
Peter Simons
c0b25fe164 configuration-ghcjs.nix: remove obsolete overrides for dependent-map
Fixes https://github.com/NixOS/nixpkgs/issues/9734.
2015-09-09 10:22:29 +02:00
Nikolay Amiantov
1a590a6185 haskell: use postPatch instead of patchPhase where possible
Closes https://github.com/NixOS/nixpkgs/pull/9297.
2015-08-19 11:01:47 +02:00
Peter Simons
fcb8d47fcd Switch ghcjs to ghc 7.10.2. 2015-08-07 15:13:14 +02:00
obadz
3801ef5912 haskell: move patches to patches directory 2015-08-06 11:14:05 +01:00
Richard Wallace
b5f2fd7220 no longer need to patch reactive-banana, latest version has all the necessary instances 2015-05-08 23:17:47 -07:00
Renzo Carbonara
9d03afa429 Haskell: explicit reflex-dom dependencies for GHCJS
When building `reflex-dom` for GHCJS, the following dependencies are not
needed and will fail to build: glib, gtk3, webkitgtk3,
webkitgtk3-javascriptcore. Now we explicitely need the dependencies
needed for building for GHCJS.
2015-05-08 16:54:07 -03:00
Charles Strahan
929dc4199a ghcjs: properly wrap binaries in environment
This also:

 1  Builds Setup.hs with ghcjs, which (among other things) defines
    __GHCJS__ and ghcjs_HOST_OS during pre-processing.
 2  Fixes ghc-paths to point at ghcjs and use NIX_GHCJS_* env-vars.
 3  Boots ghcjs into $prefix/lib/$compiler.
2015-05-08 11:33:44 -04:00
Nikolay Amiantov
0e223ffafe haskellng.jsaddle: fix on non-ghcjs 2015-04-15 13:39:36 +02:00
Charles Strahan
b5f63776a0 haskell: simplify ghcjs-dom expression for GHCJS 2015-04-09 15:02:16 -04:00
Charles Strahan
ed30c8ba40 haskell: use native alex and happy for GHCJS 2015-04-09 15:02:16 -04:00
Charles Strahan
d590a0f4b6 ghcjs: support for Haskell-NG
closes #5828
closes #6786
2015-03-29 03:34:04 +02:00
Nikolay Amiantov
49f3c375b5 ghcWithPackages: add withLLVM 2015-03-26 11:29:05 +01:00
Peter Simons
55003ca34b pkgs/development/haskell-modules/lib.nix: add funky helper function for overriding 2015-01-10 23:36:59 +01:00
Peter Simons
54baa53df1 Say hello to our brand-new Haskell infrastructure. 2015-01-07 23:45:21 +01:00