From 313bf2122871953a47da3bc30bd53934a58f6629 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Fri, 20 Mar 2020 22:24:22 +0100
Subject: [PATCH 1/3] arion-compose.cabal: Allow newer base up to a point

---
 arion-compose.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arion-compose.cabal b/arion-compose.cabal
index 6df6efc..26d04c7 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

From eeed0577bef179170d88b97dd27ece638ceb7ec3 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Fri, 20 Mar 2020 22:19:23 +0100
Subject: [PATCH 2/3] haskell: Resolve lines ambiguity

---
 src/haskell/lib/Arion/Images.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 ""

From 3b8667939916a9650fd1b3414c081a991f7c8b51 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Fri, 20 Mar 2020 22:20:00 +0100
Subject: [PATCH 3/3] Resolve NonEmpty import warning

---
 arion-compose.cabal          | 2 +-
 src/haskell/exe/Main.hs      | 2 --
 src/haskell/lib/Arion/Nix.hs | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/arion-compose.cabal b/arion-compose.cabal
index 26d04c7..df6acb3 100644
--- a/arion-compose.cabal
+++ b/arion-compose.cabal
@@ -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/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 )