From 8d2e747755952e5622ef4fb669fde243fb268d3d Mon Sep 17 00:00:00 2001 From: Simon Jakobi Date: Sun, 19 Jan 2020 15:32:28 +0100 Subject: [PATCH 1/5] Re-enable snap-server and threepenny-gui --- build-constraints.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index ed29fbf8..0234dc0f 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -430,8 +430,8 @@ packages: "Simon Jakobi @sjakobi": - path - present < 0 # MonadFail - - threepenny-gui < 0 # via base-4.13.0.0 - - snap-server < 0 # via base-4.13.0.0 + - threepenny-gui + - snap-server - newtype-generics - bsb-http-chunked - coercible-utils From 75d05a68b581b2662cdf0d662ca94b978a3707a2 Mon Sep 17 00:00:00 2001 From: Simon Jakobi Date: Sun, 19 Jan 2020 15:49:27 +0100 Subject: [PATCH 2/5] Re-enable dependencies --- build-constraints.yaml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 0234dc0f..1cb29a4a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -539,7 +539,7 @@ packages: - s3-signer < 0 # via http-types # - google-translate # servant 0.12 # - hackernews # servant 0.12 - - ses-html < 0 # via http-streams + - ses-html # - stripe-haskell # free 5 # - stripe-http-streams # free 5 - stripe-core < 0 # via aeson-1.3.1.0 @@ -712,7 +712,7 @@ packages: # profiteur # aeson-1.4.0.0 - psqueues - websockets - - websockets-snap < 0 # via io-streams + - websockets-snap - hakyll < 0 # jaspervdj/hakyll#691 "Sibi Prabakaran @psibi": @@ -1558,7 +1558,7 @@ packages: - mole < 0 # GHC 8.4 via base-4.11.0.0 - publicsuffix - rethinkdb-client-driver - - snap-blaze < 0 # via snap-core + - snap-blaze "Alexandr Kurilin @alex_kurilin": - bcrypt @@ -2428,7 +2428,7 @@ packages: "Andrew Cowie @afcowie": - chronologique - http-common - - http-streams < 0 # via io-streams & openssl-streams + - http-streams - locators < 0 # via cryptohash - core-data - core-program @@ -2968,7 +2968,7 @@ packages: - postgresql-transactional < 0 # via postgresql-simple "Tom Murphy ": - - gingersnap < 0 # via snap-core + - gingersnap - microspec - midair - nano-erl @@ -4292,7 +4292,7 @@ packages: - insert-ordered-containers - inspection-testing - integer-logarithms - - io-streams-haproxy < 0 # via base-4.13.0.0 + - io-streams-haproxy - ixset-typed < 0 # via safecopy-0.10.0 - json < 0 # via base-4.13.0.0 - json-alt @@ -4420,7 +4420,7 @@ packages: - size-based < 0 # via template-haskell-2.15.0.0 - skein - skylighting-core - - snap-core < 0 # via test-framework + - snap-core - some - special-values - splice @@ -4874,7 +4874,6 @@ skipped-tests: - hackage-security # QuickCheck - haddock-library # base-compat-0.10.1, hspec-2.5.1 - haskell-names # via tasty-1.2 - - http-streams # via snap-server-1.1.0.0 - hw-balancedparens # via QuickCheck-2.12.6.1, via hspec-2.6.0 - hw-bits # via QuickCheck-2.12.6.1 - hw-excess # via QuickCheck-2.12.6.1, via hspec-2.6.0 From 54e2c49daed5ec5fe43715a852e3755693552cf6 Mon Sep 17 00:00:00 2001 From: Simon Jakobi Date: Sun, 19 Jan 2020 16:04:55 +0100 Subject: [PATCH 3/5] Re-enable openssl-streams --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 1cb29a4a..44507207 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2423,7 +2423,7 @@ packages: "Gregory Collins @gregorycollins": - hashtables - io-streams - - openssl-streams < 0 # via test-framework-hunit + - openssl-streams "Andrew Cowie @afcowie": - chronologique From b6dd5c0691f5432d76dec36f69d373c185b5a0f4 Mon Sep 17 00:00:00 2001 From: Simon Jakobi Date: Sun, 19 Jan 2020 16:07:52 +0100 Subject: [PATCH 4/5] Re-add http-streams to "skipped-tests" section --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 44507207..bac62547 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4874,6 +4874,7 @@ skipped-tests: - hackage-security # QuickCheck - haddock-library # base-compat-0.10.1, hspec-2.5.1 - haskell-names # via tasty-1.2 + - http-streams # via snap-server-1.1.0.0 - hw-balancedparens # via QuickCheck-2.12.6.1, via hspec-2.6.0 - hw-bits # via QuickCheck-2.12.6.1 - hw-excess # via QuickCheck-2.12.6.1, via hspec-2.6.0 From 20d938ba0610a607d01a0405471d323040092d34 Mon Sep 17 00:00:00 2001 From: Simon Jakobi Date: Sun, 19 Jan 2020 16:16:10 +0100 Subject: [PATCH 5/5] Unskip benchmarks for newtype-generics --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index bac62547..5779989a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5556,7 +5556,6 @@ skipped-benchmarks: - monad-logger-prefix - monad-memo - netpbm - - newtype-generics - openpgp-asciiarmor - phantom-state - pretty-simple