summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2017-01-26 02:48:25 -0400
committerJoey Hess2017-01-26 02:48:25 -0400
commit1a4bf7a8b14abf8ddabfbe829635eb91d9960acc (patch)
tree47e58fdff45b32527069a3fb2cda1012855f1d12
parent58553acacc151aa73ceb812722372c4ce602416d (diff)
parent13a462c5bbd5552c16296900b68289a5fe5ba7da (diff)
Merge branch 'joeyconfig'
-rw-r--r--debian/changelog2
-rw-r--r--src/Propellor/DotDir.hs2
-rw-r--r--stack.yaml2
3 files changed, 4 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index a79611b1..0e5aa8d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ propellor (3.2.4) UNRELEASED; urgency=medium
Thanks, FĂ©lix Sipma.
* Apt.noPDiffs added.
Thanks, Sean Whitton.
+ * 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
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:
- '.'