From 7173bb3328bbb3cfdbed0cf53f4d06d7fa130da0 Mon Sep 17 00:00:00 2001
From: Andrew Cowie <andrew@operationaldynamics.com>
Date: Wed, 18 Jan 2017 13:57:07 +1100
Subject: Bump resolver

Compile with GHC 8.0.1 against lts-7.16.
---
 src/Propellor/DotDir.hs | 2 +-
 stack.yaml              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Propellor/DotDir.hs b/src/Propellor/DotDir.hs
index 21a9cdb7..417abcfa 100644
--- a/src/Propellor/DotDir.hs
+++ b/src/Propellor/DotDir.hs
@@ -316,7 +316,7 @@ minimalConfig = do
 		]
 
 stackResolver :: String
-stackResolver = "lts-5.10"
+stackResolver = "lts-7.16"
 
 fullClone :: IO Result
 fullClone = do
diff --git a/stack.yaml b/stack.yaml
index 2689c624..3ed7bd27 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,4 +1,4 @@
 # When updating the resolver here, also update stackResolver in Propellor.DotDir
-resolver: lts-5.10
+resolver: lts-7.16
 packages:
 - '.'
-- 
cgit v1.3-2-g0d8e


From 13a462c5bbd5552c16296900b68289a5fe5ba7da Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Wed, 25 Jan 2017 16:02:49 -0400
Subject: stack.yaml: Compile with GHC 8.0.1 against lts-7.16. Thanks, Andrew
 Cowie.

---
 debian/changelog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 20923ab8..1daf0c1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ propellor (3.2.4) UNRELEASED; urgency=medium
 
   * GHC's fileSystemEncoding is used for all String IO, to avoid
     encoding-related crashes in eg, Propellor.Property.File.
+  * stack.yaml: Compile with GHC 8.0.1 against lts-7.16.
+    Thanks, Andrew Cowie.
 
  -- Joey Hess <id@joeyh.name>  Sat, 24 Dec 2016 15:06:36 -0400
 
-- 
cgit v1.3-2-g0d8e