Peter Simons
8d8061ec20
Revert "Revive multiple outputs for Haskell packages."
2017-12-05 09:36:08 +01:00
Nicholas Clarke
d90165c7db
Revert "Revert "Merge pull request #27209 from nc6/nc/haskell-multiple-out""
...
This reverts commit 89f5d52cf44baec14a7f542a605243777b16e7a5.
2017-11-27 16:05:22 +00:00
Pascal Wittmann
24e87b49b6
Change many homepage urls from http to https #30636
2017-11-10 22:13:46 +01:00
Jude Taylor
737b466031
fix ghcjs socket.io
2017-11-01 12:16:48 +01:00
Moritz Kiefer
d222538732
ghcjs: Do not mark as broken
...
This has been fixed in #30214
2017-10-21 13:27:42 +01:00
Peter Simons
f9090c3332
Merge pull request #30214 from cocreature/ghcjs
...
ghcjs/ghcjsHEAD: Use separate patch files to fix build of ghcjs
2017-10-17 10:44:37 +01:00
Peter Simons
6a84b39950
ghcjs: mark build as broken
2017-10-09 17:25:57 +02:00
Moritz Kiefer
78aa7f2338
ghcjs/ghcjsHEAD: Use separate patch files to fix build of ghcjs
2017-10-08 11:26:25 +02:00
Moritz Kiefer
582c7d24fc
ghcjsHEAD: Bump ghcjs and ghcjs-boot revisions
...
head_stage2.nix has been regenerated to reflect changes in ghcjs
2017-09-23 18:56:54 +02:00
Moritz Kiefer
d5a33e8f38
ghcjsHEAD: bump ghcjs shims
2017-09-20 10:59:22 +02:00
Peter Simons
89f5d52cf4
Revert "Merge pull request #27209 from nc6/nc/haskell-multiple-out"
...
This reverts commit dfb0f254844150d05d34150a975e6479b883d409, reversing
changes made to 7f8ff024372f985e96b438fa5591d9b43fc6e7bd. These changes broke
the ghcWithPackages wrapper:
nix-shell -p "haskellPackages.ghcWithPackages (ps: [ps.mtl])" --run "ghc-pkg list mtl"
/nix/store/szz84j5k1dy3jdashis6ws28d8l8zxxb-ghc-8.0.2-with-packages/lib/ghc-8.0.2/package.conf.d
(no packages)
2017-09-06 10:19:18 +02:00
Nicholas Clarke
8c642d5937
Provide hscolour, happy, alex bin to buildInputs.
...
Use stdenv.lib.getBin instead of `.bin`
2017-09-04 12:35:57 +01:00
Moritz Kiefer
03b4cab963
haskell: fix ghcjs build with cabal-install-2.0
2017-08-11 22:14:01 +02:00
Silvan Mosberger
f5fa5fa4d6
pkgs: refactor needless quoting of homepage meta attribute ( #27809 )
...
* pkgs: refactor needless quoting of homepage meta attribute
A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.
* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit
* Fixed some instances
2017-08-01 22:03:30 +02:00
Renzo Carbonara
d0c68a1658
ghcjsHEAD: bump git revision
...
This particular revision brings significant performance improvements
when building code that uses TemplateHaskell.
2017-06-05 20:01:26 +02:00
Peter Simons
a1b6c5f5d6
Revert "Use consistent package naming for HEAD.nix files" for GHC and GHCjs.
...
This reverts commit 31b0e34d1dd1226de1492101e3aeea60292196d7. The version
numbers used in that commit were no improvement.
2017-05-09 17:59:28 +02:00
Arseniy Seroka
87e7faa937
Merge pull request #25631 from rht/master
...
Use consistent package naming for HEAD.nix files
2017-05-09 11:27:03 +03:00
David Johnson
a5df611d91
ghcjs: mark as fixed
2017-05-08 22:32:08 -07:00
rht
31b0e34d1d
Use consistent package naming for HEAD.nix files
2017-05-09 10:31:15 +07:00
Aristid Breitkreuz
a0eabfbcbd
Merge pull request #24715 from ljli/ghcjs-dep-cycle
...
haskell: ghcjs packages: Break dependency cycle less invasive
2017-04-08 12:25:54 +02:00
Leon Isenberg
60e9371738
haskell: ghcjs packages: Remove ghcjs-prim
...
It is wired into ghcjs now.
2017-04-07 21:41:01 +02:00
Leon Isenberg
7a08e57b9e
haskell: ghcjs packages: Break dependency cycle less invasive
...
Between cabal and hscolour.
2017-04-07 19:02:52 +02:00
Jordan Woehr
117797367a
ghcjs (head): Fix infinite recursion ...
...
... in hscolour when building packages.
2017-03-31 12:39:12 -06: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
Bas van Dijk
1c656d2f35
ghcjsHEAD: upgrade ghcjs-boot packages
...
Move them closer to the latest LTS Haskell.
2017-03-24 15:07:10 +01:00
Leon Isenberg
82aa79d57f
haskell: ghcjs shims: dc034a0 -> b970152
2017-03-07 20:48:18 +01:00
3noch
4b77d425aa
Fix GHCJS HEAD patch; support GHCJS libdir link; use full ghcEnv for GHCJS
...
Original:
f3110651c8
(With some tweaks from @cstrahan)
closes #23199
2017-03-02 11:35:11 -05:00
Domen Kožar
fe6ebba59c
Merge pull request #22574 from k0001/ghcjs-node
...
compilers/ghcjs/base.nix: Take ghcjsNodePkgs as argument
2017-02-27 14:28:36 +01:00
Charles Strahan
1ba97d6ee9
ghcjsHEAD: unbreak
2017-02-27 02:10:34 -05:00
Renzo Carbonara
1684c9a6a0
compilers/ghcjs/base.nix: Take ghcjsNodePkgs as argument
2017-02-09 00:22:47 +01:00
Bas van Dijk
0cbb65c832
ghcjs-HEAD: upgrade to the latest HEAD
...
It includes the following changes:
* Fixed crash on Safari on iOS
* Make linker write externs for closure compiler ADVANCED_OPTIMIZATIONS
* ghcjs-pkg fixes for ghc 8.0.2
Because of the latter I switched from GHC-8.0.1 to GHC-8.0.2 to build ghcjs-HEAD.
2017-01-27 01:45:50 +01:00
Peter Simons
d82a1abbb4
ghcjs: mark this build as broken
2016-12-24 16:15:35 +01:00
Travis Whitaker
caa81f7bcf
ghcjs: Add ghc-8.0 stage2 packages, update shims. ( #20564 )
2016-11-21 10:13:09 +01:00
Profpatsch
b399de2970
ghcjsHEAD: don’t just copy & replace, reuse same code ( #20493 )
...
* ghcjsHEAD: don’t just copy & replace, reuse same code
The HEAD file was just copied over and a few hashes replaced.
Most of these hashes were already function arguments anyway, so no reason to not
abstract over that.
* ghcjs/base: factor out stage1Packages & regenerate for HEAD
The stage1Packages have changed on ghcjs head, this adds the new list.
2016-11-18 16:13:56 +01:00
Travis Whitaker
c491309d61
ghcjs: add ghcsjHEAD, tracking ghc-8.0 branch
...
Closes https://github.com/NixOS/nixpkgs/pull/20071 .
Closes https://github.com/NixOS/nixpkgs/issues/19905 .
2016-11-03 17:37:19 +01:00
Peter Simons
8c95f0ffaf
ghcjs: revert "mark build as broken"
...
This reverts commit 8f07d4bd780a24dcf33be46d8cbfc6163fcdde0e. The build
failure blocking this package has been fixed in the meanwhile. Thanks to
@basvandijk for the heads-up.
(cherry picked from commit 56d033ac1b00a8b29bc29589312d2f5024656bd3)
2016-10-12 16:52:41 +02:00
Peter Simons
2f0d0cd05a
ghcjs: mark build as broken
...
(cherry picked from commit 8f07d4bd780a24dcf33be46d8cbfc6163fcdde0e)
2016-10-05 09:46:53 +02:00
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