fix distributed-process merge conflicts #886

# Conflicts:
#	build-constraints.yaml
This commit is contained in:
Jens Petersen 2015-10-12 00:41:20 +09:00
commit 3e8cd0a1b6

View File

@ -117,20 +117,6 @@ packages:
- th-desugar
- quickcheck-assertions
# Cloud Haskell not yet updated to GHC 7.10
#- distributed-process-simplelocalnet
# cloud-haskell
#- rank1dynamic
#- distributed-static
- network-transport
#- distributed-process
#- distributed-process-extras
#- distributed-process-async
#- distributed-process-client-server
#- distributed-process-supervisor
#- distributed-process-task
#- distributed-process-execution
- kure
- ide-backend
@ -1513,6 +1499,19 @@ packages:
- hasty-hamiltonian
- declarative
"Facundo Domínguez <facundo.dominguez@tweag.io> @facundominguez":
- distributed-process
- distributed-process-async
- distributed-process-client-server
- distributed-process-execution
- distributed-process-extras
- distributed-process-simplelocalnet
- distributed-process-supervisor
- distributed-process-task
- distributed-static
- network-transport
- rank1dynamic
"Stackage upper bounds":
# https://github.com/fpco/stackage/issues/537
- zlib < 0.6