Commit 0308ba81 authored by Clint Adams's avatar Clint Adams
Browse files

fixes

parent be434ea0
Loading
Loading
Loading
Loading
+24 −24
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ attoparsec-iso8601 1.0.0.0
authenticate 1.3.4
authenticate-oauth 1.6
auto-update 0.1.4
aws 0.19 notest ignore
aws 0.19 notest ignore # BROKEN: LTS 11: newer conduit
base16-bytestring 0.1.1.6
base64-bytestring 1.0.0.1
base-compat 0.9.3
@@ -68,7 +68,7 @@ BoundedChan 1.0.3.0
boxes 0.1.5
brainfuck 0.1.0.3
brick 0.34.1
bustle 0.5.4 key binary=bustle # BROKEN - LTS 8 (via hgettext)
bustle 0.5.4 key binary=bustle
byteable 0.1.1
bytedump 1.0
byteorder 1.0.4
@@ -190,13 +190,13 @@ data-ordlist 0.4.7.0
DAV 1.3.2
dbus 0.10.15 notest
debian 3.93.2
debug-me 1.20170810 binary
debug-me 1.20170810 binary ignore # BROKEN: LTS 11: newer graphviz
Decimal 0.5.1
deepseq-generics 0.2.0.0
dependent-map 0.2.4.0
dependent-sum 0.4
dependent-sum-template 0.0.0.6
derive 2.6.3
derive 2.6.3 ignore # BROKEN: LTS 11: newer haskell-src-exts
deriving-compat 0.4.1
descriptive 0.9.4 # dep of structured-haskell-mode, by Thomas Koch
diagrams 1.4 binary=libghc-diagrams-dev ignore # hand-created meta package, does not yet pull in diagrams-contrib
@@ -262,12 +262,12 @@ fclabels 2.0.3.3
fdo-notify 0.3.1
feed 1.0.0.0
fgl 5.6.0.0
fgl-arbitrary 0.2.0.3
fgl-arbitrary 0.2.0.3 ignore # BROKEN: LTS 11: newer QuickCheck
file-embed 0.0.10.1
file-location 0.4.9
filelock 0.1.1.2
filemanip 0.3.6.3
filestore 0.6.3.1 notest
filestore 0.6.3.1 notest ignore # BROKEN: LTS 11: newer process
fingertree 0.1.4.1
finite-field 0.8.0
fixed 0.2.1.1
@@ -278,29 +278,29 @@ foldl 1.3.7
formatting 6.3.2
foundation 0.0.20
free 5.0.1
frown 0.6.2.3 binary
frown 0.6.2.3 binary ignore # BROKEN: LTS 11: newer base
fsnotify 0.2.1.1 notest
ftphs 1.0.9.1
gd 3000.7.3
generic-deriving 1.12.1
generics-sop 0.3.2.0
generic-trie 0.3.0.2
generic-trie 0.3.0.2 ignore # BROKEN: LTS 11: newer base
geniplate-mirror 0.7.6
getopt-generics 0.13.0.2
ghc-events 0.7.2
ghc-mod 5.8.0.0 binary notest # tests need patching for newer hspec (possibly just a bounds bump)
ghc-mod 5.8.0.0 binary ignore # BROKEN: LTS 11: newer base
ghc-mtl 1.2.1.0
ghc-paths 0.1.0.9
ghc-syb-utils 0.2.3.3
gio 0.13.4.0
git-annex 6.20180316 binary key -f-ConcurrentOutput
github 0.19
github-backup 1.20170301 binary key
gitit 0.12.2.1 key ignore # BROKEN - LTS 9 - needs patching for newer hoauth2
github-backup 1.20170301 binary key ignore # BROKEM: LTS 11: newer github
gitit 0.12.2.1 key ignore # BROKEN: LTS 11: newer time
gitlib 3.1.1
gitrev 1.3.1
glib 0.13.5.0
glirc 2.24 binary
glirc 2.26 binary
Glob 0.9.2
gloss 1.11.1.1 key
gloss-rendering 1.11.1.1
@@ -309,20 +309,20 @@ GLUT 2.7.0.13
gnuidn 0.2.2
gnutls 0.2
GraphSCC 1.0.4
graphviz 2999.18.1.2
graphviz 2999.19.0.0 ignore # BROKEN: LTS 11: newer fgl
groups 0.4.1.0
gsasl 0.3.6
gtk 0.14.7
gtk2hs-buildtools 0.13.3.1 binary
gtk3 0.14.8
gtk-traymanager 0.1.6
hackage-mirror 0.1.1.1
hackage-mirror 0.1.1.1 ignore # BROKEN: LTS 11: via aws
hackage-security 0.5.3.0
haddock-library 1.4.5 notest
haddock-library 1.4.5 ignore # BROKEN: ???
hakyll 4.12.1.0
half 0.2.2.3
hamlet 1.2.0 avoid
happstack-authenticate 2.3.4.7 key # David Fox likes this packages
happstack-authenticate 2.3.4.8 ignore # BROKEN: LTS 11: newer aeson
happstack-hsp 7.3.7.3 key
happstack-jmacro 7.0.12
happstack-server 7.5.1
@@ -338,7 +338,7 @@ haskell-lexer 1.0.1
haskell-qrencode 1.0.4
haskell-src 1.0.3.0
haskell-src-exts 1.20.2 notest
haskell-src-exts-simple 1.19.0.0
haskell-src-exts-simple 1.20.0.0
haskell-src-exts-util 0.2.2
haskell-src-meta 0.8.0.2
hasktags 0.69.3 binary key
@@ -359,7 +359,7 @@ heist 1.0.1.2
here 1.2.13
heredoc 0.2.0.0
hex 0.1.2
hgettext 0.1.30 # BROKEN - LTS 8
hgettext 0.1.30
hierarchical-clustering 0.4.6
highlighting-kate 0.6.4 -fpcre-light
hinotify 0.3.9
@@ -377,19 +377,19 @@ hmatrix-gsl 0.18.2.0
hmt 0.15
hoauth2 1.3.0
hoogle 5.0.17.2 notest
hookup 0.1.0.0
hookup 0.2
hOpenPGP 2.6 key
hopenpgp-tools 0.20.1 binary
hosc 0.16
hostname 1.0
hothasktags 0.3.8 binary key
hothasktags 0.3.8 binary ignore # BROKEN: LTS 11: newer haskell-src-exts
hourglass 0.2.11
hpack 0.27.0
hs-bibutils 6.2.0.1
hscolour 1.24.4
hsemail 2
HSH 2.1.2 key # dependency of twidge
hsini 0.5.0
hsini 0.5.1.1
hslogger 1.2.10
hslua 0.9.5.1
HsOpenSSL 0.11.4.13 notest
@@ -574,7 +574,7 @@ network-protocol-xmpp 0.4.8
network-uri 2.6.1.0
network-uri-flag 0.1
newtype 0.2
newtype-generics 0.5.3 notest # BROKEN - LTS 8 - test needs patching for newer hspec
newtype-generics 0.5.3
nonce 1.0.7
numbers 3000.2.0.1
numeric-extras 0.1
@@ -885,8 +885,8 @@ utf8-string 1.0.1.1
utility-ht 0.0.14 key # dependency of mediawiki2latex
uuagc 0.9.42.3 binary key
uuagc-cabal 1.0.4.0
uuid 1.3.13 notest # BROKEN - LTS 8 - test needs patching for newer HUnit
uuid-types 1.0.3 notest # BROKEN - LTS 8 - test needs patching for newer HUnit
uuid 1.3.13
uuid-types 1.0.3
uulib 0.9.20
vault 0.3.1.0
vector 0.12.0.1 notest # Testing disabled during transition to 7.10
+0 −29
Original line number Diff line number Diff line
--- a/hledger-lib.cabal
+++ b/hledger-lib.cabal
@@ -71,7 +71,7 @@ library
     , directory
     , filepath
     , hashtables >= 1.2
-    , megaparsec >=5.0 && < 5.3
+    , megaparsec >=5.0 && < 5.4
     , mtl
     , old-time
     , pretty-show >=1.6.4
@@ -164,7 +164,7 @@ test-suite doctests
     , directory
     , filepath
     , hashtables >= 1.2
-    , megaparsec >=5.0 && < 5.3
+    , megaparsec >=5.0 && < 5.4
     , mtl
     , old-time
     , pretty-show >=1.6.4
@@ -248,7 +248,7 @@ test-suite hunittests
     , directory
     , filepath
     , hashtables >= 1.2
-    , megaparsec >=5.0 && < 5.3
+    , megaparsec >=5.0 && < 5.4
     , mtl
     , old-time
     , pretty-show >=1.6.4
+26 −0
Original line number Diff line number Diff line
--- a/hledger-lib.cabal
+++ b/hledger-lib.cabal
@@ -73,7 +73,6 @@ library
@@ -120,7 +120,6 @@
     , hashtables >=1.2
     , megaparsec >=5.0 && < 5.3
     , megaparsec >=5.0
     , mtl
-    , mtl-compat
     , old-time
     , parsec >=3
     , pretty-show >=1.6.4
     , regex-tdfa
@@ -167,7 +166,6 @@ test-suite doctests
@@ -212,7 +211,6 @@
     , hashtables >=1.2
     , megaparsec >=5.0 && < 5.3
     , megaparsec >=5.0
     , mtl
-    , mtl-compat
     , old-time
     , parsec >=3
     , pretty-show >=1.6.4
     , regex-tdfa
@@ -252,7 +250,6 @@ test-suite hunittests
     , hashtables >= 1.2
     , megaparsec >=5.0 && < 5.3
@@ -303,7 +301,6 @@
     , hledger-lib
     , megaparsec >=5.0
     , mtl
-    , mtl-compat
     , old-time
     , parsec >=3
     , pretty-show >=1.6.4
     , regex-tdfa
+0 −1
Original line number Diff line number Diff line
no-mtl-compat.patch
newer-megaparsec
+0 −11
Original line number Diff line number Diff line
--- a/hledger.cabal
+++ b/hledger.cabal
@@ -104,7 +104,7 @@ library
     , HUnit
     , mtl
     , old-time
-    , megaparsec >=5.0 && < 5.3
+    , megaparsec >=5.0 && < 5.4
     , regex-tdfa
     , safe >=0.2
     , split >=0.1 && <0.3
Loading