Merge branch 'master' of github.com:fpco/stackage
Conflicts:
build-constraints.yaml
commitf6619634b9c420f57391f4939b2731950b8167af
authorMichael Snoyman <michael@fpcomplete.com>
dateTue 13 Oct 2015, 08:14 (11 years ago)
parentd5795ae4fdce7e
build-constraints.yaml+4
@@ -1529,6 +1529,10 @@ packages:
15291529 "Robbin C. <robbinch33@gmail.com>":
15301530 - zim-parser
15311531
1532+ "David Wiltshire <david.wiltshire@metark.com> @dave77":
1533+ # on behalf of Alexey Karakulov @w3rs
1534+ - hashable-time
1535+
15321536 "Stackage upper bounds":
15331537 # https://github.com/fpco/stackage/issues/537
15341538 - zlib < 0.6