diff --git a/patches/language-docker-8.0.2.patch b/patches/language-docker-8.1.1.patch similarity index 51% rename from patches/language-docker-8.0.2.patch rename to patches/language-docker-8.1.1.patch index 6eda3d7f3afa53e7e417bb84cc1d95260d257680..02c0eeec06be79ba527255e42082a072b9e56531 100644 --- a/patches/language-docker-8.0.2.patch +++ b/patches/language-docker-8.1.1.patch @@ -1,29 +1,8 @@ diff --git a/src/Language/Docker/Syntax/Lift.hs b/src/Language/Docker/Syntax/Lift.hs -index d9d9eba..0713e50 100644 +index c953d02..77129be 100644 --- a/src/Language/Docker/Syntax/Lift.hs +++ b/src/Language/Docker/Syntax/Lift.hs -@@ -1,3 +1,5 @@ -+{-# LANGUAGE CPP #-} -+{-# LANGUAGE PolyKinds #-} - {-# LANGUAGE TemplateHaskell #-} - - module Language.Docker.Syntax.Lift where -@@ -15,10 +17,14 @@ import Language.Docker.Syntax - instance Lift ByteString.ByteString where - lift b = [|ByteString.pack $(lift $ ByteString.unpack b)|] - -+#if !(MIN_VERSION_text(1,2,4)) - instance Lift Text.Text where - lift b = [|Text.pack $(lift $ Text.unpack b)|] -+#endif - -+#if !(MIN_VERSION_template_haskell(2,15,0)) - deriveLift ''NonEmpty -+#endif - - deriveLift ''Fixed - -@@ -44,9 +50,13 @@ deriveLift ''BaseImage +@@ -35,9 +35,13 @@ deriveLift ''BaseImage deriveLift ''Arguments @@ -39,7 +18,7 @@ index d9d9eba..0713e50 100644 deriveLift ''SourcePath -@@ -54,16 +64,12 @@ deriveLift ''TargetPath +@@ -45,16 +49,12 @@ deriveLift ''TargetPath deriveLift ''Chown