From bd1c05aa92673d2382c6f2362c92bbb2dbd489fd Mon Sep 17 00:00:00 2001 From: Simon Jakobi Date: Fri, 11 Aug 2017 14:26:02 +0200 Subject: [PATCH 1/2] Re-add snap-server and dependent packages Closes #2738, #2743 --- build-constraints.yaml | 49 +++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 2405aa5e..f8f200f8 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -44,10 +44,10 @@ packages: - arrowp-qq - clr-marshal - clr-host - # hexml-lens # via snap-server, https://github.com/fpco/stackage/issues/2738 + - hexml-lens - hp2pretty # With permission of Claude Heiland-Allend - floatshow # https://bitbucket.org/dafis/floatshow/issues/1/add-to-stackage - # - threepenny-editors # GHC 8.2.1 via threepenny-gui + - threepenny-editors - clr-inline # possibly nondeterministic failures, see https://github.com/fpco/stackage/issues/2510 @@ -142,7 +142,7 @@ packages: "Jeremy Barisch-Rooney @barischj": [] - # - threepenny-gui-flexbox # GHC 8.2.1 via threepenny-gui + - threepenny-gui-flexbox "Romain Edelmann @redelmann": - distribution @@ -156,7 +156,8 @@ packages: "Simon Jakobi @sjakobi": - path - present - # - threepenny-gui # GHC 8.2.1 via snap-server + - threepenny-gui + - snap-server "Joe M @joe9": [] @@ -248,8 +249,8 @@ packages: # - google-translate # bounds: servant # - hackernews # GHC 8.2.1 # - ses-html # bounds: time 1.6 - # - stripe-haskell # via: stripe-http-streams - # - stripe-http-streams # via: http-streams + - stripe-haskell + - stripe-http-streams # - stripe-core # bounds: aeson 1.0 "Piotr Mlodawski @pmlodawski": @@ -401,7 +402,7 @@ packages: # - profiteur # GHC 8.2.1 via ghc-prof - psqueues - websockets - # - websockets-snap # GHC 8.2.1 via snap-server + - websockets-snap "Sibi Prabakaran @psibi": - download @@ -613,7 +614,7 @@ packages: # - diagrams-svg # bounds: optparse-applicative # - dual-tree # GHC 8.2.1 via testing-feat - force-layout - # - haxr # GHC 8.2.1 via http-streams + - haxr - MonadRandom - monoid-extras @@ -960,7 +961,7 @@ packages: - wai-middleware-caching-lru # - wai-middleware-caching-redis # GHC 8.2.1 via hedis # not package maintainer - # - ekg # GHC 8.2.1 via snap-server + - ekg # - ekg-json # GHC 8.2.1 "Paul Rouse @paul-rouse": @@ -1142,12 +1143,12 @@ packages: - indentation-parsec "Alois Cochard @aloiscochard": - # - codex # bounds: http-client, wreq, directory + # - codex # bounds: http-client, directory - machines-binary # - machines-process # GHC 8.2.1 # - sarsi # bound: cryptonite # on behalf of Bryan O'Sullivan @bos: - # - wreq # GHC 8.2.1 via snap-server + - wreq "Andraz Bajt @edofic": - effect-handlers @@ -1206,7 +1207,7 @@ packages: - google-cloud - kraken - libinfluxdb - # - mole # via snap, snap-server, heist, xmlhtml, + # - mole # via snap, heist, xmlhtml, - publicsuffix - rethinkdb-client-driver - snap-blaze @@ -1230,8 +1231,8 @@ packages: "Leon Mergen @solatis": - base32string - base58string - # - bitcoin-api # GHC 8.2.1 via wreq - # - bitcoin-api-extra # GHC 8.2.1 via wreq + - bitcoin-api + - bitcoin-api-extra - bitcoin-block - bitcoin-script - bitcoin-tx @@ -1299,7 +1300,7 @@ packages: # - waitra # GHC 8.2.1 # scrive/log - # - log # via bloodhound: bounds: vector # GHC 8.2.1 via ekg via snap-server + # - log # via bloodhound: bounds: vector - log-base # - log-elasticsearch # via bloodhound: bounds: vector # GHC 8.2.1 - log-postgres @@ -2181,7 +2182,7 @@ packages: "Andrew Cowie @afcowie": - http-common - # - http-streams # GHC 8.2.1 via snap-server + - http-streams # "Devan Stormont @stormont": # - forecast-io # bounds: aeson 1.0 @@ -2378,7 +2379,7 @@ packages: "Luke Iannini @lukexi": - inline-c - inline-c-cpp - # - ekg # GHC 8.2.1 + - ekg # "Emin Karayel @ekarayel": # - sync-mht # bounds: ghc, base @@ -2501,10 +2502,10 @@ packages: # - hzulip # bounds: aeson, stm-conduit - list-prompt # - memoization-utils # bounds: time - # - package-description-remote # GHC 8.2.1 via wreq + - package-description-remote - projectroot - questioner - # - stack-run-auto # GHC 8.2.1 via wreq + - stack-run-auto # - hpack-convert # bounds: aeson 1.0 - language-dockerfile @@ -2568,9 +2569,9 @@ packages: - extensible-effects "Justus Adam @JustusAdam": - # - marvin >= 0.1.4 # GHC 8.2.1 via wreq + - marvin >= 0.1.4 - marvin-interpolate >= 1.1 - # - mustache # GHC 8.2.1 via wreq + - mustache "Cindy Wang @CindyLinz": # - NoTrace # GHC 8.2.1 @@ -2906,8 +2907,8 @@ packages: # - heatshrink # GHC 8.2.1 via c2hs # - hocilib # GHC 8.2.1 via c2hs - # "Matthias Herrmann @2chilled": - # - scrape-changes # GHC 8.2.1 via wreq + "Matthias Herrmann @2chilled": + - scrape-changes "Daniel Mendler @minad": - quickcheck-special @@ -3073,7 +3074,7 @@ packages: - snowtify "Mitsutoshi Aoe @maoe": - # - sensu-run # GHC 8.2.1 via wreq, time, snap-server + - sensu-run - viewprof "Dylan Simon @dylex": From e25d31fad5a575bf86807650dc591909b4a22e1a Mon Sep 17 00:00:00 2001 From: Simon Jakobi Date: Fri, 11 Aug 2017 14:39:09 +0200 Subject: [PATCH 2/2] Fix YAML syntax --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index f8f200f8..85a990ed 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -141,7 +141,6 @@ packages: - ix-shapable "Jeremy Barisch-Rooney @barischj": - [] - threepenny-gui-flexbox "Romain Edelmann @redelmann":