Commit Graph

63 Commits

Author SHA1 Message Date
Domen Kožar
1f7dfda8b8 ghcjs: fix eval /cc @svanderburg
(cherry picked from commit ad771764743d9645084ac21730bb5a6cc11ce672)
Signed-off-by: Domen Kožar <domen@dev.si>
2016-09-04 11:31:02 +02:00
Ryan Trinkle
92d21f1115 Merge pull request #17314 from ryantrinkle/ghcjs-cabal-3494
ghcjs: work around haskell/cabal#3494
2016-07-27 16:35:39 -04:00
Ryan Trinkle
bf6fdae0f2 ghcjs: work around haskell/cabal#3494
See also NixOS/nixpkgs#16144
2016-07-27 14:34:12 -04: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
Charles Strahan
d3754d3482 ghcjs-base: update via ghcjs-boot
This pulls in two fixes for XMLHttpRequest for ghcjs-base:

* Fix two typos for websockets
  https://github.com/ghcjs/ghcjs-base/pull/54

* Respect `.withCredentials`property of XHR
  https://github.com/ghcjs/ghcjs-base/pull/57
2016-04-22 22:49:00 -04:00
Charles Strahan
0be225a8dc ghcjs: update sources to latest 2016-04-16 01:55:56 -04:00
Vladimír Čunát
09af15654f Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Jude Taylor
4686bc54a6 add socket.io to interactive ghcjs environments 2016-03-01 16:06:29 -08:00
Jude Taylor
f6c3b13c7c ghcjs: pull in ghcjsi branch 2016-02-26 11:27:47 -08:00
Ryan Trinkle
55720db388 ghcjs: Make ghcjs-boot source code overridable 2016-02-24 16:29:13 -05:00
John Ericson
51b66ed4d9 haskell: Add notion of cross compiler and define nativeGhc with it
Tested to not change hashes
2016-02-21 10:16:13 -08:00
John Ericson
114cd6765d haskell: Expose the package set used to build each GHC, where possible
Tested to not change hashes
2016-02-21 10:16:13 -08:00
John Ericson
e6d3a4e7d1 ghcjs: Remove wrapper, which seems long unused 2016-02-21 10:16:13 -08:00
Charles Strahan
c374ce26b0 ghcjs-shims: 2016/01/07 -> 2016/02/10
Bump revisions: 45f44f5f027 -> 4df1808d031
2016-02-18 19:15:02 -05:00
Charles Strahan
bbce88302a ghcjs: fix building with cabal-install-1.22.8.0 2016-02-18 03:15:59 -05:00
Vladimír Čunát
d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Vladimír Čunát
ae74c356d9 Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
Charles Strahan
05b2afed33 ghcjs: build hoogle docs for base libraries 2016-01-31 20:45:28 -05:00
Charles Strahan
ec1e4d5495 ghcjs-boot: 3529c6ab61d5f786b -> 97dea5c4145bf80a1 2016-01-31 20:07: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
4fd985b9ae haskell-packages: properly set postPatch
The existing code overrode the postPatch, instead of combining the
jailbreak commands with the user supplied postPatch.
2016-01-24 13:32:56 -05:00
Charles Strahan
700e4aebdc ghcjs: fix the build 2016-01-24 13:28:24 -05:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Peter Simons
1ec9144cad ghcjs: mark broken
Citing from http://hydra.cryp.to/build/1533084/log/raw:

    Configuring ghcjs-0.2.0...
    Setup: At least the following dependencies are missing:
    aeson >=0.7 && <0.10,
    haskell-src-exts ==1.16.*,
    optparse-applicative ==0.11.*,
    syb >=0.4 && <0.6

This issue has been present for a while now, and it's only gotten worse.
2016-01-11 12:06:03 +01:00
Luca Bruno
920b1d3591 Merge branch 'master' into closure-size 2015-11-29 16:50:26 +01:00
John Ericson
a122a7f65a ghcjs: bump version number to 0.2.0
Actually should have been this for a while.
2015-11-25 16:35:56 -08:00
Luca Bruno
a412927924 Merge remote-tracking branch 'origin/master' into closure-size 2015-11-25 21:37:30 +01:00
Ken Micklas
8d8f8f3c09 bump ghcjs, ghcjs-boot, ghcjs-shims 2015-11-25 11:30:43 +01:00
Vladimír Čunát
333d69a5f0 Merge staging into closure-size
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
Vladimír Čunát
148e03b2f1 gmp: split into multiple outputs 2015-10-28 10:15:49 +01:00
David Waern
d1360231d1 ghcjs: make it easier to override shims and ghcjs-boot 2015-10-16 21:58:44 +02:00
Renzo Carbonara
5ed4e0c2fd pkgs bumps: ghcjs, ghcjs-boot, ghcjs-shims, ghcjs-dom 2015-10-05 01:20:22 -03:00
Renzo Carbonara
8ce1f6efcd bump ghcjs, ghcjs-boot, ghcjs-shims 2015-09-23 15:08:19 +02:00
Michael Alan Dorman
57c276110f haskell-ghcjs: use ghcjs compatible with new vector
Closes https://github.com/NixOS/nixpkgs/issues/9328.
2015-08-19 13:59:40 +02:00
Michael Alan Dorman
297ca5ff21 Update ghcjs. 2015-08-05 21:36:19 +02:00
Michael Alan Dorman
700d365d16 Update ghcjs-shims 2015-08-05 21:36:19 +02:00
Michael Alan Dorman
e0826531e1 Update ghcjs-boot 2015-08-05 21:36:19 +02:00
Charles Strahan
af21595eca ghcjs: fix/bump git refs 2015-06-16 21:26:11 -04:00
Peter Simons
8a8ed5fa1b ghcjs: unbreak syntax highlighting in Emacs 2015-06-16 13:02:28 +02:00
Peter Simons
fbe153989c ghcjs: mark broken
The build has been failing for quite some time.
2015-06-16 13:02:28 +02:00
Charles Strahan
688e9ea04c ghcjs: bump ghcjs and ghcjs-boot
fixes #7881
2015-05-21 21:03:54 -04:00
Charles Strahan
ac4515958d ghcjs: bump ghcjs-boot
This updates the git reference of the aeson submodule; the old one
vanished.
2015-05-12 20:04:12 -04: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
Charles Strahan
007dfb8438 ghcjs: bump git revision
This resolves an issue in ghcjs where lazy IO can result in opening too
many files during linking due to lazy IO.
2015-05-05 20:35:39 -04:00
Joachim Fasting
bf7ad2d84f meta.description fixups
Mostly scripted substitutions with a couple of subjective enhancements.
2015-04-30 18:17:42 +02:00
dnhgff
afa51d31f5 ghcjs: bump ghcjs-boot commit
see https://github.com/ghcjs/ghcjs-boot/pull/17 for justification (ghcjs-boot
won't build anymore on the previous commit :()
2015-04-28 17:37:27 -07:00
j-keck
46aee4e3ca ghcjs: update revisions
* ghcjs in nixpkgs depends on lens < 4.9
 * current lens in nixpkgs is 4.9.1
 * actual upstream ghcjs depends on lens < 4.10

Closes https://github.com/NixOS/nixpkgs/pull/7536.
2015-04-24 14:47:03 +02:00
Aycan iRiCAN
620dcad2d4 ghcjs-boot doesn't build due to broken submodule ref. 2015-04-16 11:31:14 +03:00
Charles Strahan
c17aa58fa9 ghcjs: mark as unbroken on i686 2015-04-14 20:00:37 -04:00