summaryrefslogtreecommitdiff
path: root/src/Propellor
diff options
context:
space:
mode:
authordavean2016-05-06 21:17:08 -0400
committerJoey Hess2016-05-07 00:26:34 -0400
commitf815316301ef176c980deed3a89ab58e6a18efff (patch)
tree011848157e50d24a7672b317382d29b9820daae5 /src/Propellor
parent5cb6ddd9a9dc73bb514ebfdd86b0026e7ad97770 (diff)
Compiling propellor on GHC 8.0.1-rc4
ConstrainedClassMethods was added in GHC 7.6.1.3 so I think its sufficiently backwards compatible for you?
Diffstat (limited to 'src/Propellor')
-rw-r--r--src/Propellor/Base.hs2
-rw-r--r--src/Propellor/Types/ZFS.hs1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/Propellor/Base.hs b/src/Propellor/Base.hs
index 2a0f5cbc..ef75bf03 100644
--- a/src/Propellor/Base.hs
+++ b/src/Propellor/Base.hs
@@ -47,7 +47,7 @@ import Propellor.PropAccum
import Propellor.Location
import Propellor.Utilities
-import System.Directory
+import System.Directory hiding (isSymbolicLink)
import System.IO
import System.FilePath
import Data.Maybe
diff --git a/src/Propellor/Types/ZFS.hs b/src/Propellor/Types/ZFS.hs
index 8784c641..3ce4b22c 100644
--- a/src/Propellor/Types/ZFS.hs
+++ b/src/Propellor/Types/ZFS.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE ConstrainedClassMethods #-}
-- | Types for ZFS Properties.
--
-- Copyright 2016 Evan Cofsky <evan@theunixman.com>