ats-pkg 2.11.0.7 → 2.11.0.8

raw patch · 7 files changed

+13/−11 lines, 7 filesdep ~dhallPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

Dependency ranges changed: dhall

API changes (from Hackage documentation)

Files

• ats-pkg.cabal +2/−2
• src/Language/ATS/Package/Build.hs +2/−1
• src/Language/ATS/Package/Config.hs +2/−2
• src/Language/ATS/Package/Debian.hs +1/−2
• src/Language/ATS/Package/Dhall.hs +2/−1
• src/Language/ATS/Package/PackageSet.hs +2/−1
• src/Quaalude.cpphs +2/−2

@@ -1,6 +1,6 @@ cabal-version: 1.18 name: ats-pkg-version: 2.11.0.7+version: 2.11.0.8 license: BSD3 license-file: LICENSE copyright: Copyright: (c) 2018 Vanessa McHale@@ -102,7 +102,7 @@         containers -any,         parallel-io -any,         mtl -any,-        dhall >=1.14.0,+        dhall >=1.15.0,         ansi-wl-pprint -any,         shake-ats >=1.8.0.0,         shake-ext >=3.0.0.0,

@@ -13,6 +13,7 @@ import qualified Data.ByteString                 as BS import qualified Data.ByteString.Lazy            as BSL import           Data.List                       (intercalate)+import qualified Data.Text                       as T import           Development.Shake               (alwaysRerun, getVerbosity) import           Development.Shake.ATS import           Development.Shake.C             (ccFromString)@@ -118,7 +119,7 @@     d <- fromMaybe <$> fmap (</> "atspkg.dhall") getCurrentDirectory <*> pure dir'     b <- not <$> doesFileExist ".atspkg/config"     if b-        then input auto (pack d)+        then input auto (T.pack d)         else fmap (decode . BSL.fromStrict) . BS.readFile $ ".atspkg/config"  manTarget :: Text -> FilePath

@@ -9,7 +9,7 @@  import qualified Data.ByteString.Lazy as BSL import           Data.FileEmbed-import qualified Data.Text.Lazy       as TL+import qualified Data.Text            as T import           Quaalude  data UserConfig = UserConfig { defaultPkgs    :: Text@@ -50,7 +50,7 @@              cfgBin' %> \_ -> do                 need [cfg]-                cfgContents <- liftIO $ input auto (TL.pack cfg)+                cfgContents <- liftIO $ input auto (T.pack cfg)                 liftIO $ BSL.writeFile cfgBin' (encode (cfgContents :: UserConfig))  readUserConfig :: FilePath -> FilePath -> Rules ()

@@ -13,10 +13,9 @@ import           Data.Dependency            (Version (..)) import           Data.Hashable              (Hashable) import           Data.List                  (intercalate)-import           Data.Text.Lazy             (Text) import           Development.Shake          hiding ((*>)) import           Development.Shake.FilePath-import           Dhall+import           Dhall                      hiding (Text) import           Quaalude  data Debian = Debian { package     :: Text

@@ -3,6 +3,7 @@                                   ) where  import           Data.Dependency+import qualified Data.Text                       as T import           Language.ATS.Package.PackageSet import           Language.ATS.Package.Type import           Quaalude@@ -19,7 +20,7 @@            -> IO a checkDhall path d =     bool id detailed d $-        input auto (pack ('.' : pathSeparator : path))+        input auto (T.pack ('.' : pathSeparator : path))  checkPkgSet :: FilePath -- ^ Path to @.dhall@ file defining a package set.             -> Bool -- ^ Whether to print detailed error messages.

@@ -12,6 +12,7 @@ import           Data.Dependency import qualified Data.Map                   as M import qualified Data.Set                   as S+import qualified Data.Text                  as T import           Language.ATS.Package.Error import           Language.ATS.Package.Type import           Quaalude@@ -39,7 +40,7 @@ listDeps :: Bool -- ^ Whether to sort dependencies          -> String -- ^ URL of package set          -> IO ATSPackageSet-listDeps b = fmap s . input auto . pack+listDeps b = fmap s . input auto . T.pack     where s = bool id s' b           s' = over atsPkgSet (sortBy (compare `on` libName)) 

@@ -132,11 +132,11 @@ import           Data.List import           Data.Maybe                   (fromMaybe) import           Data.Semigroup-import           Data.Text.Lazy               (pack, unpack)+import           Data.Text.Lazy               (Text, pack, unpack) import           Data.Version                 (showVersion) import           Development.Shake            hiding (getEnv) import           Development.Shake.FilePath-import           Dhall                        hiding (bool)+import           Dhall                        hiding (bool, Text) import           Lens.Micro                   hiding (both) import           Lens.Micro.Extras import           Network.HTTP.Client