From 4874bc914b53c8ce9d18ae62797cd9c2a59210aa Mon Sep 17 00:00:00 2001 From: Moritz Kiefer Date: Tue, 16 Feb 2016 21:44:10 +0100 Subject: [PATCH] Add Ord instances for Cradle --- Language/Haskell/GhcMod/Types.hs | 6 +++--- stack.yaml | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Language/Haskell/GhcMod/Types.hs b/Language/Haskell/GhcMod/Types.hs index 42dac13..2281ba9 100644 --- a/Language/Haskell/GhcMod/Types.hs +++ b/Language/Haskell/GhcMod/Types.hs @@ -134,7 +134,7 @@ data Project = CabalProject | SandboxProject | PlainProject | StackProject StackEnv - deriving (Eq, Show) + deriving (Eq, Show, Ord) isCabalHelperProject :: Project -> Bool isCabalHelperProject StackProject {} = True @@ -146,7 +146,7 @@ data StackEnv = StackEnv { , seBinPath :: [FilePath] , seSnapshotPkgDb :: FilePath , seLocalPkgDb :: FilePath - } deriving (Eq, Show) + } deriving (Eq, Show, Ord) -- | The environment where this library is used. data Cradle = Cradle { @@ -161,7 +161,7 @@ data Cradle = Cradle { , cradleCabalFile :: Maybe FilePath -- | The build info directory. , cradleDistDir :: FilePath - } deriving (Eq, Show) + } deriving (Eq, Show, Ord) data GmStream = GmOutStream | GmErrStream deriving (Show) diff --git a/stack.yaml b/stack.yaml index fdcb756..1e26270 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,6 +1,5 @@ flags: {} packages: - '.' -extra-deps: -- cabal-helper-0.6.2.0 -resolver: lts-3.20 +extra-deps: [] +resolver: lts-5.3