Fix the build of hledger-lib with ghc 8.0.x and base-compat 0.10.x.
We don't need to import Data.Monoid because Prelude.Compat exports "<>"
already. In fact, importing that module causes build failures:
    Hledger/Read/Common.hs:725:62: error:
        Ambiguous occurrence ‘<>’
        It could refer to either ‘Sem.<>’,
                                 imported from ‘Prelude.Compat’ at Hledger/Read/Common.hs:97:1-39
                                 (and originally defined in ‘Data.Semigroup’)
                              or ‘Data.Monoid.<>’,
                                 imported from ‘Data.Monoid’ at Hledger/Read/Common.hs:110:1-18
Fixes https://github.com/simonmichael/hledger/issues/794.
			
			
This commit is contained in:
		
							parent
							
								
									0808307af1
								
							
						
					
					
						commit
						8c0c168cd6
					
				| @ -106,9 +106,6 @@ import Data.Functor.Identity | ||||
| import Data.List.Compat | ||||
| import Data.List.NonEmpty (NonEmpty(..)) | ||||
| import Data.Maybe | ||||
| #if !(MIN_VERSION_base(4,11,0)) | ||||
| import Data.Monoid | ||||
| #endif | ||||
| import qualified Data.Map as M | ||||
| import qualified Data.Semigroup as Sem | ||||
| import Data.Text (Text) | ||||
|  | ||||
| @ -78,9 +78,6 @@ import Control.Monad | ||||
| import Control.Monad.Except (ExceptT(..), runExceptT, throwError) | ||||
| import Control.Monad.State.Strict | ||||
| import qualified Data.Map.Strict as M | ||||
| #if !(MIN_VERSION_base(4,11,0)) | ||||
| import Data.Monoid | ||||
| #endif | ||||
| import Data.Text (Text) | ||||
| import Data.String | ||||
| import Data.List | ||||
|  | ||||
| @ -2,7 +2,7 @@ | ||||
| -- | ||||
| -- see: https://github.com/sol/hpack | ||||
| -- | ||||
| -- hash: 408bc36237e01b4976cc96ca0444f05937bd517efb0ef378e0d1d4aac76b9e56 | ||||
| -- hash: f08b7ddfe8e3ee85bfdc0af7c7320be85b073578c872a98b23b9c6e5bbbe5650 | ||||
| 
 | ||||
| name:           hledger-lib | ||||
| version:        1.9.99 | ||||
| @ -105,7 +105,7 @@ library | ||||
|     , ansi-terminal >=0.6.2.3 | ||||
|     , array | ||||
|     , base >=4.8 && <4.12 | ||||
|     , base-compat >=0.8.1 | ||||
|     , base-compat ==0.10.* | ||||
|     , blaze-markup >=0.5.1 | ||||
|     , bytestring | ||||
|     , cmdargs >=0.10 | ||||
| @ -200,7 +200,7 @@ test-suite doctests | ||||
|     , ansi-terminal >=0.6.2.3 | ||||
|     , array | ||||
|     , base >=4.8 && <4.12 | ||||
|     , base-compat >=0.8.1 | ||||
|     , base-compat ==0.10.* | ||||
|     , blaze-markup >=0.5.1 | ||||
|     , bytestring | ||||
|     , cmdargs >=0.10 | ||||
| @ -295,7 +295,7 @@ test-suite easytests | ||||
|     , ansi-terminal >=0.6.2.3 | ||||
|     , array | ||||
|     , base >=4.8 && <4.12 | ||||
|     , base-compat >=0.8.1 | ||||
|     , base-compat ==0.10.* | ||||
|     , blaze-markup >=0.5.1 | ||||
|     , bytestring | ||||
|     , cmdargs >=0.10 | ||||
| @ -391,7 +391,7 @@ test-suite hunittests | ||||
|     , ansi-terminal >=0.6.2.3 | ||||
|     , array | ||||
|     , base >=4.8 && <4.12 | ||||
|     , base-compat >=0.8.1 | ||||
|     , base-compat ==0.10.* | ||||
|     , blaze-markup >=0.5.1 | ||||
|     , bytestring | ||||
|     , cmdargs >=0.10 | ||||
|  | ||||
| @ -40,7 +40,7 @@ extra-source-files: | ||||
| 
 | ||||
| dependencies: | ||||
| - base >=4.8 && <4.12 | ||||
| - base-compat >=0.8.1 | ||||
| - base-compat == 0.10.* | ||||
| - ansi-terminal >=0.6.2.3 | ||||
| - array | ||||
| - blaze-markup >=0.5.1 | ||||
|  | ||||
| @ -2,7 +2,7 @@ | ||||
| -- | ||||
| -- see: https://github.com/sol/hpack | ||||
| -- | ||||
| -- hash: 0c78f681a99e0d6cc3ae1ff87b9397afc508292a6c412d00c85b5cdb5607b933 | ||||
| -- hash: ecf98aad3ab1dc507594bf7da100bfa858c432a4e216023543e699f760a271d1 | ||||
| 
 | ||||
| name:           hledger-ui | ||||
| version:        1.9.99 | ||||
| @ -69,7 +69,7 @@ executable hledger-ui | ||||
|     , ansi-terminal >=0.6.2.3 | ||||
|     , async | ||||
|     , base >=4.8 && <4.12 | ||||
|     , base-compat >=0.8.1 | ||||
|     , base-compat ==0.10.* | ||||
|     , cmdargs >=0.8 | ||||
|     , containers | ||||
|     , data-default | ||||
|  | ||||
| @ -45,7 +45,7 @@ dependencies: | ||||
|  - ansi-terminal >=0.6.2.3 | ||||
|  - async | ||||
|  - base >=4.8 && <4.12 | ||||
|  - base-compat >=0.8.1 | ||||
|  - base-compat == 0.10.* | ||||
|  - cmdargs >=0.8 | ||||
|  - containers | ||||
|  - data-default | ||||
|  | ||||
| @ -2,7 +2,7 @@ | ||||
| -- | ||||
| -- see: https://github.com/sol/hpack | ||||
| -- | ||||
| -- hash: c000d351c61aeef057878385c2fbb01b696d20af9137ac2210902ba8de60bfaa | ||||
| -- hash: 7307cbaf625ff1863fcf59a405c2f148585b0cc13d02486494e726c5e609eb07 | ||||
| 
 | ||||
| name:           hledger-web | ||||
| version:        1.9.99 | ||||
| @ -144,7 +144,7 @@ library | ||||
|   build-depends: | ||||
|       HUnit | ||||
|     , base >=4.8 && <4.12 | ||||
|     , base-compat >=0.8.1 | ||||
|     , base-compat ==0.10.* | ||||
|     , blaze-html | ||||
|     , blaze-markup | ||||
|     , bytestring | ||||
| @ -195,7 +195,7 @@ executable hledger-web | ||||
|   build-depends: | ||||
|       HUnit | ||||
|     , base >=4.8 && <4.12 | ||||
|     , base-compat >=0.8.1 | ||||
|     , base-compat ==0.10.* | ||||
|     , blaze-html | ||||
|     , blaze-markup | ||||
|     , bytestring | ||||
| @ -254,7 +254,7 @@ test-suite test | ||||
|   build-depends: | ||||
|       HUnit | ||||
|     , base >=4.8 && <4.12 | ||||
|     , base-compat >=0.8.1 | ||||
|     , base-compat ==0.10.* | ||||
|     , blaze-html | ||||
|     , blaze-markup | ||||
|     , bytestring | ||||
|  | ||||
| @ -65,7 +65,7 @@ dependencies: | ||||
| - hledger-lib >=1.9.99 && <2.0 | ||||
| - hledger >=1.9.99 && <2.0 | ||||
| - base >=4.8 && <4.12 | ||||
| - base-compat >=0.8.1 | ||||
| - base-compat == 0.10.* | ||||
| - blaze-html | ||||
| - blaze-markup | ||||
| - bytestring | ||||
|  | ||||
| @ -2,7 +2,7 @@ | ||||
| -- | ||||
| -- see: https://github.com/sol/hpack | ||||
| -- | ||||
| -- hash: 0f0ae8e75569c28e8c5987ba06696f6dbbbfc9334de43851eb1d1420ffc89d5a | ||||
| -- hash: c0eb869dc10f744521ca915b20715da6a280e9deb5089d74814f63c8b55c5cd9 | ||||
| 
 | ||||
| name:           hledger | ||||
| version:        1.9.99 | ||||
| @ -116,7 +116,7 @@ library | ||||
|     , HUnit | ||||
|     , ansi-terminal >=0.6.2.3 | ||||
|     , base >=4.8 && <4.12 | ||||
|     , base-compat >=0.8.1 | ||||
|     , base-compat ==0.10.* | ||||
|     , bytestring | ||||
|     , cmdargs >=0.10 | ||||
|     , containers | ||||
| @ -168,7 +168,7 @@ executable hledger | ||||
|     , HUnit | ||||
|     , ansi-terminal >=0.6.2.3 | ||||
|     , base >=4.8 && <4.12 | ||||
|     , base-compat >=0.8.1 | ||||
|     , base-compat ==0.10.* | ||||
|     , bytestring | ||||
|     , cmdargs >=0.10 | ||||
|     , containers | ||||
| @ -222,7 +222,7 @@ test-suite test | ||||
|     , HUnit | ||||
|     , ansi-terminal >=0.6.2.3 | ||||
|     , base >=4.8 && <4.12 | ||||
|     , base-compat >=0.8.1 | ||||
|     , base-compat ==0.10.* | ||||
|     , bytestring | ||||
|     , cmdargs >=0.10 | ||||
|     , containers | ||||
| @ -275,7 +275,7 @@ benchmark bench | ||||
|     , HUnit | ||||
|     , ansi-terminal >=0.6.2.3 | ||||
|     , base >=4.8 && <4.12 | ||||
|     , base-compat >=0.8.1 | ||||
|     , base-compat ==0.10.* | ||||
|     , bytestring | ||||
|     , cmdargs >=0.10 | ||||
|     , containers | ||||
|  | ||||
| @ -81,7 +81,7 @@ dependencies: | ||||
| - hledger-lib >=1.9.99 && <2.0 | ||||
| - ansi-terminal >=0.6.2.3 | ||||
| - base >=4.8 && <4.12 | ||||
| - base-compat >=0.8.1 | ||||
| - base-compat == 0.10.* | ||||
| - bytestring | ||||
| - cmdargs >=0.10 | ||||
| - containers | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user