Commit Graph

6718 Commits

Author SHA1 Message Date
Jens Petersen
4ef43e7a46 Revert "disable marvin for bounds (#2310)"
This reverts commit e85580faf5.
2017-02-19 13:17:09 +09:00
Jens Petersen
f70f534b67 Merge pull request #2315 from MackeyRMS/master
Add tsv2csv package
2017-02-19 13:15:18 +09:00
Jens Petersen
fd20deeb3e Merge pull request #2313 from k0ral/master
Add upper-bounds on packages that depend on xml-conduit-1.5.0
2017-02-19 12:55:22 +09:00
Kanishka Azimi
8045c45d15 Add tsv2csv package 2017-02-18 22:00:09 -05:00
koral
81c0b63df8 Add upper-bounds on packages that depend on xml-conduit-1.5.0 2017-02-18 09:41:03 +01:00
Jens Petersen
06cc0aa773 rss-conduit < 0.3.0.1 (#2312) 2017-02-18 16:48:36 +09:00
Jens Petersen
288756adbe xml-conduit < 1.5.0 (#2312)
reflecting the Hackage preferred version range
2017-02-18 16:43:11 +09:00
Jens Petersen
e85580faf5 disable marvin for bounds (#2310) 2017-02-18 16:33:48 +09:00
Jens Petersen
f330989d62 Merge pull request #2310 from JustusAdam/master
Adding marvin
2017-02-18 16:20:05 +09:00
Jens Petersen
f544e29497 Merge pull request #2304 from fpco/add-back-stackage-curator
Add back stackage-curator (store-0.3.1 fixes memory issues)
2017-02-18 16:16:20 +09:00
Jens Petersen
502e513552 Revert "test not compiling (2chilled/scrape-changes#2)"
should be fixed now

This reverts commit 802052f850.
2017-02-18 16:14:13 +09:00
Jens Petersen
4b62566d7d Merge pull request #2309 from fpco/reduce-maintainer-responsiveness
MAINTAINERS.md: soften the responsiveness language
2017-02-18 16:02:32 +09:00
Justus Adam
fc2e382207 Higher version constraints on marvin 2017-02-17 22:04:23 +01:00
Jens Petersen
b1e6f4fac9 MAINTAINERS.md: add a little more leniency 2017-02-18 00:55:20 +09:00
Justus Adam
c4a75623ae And I need mustache 2017-02-17 13:51:09 +01:00
Justus Adam
88eb13563b Version constraints for marvin 2017-02-17 13:26:50 +01:00
Justus Adam
07b5862028 Adding marvin 2017-02-17 13:25:18 +01:00
Michael Snoyman
ae4c8919ae Add back stackage-curator (store-0.3.1 fixes memory issues)
Skips benchmark due to criterion, and adds store explicitly
2017-02-17 12:55:20 +02:00
Michael Snoyman
ee2e621bff Remove time limits from maintainer agreement 2017-02-17 06:50:15 +02:00
Jens Petersen
b849fc0e9d Merge pull request #2308 from fpinsight/ocilib-4.3.2
upgraded ocilib to 4.3.2
2017-02-17 11:53:44 +09:00
Jens Petersen
2deb69adda drop the bloodhood comment 2017-02-17 11:48:03 +09:00
Jens Petersen
24a2762aa7 Merge pull request #2307 from bitemyapp/patch-1
Reinstate Bloodhound
2017-02-17 11:40:45 +09:00
Jens Petersen
056ebfd7d3 Revert "csp test failing (#2296)"
should be fixed in 1.3.1

This reverts commit 3ccf8de6a0.
2017-02-17 11:30:18 +09:00
Thierry Bourrillon
d7cfc0fdd9 upgraded ocilib to 4.3.2 2017-02-17 01:28:16 +01:00
Chris Allen
4b5af4e1fa Reinstate Bloodhound
0.13.0.0 should have us compatible again.
2017-02-16 11:07:38 -06:00
Jens Petersen
5e83cd2f75 add xmonad-contrib under juhp
Ping me if you want to own it in Stackage
2017-02-16 15:25:27 +09:00
Jens Petersen
93a0c33888 Revert "xml-conduit < 1.5.0" (#2299)
This reverts 8c44548
2017-02-16 14:22:15 +09:00
Jens Petersen
3ccf8de6a0 csp test failing (#2296) 2017-02-16 14:19:12 +09:00
Jens Petersen
203d24e7ee Merge pull request #2295 from fpco/bootstrap-get-stack
debian-bootstrap.sh: changes to support re-use in building 'fpco/stack-build' Docker images
2017-02-16 12:20:41 +09:00
Jens Petersen
e027bc7398 Merge pull request #2296 from abarbu/master
Add nondeterminism and csp
2017-02-16 12:20:10 +09:00
Jens Petersen
8e1223becb disable gogol-affiliates and gogol-classroom (brendanhay/gogol#61) 2017-02-16 12:15:20 +09:00
Jens Petersen
802052f850 test not compiling (2chilled/scrape-changes#2) 2017-02-16 12:00:55 +09:00
Jens Petersen
635039321b Merge pull request #2303 from ocramz/patch-4
Added matrix-market-attoparsec
2017-02-16 11:44:09 +09:00
Jens Petersen
ae15efc873 Merge pull request #2302 from eskimor/reenalbe-servant-purescript
Enabled servant-purescript and subscriber again
2017-02-16 11:43:07 +09:00
Jens Petersen
9366e3f04f Merge pull request #2301 from cdepillabout/add-yesod-markdown
Add the yesod-markdown package.
2017-02-16 11:42:17 +09:00
Jens Petersen
6a652aa319 Merge pull request #2289 from redelmann/master
add distribution
2017-02-16 11:33:08 +09:00
Jens Petersen
6cdd2af2af Merge branch 'master' into master 2017-02-16 11:32:47 +09:00
Jens Petersen
07f7e838d8 debian-bootstrap.sh: add libsdl2-ttf (#2297) 2017-02-16 11:22:59 +09:00
(cdep)illabout
b11133a5a9 Add the yesod-markdown package. 2017-02-16 09:26:39 +09:00
Marco Zocca
bc744523c7 Update build-constraints.yaml 2017-02-16 00:18:42 +01:00
Robert Klotzner
91d6f64c4f Enabled servant-purescript and subscriber again 2017-02-15 17:41:03 +01:00
Jens Petersen
481d2674e6 Merge pull request #2297 from rongcuid/master
Add sdl2-ttf
2017-02-16 00:14:16 +09:00
Jens Petersen
50f1ed32ac reenable wreq!! (#2032)
woohoo
2017-02-15 21:57:41 +09:00
Jens Petersen
eb30b483d7 Revert "Constrain ghc-prof per #2298"
This reverts commit c38f5365a4.
2017-02-15 21:20:15 +09:00
Jens Petersen
5931ad10e6 Merge pull request #2300 from cdepillabout/reenable-hailgun
Reenable the hailgun and hailgun-simple libraries.
2017-02-15 21:17:21 +09:00
Luke Murphy
27ac4f8e86 Re-enable git.
Please see vincenthz/hs-git/issues/5#issuecomment-279649536.
2017-02-14 13:51:48 +00:00
(cdep)illabout
85e7420d50 Reenable the hailgun and hailgun-simple libraries. 2017-02-14 20:24:47 +09:00
Dan Burton
5fabc61c24
Re-enable servant-elm per mattjbray/servant-elm#26 2017-02-13 22:10:34 -08:00
Dan Burton
8c44548b56
Constrain xml-conduit per #2299 2017-02-13 22:08:52 -08:00
Dan Burton
c38f5365a4
Constrain ghc-prof per #2298 2017-02-13 22:08:12 -08:00