Merge branch 'master' into return-validation-to-stackage

This commit is contained in:
Jens Petersen 2017-09-19 19:30:52 +09:00 committed by GitHub
commit 563012a6d8

View File

@ -8,7 +8,7 @@ cabal-format-version: "1.24"
# Constraints for brand new builds
packages:
"Olaf Chitil <oc@kent.ac.uk> @OlafChitil":
- fpretty
[]
"Maarten Faddegon <stackage@maartenfaddegon.nl> @MaartenFaddegon":
- libgraph
@ -1882,6 +1882,7 @@ packages:
"koral koral@mailoo.org @k0ral":
- atom-conduit
- conduit-parse
- dublincore-xml-conduit
- opml-conduit
- rss-conduit < 0 # test runtime failure
- imm < 0 # compilation failure via synthesizer-core
@ -1910,7 +1911,6 @@ packages:
- pipes-fastx
# - pipes-illumina # via: pipes-bgzf
- seqalign
- thermonuc
- xlsior < 0 # compilation failure https://github.com/eurekagenomics/xlsior/issues/3
"John Lenz <wuzzeb@gmail.com> @wuzzeb":
@ -2076,7 +2076,7 @@ packages:
# - euphoria # GHC 8.2.1
"Ashley Moni ashley.moni1@gmail.com @AshleyMoni":
- quadtree
[]
"Brian Lewis brian@lorf.org @bsl":
[]
@ -2144,7 +2144,6 @@ packages:
"Dmitry Ivanov <ethercrow@gmail.com> @ethercrow":
- charsetdetect-ae
- compiler-errors
- docopt
- dynamic-state
- dyre
@ -2812,9 +2811,8 @@ packages:
- directory-tree
"Ian Grant Jeffries <ian@housejeffries.com> @seagreen":
[]
# - hjsonpointer # GHC 8.2.1
# - hjsonschema # GHC 8.2.1
- hjsonpointer
- hjsonschema
"Drew Hess <src@drewhess.com> @dhess":
- hpio
@ -3017,7 +3015,6 @@ packages:
- tce-conf
"Jonathan Fischoff <jonathangfischoff@gmail.com>":
- threads-extra
- clock-extras
- next-ref
- tmp-postgres