From 729a052cede11855644bf00c4b7661a89148bdc7 Mon Sep 17 00:00:00 2001 From: Matchwood Date: Tue, 17 Jul 2018 11:17:59 +0100 Subject: [PATCH 1/3] Change ghcjs warning from deprecated to experimental and add subsystem maintainer --- ChangeLog.md | 2 +- README.md | 4 ++++ src/Stack/Setup/Installed.hs | 3 +-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index b8ffc85d9f..422a36697d 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -7,7 +7,7 @@ Release notes: Major changes: -* `GHCJS` support is being deprecated after the next major Stack release. At time of writing the upcoming release is 1.8. A warning notifying the user of the deprecation will be incorporated into 1.8. +* `GHCJS` support is being downgraded to 'experimental'. At time of writing the upcoming release is 1.8. A warning notifying the user of the experimental status of `GHCJS` will be incorporated into 1.8. Behavior changes: diff --git a/README.md b/README.md index 7c2f279c8c..71d585cc93 100644 --- a/README.md +++ b/README.md @@ -9,3 +9,7 @@ Stack is a cross-platform program for developing Haskell projects. It is intende See [haskellstack.org](http://haskellstack.org) or the [doc](./doc) directory for more information. + +### Subsystem maintainers + +* GHJCS - [Matchwood](https://github.com/matchwood) \ No newline at end of file diff --git a/src/Stack/Setup/Installed.hs b/src/Stack/Setup/Installed.hs index e7ceb2995b..794f657db0 100644 --- a/src/Stack/Setup/Installed.hs +++ b/src/Stack/Setup/Installed.hs @@ -95,8 +95,7 @@ warnAboutGHCJS = ghcjsWarning :: String ghcjsWarning = unwords - [ "Note that GHCJS support in Stack is DEPRECATED and it will be removed " - , "in a future release of Stack." + [ "Note that GHCJS support in Stack is EXPERIMENTAL" ] getCompilerVersion From cbd391a724ac410333799dc3b37a92f10abe87ed Mon Sep 17 00:00:00 2001 From: Matchwood Date: Tue, 17 Jul 2018 11:41:03 +0100 Subject: [PATCH 2/3] Change docs to reflect experimental nature of ghcjs support and add note on matchwood ghcjs versions for lts 8 and 9 --- doc/ghcjs.md | 15 +++++++++++---- mkdocs.yml | 2 +- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/doc/ghcjs.md b/doc/ghcjs.md index 42ea64c090..ccbc542faa 100644 --- a/doc/ghcjs.md +++ b/doc/ghcjs.md @@ -1,8 +1,8 @@
-# GHCJS +# GHCJS (experimental) -To use GHCJS with stack, place a GHCJS version in the [`compiler`](yaml_configuration.md#compiler) field of `stack.yaml`. After this, all stack commands should work with GHCJS! In particular: +To use GHCJS with stack, place a GHCJS version in the [`compiler`](yaml_configuration.md#compiler) field of `stack.yaml`. After this, some stack commands should work with GHCJS. In particular: * `stack setup` will install GHCJS from source and boot it, which takes a long time. @@ -21,7 +21,13 @@ then you may need to install a different version of `node`. See ## Example Configurations -### Recent versions of GHCJS, repacked for stack +### GHCJS repacked for snapsnots lts-8 and lts-9 + +Please see the [ghcjs-stack-dist repository](https://github.com/matchwood/ghcjs-stack-dist) for `lts-8` and `lts-9` configurations and refer to the [README](https://github.com/matchwood/ghcjs-stack-dist/blob/master/README.md) for common issues. + +Support for `> lts-9` snapshots (`GHC 8.2` and above) is currently [work in progress](https://github.com/matchwood/ghcjs-stack-dist/issues/10). + +### GHCJS repacked for snapsnots < lts-8 These versions of GHCJS were created by [Marcin Tolysz](https://github.com/tolysz), and were particularly crafted to @@ -55,7 +61,7 @@ setup-info: url: http://ghcjs.tolysz.org/ghc-8.0-2017-02-05-lts-7.19-9007019.tar.gz sha1: d2cfc25f9cda32a25a87d9af68891b2186ee52f9 ``` -The later can be generated via: https://github.com/tolysz/prepare-ghcjs +The latter can be generated via: https://github.com/tolysz/prepare-ghcjs the former is a bit more manual. Those bundles are only tested against the latest `node-7.4.0`. In order to correctly boot and use ghcjs, one might need to install `alex` `happy` `hscolour` `hsc2hs` with the normal ghc. @@ -64,6 +70,7 @@ Older resolvers: |resolver|ghcjs|url|sha1| |---|---|---|---| +| lts-7.19 |0.2.1| http://ghcjs.tolysz.org/ghc-8.0-2017-02-05-lts-7.19-9007019.tar.gz | d2cfc25f9cda32a25a87d9af68891b2186ee52f9 | | lts-7.15 |0.2.1| http://ghcjs.tolysz.org/ghc-8.0-2017-01-11-lts-7.15-9007015.tar.gz | 30d34e9d704bdb799066387dfa1ba98b8884d932 | | lts-7.14 |0.2.1| http://ghcjs.tolysz.org/ghc-8.0-2016-12-25-lts-7.14-9007014.tar.gz | 530c4ee5e19e2874e128431c7ad421e336df0303 | | lts-7.13 |0.2.1| http://ghcjs.tolysz.org/ghc-8.0-2016-12-18-lts-7.13-9007013.tar.gz | 0d2ebe0931b29adca7cb9d9b9f77d60095bfb864 | diff --git a/mkdocs.yml b/mkdocs.yml index 6555a06639..fe9ae1e3f3 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -23,7 +23,7 @@ pages: - Build command: build_command.md - Dependency visualization: dependency_visualization.md - Docker integration: docker_integration.md - - GHCJS: ghcjs.md + - GHCJS (experimental): ghcjs.md - Nix integration: nix_integration.md - Non-standard project initialization: nonstandard_project_init.md - Shell auto-completion: shell_autocompletion.md From 92367bc65a636986e44a8266af221eeafbc6f896 Mon Sep 17 00:00:00 2001 From: Matchwood Date: Tue, 17 Jul 2018 11:59:46 +0100 Subject: [PATCH 3/3] Fix typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 71d585cc93..0fca83bb90 100644 --- a/README.md +++ b/README.md @@ -12,4 +12,4 @@ information. ### Subsystem maintainers -* GHJCS - [Matchwood](https://github.com/matchwood) \ No newline at end of file +* GHCJS - [Matchwood](https://github.com/matchwood) \ No newline at end of file