Merge branch 'master' into SamProtas-add-composable-associations

This commit is contained in:
Michael Snoyman 2017-07-31 06:44:01 +03:00
commit 83b9d84cec
No known key found for this signature in database
GPG Key ID: A048E8C057E86876

View File

@ -153,7 +153,7 @@ packages:
# - text-generic-pretty # GHC 8.2.1 via ixset-typed # - text-generic-pretty # GHC 8.2.1 via ixset-typed
"Li-yao Xia <lysxia@gmail.com> @Lysxia": "Li-yao Xia <lysxia@gmail.com> @Lysxia":
- boltzmann-samplers # - boltzmann-samplers # https://github.com/albertoruiz/hmatrix/issues/232
- generic-random - generic-random
"Tobias Dammers <tdammers@gmail.com> @tdammers": "Tobias Dammers <tdammers@gmail.com> @tdammers":
@ -1545,7 +1545,7 @@ packages:
# - mbox # GHC 8.2.1 # - mbox # GHC 8.2.1
- kmeans - kmeans
- boolsimplifier - boolsimplifier
- cubicspline # - cubicspline # https://github.com/albertoruiz/hmatrix/issues/232
- maximal-cliques - maximal-cliques
"Alexander Bondarenko <aenor.realm@gmail.com> @wiz": "Alexander Bondarenko <aenor.realm@gmail.com> @wiz":
@ -1557,9 +1557,9 @@ packages:
- generics-sop - generics-sop
"Vivian McPhail <haskell.vivian.mcphail@gmail.com> @amcphail": "Vivian McPhail <haskell.vivian.mcphail@gmail.com> @amcphail":
- hmatrix-gsl-stats # - hmatrix-gsl-stats # https://github.com/albertoruiz/hmatrix/issues/232
- hsignal # - hsignal # https://github.com/albertoruiz/hmatrix/issues/232
- hstatistics # - hstatistics # https://github.com/albertoruiz/hmatrix/issues/232
# - plot # Cabal 2.0.0.2 # - plot # Cabal 2.0.0.2
# - plot-gtk # Cabal 2.0.0.2 # - plot-gtk # Cabal 2.0.0.2
# - plot-gtk3 # Cabal 2.0.0.2 # - plot-gtk3 # Cabal 2.0.0.2
@ -1745,9 +1745,9 @@ packages:
"Justin Le <justin@jle.im> @mstksg": "Justin Le <justin@jle.im> @mstksg":
- auto - auto
- backprop # - backprop # https://github.com/albertoruiz/hmatrix/issues/232
- configurator-export - configurator-export
- hamilton # - hamilton # https://github.com/albertoruiz/hmatrix/issues/232
- prompt - prompt
# - tagged-binary # https://github.com/mstksg/tagged-binary/issues/2 # - tagged-binary # https://github.com/mstksg/tagged-binary/issues/2
- typelits-witnesses - typelits-witnesses
@ -2980,7 +2980,7 @@ packages:
# - language-python # https://github.com/bjpop/language-python/issues/35 # - language-python # https://github.com/bjpop/language-python/issues/35
"Mahdi Dibaiee <mdibaiee@aol.com>": "Mahdi Dibaiee <mdibaiee@aol.com>":
- picedit # - picedit # https://github.com/albertoruiz/hmatrix/issues/232
- mathexpr - mathexpr
# - sibe # GHC 8.2.1 via stemmer # - sibe # GHC 8.2.1 via stemmer
- termcolor - termcolor
@ -3236,7 +3236,7 @@ packages:
"Alexander Ignatyev <ignatyev.alexander@gmail.com> @alexander-ignatyev": "Alexander Ignatyev <ignatyev.alexander@gmail.com> @alexander-ignatyev":
- astro - astro
- mltool # - mltool # https://github.com/albertoruiz/hmatrix/issues/232
"Edward Amsden <edwardamsden@gmail.com> @eamsden": "Edward Amsden <edwardamsden@gmail.com> @eamsden":
- h2c - h2c