From b00e219a1fa1d1c77bf7e4e40b81ebbbead198a6 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Sat, 28 Jul 2018 15:03:18 +0100 Subject: [PATCH 01/11] Add dhall-to-cabal to Stackage --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 9438024d..659c884a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1991,6 +1991,7 @@ packages: - network-carbon < 0 # GHC 8.4 via base-4.11.0.0 - tasty-rerun < 0 # GHC 8.4 via base-4.11.0.0 - logging-effect + - dhall-to-cabal # - reactive-banana # pqueue-1.4.1 "Antoni Silvestre @asilvestre": From ca2f5fc2e2ca8b58166bae8dc15fa27237bad2da Mon Sep 17 00:00:00 2001 From: Justin Le Date: Wed, 8 Aug 2018 22:28:22 -0700 Subject: [PATCH 02/11] Add back in vector-sized and personally managed reverse deps --- build-constraints.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index c29572f4..45cb2982 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1833,16 +1833,16 @@ packages: - auto - backprop - configurator-export - - hamilton < 0 # via vector-sized - - hmatrix-backprop < 0 # via vector-sized - - hmatrix-vector-sized < 0 # via vector-sized + - hamilton + - hmatrix-backprop + - hmatrix-vector-sized - one-liner-instances < 0 # via one-liner - prompt - tagged-binary # - type-combinators-singletons # GHC 8.4 via type-combinators - typelits-witnesses - uncertain - - vector-sized < 0 # via distributive-0.6 + - vector-sized "Ian Duncan @iand675": - feature-flags From ae29b5e08cf8c52b6317eec4b839e6efadc60b9f Mon Sep 17 00:00:00 2001 From: Xia Li-yao Date: Thu, 9 Aug 2018 07:53:57 -0400 Subject: [PATCH 03/11] Add first-class-families --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index c29572f4..9b3c97c8 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -266,6 +266,7 @@ packages: "Li-yao Xia @Lysxia": - boltzmann-samplers + - first-class-families - generic-data - generic-random - scanf From 6f5455b89cb3f196ce40e6bd87bab1d53caa636a Mon Sep 17 00:00:00 2001 From: Alexey Zabelin Date: Thu, 9 Aug 2018 10:49:24 -0400 Subject: [PATCH 04/11] Add upper bound for hinotify, #3898 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index c29572f4..fab5a2a2 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3633,6 +3633,9 @@ packages: # https://github.com/commercialhaskell/stackage/issues/3884 - pretty-show < 1.8 + # https://github.com/commercialhaskell/stackage/issues/3898 + - hinotify < 0.4 + # end of packages # Package flags are applied to individual packages, and override the values of From 62ee2b395f9207c2215c0a4835d29592758fad9e Mon Sep 17 00:00:00 2001 From: Alexey Zabelin Date: Thu, 9 Aug 2018 11:50:39 -0400 Subject: [PATCH 05/11] Add windns, related to #3897 --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 8450d452..da7529d6 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3807,6 +3807,7 @@ skipped-builds: - lzma-clib - Win32 - Win32-notify + - windns # end of skipped-builds From 26173da657567f357f973622fe3a057e72b7f74c Mon Sep 17 00:00:00 2001 From: Alexey Zabelin Date: Thu, 9 Aug 2018 11:53:55 -0400 Subject: [PATCH 06/11] Remove upper bound on hinotify, closes #3898 --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index da7529d6..a3a4a550 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3634,9 +3634,6 @@ packages: # https://github.com/commercialhaskell/stackage/issues/3884 - pretty-show < 1.8 - # https://github.com/commercialhaskell/stackage/issues/3898 - - hinotify < 0.4 - # end of packages # Package flags are applied to individual packages, and override the values of From 66c84083acdaddf404069207068b8fba72a21c5c Mon Sep 17 00:00:00 2001 From: Alexey Zabelin Date: Thu, 9 Aug 2018 18:48:48 -0400 Subject: [PATCH 07/11] Upgrade cabal-format-version to 2.2 --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 09769991..393a64f7 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3,7 +3,7 @@ ghc-major-version: "8.4" # This affects which version of the Cabal file format we allow. We # should ensure that this is always no greater than the version # supported by the most recent cabal-install and Stack releases. -cabal-format-version: "2.0" +cabal-format-version: "2.2" # Constraints for brand new builds packages: From 3eb4fa8e9531d456ea9db7db95cec3a8ee053a91 Mon Sep 17 00:00:00 2001 From: Alexey Zabelin Date: Thu, 9 Aug 2018 18:57:55 -0400 Subject: [PATCH 08/11] Expect test failures for dhall-to-cabal, #3899 --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 393a64f7..16a5fbd7 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4105,6 +4105,7 @@ expected-test-failures: - rematch # No issue tracker, sent e-mail to maintainer https://github.com/fpco/stackage/issues/376 - web3 # https://github.com/airalab/hs-web3/issues/63 - xlsior # https://github.com/rcallahan/xlsior/issues/1 + - dhall-to-cabal # https://github.com/commercialhaskell/stackage/issues/3899 # Assertion failures, these can be real bugs or just limitations # in the test cases. From fc3bc3d195cb61a0df6a5490e91edc7aa0345aa4 Mon Sep 17 00:00:00 2001 From: Alexey Zabelin Date: Thu, 9 Aug 2018 22:18:44 -0400 Subject: [PATCH 09/11] Add windns properly --- build-constraints.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 16a5fbd7..891d6945 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -446,6 +446,7 @@ packages: - hinotify - hfsevents - Win32-notify + - windns - mono-traversable - http-client @@ -3752,7 +3753,10 @@ package-flags: five-three: true greskell: - hint-test: false + hint-test: false + + windns: + allow-non-windows: true # end of package-flags From 3ce9139df1bf8e0773225fa60f62da12b920aa8e Mon Sep 17 00:00:00 2001 From: Alexey Zabelin Date: Fri, 10 Aug 2018 18:45:49 -0400 Subject: [PATCH 10/11] Re-enable tests for dhall-to-cabal, closes #3899 --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 891d6945..adc274b3 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4109,7 +4109,6 @@ expected-test-failures: - rematch # No issue tracker, sent e-mail to maintainer https://github.com/fpco/stackage/issues/376 - web3 # https://github.com/airalab/hs-web3/issues/63 - xlsior # https://github.com/rcallahan/xlsior/issues/1 - - dhall-to-cabal # https://github.com/commercialhaskell/stackage/issues/3899 # Assertion failures, these can be real bugs or just limitations # in the test cases. From 019f887e0e336b8c1550510fd261e15f311ce6b1 Mon Sep 17 00:00:00 2001 From: Alexey Zabelin Date: Sat, 11 Aug 2018 13:10:10 -0400 Subject: [PATCH 11/11] Add upper bound for attoparsec-uri, #3901 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index adc274b3..5f581504 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3636,6 +3636,9 @@ packages: # https://github.com/commercialhaskell/stackage/issues/3884 - pretty-show < 1.8 + # https://github.com/commercialhaskell/stackage/issues/3901 + - attoparsec-uri < 0.0.5 + # end of packages # Package flags are applied to individual packages, and override the values of