Merge branch 'master' of github.com:fpco/stackage

This commit is contained in:
Michael Snoyman 2017-08-06 15:00:33 +03:00
commit 3a51bb92d4
No known key found for this signature in database
GPG Key ID: A048E8C057E86876

View File

@ -277,7 +277,7 @@ packages:
- warp-tls - warp-tls
# - yackage # GHC 8.2.1 via yesod-form # - yackage # GHC 8.2.1 via yesod-form
- yesod - yesod
# - yesod-auth # GHC 8.2.1 via email-validate - yesod-auth
- authenticate-oauth - authenticate-oauth
- yesod-bin - yesod-bin
- yesod-eventsource - yesod-eventsource
@ -380,8 +380,7 @@ packages:
# - HaRe # via: ghc-mod # - HaRe # via: ghc-mod
"Alfredo Di Napoli <alfredo.dinapoli@gmail.com> @adinapoli": "Alfredo Di Napoli <alfredo.dinapoli@gmail.com> @adinapoli":
[] - mandrill
# - mandrill # GHC 8.2.1 via email-validate
"Jon Schoning <jonschoning@gmail.com> @jonschoning": "Jon Schoning <jonschoning@gmail.com> @jonschoning":
- pinboard - pinboard
@ -405,11 +404,11 @@ packages:
- tldr - tldr
- fb - fb
- yesod-fb - yesod-fb
# - yesod-auth-fb # GHC 8.2.1 via yesod-auth - yesod-auth-fb
- hourglass-orphans - hourglass-orphans
- wai-slack-middleware - wai-slack-middleware
- sysinfo - sysinfo
# - xmonad-extras # GHC 8.2.1 via libmpd - xmonad-extras
"haskell-openal": "haskell-openal":
- OpenAL - OpenAL
@ -469,7 +468,7 @@ packages:
# - labels # https://github.com/chrisdone/labels/issues/8 # - labels # https://github.com/chrisdone/labels/issues/8
- ace - ace
- ical - ical
# - check-email # GHC 8.2.1 via email-validate - check-email
- freenect - freenect
- frisby - frisby
- gd - gd
@ -2091,7 +2090,7 @@ packages:
- irc - irc
"Dennis Gosnell <cdep.illabout@gmail.com> @cdepillabout": "Dennis Gosnell <cdep.illabout@gmail.com> @cdepillabout":
# - emailaddress # GHC 8.2.1 via email-validate - emailaddress
- envelope - envelope
- from-sum - from-sum
# - hailgun # GHC 8.2.1 # - hailgun # GHC 8.2.1
@ -2883,8 +2882,7 @@ packages:
# - dictionaries # GHC 8.2.1 # - dictionaries # GHC 8.2.1
"Joachim Fasting <joachifm@fastmail.fm> @joachifm": "Joachim Fasting <joachifm@fastmail.fm> @joachifm":
[] - libmpd
# - libmpd # GHC 8.2.1
"Moritz Kiefer <moritz.kiefer@purelyfunctional.org> @cocreature": "Moritz Kiefer <moritz.kiefer@purelyfunctional.org> @cocreature":
- lrucaching - lrucaching
@ -3234,8 +3232,7 @@ packages:
- shikensu - shikensu
"George Pollard <porges@porg.es> @Porges": "George Pollard <porges@porg.es> @Porges":
[] - email-validate
# - email-validate # GHC 8.2.1
"Alexander Ignatyev <ignatyev.alexander@gmail.com> @alexander-ignatyev": "Alexander Ignatyev <ignatyev.alexander@gmail.com> @alexander-ignatyev":
- astro - astro
@ -3387,7 +3384,7 @@ package-flags:
containers: true containers: true
timezone-series: timezone-series:
time_1_6_and_1_7: true time_1_6_and_1_7: false
time_pre_1_6: false time_pre_1_6: false
mintty: mintty: