diff --git a/arion-compose.cabal b/arion-compose.cabal index 6df6efc..df6acb3 100644 --- a/arion-compose.cabal +++ b/arion-compose.cabal @@ -25,7 +25,7 @@ data-files: nix/*.nix 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 @@ common common , process , temporary , text - , protolude + , protolude >= 0.2 , unix ghc-options: -Wall diff --git a/src/haskell/exe/Main.hs b/src/haskell/exe/Main.hs index 6f806c6..eeb6731 100644 --- a/src/haskell/exe/Main.hs +++ b/src/haskell/exe/Main.hs @@ -17,8 +17,6 @@ import Control.Monad.Fail 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 = diff --git a/src/haskell/lib/Arion/Images.hs b/src/haskell/lib/Arion/Images.hs index a533cec..90f5152 100644 --- a/src/haskell/lib/Arion/Images.hs +++ b/src/haskell/lib/Arion/Images.hs @@ -11,10 +11,10 @@ import Protolude hiding (to) 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 @@ loadImage imgPath = withFile (imgPath) ReadMode $ \fileHandle -> do 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 "" diff --git a/src/haskell/lib/Arion/Nix.hs b/src/haskell/lib/Arion/Nix.hs index dbc9103..cdd3761 100644 --- a/src/haskell/lib/Arion/Nix.hs +++ b/src/haskell/lib/Arion/Nix.hs @@ -22,7 +22,6 @@ import Paths_arion_compose 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 )