Skip to content

Commit

Permalink
Asd
Browse files Browse the repository at this point in the history
  • Loading branch information
ranjitjhala committed Jul 26, 2015
1 parent 3e8ef20 commit 75bd73f
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 7 deletions.
4 changes: 4 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## NEXT

- Added support for building with `stack`

- Added support for GHC 7.10 (in addition to 7.8)

- Added '--cabaldir' option that will automatically find a .cabal file in the ancestor
path from which the target file belongs, and then add the relevant source and dependencies
to the paths searched for by LiquidHaskell.
Expand Down
20 changes: 13 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ LiquidHaskell [![Build Status](https://travis-ci.org/ucsd-progsys/liquidhaskell.
Requirements
------------


LiquidHaskell requires (in addition to the cabal dependencies)

- SMTLIB2 compatible solver
Expand Down Expand Up @@ -36,21 +35,28 @@ directory of the distribution:
git clone [email protected]:ucsd-progsys/liquid-fixpoint.git
git clone [email protected]:ucsd-progsys/liquidhaskell.git
cd liquidhaskell
cabal sandbox init
cabal sandbox add-source ../liquid-fixpoint/
```
3. Install
3. (If using **stack**) To build and install
```
stack install
```
(If using **cabal**) then
```
cabal sandbox init
cabal sandbox add-source ../liquid-fixpoint/
cabal install
```
To **rebuild** after this step, run
4. To **rebuild** after this step, run
`make` or `cabal install`
`make` or `cabal install` or `stack install`
inside
inside
/path/to/liquid/liquidhaskell/
Expand Down
12 changes: 12 additions & 0 deletions stack.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# GHC 7.10
# resolver: nightly-2015-06-16

# GHC 7.8
# resolver: lts-2.14

resolver: nightly-2015-06-16
packages:
- ../liquid-fixpoint
- .
extra-deps:
- intern-0.9.1.4

0 comments on commit 75bd73f

Please sign in to comment.