arion-compose 0.1.1.0 → 0.1.1.1

raw patch · 5 files changed

+11/−8 lines, 5 filesdep ~basedep ~protolude

Dependency ranges changed: base, protolude

Files

• CHANGELOG.md +6/−0
• arion-compose.cabal +3/−3
• src/haskell/exe/Main.hs +0/−2
• src/haskell/lib/Arion/Images.hs +2/−2
• src/haskell/lib/Arion/Nix.hs +0/−1

@@ -2,6 +2,12 @@  ## Unreleased +## 0.1.1.1 -- 2020-03-20++* Fix ambiguous import of `lines`+* Improve base version constraint+* Fix warnings+ ## 0.1.1.0 -- 2020-03-19  * Support Nixpkgs 20.03

@@ -1,7 +1,7 @@ cabal-version:       2.4  name:                arion-compose-version: 0.1.1.0+version: 0.1.1.1 synopsis:            Run docker-compose with help from Nix/NixOS description:         Arion is a tool for building and running applications that consist of multiple docker containers using NixOS modules. It has special support for docker images that are built with Nix, for a smooth development experience and improved performance. homepage:            https://github.com/hercules-ci/arion#readme@@ -25,7 +25,7 @@ data-dir:            src  common common-  build-depends:     base ^>=4.12.0.0+  build-depends:     base >=4.12.0.0 && <4.14                    , aeson                    , aeson-pretty                    , async@@ -36,7 +36,7 @@                    , process                    , temporary                    , text-                   , protolude+                   , protolude >= 0.2                    , unix   ghc-options:     -Wall 

@@ -17,8 +17,6 @@ import qualified Data.Text as T import qualified Data.Text.IO as T -import Data.List.NonEmpty (NonEmpty(..))- import System.Posix.User (getRealUserID)  data CommonOptions =

@@ -11,10 +11,10 @@ import qualified Data.Aeson as Aeson import           Arion.Aeson (decodeFile) import qualified System.Process as Process+import qualified Data.Text as T  import Control.Lens import Data.Aeson.Lens-import Data.String import System.IO (withFile, IOMode(ReadMode))  @@ -57,4 +57,4 @@ dockerImages :: IO [TaggedImage] dockerImages = do   let procSpec = Process.proc "docker" [ "images",  "--filter", "dangling=false", "--format", "{{.Repository}}:{{.Tag}}" ]-  (map toS . lines) <$> Process.readCreateProcess procSpec ""+  (map toS . T.lines . toS) <$> Process.readCreateProcess procSpec ""

@@ -22,7 +22,6 @@ import qualified Data.Text.IO                  as T  import qualified Data.List.NonEmpty            as NE-import           Data.List.NonEmpty             ( NonEmpty(..) )  import           Control.Arrow                  ( (>>>) ) import           System.IO.Temp                 ( withTempFile )