ats-pkg 2.6.0.2 → 2.6.0.3

raw patch · 3 files changed

+17/−19 lines, 3 filesPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

API changes (from Hackage documentation)

Files

• ats-pkg.cabal +1/−1
• src/Language/ATS/Package/Build.hs +15/−18
• src/Quaalude.hs +1/−0

@@ -1,6 +1,6 @@ cabal-version: 1.18 name: ats-pkg-version: 2.6.0.2+version: 2.6.0.3 license: BSD3 license-file: LICENSE copyright: Copyright: (c) 2018 Vanessa McHale

@@ -13,24 +13,22 @@                                   ) where  import           Control.Concurrent.ParallelIO.Global-import qualified Data.ByteString                        as BS-import qualified Data.ByteString.Lazy                   as BSL-import           Data.List                              (nub)-import qualified Data.Map                               as M-import           Data.Version                           (showVersion)+import qualified Data.ByteString                      as BS+import qualified Data.ByteString.Lazy                 as BSL+import           Data.List                            (nub)+import           Data.Version                         (showVersion) import           Development.Shake.ATS import           Development.Shake.Check import           Development.Shake.Clean import           Development.Shake.Man-import           Distribution.PackageDescription        hiding (Executable, includes, options)-import           Distribution.Simple                    hiding (Version, showVersion)+import           Distribution.PackageDescription      hiding (Executable, includes, options)+import           Distribution.Simple                  hiding (Version, showVersion) import           Distribution.Simple.Setup-import           Distribution.Types.UnqualComponentName import           Language.ATS.Package.Compiler import           Language.ATS.Package.Config import           Language.ATS.Package.Dependency-import           Language.ATS.Package.Type              hiding (Version)-import qualified Paths_ats_pkg                          as P+import           Language.ATS.Package.Type            hiding (Version)+import qualified Paths_ats_pkg                        as P import           Quaalude  check :: Maybe FilePath -> IO Bool@@ -46,20 +44,19 @@ buildAll :: Maybe FilePath -> IO () buildAll p = on (>>) (=<< wants p) fetchCompiler setupCompiler -buildCabal :: String -> Args -> ConfigFlags -> IO HookedBuildInfo-buildCabal libName _ _ = do+buildCabal :: Args -> ConfigFlags -> IO HookedBuildInfo+buildCabal _ _ = do     build mempty     libDir <- (<> "/") <$> getCurrentDirectory-    pure (modifyLib libDir (mkUnqualComponentName libName) emptyHookedBuildInfo)+    pure (modifyLib libDir emptyHookedBuildInfo) -modifyLib :: String -> UnqualComponentName -> HookedBuildInfo -> HookedBuildInfo-modifyLib libDir key = second (M.toList . M.alter (fmap modify) key . M.fromList)+modifyLib :: String -> HookedBuildInfo -> HookedBuildInfo+modifyLib libDir = first (over _Just modify)     where modify bi = let olds = extraLibDirs bi             in bi { extraLibDirs = (libDir <>) <$> olds } -cabalHooks :: String -- ^ Haskell library name-           -> UserHooks-cabalHooks libName = simpleUserHooks { preConf = buildCabal libName }+cabalHooks :: UserHooks+cabalHooks = simpleUserHooks { preConf = buildCabal }  -- | Build a set of targets build :: [String] -- ^ Targets

@@ -98,6 +98,7 @@                 , module X                 -- Lens exports                 , over+                , _Just                 , view                 , _1                 , _2