Merge branch 'master' into release
Conflicts: ChangeLog
This commit is contained in:
commit
f3fd04c2a9
30
README.md
30
README.md
@ -5,22 +5,38 @@ Please read: [http://www.mew.org/~kazu/proj/ghc-mod/](http://www.mew.org/~kazu/p
|
||||
|
||||
## Using the stable version
|
||||
|
||||
Emacs front-end, which is consistent with binaries on Hackage, is available *stable* MELPA whose URL is http://melpa-stable.milkbox.net/packages/. So, your "~/.emacs" should be:
|
||||
The Emacs front-end is available from
|
||||
[*stable* MELPA](http://melpa-stable.milkbox.net/). This package should
|
||||
always be compatible with the latest version of ghc-mod from hackage.
|
||||
|
||||
To use stable *stable* MELPA add this to your `.emacs`:
|
||||
|
||||
```elisp
|
||||
(require 'package)
|
||||
(add-to-list 'package-archives
|
||||
(add-to-list 'package-archives
|
||||
'("melpa" . "http://melpa-stable.milkbox.net/packages/"))
|
||||
(package-initialize)
|
||||
```
|
||||
|
||||
With this configuration you can install the stable Emacs front end indicated by "ghc" from MELPA while you can install `ghc-mod`/`ghc-modi` binaries by:
|
||||
With this configuration you can install the Emacs front end from MELPA (the
|
||||
package is called `ghc` there, not `ghc-mod`) and install the
|
||||
`ghc-mod`/`ghc-modi` binaries from hackage by doing:
|
||||
|
||||
```shell
|
||||
% cabal update
|
||||
% cabal install ghc-mod
|
||||
% cabal update && cabal install ghc-mod
|
||||
```
|
||||
|
||||
## Using the develop version
|
||||
## Using the development version
|
||||
|
||||
You should install both Emacs front-end and binaries from this git repo. If you use the snapshot MELPA to install Emacs front-end, you would suffer from inconsistency between Emacs front-end and binaries.
|
||||
The easiest way to hack on ghc-mod is compile it, then add `dist/build/ghc-mod`
|
||||
and `dist/build/ghc-modi` to your `PATH` and add the `elisp/` directory to your
|
||||
Emacs `load-path`.
|
||||
|
||||
Make sure you're not using the MELPA version of `ghc.el` otherwise you might get
|
||||
all sorts of nasty conflicts.
|
||||
|
||||
|
||||
## IRC
|
||||
|
||||
If you have any problems, suggestions, comments swing by
|
||||
[#ghc-mod](irc://chat.freenode.net/ghc-mod) on Freenode.
|
||||
|
@ -46,6 +46,8 @@ Extra-Source-Files: ChangeLog
|
||||
test/data/duplicate-pkgver/.cabal-sandbox/i386-osx-ghc-7.6.3-packages.conf.d/template-haskell-1.0-7c59d13f32294d1ef6dc6233c24df961.conf
|
||||
test/data/duplicate-pkgver/.cabal-sandbox/i386-osx-ghc-7.6.3-packages.conf.d/template-haskell-2.8.0.0-14e543bdae2da4d2aeff5386892c9112.conf
|
||||
test/data/duplicate-pkgver/.cabal-sandbox/i386-osx-ghc-7.6.3-packages.conf.d/template-haskell-2.8.0.0-32d4f24abdbb6bf41272b183b2e23e9c.conf
|
||||
test/data/pattern-synonyms/*.cabal
|
||||
test/data/pattern-synonyms/*.hs
|
||||
test/data/ghc-mod-check/*.cabal
|
||||
test/data/ghc-mod-check/*.hs
|
||||
test/data/ghc-mod-check/Data/*.hs
|
||||
@ -102,7 +104,7 @@ Library
|
||||
, ghc-syb-utils
|
||||
, hlint >= 1.8.61
|
||||
, io-choice
|
||||
, monad-journal >= 0.2.2.0
|
||||
, monad-journal >= 0.2.2.0 && < 0.2.3.2
|
||||
, old-time
|
||||
, process
|
||||
, syb
|
||||
@ -195,7 +197,7 @@ Test-Suite spec
|
||||
, ghc-syb-utils
|
||||
, hlint >= 1.7.1
|
||||
, io-choice
|
||||
, monad-journal >= 0.2.2.0
|
||||
, monad-journal >= 0.2.2.0 && < 0.2.3.2
|
||||
, old-time
|
||||
, process
|
||||
, syb
|
||||
|
Loading…
Reference in New Issue
Block a user