cabal-meta 0.4.0.1 → 0.4.1

raw patch · 3 files changed

+11/−12 lines, 3 filesdep ~shellyPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: shelly

API changes (from Hackage documentation)

Files

• CabalMeta.hs +2/−2
• cabal-meta.cabal +4/−4
• main.hs +5/−6

@@ -16,8 +16,8 @@  import Shelly hiding (tag) import Prelude hiding (FilePath)-import Data.Text.Lazy (Text, unpack)-import qualified Data.Text.Lazy as T+import Data.Text (Text, unpack)+import qualified Data.Text as T import Filesystem.Path.CurrentOS (hasExtension, basename, dirname) import Data.Maybe (fromMaybe, maybeToList, listToMaybe) import Data.List (partition)

@@ -1,5 +1,5 @@ name:            cabal-meta-version:         0.4.0.1+version:         0.4.1 license:         BSD3 license-file:    LICENSE author:          Greg Weber <greg@gregweber.info>@@ -21,7 +21,7 @@         cpp-options:     -DGHC7     else         build-depends:   base            >= 4        && < 4.3-    build-depends: shelly >= 0.9 && < 1.0+    build-depends: shelly >= 1.0 && < 2                  , text, system-filepath                  -- , file-location     extensions: OverloadedStrings @@ -35,7 +35,7 @@         cpp-options:     -DGHC7     else         build-depends:   base            >= 4        && < 4.3-    build-depends: shelly >= 0.9 && < 1.0+    build-depends: shelly >= 1.0 && < 2                  , text, system-filepath, system-fileio                  -- , file-location @@ -50,7 +50,7 @@   hs-source-dirs: .   type:           exitcode-stdio-1.0 -  build-depends: shelly >= 0.9 && < 1.0+  build-depends: shelly >= 1.0 && < 2                , hspec >= 1.3, unix, base, text, system-filepath                -- , file-location   extensions: OverloadedStrings , CPP

@@ -5,10 +5,9 @@ import Paths_cabal_meta  import qualified Data.Text as T-import qualified Data.Text.Lazy as LT import Control.Monad (forM_) import Data.Maybe (isNothing, isJust)-import Data.Text.Lazy (Text)+import Data.Text (Text) import Data.Version (showVersion)  import Filesystem.Path.CurrentOS (filename)@@ -19,7 +18,7 @@ headDef _ (x:_) = x  help :: Text-help = LT.intercalate "\n" [+help = T.intercalate "\n" [   "cabal-meta is a cabal wrapper for installing multiple packages at once that may not be on hackage"  ,"run with:"  ,""@@ -68,17 +67,17 @@   assertCabalDependencies cabal    unless (headDef "" noDevArgs == "install") $ do-    putStrLn $ LT.unpack help+    putStrLn $ T.unpack help     putStrLn $ "using cabal: " ++ show cabal     shelly $ exit 1 -  let (_:args) = map LT.fromStrict noDevArgs+  let (_:args) = noDevArgs    shelly $ verbosely $ do     packageSources <- readPackages True "."     let installs = packageList packageSources     echo "Installing packages:"-    mapM_ echo $ map (LT.intercalate " ") installs+    mapM_ echo $ map (T.intercalate " ") installs      cabal_install_ cabal $ args ++ concat installs     whenCabal cabal $ do