diff --git a/what4/src/What4/Utils/Versions.hs b/what4/src/What4/Utils/Versions.hs index 9c395bf8..b074226d 100644 --- a/what4/src/What4/Utils/Versions.hs +++ b/what4/src/What4/Utils/Versions.hs @@ -1,11 +1,8 @@ -{-# LANGUAGE CPP #-} {-# LANGUAGE DeriveLift #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE StandaloneDeriving #-} {-# LANGUAGE TemplateHaskell #-} -{-# OPTIONS_GHC -Wno-orphans #-} - module What4.Utils.Versions where import qualified Config as Config @@ -22,17 +19,6 @@ import Instances.TH.Lift () import Language.Haskell.TH import Language.Haskell.TH.Lift --- NB, orphan instances :-( --- See also https://github.com/fosskers/versions/issues/68 -#if MIN_VERSION_versions(6,0,0) -deriving instance Lift Versions.Chunk -deriving instance Lift Versions.Chunks -deriving instance Lift Versions.Release -#else -deriving instance Lift Versions.VUnit -#endif -deriving instance Lift Versions.Version - ver :: Text -> Q Exp ver nm = case Versions.version nm of diff --git a/what4/what4.cabal b/what4/what4.cabal index ab665e78..c20a85fb 100644 --- a/what4/what4.cabal +++ b/what4/what4.cabal @@ -135,7 +135,7 @@ library unordered-containers >= 0.2.10, utf8-string >= 1.0.1, vector >= 0.12.1, - versions >= 4.0 && < 6.1, + versions >= 6.0.2 && < 6.1, zenc >= 0.1.0 && < 0.2.0, ghc-prim >= 0.5.2