From c5bca9fb03dbfebc3e30f147e57715820d76055d Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Thu, 3 Oct 2019 13:26:29 +0300 Subject: [PATCH 1/3] http-media allows base-4.13 --- build-constraints.yaml | 50 +++--------------------------------------- 1 file changed, 3 insertions(+), 47 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 09d5e757..6cdfb8eb 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4334,6 +4334,7 @@ packages: - skein - skylighting-core - snap-core + - some - special-values - splice - split @@ -4403,6 +4404,7 @@ packages: - unbounded-delays - universe - universe-base + - universe-some - universe-dependent-sum - universe-instances-base - universe-instances-extended @@ -4749,7 +4751,6 @@ packages: - hledger-ui < 0 # via base-4.13.0.0 - hledger-web < 0 # via base-4.13.0.0 - hspec-need-env < 0 # via base-4.13.0.0 - - http-media < 0 # via base-4.13.0.0 - hyper < 0 # via base-4.13.0.0 - ihaskell < 0 # via base-4.13.0.0 - indentation-core < 0 # via base-4.13.0.0 @@ -4792,7 +4793,6 @@ packages: - rhine < 0 # via base-4.13.0.0 - rhine-gloss < 0 # via base-4.13.0.0 - salve < 0 # via base-4.13.0.0 - - servant-JuicyPixels < 0 # via base-4.13.0.0 - servant-auth < 0 # via base-4.13.0.0 - servant-auth-client < 0 # via base-4.13.0.0 - servant-auth-docs < 0 # via base-4.13.0.0 @@ -4996,8 +4996,6 @@ packages: - wild-bind-x11 < 0 # via time-1.9.3 - ztail < 0 # via time-1.9.3 - mysql-haskell < 0 # via tls-1.5.1 - - universe < 0 # via universe-some - - universe-dependent-sum < 0 # via universe-some - MissingH < 0 # via unix-2.7.2.2 - beam-core < 0 # via vector-sized-1.4.0.0 - beam-mysql < 0 # via beam-core @@ -5042,13 +5040,11 @@ packages: - Chart-diagrams < 0 # via blaze-markup - SVGFonts < 0 # via blaze-markup - ace < 0 # via blaze-markup - - blaze-html < 0 # via blaze-markup - blaze-svg < 0 # via blaze-markup - heterocephalus < 0 # via blaze-markup - hoogle < 0 # via blaze-markup - markdown < 0 # via blaze-markup - plotlyhs < 0 # via blaze-markup - - servant-swagger-ui-core < 0 # via blaze-markup - shakespeare < 0 # via blaze-markup - trifecta < 0 # via blaze-markup - xml-conduit < 0 # via blaze-markup @@ -5169,23 +5165,10 @@ packages: - yesod-fb < 0 # via http-conduit - yesod-recaptcha2 < 0 # via http-conduit - cachix-api < 0 # via http-media - - servant < 0 # via http-media - - servant-blaze < 0 # via http-media - - servant-cassava < 0 # via http-media - servant-checked-exceptions-core < 0 # via http-media - - servant-client < 0 # via http-media - - servant-client-core < 0 # via http-media - - servant-conduit < 0 # via http-media - - servant-docs < 0 # via http-media - - servant-lucid < 0 # via http-media - - servant-machines < 0 # via http-media - - servant-pipes < 0 # via http-media - servant-rawm < 0 # via http-media - servant-static-th < 0 # via http-media - - servant-swagger < 0 # via http-media - - servant-swagger-ui-core < 0 # via http-media - servant-xml < 0 # via http-media - - servant-yaml < 0 # via http-media - wai-middleware-auth < 0 # via http-reverse-proxy - ses-html < 0 # via http-streams - board-games < 0 # via httpd-shed @@ -5273,19 +5256,9 @@ packages: - servant-auth-wordpress < 0 # via servant-server - servant-checked-exceptions < 0 # via servant-server - servant-cli < 0 # via servant-server - - servant-conduit < 0 # via servant-server - - servant-js < 0 # via servant-server - - servant-lucid < 0 # via servant-server - - servant-machines < 0 # via servant-server - - servant-mock < 0 # via servant-server - - servant-pipes < 0 # via servant-server - servant-rawm < 0 # via servant-server - servant-static-th < 0 # via servant-server - - servant-swagger-ui < 0 # via servant-server - - servant-swagger-ui-core < 0 # via servant-server - - servant-swagger-ui-redoc < 0 # via servant-server - servant-tracing < 0 # via servant-server - - servant-yaml < 0 # via servant-server - tonatona-servant < 0 # via servant-server - testing-feat < 0 # via size-based - gingersnap < 0 # via snap-core @@ -5304,10 +5277,6 @@ packages: - sv-cassava < 0 # via sv-core - Chart-diagrams < 0 # via svg-builder - cachix-api < 0 # via swagger2 - - servant-swagger < 0 # via swagger2 - - servant-swagger-ui < 0 # via swagger2 - - servant-swagger-ui-core < 0 # via swagger2 - - servant-swagger-ui-redoc < 0 # via swagger2 - hspec-pg-transact < 0 # via tmp-postgres - pg-transact < 0 # via tmp-postgres - salak-toml < 0 # via tomland @@ -5322,7 +5291,6 @@ packages: - hamilton < 0 # via vty - hledger-iadd < 0 # via vty - servant-rawm < 0 # via wai-app-static - - servant-swagger-ui-core < 0 # via wai-app-static - servius < 0 # via wai-app-static - wai-middleware-auth < 0 # via wai-app-static - yesod-static < 0 # via wai-app-static @@ -5409,9 +5377,6 @@ packages: - template-toolkit < 0 # via regex-pcre-builtin - dl-fedora < 0 # via regex-posix - inline-c < 0 # via regex-posix - - language-haskell-extract < 0 # via regex-posix - - test-framework < 0 # via regex-posix - - test-framework-th < 0 # via regex-posix - xml-to-json < 0 # via regex-posix - cabal-debian < 0 # via regex-tdfa - haskell-gi < 0 # via regex-tdfa @@ -5422,7 +5387,6 @@ packages: - relational-record < 0 # via relational-query-HDBC - wikicfp-scraper < 0 # via scalpel-core - miso < 0 # via servant - - servant-foreign < 0 # via servant - miso < 0 # via servant-lucid - state-codes < 0 # via shakespeare - xml-hamlet < 0 # via shakespeare @@ -5529,9 +5493,7 @@ packages: - abstract-deque-tests < 0 # via test-framework - crypto-api-tests < 0 # via test-framework - crypto-cipher-tests < 0 # via test-framework - - test-framework-hunit < 0 # via test-framework - test-framework-leancheck < 0 # via test-framework - - test-framework-quickcheck2 < 0 # via test-framework - test-framework-smallcheck < 0 # via test-framework - tonatona < 0 # via tonaparser - tonatona-logger < 0 # via tonaparser @@ -5586,11 +5548,9 @@ packages: - ws < 0 # via attoparsec-uri - microformats2-parser < 0 # via blaze-html - persistent-mongoDB < 0 # via blaze-html - - wai-app-static < 0 # via blaze-html - yesod-core < 0 # via blaze-html - yesod-test < 0 # via blaze-html - microformats2-parser < 0 # via blaze-markup - - wai-app-static < 0 # via blaze-markup - yesod-core < 0 # via blaze-markup - hOpenPGP < 0 # via bzlib - xml-lens < 0 # via case-insensitive-1.2.1.0 @@ -5606,10 +5566,6 @@ packages: - microformats2-parser < 0 # via html-conduit - yesod-test < 0 # via html-conduit - pantry < 0 # via http-download - - servant-http-streams < 0 # via http-media - - servant-multipart < 0 # via http-media - - servant-server < 0 # via http-media - - swagger2 < 0 # via http-media - asif < 0 # via hw-hspec-hedgehog - asif < 0 # via hw-ip - hOpenPGP < 0 # via incremental-parser @@ -5653,7 +5609,6 @@ packages: - haskoin-core < 0 # via secp256k1-haskell - servant-http-streams < 0 # via servant - servant-multipart < 0 # via servant - - servant-server < 0 # via servant - servant-http-streams < 0 # via servant-client-core - servant-multipart < 0 # via servant-docs - servant-multipart < 0 # via servant-foreign @@ -6066,6 +6021,7 @@ skipped-tests: # These can periodically be checked for updates; # just remove these lines and run `stackage-curator check' to verify. - time-compat # base-compat 0.11 + - http-media # base-4.13 # fails with ghc 8.8 - alex # as of alex-3.2.4 From 41e13d1b2145579814714f1cc7f982b0d6406414 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20Ch=C3=A9ron?= Date: Thu, 3 Oct 2019 20:54:52 +0200 Subject: [PATCH 2/3] Restore http-client-tls and dependencies --- build-constraints.yaml | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 0e491c2e..00fcbdec 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4678,7 +4678,6 @@ packages: - active < 0 # via base-4.13.0.0 - aeson-diff < 0 # via base-4.13.0.0 - alarmclock < 0 # via base-4.13.0.0 - - asn1-encoding < 0 # via base-4.13.0.0 - autoexporter < 0 # via base-4.13.0.0 - bank-holidays-england < 0 # via base-4.13.0.0 - base-noprelude < 0 # via base-4.13.0.0 @@ -4805,7 +4804,6 @@ packages: - slack-web < 0 # via base-4.13.0.0 - smallcheck-series < 0 # via base-4.13.0.0 - snap-server < 0 # via base-4.13.0.0 - - socks < 0 # via base-4.13.0.0 - sqlite-simple < 0 # via base-4.13.0.0 - statestack < 0 # via base-4.13.0.0 - strive < 0 # via base-4.13.0.0 @@ -5032,14 +5030,10 @@ packages: - file-modules < 0 # via MissingH - hadolint < 0 # via ShellCheck - ipynb < 0 # via aeson-diff - - asn1-parse < 0 # via asn1-encoding - aws-cloudfront-signed-cookies < 0 # via asn1-encoding - crypto-pubkey-openssh < 0 # via asn1-encoding - crypto-pubkey-types < 0 # via asn1-encoding - pkcs10 < 0 # via asn1-encoding - - x509 < 0 # via asn1-encoding - - x509-store < 0 # via asn1-encoding - - x509-validation < 0 # via asn1-encoding - avers-api < 0 # via servant - fib < 0 # via base-noprelude - bencoding < 0 # via bencode @@ -5452,9 +5446,7 @@ packages: - stripe-wreq < 0 # via wreq - jose < 0 # via x509 - jwt < 0 # via x509 - - x509-system < 0 # via x509 - jwt < 0 # via x509-store - - x509-system < 0 # via x509-store - haskell-gi < 0 # via xml-conduit - xlsx < 0 # via xml-conduit - xml-conduit-parse < 0 # via xml-conduit @@ -5606,7 +5598,6 @@ packages: - tcp-streams-openssl < 0 # via HsOpenSSL-x509-system - pandoc-citeproc < 0 # via HsYAML-aeson - hOpenPGP < 0 # via asn1-encoding - - tls < 0 # via asn1-encoding - ws < 0 # via attoparsec-uri - microformats2-parser < 0 # via blaze-html - persistent-mongoDB < 0 # via blaze-html @@ -5687,7 +5678,6 @@ packages: - servant-multipart < 0 # via servant-foreign - yesod-bin < 0 # via shakespeare - yesod-core < 0 # via shakespeare - - connection < 0 # via socks - network-simple < 0 # via socks - store < 0 # via store-core - pantry < 0 # via tar-conduit @@ -5724,28 +5714,17 @@ packages: - vivid < 0 # via vivid-supercollider - web-routes-wai < 0 # via web-routes - ws < 0 # via wuss - - connection < 0 # via x509 - network-simple-tls < 0 # via x509 - postgresql-typed < 0 # via x509 - tcp-streams < 0 # via x509 - - tls < 0 # via x509 - - tls-debug < 0 # via x509 - warp-tls-uid < 0 # via x509 - - connection < 0 # via x509-store - network-simple-tls < 0 # via x509-store - postgresql-typed < 0 # via x509-store - tcp-streams < 0 # via x509-store - - tls < 0 # via x509-store - - tls-debug < 0 # via x509-store - - connection < 0 # via x509-system - network-simple-tls < 0 # via x509-system - tcp-streams < 0 # via x509-system - - tls-debug < 0 # via x509-system - - connection < 0 # via x509-validation - network-simple-tls < 0 # via x509-validation - postgresql-typed < 0 # via x509-validation - - tls < 0 # via x509-validation - - tls-debug < 0 # via x509-validation - DAV < 0 # via xml-conduit - pandoc-citeproc < 0 # via xml-conduit - xml-lens < 0 # via xml-conduit @@ -5754,7 +5733,6 @@ packages: - HandsomeSoup < 0 # via HTTP - hxt-http < 0 # via HTTP - amqp < 0 # via connection - - http-client-tls < 0 # via connection - http-conduit < 0 # via connection - network-conduit-tls < 0 # via connection - http-streams < 0 # via io-streams @@ -5765,10 +5743,8 @@ packages: - pipes-network-tls < 0 # via network-simple - pipes-network-tls < 0 # via network-simple-tls - http-streams < 0 # via openssl-streams - - http-client-tls < 0 # via tls - network-conduit-tls < 0 # via tls - pipes-network-tls < 0 # via tls - - tls-session-manager < 0 # via tls - warp-tls < 0 # via tls - wai-websockets < 0 # via wai-app-static - wai-session-postgresql < 0 # via wai-session From 9d69af25a4d6c48e6213fd8539bc8c3cfef5e65b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 4 Oct 2019 09:17:25 +0800 Subject: [PATCH 3/3] allow ghc-exactprint test failure (alanz/ghc-exactprint#82) --- build-constraints.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 09d5e757..97ea5f99 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -6717,6 +6717,8 @@ expected-test-failures: # https://github.com/commercialhaskell/stackage/issues/4815 - brittany + # https://github.com/alanz/ghc-exactprint/issues/82 + - ghc-exactprint # end of expected-test-failures # Benchmarks which are known not to build. Note that, currently we do not run