diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # ats-pkg +## 3.2.6.4 + + * Upgrade to latest `dhall` + ## 3.2.6.3 * Better `clean` command diff --git a/app/Language/ATS/Package/Dhall.hs b/app/Language/ATS/Package/Dhall.hs --- a/app/Language/ATS/Package/Dhall.hs +++ b/app/Language/ATS/Package/Dhall.hs @@ -13,7 +13,7 @@ -> IO (Version -> ATSDependency) checkPkg = checkDhall -checkDhall :: Interpret a +checkDhall :: FromDhall a => FilePath -> Bool -> IO a diff --git a/ats-pkg.cabal b/ats-pkg.cabal --- a/ats-pkg.cabal +++ b/ats-pkg.cabal @@ -1,6 +1,6 @@ cabal-version: 2.0 name: ats-pkg -version: 3.2.6.3 +version: 3.2.6.4 license: BSD3 license-file: LICENSE copyright: Copyright: (c) 2018-2019 Vanessa McHale @@ -119,10 +119,10 @@ containers >=0.6 if !impl(ghc >=8.4) - build-depends: dhall >=1.23.0 && <1.25.0 + build-depends: dhall >=1.27.0 && <1.25.0 else - build-depends: dhall >=1.23.0 + build-depends: dhall >=1.27.0 if flag(development) cpp-options: -DDEBUG @@ -162,7 +162,7 @@ shake -any, cli-setup -any, quaalude -any, - dhall >=1.26.1 + dhall >=1.27.0 if flag(development) ghc-options: -Werror diff --git a/internal/Quaalude.cpphs b/internal/Quaalude.cpphs --- a/internal/Quaalude.cpphs +++ b/internal/Quaalude.cpphs @@ -50,8 +50,8 @@ , thread , bisequence' -- * Dhall reëxports - , Interpret - , Inject + , FromDhall + , ToDhall , Generic , Binary , input @@ -151,7 +151,7 @@ #endif import Development.Shake hiding (doesFileExist, getEnv) import Development.Shake.FilePath -import Dhall hiding (Text, bool) +import Dhall hiding (Text, bool, void) import Lens.Micro import Lens.Micro.Extras import Network.HTTP.Client diff --git a/src/Language/ATS/Package/Config.hs b/src/Language/ATS/Package/Config.hs --- a/src/Language/ATS/Package/Config.hs +++ b/src/Language/ATS/Package/Config.hs @@ -16,7 +16,7 @@ , path :: Maybe Text , githubUsername :: Text , filterErrors :: Bool - } deriving (Generic, Interpret, Binary) + } deriving (Generic, FromDhall, Binary) cfgFile :: String cfgFile = $(embedStringFile ("dhall" "config.dhall")) diff --git a/src/Language/ATS/Package/Debian.hs b/src/Language/ATS/Package/Debian.hs --- a/src/Language/ATS/Package/Debian.hs +++ b/src/Language/ATS/Package/Debian.hs @@ -34,9 +34,9 @@ } -- TODO: section https://www.debian.org/doc/debian-policy/ch-archive.html#s-subsections -- TODO: priority https://www.debian.org/doc/debian-policy/ch-archive.html#s-priorities - deriving (Generic, Binary, Interpret) + deriving (Generic, Binary, FromDhall) -deriving newtype instance Interpret Version +deriving newtype instance FromDhall Version control :: Debian -> String control Debian{..} = intercalate "\n" diff --git a/src/Language/ATS/Package/PackageSet.hs b/src/Language/ATS/Package/PackageSet.hs --- a/src/Language/ATS/Package/PackageSet.hs +++ b/src/Language/ATS/Package/PackageSet.hs @@ -19,7 +19,7 @@ import Quaalude newtype ATSPackageSet = ATSPackageSet { _atsPkgSet :: [ ATSDependency ] } - deriving (Interpret) + deriving (FromDhall) atsPkgSet :: Lens' ATSPackageSet [ATSDependency] atsPkgSet f s = fmap (\x -> s { _atsPkgSet = x }) (f (_atsPkgSet s)) diff --git a/src/Language/ATS/Package/Type.hs b/src/Language/ATS/Package/Type.hs --- a/src/Language/ATS/Package/Type.hs +++ b/src/Language/ATS/Package/Type.hs @@ -32,9 +32,9 @@ data ATSConstraint = ATSConstraint { lower :: Maybe Version , upper :: Maybe Version } - deriving (Eq, Show, Generic, Binary, Interpret) + deriving (Eq, Show, Generic, Binary, FromDhall) -deriving newtype instance Inject Version +deriving newtype instance ToDhall Version type LibDep = (Text, ATSConstraint) @@ -53,7 +53,7 @@ , libCDeps :: [LibDep] -- ^ C dependencies to be built , script :: [Text] -- ^ Optional build script for C library } - deriving (Generic, Interpret, Binary) + deriving (Generic, FromDhall, Binary) dirLens :: Lens' ATSDependency Text dirLens f s = fmap (\x -> s { dir = x }) (f (dir s)) @@ -62,18 +62,18 @@ data TargetPair = TargetPair { hs :: Text , ats :: Text , cpphs :: Bool - } deriving (Generic, Interpret, Binary) + } deriving (Generic, FromDhall, Binary) -deriving instance Interpret ForeignCabal +deriving instance FromDhall ForeignCabal -deriving instance Interpret Solver +deriving instance FromDhall Solver data Src = Src { atsSrc :: Text , cTarget :: Text , atsGen :: [TargetPair] , extras :: [Text] } - deriving (Generic, Interpret, Binary) + deriving (Generic, FromDhall, Binary) data Bin = Bin { src :: Text -- ^ Source file (should end with @.dats@) , target :: Text -- ^ Binary to be built @@ -83,7 +83,7 @@ , gcBin :: Bool -- ^ Whether to use the garbage collector , extras :: [Text] -- ^ Extra source files the build depends on } - deriving (Generic, Interpret, Binary) + deriving (Generic, FromDhall, Binary) data Lib = Lib { name :: Text -- ^ Name of library being provided , src :: [Text] -- ^ Source files (should end with @.dats@) to be compiled to object files @@ -96,7 +96,7 @@ , extras :: [Text] -- ^ Other source files the build depends on , static :: Bool -- ^ Whether to make a static library } - deriving (Generic, Interpret, Binary) + deriving (Generic, FromDhall, Binary) -- | Data type associated with @atspkg.dhall@ file. data Pkg = Pkg { bin :: [Bin] -- ^ List of binaries to be built @@ -118,4 +118,4 @@ , debPkg :: Maybe Debian -- ^ Optional specificiation as a debian package. , atsLib :: Bool -- ^ Whether to link/build @atslib@. } - deriving (Generic, Interpret, Binary) + deriving (Generic, FromDhall, Binary)