From 75bd73feb14e54e84e27329d82669d759377c188 Mon Sep 17 00:00:00 2001
From: Ranjit Jhala <jhala@cs.ucsd.edu>
Date: Sun, 26 Jul 2015 15:18:11 -0700
Subject: [PATCH] Asd

---
 CHANGES.md |  4 ++++
 README.md  | 20 +++++++++++++-------
 stack.yaml | 12 ++++++++++++
 3 files changed, 29 insertions(+), 7 deletions(-)
 create mode 100644 stack.yaml

diff --git a/CHANGES.md b/CHANGES.md
index 9b4637bb8b..8fd1ef1872 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -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.
diff --git a/README.md b/README.md
index d70e96e160..b13e23d7f1 100644
--- a/README.md
+++ b/README.md
@@ -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
@@ -36,21 +35,28 @@ directory of the distribution:
     git clone git@github.com:ucsd-progsys/liquid-fixpoint.git
     git clone git@github.com: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/
 
diff --git a/stack.yaml b/stack.yaml
new file mode 100644
index 0000000000..f6f8f47e71
--- /dev/null
+++ b/stack.yaml
@@ -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