From eed4334834cf127e9f44ea52bc323c1d29ded2c1 Mon Sep 17 00:00:00 2001 From: Albert Krewinkel Date: Sun, 28 Nov 2021 10:04:13 +0100 Subject: [PATCH 01/26] Add pandoc-lua-marshal Code extracted from pandoc's main repo. --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 20c98382..cea75a74 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3741,6 +3741,7 @@ packages: - lpeg - lua - lua-arbitrary + - pandoc-lua-marshal - tasty-hslua - tasty-lua From e1de8cc175e1bd6c92c2b8e4b56cc1279716df4b Mon Sep 17 00:00:00 2001 From: Joshua Chia Date: Fri, 19 Nov 2021 10:03:28 +0800 Subject: [PATCH 02/26] Re-enabled gi-gdk, gi-gtk & gi-gtk-hs but only for major version 3 --- build-constraints.yaml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index f65f522a..a700e95b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3265,14 +3265,14 @@ packages: - gi-cairo - gi-dbusmenu - gi-dbusmenugtk3 - - gi-gdk + - gi-gdk == 3.* # https://github.com/commercialhaskell/stackage/issues/6317 - gi-gdkpixbuf - gi-gdkx11 - gi-gio - gi-glib - gi-gobject - gi-graphene - - gi-gtk + - gi-gtk == 3.* # https://github.com/commercialhaskell/stackage/issues/6317 - gi-gtk-hs - gi-gmodule - gi-pango @@ -5338,7 +5338,6 @@ packages: - eventsource-store-specs < 0 - exinst < 0 - ftp-client-conduit < 0 # 0.5.0.5 - - gi-gdk < 0 - ginger < 0 # 0.10.2.0 - giphy-api < 0 # https://github.com/passy/giphy-api/pull/19 - groundhog-th < 0 # 0.11 @@ -5900,9 +5899,6 @@ packages: - gi-dbusmenugtk3 < 0 # tried gi-dbusmenugtk3-0.4.11, but its *library* requires the disabled package: gi-gdk - gi-gdkx11 < 0 # tried gi-gdkx11-4.0.4, but its *library* requires the disabled package: gi-gdk - gi-gsk < 0 # tried gi-gsk-4.0.4, but its *library* requires the disabled package: gi-gdk - - gi-gtk < 0 # tried gi-gtk-4.0.5, but its *library* requires the disabled package: gi-gdk - - gi-gtk-hs < 0 # tried gi-gtk-hs-0.3.11, but its *library* does not support: gi-gtk-4.0.5 - - gi-gtk-hs < 0 # tried gi-gtk-hs-0.3.11, but its *library* requires the disabled package: gi-gdk - gi-gtksource < 0 # tried gi-gtksource-3.0.25, but its *library* does not support: gi-gtk-4.0.5 - gi-gtksource < 0 # tried gi-gtksource-3.0.25, but its *library* requires the disabled package: gi-gdk - gi-vte < 0 # tried gi-vte-2.91.29, but its *library* does not support: gi-gtk-4.0.5 From c0edb9c44cdc819436eb368e0a678584a9590507 Mon Sep 17 00:00:00 2001 From: Joshua Chia Date: Mon, 29 Nov 2021 17:47:06 +0800 Subject: [PATCH 03/26] Re-enabled th-extras --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index f65f522a..2658d55d 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5410,7 +5410,6 @@ packages: - sydtest-persistent-sqlite < 0 - text-region < 0 - th-data-compat < 0 - - th-extras < 0 - throttle-io-stream < 0 - throwable-exceptions < 0 - thyme < 0 From 3d7a15ee7aaf87646dfaec4f22a209a9e73094af Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 29 Nov 2021 19:52:23 +0800 Subject: [PATCH 04/26] cabal-flatpak-0.1.0.3 supports aeson-2.0 (#6217) --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 63832e5f..f405341d 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -6695,6 +6695,7 @@ packages: # https://github.com/commercialhaskell/stackage/issues/6217 - aeson < 2.0.0.0 - aura < 3.2.6 + - cabal-flatpak < 0.1.0.3 - core-data < 0.3.0.0 - forma < 1.2.0 - microlens-aeson < 2.4 From 3eaaeae56eef308fec6a764952bb1cf314a1bfd8 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 29 Nov 2021 19:55:16 +0800 Subject: [PATCH 05/26] retry < 0.9.0.0 (#6330) --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index f405341d..24c13555 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -6779,6 +6779,9 @@ packages: # https://github.com/commercialhaskell/stackage/issues/6322 - hashtables < 1.3 + + # https://github.com/commercialhaskell/stackage/issues/6330 + - retry < 0.9.0.0 # end of packages # Package flags are applied to individual packages, and override the values of From 3a9dee9c523f95b1b17a29e0e95239c4626a08e7 Mon Sep 17 00:00:00 2001 From: "Michael B. Gale" Date: Mon, 29 Nov 2021 12:15:23 +0000 Subject: [PATCH 06/26] Update @mbg's email address --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 24c13555..b329309c 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4582,7 +4582,7 @@ packages: "Masahiro Honma @hiratara": - string-random - "Michael B. Gale @mbg": + "Michael B. Gale @mbg": - c14n - katip-logstash - logstash From 446bfc6e967521f35edffb5eae1475569adff95b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 29 Nov 2021 23:43:36 +0800 Subject: [PATCH 07/26] Revert "path testsuite doesn't compile with genvalidity 1.0 (commercialhaskell/path#183)" This reverts commit 8dd5c0c4410d8d95c87c0734f506933c96c85241. --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 24c13555..e9004edf 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -7570,7 +7570,6 @@ expected-test-failures: - multiarg - murmur3 - parameterized # # https://github.com/commercialhaskell/stackage/issues/5746 - - path # https://github.com/commercialhaskell/path/issues/183 - protobuf - record-wrangler - relapse # #5948/closed From bf10bde798df229258967b6e6a8a6b31ea22d6cd Mon Sep 17 00:00:00 2001 From: Leonhard Markert Date: Tue, 30 Nov 2021 10:20:23 +0100 Subject: [PATCH 08/26] Dominic Steinitz now maintains monad-bayes Also see https://github.com/tweag/monad-bayes/pull/118. --- build-constraints.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index e9004edf..a72c83a6 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1310,6 +1310,7 @@ packages: - cassava-conduit "Dominic Steinitz @idontgetoutmuch": + - monad-bayes - random-fu "Ben Gamari @bgamari": @@ -2778,9 +2779,6 @@ packages: - wave - zip - "Leonhard Markert @curiousleo": - - monad-bayes - "Emmanuel Touzery @emmanueltouzery": - app-settings - hsexif From 31517ce7516017e7c6a83047f588fd95411877d6 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 30 Nov 2021 18:29:58 +0800 Subject: [PATCH 09/26] faktory hruby hspec-expectations-json for aeson-2 (#6217) --- build-constraints.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index e9004edf..5213f952 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -6692,12 +6692,16 @@ packages: # https://github.com/commercialhaskell/stackage/issues/6195 - miso < 1.8 + # aeson-2 # https://github.com/commercialhaskell/stackage/issues/6217 - aeson < 2.0.0.0 - aura < 3.2.6 - cabal-flatpak < 0.1.0.3 - core-data < 0.3.0.0 + - faktory < 1.1.2.1 - forma < 1.2.0 + - hruby < 0.4.0.0 + - hspec-expectations-json < 1.0.0.5 - microlens-aeson < 2.4 - mmark-cli < 0.0.5.1 - postgresql-binary < 0.12.4.2 From 66478e3c211fbbf4a6f02c0e3a8852a18a9d9499 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 30 Nov 2021 18:50:14 +0800 Subject: [PATCH 10/26] ormolu-0.4.0.0 for ghc-9.2 (#6264) --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 5213f952..f5a5c005 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -6733,6 +6733,7 @@ packages: - th-desugar < 1.13 - eliminators < 0.9 - ghc-syntax-highlighter < 0.0.8 # requires ghc-lib-parser >= 9.2 + - ormolu < 0.4.0.0 # https://github.com/commercialhaskell/stackage/issues/6265 - attoparsec < 0.14.2 From 804de5d30a5941063fb1d5859c3a05f2e6a7a4cc Mon Sep 17 00:00:00 2001 From: Joshua Chia Date: Tue, 30 Nov 2021 16:08:19 +0800 Subject: [PATCH 11/26] Re-enabled flexible-defaults & random-source --- build-constraints.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index e9004edf..6451e335 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5877,7 +5877,6 @@ packages: - filecache < 0 # tried filecache-0.4.1, but its *library* requires the disabled package: strict-base-types - find-clumpiness < 0 # tried find-clumpiness-0.2.3.2, but its *library* requires the disabled package: BiobaseNewick - find-clumpiness < 0 # tried find-clumpiness-0.2.3.2, but its *library* requires the disabled package: hierarchical-clustering - - flexible-defaults < 0 # tried flexible-defaults-0.0.3, but its *library* requires the disabled package: th-extras - freer-simple < 0 # tried freer-simple-1.2.1.1, but its *library* does not support: template-haskell-2.17.0.0 - friday < 0 # tried friday-0.2.3.1, but its *library* does not support: containers-0.6.4.1 - friday < 0 # tried friday-0.2.3.1, but its *library* requires the disabled package: ratio-int @@ -6351,7 +6350,6 @@ packages: - rakuten < 0 # tried rakuten-0.1.1.5, but its *library* does not support: req-3.9.2 - rakuten < 0 # tried rakuten-0.1.1.5, but its *library* requires the disabled package: extensible - random-fu < 0 # tried random-fu-0.2.7.7, but its *library* requires the disabled package: random-source - - random-source < 0 # tried random-source-0.3.0.11, but its *library* requires the disabled package: th-extras - ranged-list < 0 # tried ranged-list-0.1.0.0, but its *library* requires the disabled package: typecheck-plugin-nat-simple - rank-product < 0 # tried rank-product-0.2.2.0, but its *library* requires the disabled package: random-fu - reanimate < 0 # tried reanimate-1.1.4.0, but its *library* requires the disabled package: hgeometry From 5434c927126fadb3a6045749cedfd8278c95e5d3 Mon Sep 17 00:00:00 2001 From: jkachmar Date: Wed, 1 Dec 2021 09:04:43 -0500 Subject: [PATCH 12/26] Restricts streamly < 0.8.1 (#6335) --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index b5bae37c..fd77671c 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -656,7 +656,7 @@ packages: - bench-show - monad-recorder - packcheck - - streamly + - streamly < 0.8.1 # https://github.com/commercialhaskell/stackage/issues/6335 - unicode-transforms - xls From 38a81f3b35ba50aceaf2d7f3167fd57495aa69dc Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Wed, 1 Dec 2021 20:54:40 +0100 Subject: [PATCH 13/26] Reenable MissingH and its reverse dependencies library: - MissingH - ConfigFile - cryptocompare - file-modules - hocon tests: - pipes-csv benchmarks: - glob-posix --- build-constraints.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index fd77671c..27329b05 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5450,7 +5450,6 @@ packages: - Chart-cairo < 0 # tried Chart-cairo-1.9.3, but its *library* requires the disabled package: operational - Chart-diagrams < 0 # tried Chart-diagrams-1.9.3, but its *library* does not support: SVGFonts-1.8.0.1 - Chart-diagrams < 0 # tried Chart-diagrams-1.9.3, but its *library* requires the disabled package: operational - - ConfigFile < 0 # tried ConfigFile-1.1.4, but its *library* requires the disabled package: MissingH - EntrezHTTP < 0 # tried EntrezHTTP-1.0.4, but its *library* requires the disabled package: biocore - FPretty < 0 # tried FPretty-1.1, but its *library* does not support: base-4.15.0.0 - GPipe < 0 # tried GPipe-2.2.5, but its *library* does not support: linear-1.21.8 @@ -5471,7 +5470,6 @@ packages: - MFlow < 0 # tried MFlow-0.4.6.0, but its *library* requires the disabled package: monadloc - MFlow < 0 # tried MFlow-0.4.6.0, but its *library* requires the disabled package: pwstore-fast - MapWith < 0 # tried MapWith-0.2.0.0, but its *library* does not support: base-4.15.0.0 - - MissingH < 0 # tried MissingH-1.4.3.0, but its *library* does not support: random-1.2.1 - Network-NineP < 0 # tried Network-NineP-0.4.7.1, but its *library* requires the disabled package: mstate - NoTrace < 0 # tried NoTrace-0.3.0.4, but its *library* does not support: base-4.15.0.0 - RNAlien < 0 # tried RNAlien-1.7.0, but its *library* does not support: BiobaseBlast-0.3.3.0 @@ -5710,7 +5708,6 @@ packages: - brittany < 0 # tried brittany-0.13.1.2, but its *library* does not support: ghc-9.0.1 - brittany < 0 # tried brittany-0.13.1.2, but its *library* does not support: ghc-boot-th-9.0.1 - broadcast-chan < 0 # tried broadcast-chan-0.2.1.1, but its *library* does not support: base-4.15.0.0 - - buchhaltung < 0 # tried buchhaltung-0.0.7, but its *library* requires the disabled package: MissingH - buchhaltung < 0 # tried buchhaltung-0.0.7, but its *library* requires the disabled package: regex-tdfa-text - bulletproofs < 0 # tried bulletproofs-1.1.0, but its *library* requires the disabled package: elliptic-curve - butcher < 0 # tried butcher-1.3.3.2, but its *library* does not support: base-4.15.0.0 @@ -5769,7 +5766,6 @@ packages: - cql-io < 0 # tried cql-io-1.1.1, but its *library* requires the disabled package: cql - crypto-pubkey < 0 # tried crypto-pubkey-0.2.8, but its *library* requires the disabled package: crypto-numbers - cryptocipher < 0 # tried cryptocipher-0.6.2, but its *library* requires the disabled package: cipher-blowfish - - cryptocompare < 0 # tried cryptocompare-0.1.2, but its *library* requires the disabled package: MissingH - csg < 0 # tried csg-0.1.0.6, but its *library* does not support: QuickCheck-2.14.2 - csg < 0 # tried csg-0.1.0.6, but its *library* does not support: attoparsec-0.14.1 - csg < 0 # tried csg-0.1.0.6, but its *library* does not support: simple-vec3-0.6.0.1 @@ -5871,7 +5867,6 @@ packages: - exception-hierarchy < 0 # tried exception-hierarchy-0.1.0.4, but its *library* does not support: template-haskell-2.17.0.0 - fasta < 0 # tried fasta-0.10.4.2, but its *library* requires the disabled package: pipes-text - fib < 0 # tried fib-0.1.0.1, but its *library* requires the disabled package: base-noprelude - - file-modules < 0 # tried file-modules-0.1.2.4, but its *library* requires the disabled package: MissingH - filecache < 0 # tried filecache-0.4.1, but its *library* requires the disabled package: strict-base-types - find-clumpiness < 0 # tried find-clumpiness-0.2.3.2, but its *library* requires the disabled package: BiobaseNewick - find-clumpiness < 0 # tried find-clumpiness-0.2.3.2, but its *library* requires the disabled package: hierarchical-clustering @@ -6032,7 +6027,6 @@ packages: - hit < 0 # tried hit-0.7.0, but its *executable* requires the disabled package: git - hmatrix-backprop < 0 # tried hmatrix-backprop-0.1.3.0, but its *library* requires the disabled package: backprop - hmpfr < 0 # tried hmpfr-0.4.4, but its *library* does not support: integer-gmp-1.1 - - hocon < 0 # tried hocon-0.1.0.4, but its *library* requires the disabled package: MissingH - holy-project < 0 # tried holy-project-0.2.0.1, but its *library* requires the disabled package: hastache - hopenpgp-tools < 0 # tried hopenpgp-tools-0.23.6, but its *executable* requires the disabled package: ixset-typed - hpc-coveralls < 0 # tried hpc-coveralls-1.0.10, but its *library* does not support: aeson-1.5.6.0 @@ -7197,7 +7191,6 @@ skipped-tests: - oset # tried oset-0.4.0.1, but its *test-suite* does not support: hspec-2.8.5 - oset # tried oset-0.4.0.1, but its *test-suite* does not support: hspec-discover-2.8.5 - partial-semigroup # tried partial-semigroup-0.5.1.12, but its *test-suite* does not support: doctest-0.18.2 - - pipes-csv # tried pipes-csv-1.4.3, but its *test-suite* requires the disabled package: MissingH - pipes-fluid # tried pipes-fluid-0.6.0.1, but its *test-suite* requires the disabled package: pipes-misc - postgrest # tried postgrest-8.0.0, but its *test-suite* does not support: hspec-2.8.5 - proto3-wire # tried proto3-wire-1.2.2, but its *test-suite* does not support: doctest-0.18.2 @@ -7813,7 +7806,6 @@ skipped-benchmarks: - ed25519 # tried ed25519-0.0.5.0, but its *benchmarks* does not support: criterion-1.5.11.0 - elynx-tree # tried elynx-tree-0.6.1.0, but its *benchmarks* requires the disabled package: elynx-tools - extensible-effects # tried extensible-effects-5.0.0.1, but its *benchmarks* requires the disabled package: test-framework-th - - glob-posix # tried glob-posix-0.2.0.1, but its *benchmarks* requires the disabled package: MissingH - haskell-tools-cli # tried haskell-tools-cli-1.1.1.0, but its *benchmarks* does not support: aeson-1.5.6.0 - haskell-tools-cli # tried haskell-tools-cli-1.1.1.0, but its *benchmarks* does not support: time-1.9.3 - hip # tried hip-1.5.6.0, but its *benchmarks* requires the disabled package: repa-algorithms From 4a8cafe6651b5dd81059d28296eae198ae3d24ee Mon Sep 17 00:00:00 2001 From: jkachmar Date: Thu, 2 Dec 2021 10:24:25 -0500 Subject: [PATCH 14/26] Restricts unicode-transforms < 0.4 (#6337) --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index fd77671c..9108d506 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -657,7 +657,7 @@ packages: - monad-recorder - packcheck - streamly < 0.8.1 # https://github.com/commercialhaskell/stackage/issues/6335 - - unicode-transforms + - unicode-transforms < 0.4 # https://github.com/commercialhaskell/stackage/issues/6337 - xls "Pranay Sashank @pranaysashank": From ef278b9a8de09a6c01fa873eab593804f80bc5dc Mon Sep 17 00:00:00 2001 From: jkachmar Date: Thu, 2 Dec 2021 10:26:16 -0500 Subject: [PATCH 15/26] Disables hledger-iadd & hledger-interest (#6338) --- build-constraints.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 9108d506..1f08fe22 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2696,7 +2696,7 @@ packages: - flexible-defaults - funcmp - hackage-db - - hledger-interest + - hledger-interest < 0 # https://github.com/commercialhaskell/stackage/issues/6338 - hopenssl - hsdns - hsemail @@ -3586,7 +3586,7 @@ packages: - pvar "Hans-Peter Deifel @hpdeifel": - - hledger-iadd + - hledger-iadd < 0 # https://github.com/commercialhaskell/stackage/issues/6338 "Roy Levien @orome": - crypto-enigma From 70cc17cea67a75e8687cfad4b5e50ccb3a8aef01 Mon Sep 17 00:00:00 2001 From: jkachmar Date: Thu, 2 Dec 2021 14:35:04 -0500 Subject: [PATCH 16/26] Expects greskell doctests to fail (#6339) --- build-constraints.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 1f08fe22..9535f82e 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -7609,6 +7609,8 @@ expected-test-failures: - dhall - doctest-driver-gen - email-validate + - greskell + - greskell-core - headroom - hint - hledger-lib From c87e43f5743b12ef4a22b5795bd25b00afd8f913 Mon Sep 17 00:00:00 2001 From: jkachmar Date: Thu, 2 Dec 2021 17:19:37 -0500 Subject: [PATCH 17/26] Disables Haddock for hw-ip & hw-json (#5014) --- build-constraints.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 9535f82e..37e831d2 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -7694,6 +7694,8 @@ expected-haddock-failures: # internal error when calculating transitive package dependencies - hw-balancedparens + - hw-ip # https://github.com/commercialhaskell/stackage/issues/5014 + - hw-json # https://github.com/commercialhaskell/stackage/issues/5014 - hw-rankselect # end of expected-haddock-failures From 518632c71dc369ebd63e40cb14bb6df437c0af15 Mon Sep 17 00:00:00 2001 From: jkachmar Date: Thu, 2 Dec 2021 17:23:43 -0500 Subject: [PATCH 18/26] Lifts restriction on retry (#6330) --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 37e831d2..5ff7ec10 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -6780,9 +6780,6 @@ packages: # https://github.com/commercialhaskell/stackage/issues/6322 - hashtables < 1.3 - - # https://github.com/commercialhaskell/stackage/issues/6330 - - retry < 0.9.0.0 # end of packages # Package flags are applied to individual packages, and override the values of From 13371aff5821e977d1b058fc940ab1e991129066 Mon Sep 17 00:00:00 2001 From: jkachmar Date: Thu, 2 Dec 2021 17:36:10 -0500 Subject: [PATCH 19/26] Skips serialize benchmarks (#6340) --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 5ff7ec10..5c60a96b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -7717,6 +7717,7 @@ expected-benchmark-failures: - incremental-parser # 0.5.0.2 - lz4 # https://github.com/fpco/stackage/issues/3510 - raaz # https://github.com/commercialhaskell/stackage/issues/4766 + - serialise # https://github.com/commercialhaskell/stackage/issues/6340 - thyme - universum - xmlgen # https://github.com/skogsbaer/xmlgen/issues/6 From 0a0893f23720337f5fdd026712d75fe6b361df4c Mon Sep 17 00:00:00 2001 From: jkachmar Date: Thu, 2 Dec 2021 20:15:50 -0500 Subject: [PATCH 20/26] Disables katip-elasticsearch (#6341) --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 5c60a96b..ceebb11a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3059,7 +3059,7 @@ packages: - hs-GeoIP - retry - katip - - katip-elasticsearch + - katip-elasticsearch < 0 # https://github.com/commercialhaskell/stackage/issues/6341 "Sid Kapur sidharthkapur1@gmail.com @sid-kap": - tuple From b06d40b3825d551614f3d16048e2c63e08bdb7a6 Mon Sep 17 00:00:00 2001 From: jkachmar Date: Thu, 2 Dec 2021 20:17:59 -0500 Subject: [PATCH 21/26] Disables headroom (#6342) --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index ceebb11a..c657a52f 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4543,7 +4543,7 @@ packages: - multi-containers "Vaclav Svejcar @vaclavsvejcar": - - headroom + - headroom < 0 # https://github.com/commercialhaskell/stackage/issues/6342 - vcs-ignore "Adrian Sieber @ad-si": From c03434e2aa9cfb29bdb48816eadb44cfb132cc62 Mon Sep 17 00:00:00 2001 From: Joshua Chia Date: Fri, 3 Dec 2021 22:23:59 +0800 Subject: [PATCH 22/26] Re-enabled gtk-strut --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index edbc0106..87b5c089 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5932,7 +5932,6 @@ packages: - groundhog-mysql < 0 # tried groundhog-mysql-0.11, but its *library* does not support: mysql-0.2.1 - grouped-list < 0 # tried grouped-list-0.2.2.1, but its *library* does not support: base-4.15.0.0 - gtk-sni-tray < 0 # tried gtk-sni-tray-0.1.8.0, but its *library* requires the disabled package: gi-gdk - - gtk-strut < 0 # tried gtk-strut-0.1.3.0, but its *library* requires the disabled package: gi-gdk - gtk3 < 0 # tried gtk3-0.15.6, but its *library* does not support: Cabal-3.4.0.0 - hOpenPGP < 0 # tried hOpenPGP-2.9.7, but its *library* requires the disabled package: ixset-typed - hackage-security < 0 # tried hackage-security-0.6.0.1, but its *library* does not support: template-haskell-2.17.0.0 From 7a90452e0c15142017017dac4144b1e5166bf235 Mon Sep 17 00:00:00 2001 From: Joshua Chia Date: Fri, 3 Dec 2021 22:30:57 +0800 Subject: [PATCH 23/26] Re-enabled gi-gdkx11 --- build-constraints.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index edbc0106..664d593d 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3265,7 +3265,7 @@ packages: - gi-dbusmenugtk3 - gi-gdk == 3.* # https://github.com/commercialhaskell/stackage/issues/6317 - gi-gdkpixbuf - - gi-gdkx11 + - gi-gdkx11 == 3.* # https://github.com/commercialhaskell/stackage/issues/6317 - gi-gio - gi-glib - gi-gobject @@ -5889,7 +5889,6 @@ packages: - ghcjs-dom < 0 # tried ghcjs-dom-0.9.4.0, but its *library* requires the disabled package: ghcjs-dom-jsaddle - gi-dbusmenugtk3 < 0 # tried gi-dbusmenugtk3-0.4.11, but its *library* does not support: gi-gtk-4.0.5 - gi-dbusmenugtk3 < 0 # tried gi-dbusmenugtk3-0.4.11, but its *library* requires the disabled package: gi-gdk - - gi-gdkx11 < 0 # tried gi-gdkx11-4.0.4, but its *library* requires the disabled package: gi-gdk - gi-gsk < 0 # tried gi-gsk-4.0.4, but its *library* requires the disabled package: gi-gdk - gi-gtksource < 0 # tried gi-gtksource-3.0.25, but its *library* does not support: gi-gtk-4.0.5 - gi-gtksource < 0 # tried gi-gtksource-3.0.25, but its *library* requires the disabled package: gi-gdk From b9cbeb27d40dc11bab46c59dfc2336f0a64f9e52 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Sat, 4 Dec 2021 14:46:19 +0100 Subject: [PATCH 24/26] commenter: Insert constraints into build-constraints.yaml --- CURATORS.md | 26 ++++-- build-constraints.yaml | 11 ++- etc/commenter/Cargo.lock | 181 ++++++++++++++++++++++++++++++++++++++ etc/commenter/Cargo.toml | 3 +- etc/commenter/src/lib.rs | 124 ++++++++++++++++++++++++++ etc/commenter/src/main.rs | 56 ++++++++++-- 6 files changed, 378 insertions(+), 23 deletions(-) create mode 100644 etc/commenter/src/lib.rs diff --git a/CURATORS.md b/CURATORS.md index 1a2fd6e3..4cbe245f 100644 --- a/CURATORS.md +++ b/CURATORS.md @@ -421,10 +421,10 @@ errors for builds, tests and benchmarks. ### Large scale enabling/disabling of packages -`etc/commenter` is a binary that semi-automates the translation of -`./check` errors into lines that can be copy pasted into -`build-constraints.yaml`. It can only handle bounds issues, -compilation issues still need to be analyzed manually. +`etc/commenter` is a binary that mostly automates the translation of +`./check` errors into lines that go into `build-constraints.yaml`. It +can only handle bounds issues, compilation issues still need to be +handled manually. It disables all offending packages/test suites/benchmarks, so it is only meant to be used when we close bounds issues and want to disable @@ -434,7 +434,7 @@ packages, and when upgrading GHC. This is currently a rust program, You can install the rust toolchain by using [rustup](https://rustup.rs/). -Then `cd etc/commenter && cargo install --locked --path .` +Then `cargo install --locked --path etc/commenter` #### Example usage @@ -455,7 +455,7 @@ testing-feat (GHC 9 bounds issues, Grandfathered dependencies) (not present) dep Now run: ``` -./check 2>&1 >/dev/null | commenter +./check 2>&1 >/dev/null | commenter add ``` You will get this output: @@ -469,19 +469,27 @@ TESTS - dual-tree # tried dual-tree-0.2.3.0, but its *test-suite* requires the disabled package: testing-feat - pipes-fluid # tried pipes-fluid-0.6.0.1, but its *test-suite* requires the disabled package: pipes-misc + +Adding 1 libs, 2 tests, 0 benches to build-constraints.yaml ``` -The lines under LIBS+EXES should be pasted in the shared section (currently called "GHC 9 bounds issues"). +These bounds are added to build-constraints.yaml automatically. -TESTS have a similar section under `skipped-tests`, and BENCHMARKS under `skipped-benchmarks`. +Re-run this command until no more packages are disabled. #### Re-enabling We can periodically remove all packages under the bounds sections and then re-run the disabling flow above until we get a clean plan. This will automatically pick up packages that have been fixed. +``` +commenter clear +./check 2>&1 >/dev/null | commenter add +``` + +Repeat the second command until no updates are made to build-constraints.yaml. + #### Notes -* Please keep these lists sorted as the diffs will be much cleaner when we re-enable packages and re-run this flow * Please make sure to separate bounds issues from compilation failures/test run failures, as we cannot verify that a package builds or that tests pass without running the build! diff --git a/build-constraints.yaml b/build-constraints.yaml index edbc0106..8a04d07c 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -6667,6 +6667,7 @@ packages: - ziptastic-core < 0 # tried ziptastic-core-0.2.0.3, but its *library* does not support: servant-0.18.3 - zydiskell < 0 # tried zydiskell-0.2.0.0, but its *library* does not support: base-4.15.0.0 - zydiskell < 0 # tried zydiskell-0.2.0.0, but its *library* does not support: storable-record-0.0.6 + # End of Library and exe bounds failures "Stackage upper bounds": @@ -7039,11 +7040,9 @@ skipped-tests: # https://github.com/clash-lang/clash-compiler/issues/1622 - clash-prelude - # - # Test bounds issues - # # See "Large scale enabling/disabling of packages" in CURATORS.md for how to manage this section. # + # Test bounds issues - ENIG # tried ENIG-0.0.1.0, but its *test-suite* requires the disabled package: test-framework-th - IPv6DB # tried IPv6DB-0.3.2, but its *test-suite* does not support: hspec-2.8.5 - IPv6DB # tried IPv6DB-0.3.2, but its *test-suite* does not support: http-client-0.7.9 @@ -7263,6 +7262,7 @@ skipped-tests: - wreq # tried wreq-0.5.3.3, but its *test-suite* requires the disabled package: snap-server - xmlhtml # tried xmlhtml-0.2.5.2, but its *test-suite* does not support: hspec-2.8.5 - yesod-static-angular # tried yesod-static-angular-0.1.8, but its *test-suite* does not support: yesod-test-1.6.12 + # End of Test bounds issues # end of skipped-tests @@ -7788,11 +7788,9 @@ skipped-benchmarks: - prettyprinter - prettyprinter-ansi-terminal # https://github.com/commercialhaskell/stackage/issues/5560 - # - # Benchmark bounds issues - # # See "Large scale enabling/disabling of packages" in CURATORS.md for how to manage this section. # + # Benchmark bounds issues - IntervalMap # tried IntervalMap-0.6.1.2, but its *benchmarks* requires the disabled package: SegmentTree - accelerate-bignum # tried accelerate-bignum-0.3.0.0, but its *benchmarks* requires the disabled package: accelerate-io-vector - accelerate-fourier # tried accelerate-fourier-1.0.0.5, but its *benchmarks* does not support: accelerate-llvm-native-1.3.0.0 @@ -7827,6 +7825,7 @@ skipped-benchmarks: - tz # tried tz-0.1.3.5, but its *benchmarks* requires the disabled package: thyme - unicode-transforms # tried unicode-transforms-0.3.8, but its *benchmarks* does not support: path-0.9.1 - xxhash-ffi # tried xxhash-ffi-0.2.0.0, but its *benchmarks* requires the disabled package: xxhash + # End of Benchmark bounds issues # end of skipped-benchmarks diff --git a/etc/commenter/Cargo.lock b/etc/commenter/Cargo.lock index 3b623a76..c6998282 100644 --- a/etc/commenter/Cargo.lock +++ b/etc/commenter/Cargo.lock @@ -11,12 +11,72 @@ dependencies = [ "memchr", ] +[[package]] +name = "ansi_term" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +dependencies = [ + "winapi", +] + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi", + "libc", + "winapi", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "clap" +version = "2.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +dependencies = [ + "ansi_term", + "atty", + "bitflags", + "strsim", + "textwrap", + "unicode-width", + "vec_map", +] + [[package]] name = "commenter" version = "0.1.0" dependencies = [ "lazy-regex", "regex", + "structopt", +] + +[[package]] +name = "heck" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", ] [[package]] @@ -42,6 +102,18 @@ dependencies = [ "syn", ] +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.108" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8521a1b57e76b1ec69af7599e75e38e7b7fad6610f037db8c79b127201b5d119" + [[package]] name = "memchr" version = "2.4.0" @@ -54,6 +126,30 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + [[package]] name = "proc-macro2" version = "1.0.27" @@ -89,6 +185,36 @@ version = "0.6.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" +[[package]] +name = "strsim" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + +[[package]] +name = "structopt" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40b9788f4202aa75c240ecc9c15c65185e6a39ccdeb0fd5d008b98825464c87c" +dependencies = [ + "clap", + "lazy_static", + "structopt-derive", +] + +[[package]] +name = "structopt-derive" +version = "0.4.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "syn" version = "1.0.73" @@ -100,8 +226,63 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "unicode-segmentation" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b" + +[[package]] +name = "unicode-width" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" + [[package]] name = "unicode-xid" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" + +[[package]] +name = "vec_map" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + +[[package]] +name = "version_check" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/etc/commenter/Cargo.toml b/etc/commenter/Cargo.toml index 87d6f56b..adb15eab 100644 --- a/etc/commenter/Cargo.toml +++ b/etc/commenter/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "commenter" -version = "0.1.0" +version = "0.2.0" authors = ["Adam Bergmark "] edition = "2018" @@ -9,3 +9,4 @@ edition = "2018" [dependencies] lazy-regex = "2.2.1" regex = "1.5.4" +structopt = "0.3.25" diff --git a/etc/commenter/src/lib.rs b/etc/commenter/src/lib.rs new file mode 100644 index 00000000..e4ddd2fe --- /dev/null +++ b/etc/commenter/src/lib.rs @@ -0,0 +1,124 @@ +use std::fs::File; +use std::io::{BufRead, BufReader, LineWriter, Lines, Write}; +use std::path::Path; + +pub fn clear() { + handle(|loc, _lines| match loc { + // Add empty array to keep yaml valid + Location::Lib => vec![" []".to_owned()], + Location::Test | Location::Bench => vec![], + }); +} + +pub fn add(lib: Vec, test: Vec, bench: Vec) { + handle(|loc, mut lines| { + lines.extend(match loc { + Location::Lib => lib.clone(), + Location::Test => test.clone(), + Location::Bench => bench.clone(), + }); + lines.sort(); + lines + }) +} + +enum State { + LookingForLibBounds, + ProcessingLibBounds, + LookingForTestBounds, + ProcessingTestBounds, + LookingForBenchBounds, + ProcessingBenchBounds, + Done, +} + +fn handle(f: F) +where + F: Fn(Location, Vec) -> Vec, +{ + let path = "build-constraints.yaml"; + let mut new_lines: Vec = vec![]; + + let mut state = State::LookingForLibBounds; + let mut buf = vec![]; + for line in read_lines(path).map(|s| s.unwrap()) { + match state { + State::LookingForLibBounds => { + if line == r#" "Library and exe bounds failures":"# { + state = State::ProcessingLibBounds; + } + new_lines.push(line); + } + State::ProcessingLibBounds => { + if line == r#" # End of Library and exe bounds failures"# { + new_lines.extend(f(Location::Lib, buf).into_iter()); + buf = vec![]; + new_lines.push(line); + state = State::LookingForTestBounds; + } else { + // Remove empty section + if line != " []" { + buf.push(line); + } + } + } + State::LookingForTestBounds => { + if line == r#" # Test bounds issues"# { + state = State::ProcessingTestBounds; + } + new_lines.push(line); + } + State::ProcessingTestBounds => { + if line == r#" # End of Test bounds issues"# { + new_lines.extend(f(Location::Test, buf).into_iter()); + buf = vec![]; + new_lines.push(line); + state = State::LookingForBenchBounds; + } else { + buf.push(line); + } + } + State::LookingForBenchBounds => { + if line == r#" # Benchmark bounds issues"# { + state = State::ProcessingBenchBounds; + } + new_lines.push(line); + } + State::ProcessingBenchBounds => { + if line == r#" # End of Benchmark bounds issues"# { + new_lines.extend(f(Location::Bench, buf).into_iter()); + buf = vec![]; + new_lines.push(line); + state = State::Done; + } else { + buf.push(line); + } + } + State::Done => { + new_lines.push(line); + } + } + } + + let file = File::create(path).unwrap(); + let mut file = LineWriter::new(file); + + for line in new_lines { + file.write_all((line + "\n").as_bytes()).unwrap(); + } + file.flush().unwrap(); +} + +enum Location { + Lib, + Test, + Bench, +} + +fn read_lines

(filename: P) -> Lines> +where + P: AsRef, +{ + let file = File::open(filename).unwrap(); + BufReader::new(file).lines() +} diff --git a/etc/commenter/src/main.rs b/etc/commenter/src/main.rs index 9a2cb491..282e5afd 100644 --- a/etc/commenter/src/main.rs +++ b/etc/commenter/src/main.rs @@ -1,8 +1,9 @@ -use std::collections::{HashMap}; +use std::collections::HashMap; use std::io::{self, BufRead}; use lazy_regex::regex; use regex::Regex; +use structopt::StructOpt; type H = HashMap>; @@ -12,7 +13,29 @@ enum Header { Missing { package: String }, } +#[derive(Debug, StructOpt)] +#[structopt( + name = "commenter", + about = "Automates generation of bounds in build-constraints.yaml" +)] +enum Opt { + Clear, + Add, +} + fn main() { + let opt = Opt::from_args(); + match opt { + Opt::Clear => clear(), + Opt::Add => add(), + } +} + +fn clear() { + commenter::clear(); +} + +fn add() { let mut lib_exes: H = Default::default(); let mut tests: H = Default::default(); let mut benches: H = Default::default(); @@ -61,12 +84,18 @@ fn main() { } } + let mut auto_lib_exes = vec![]; + let mut auto_tests = vec![]; + let mut auto_benches = vec![]; + if !lib_exes.is_empty() { println!("\nLIBS + EXES\n"); } for (header, packages) in lib_exes { for (package, version, component) in packages { - printer(" ", &package, true, &version, &component, &header); + let s = printer(" ", &package, true, &version, &component, &header); + println!("{}", s); + auto_lib_exes.push(s); } } @@ -75,7 +104,9 @@ fn main() { } for (header, packages) in tests { for (package, version, component) in packages { - printer(" ", &package, false, &version, &component, &header); + let s = printer(" ", &package, false, &version, &component, &header); + println!("{}", s); + auto_tests.push(s); } } @@ -84,9 +115,20 @@ fn main() { } for (header, packages) in benches { for (package, version, component) in packages { - printer(" ", &package, false, &version, &component, &header); + let s = printer(" ", &package, false, &version, &component, &header); + println!("{}", s); + auto_benches.push(s); } } + + println!(); + println!( + "Adding {lib_exes} libs, {tests} tests, {benches} benches to build-constraints.yaml", + lib_exes = auto_lib_exes.len(), + tests = auto_tests.len(), + benches = auto_benches.len() + ); + commenter::add(auto_lib_exes, auto_tests, auto_benches); } fn printer( @@ -96,9 +138,9 @@ fn printer( version: &str, component: &str, header: &Header, -) { +) -> String { let lt0 = if lt0 { " < 0" } else { "" }; - println!( + format!( "{indent}- {package}{lt0} # tried {package}-{version}, but its *{component}* {cause}", indent = indent, package = package, @@ -116,7 +158,7 @@ fn printer( package = package ), }, - ); + ) } fn insert(h: &mut H, header: Header, package: &str, version: &str, component: &str) { From a704d0707aed79edf8a152734f8d993911caacd1 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Sat, 4 Dec 2021 17:29:11 +0100 Subject: [PATCH 25/26] selective < 0.5 for #6348 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index edbc0106..c40e50ab 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -6774,6 +6774,9 @@ packages: # https://github.com/commercialhaskell/stackage/issues/6322 - hashtables < 1.3 + + # https://github.com/commercialhaskell/stackage/issues/6348 + - selective < 0.5 # end of packages # Package flags are applied to individual packages, and override the values of From bb458d94f454f2729e2034177a2ba51f245d67b2 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Sat, 4 Dec 2021 17:37:00 +0100 Subject: [PATCH 26/26] Regenerate bounds --- build-constraints.yaml | 48 ++++++++++++------------------------------ 1 file changed, 14 insertions(+), 34 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 43445ebd..916ec56a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5704,9 +5704,8 @@ packages: - blosum < 0 # tried blosum-0.1.1.4, but its *executable* requires the disabled package: pipes-text - boolean-normal-forms < 0 # tried boolean-normal-forms-0.0.1.1, but its *library* does not support: base-4.15.0.0 - boundingboxes < 0 # tried boundingboxes-0.2.3, but its *library* does not support: lens-5.0.1 - - brittany < 0 # tried brittany-0.13.1.2, but its *library* does not support: base-4.15.0.0 - - brittany < 0 # tried brittany-0.13.1.2, but its *library* does not support: ghc-9.0.1 - - brittany < 0 # tried brittany-0.13.1.2, but its *library* does not support: ghc-boot-th-9.0.1 + - brittany < 0 # tried brittany-0.14.0.0, but its *library* does not support: aeson-1.5.6.0 + - brittany < 0 # tried brittany-0.14.0.0, but its *library* does not support: text-1.2.4.1 - broadcast-chan < 0 # tried broadcast-chan-0.2.1.1, but its *library* does not support: base-4.15.0.0 - buchhaltung < 0 # tried buchhaltung-0.0.7, but its *library* requires the disabled package: regex-tdfa-text - bulletproofs < 0 # tried bulletproofs-1.1.0, but its *library* requires the disabled package: elliptic-curve @@ -5752,7 +5751,6 @@ packages: - composite-xstep < 0 # tried composite-xstep-0.1.0.0, but its *library* requires the disabled package: composite-base - compressed < 0 # tried compressed-3.11, but its *library* does not support: containers-0.6.4.1 - compressed < 0 # tried compressed-3.11, but its *library* does not support: hashable-1.3.5.0 - - conduit-algorithms < 0 # tried conduit-algorithms-0.0.11.0, but its *library* requires the disabled package: pqueue - conduit-throttle < 0 # tried conduit-throttle-0.3.1.0, but its *library* requires the disabled package: throttle-io-stream - confcrypt < 0 # tried confcrypt-0.2.3.3, but its *library* does not support: optparse-applicative-0.16.1.0 - confcrypt < 0 # tried confcrypt-0.2.3.3, but its *library* requires the disabled package: crypto-pubkey-openssh @@ -5785,10 +5783,10 @@ packages: - deepseq-instances < 0 # tried deepseq-instances-0.1.0.1, but its *library* does not support: base-4.15.0.0 - dependent-map < 0 # tried dependent-map-0.4.0.0, but its *library* requires the disabled package: dependent-sum - dependent-sum < 0 # tried dependent-sum-0.7.1.0, but its *library* does not support: some-1.0.3 - - dependent-sum-template < 0 # tried dependent-sum-template-0.1.0.3, but its *library* requires the disabled package: th-extras + - dependent-sum-template < 0 # tried dependent-sum-template-0.1.1.1, but its *library* requires the disabled package: dependent-sum - detour-via-sci < 0 # tried detour-via-sci-1.0.0, but its *library* requires the disabled package: newtype - - dhall-lsp-server < 0 # tried dhall-lsp-server-1.0.16, but its *library* requires the disabled package: haskell-lsp - - dhall-nix < 0 # tried dhall-nix-1.1.22, but its *library* requires the disabled package: hnix + - dhall-lsp-server < 0 # tried dhall-lsp-server-1.0.17, but its *library* requires the disabled package: haskell-lsp + - dhall-nix < 0 # tried dhall-nix-1.1.23, but its *library* requires the disabled package: hnix - diagrams-builder < 0 # tried diagrams-builder-0.8.0.5, but its *library* requires the disabled package: haskell-src-exts-simple - diagrams-cairo < 0 # tried diagrams-cairo-1.4.1.1, but its *library* requires the disabled package: statestack - diagrams-canvas < 0 # tried diagrams-canvas-1.4.1, but its *library* requires the disabled package: blank-canvas @@ -5803,7 +5801,6 @@ packages: - diagrams-html5 < 0 # tried diagrams-html5-1.4.1, but its *library* requires the disabled package: static-canvas - diagrams-postscript < 0 # tried diagrams-postscript-1.5, but its *library* requires the disabled package: statestack - dialogflow-fulfillment < 0 # tried dialogflow-fulfillment-0.1.1.4, but its *library* does not support: base-4.15.0.0 - - dice < 0 # tried dice-0.1.0.1, but its *library* requires the disabled package: random-fu - dictionaries < 0 # tried dictionaries-0.2.0.4, but its *executable* does not support: criterion-1.5.11.0 - dictionaries < 0 # tried dictionaries-0.2.0.4, but its *library* does not support: attoparsec-0.14.1 - dictionaries < 0 # tried dictionaries-0.2.0.4, but its *library* does not support: base-4.15.0.0 @@ -5829,7 +5826,7 @@ packages: - distribution < 0 # tried distribution-1.1.1.0, but its *library* does not support: random-1.2.1 - diversity < 0 # tried diversity-0.8.1.0, but its *library* requires the disabled package: fasta - docker < 0 # tried docker-0.6.0.6, but its *library* does not support: unliftio-core-0.2.0.1 - - docker-build-cacher < 0 # tried docker-build-cacher-2.1.1, but its *library* does not support: language-docker-10.3.0 + - docker-build-cacher < 0 # tried docker-build-cacher-2.1.1, but its *library* does not support: language-docker-10.4.0 - dom-parser < 0 # tried dom-parser-3.1.0, but its *library* requires the disabled package: xml-lens - drawille < 0 # tried drawille-0.1.2.0, but its *library* does not support: containers-0.6.4.1 - earcut < 0 # tried earcut-0.1.0.4, but its *library* does not support: base-4.15.0.0 @@ -5883,19 +5880,11 @@ packages: - gdax < 0 # tried gdax-0.6.0.0, but its *library* requires the disabled package: regex-tdfa-text - generic-xmlpickler < 0 # tried generic-xmlpickler-0.1.0.6, but its *library* does not support: base-4.15.0.0 - generic-xmlpickler < 0 # tried generic-xmlpickler-0.1.0.6, but its *library* does not support: generic-deriving-1.14.1 - - ghc-clippy-plugin < 0 # tried ghc-clippy-plugin-0.0.0.1, but its *library* does not support: dhall-1.40.1 + - ghc-clippy-plugin < 0 # tried ghc-clippy-plugin-0.0.0.1, but its *library* does not support: dhall-1.40.2 - ghc-clippy-plugin < 0 # tried ghc-clippy-plugin-0.0.0.1, but its *library* does not support: ghc-9.0.1 - ghc-syb-utils < 0 # tried ghc-syb-utils-0.3.0.0, but its *library* does not support: ghc-9.0.1 - ghcjs-dom < 0 # tried ghcjs-dom-0.9.4.0, but its *library* requires the disabled package: ghcjs-dom-jsaddle - - gi-dbusmenugtk3 < 0 # tried gi-dbusmenugtk3-0.4.11, but its *library* does not support: gi-gtk-4.0.5 - - gi-dbusmenugtk3 < 0 # tried gi-dbusmenugtk3-0.4.11, but its *library* requires the disabled package: gi-gdk - - gi-gsk < 0 # tried gi-gsk-4.0.4, but its *library* requires the disabled package: gi-gdk - - gi-gtksource < 0 # tried gi-gtksource-3.0.25, but its *library* does not support: gi-gtk-4.0.5 - - gi-gtksource < 0 # tried gi-gtksource-3.0.25, but its *library* requires the disabled package: gi-gdk - - gi-vte < 0 # tried gi-vte-2.91.29, but its *library* does not support: gi-gtk-4.0.5 - - gi-vte < 0 # tried gi-vte-2.91.29, but its *library* requires the disabled package: gi-gdk - - gi-webkit2 < 0 # tried gi-webkit2-4.0.28, but its *library* does not support: gi-gtk-4.0.5 - - gi-webkit2 < 0 # tried gi-webkit2-4.0.28, but its *library* requires the disabled package: gi-gdk + - gi-gsk < 0 # tried gi-gsk-4.0.4, but its *library* does not support: gi-gdk-3.0.25 - gi-webkit2 < 0 # tried gi-webkit2-4.0.28, but its *library* requires the disabled package: gi-soup - gingersnap < 0 # tried gingersnap-0.3.1.0, but its *library* requires the disabled package: snap-core - gio < 0 # tried gio-0.13.8.1, but its *library* does not support: Cabal-3.4.0.0 @@ -5930,7 +5919,6 @@ packages: - groundhog-inspector < 0 # tried groundhog-inspector-0.11.0, but its *library* requires the disabled package: groundhog-th - groundhog-mysql < 0 # tried groundhog-mysql-0.11, but its *library* does not support: mysql-0.2.1 - grouped-list < 0 # tried grouped-list-0.2.2.1, but its *library* does not support: base-4.15.0.0 - - gtk-sni-tray < 0 # tried gtk-sni-tray-0.1.8.0, but its *library* requires the disabled package: gi-gdk - gtk3 < 0 # tried gtk3-0.15.6, but its *library* does not support: Cabal-3.4.0.0 - hOpenPGP < 0 # tried hOpenPGP-2.9.7, but its *library* requires the disabled package: ixset-typed - hackage-security < 0 # tried hackage-security-0.6.0.1, but its *library* does not support: template-haskell-2.17.0.0 @@ -5998,8 +5986,8 @@ packages: - haskell-tools-rewrite < 0 # tried haskell-tools-rewrite-1.1.1.0, but its *library* requires the disabled package: references - haskey < 0 # tried haskey-0.3.1.0, but its *library* does not support: stm-containers-1.2 - haskey-mtl < 0 # tried haskey-mtl-0.3.1.0, but its *library* does not support: monad-control-1.0.3.1 - - haskoin-store < 0 # tried haskoin-store-0.53.11, but its *library* requires the disabled package: haskoin-node - - haskoin-store < 0 # tried haskoin-store-0.53.11, but its *library* requires the disabled package: haskoin-store-data + - haskoin-store < 0 # tried haskoin-store-0.61.0, but its *library* requires the disabled package: haskoin-node + - haskoin-store < 0 # tried haskoin-store-0.61.0, but its *library* requires the disabled package: haskoin-store-data - hasmin < 0 # tried hasmin-1.0.3, but its *executable* does not support: optparse-applicative-0.16.1.0 - hasmin < 0 # tried hasmin-1.0.3, but its *library* does not support: attoparsec-0.14.1 - haxl-amazonka < 0 # tried haxl-amazonka-0.1.1, but its *library* requires the disabled package: haxl @@ -6116,8 +6104,6 @@ packages: - kleene < 0 # tried kleene-0.1, but its *library* does not support: base-4.15.0.0 - kraken < 0 # tried kraken-0.1.0, but its *library* does not support: base-4.15.0.0 - lambdabot-core < 0 # tried lambdabot-core-5.3.0.2, but its *library* requires the disabled package: dependent-sum - - lambdabot-core < 0 # tried lambdabot-core-5.3.0.2, but its *library* requires the disabled package: dependent-sum-template - - lambdabot-core < 0 # tried lambdabot-core-5.3.0.2, but its *library* requires the disabled package: random-source - lambdabot-irc-plugins < 0 # tried lambdabot-irc-plugins-5.3.0.2, but its *library* requires the disabled package: lambdabot-core - language-ecmascript < 0 # tried language-ecmascript-0.19.1.0, but its *library* does not support: base-4.15.0.0 - language-haskell-extract < 0 # tried language-haskell-extract-0.2.4, but its *library* does not support: template-haskell-2.17.0.0 @@ -6168,7 +6154,6 @@ packages: - lsp < 0 # tried lsp-1.2.0.1, but its *library* requires the disabled package: lsp-types - lsp-test < 0 # tried lsp-test-0.14.0.1, but its *library* requires the disabled package: lsp-types - lsp-types < 0 # tried lsp-types-1.3.0.1, but its *library* requires the disabled package: dependent-sum - - lsp-types < 0 # tried lsp-types-1.3.0.1, but its *library* requires the disabled package: dependent-sum-template - lxd-client < 0 # tried lxd-client-0.1.0.6, but its *library* does not support: network-3.1.2.5 - lxd-client < 0 # tried lxd-client-0.1.0.6, but its *library* does not support: servant-0.18.3 - lxd-client < 0 # tried lxd-client-0.1.0.6, but its *library* does not support: servant-client-0.18.3 @@ -6314,7 +6299,6 @@ packages: - postgrest < 0 # tried postgrest-8.0.0, but its *library* does not support: retry-0.9.0.0 - postgrest < 0 # tried postgrest-8.0.0, but its *library* does not support: swagger2-2.7 - postgrest < 0 # tried postgrest-8.0.0, but its *library* requires the disabled package: hasql-dynamic-statements - - pqueue < 0 # tried pqueue-1.4.1.3, but its *library* does not support: base-4.15.0.0 - prairie < 0 # tried prairie-0.0.1.0, but its *library* does not support: template-haskell-2.17.0.0 - pred-set < 0 # tried pred-set-0.0.1, but its *library* requires the disabled package: HSet - pred-trie < 0 # tried pred-trie-0.6.1, but its *library* requires the disabled package: pred-set @@ -6339,9 +6323,7 @@ packages: - rakuten < 0 # tried rakuten-0.1.1.5, but its *library* does not support: lens-5.0.1 - rakuten < 0 # tried rakuten-0.1.1.5, but its *library* does not support: req-3.9.2 - rakuten < 0 # tried rakuten-0.1.1.5, but its *library* requires the disabled package: extensible - - random-fu < 0 # tried random-fu-0.2.7.7, but its *library* requires the disabled package: random-source - ranged-list < 0 # tried ranged-list-0.1.0.0, but its *library* requires the disabled package: typecheck-plugin-nat-simple - - rank-product < 0 # tried rank-product-0.2.2.0, but its *library* requires the disabled package: random-fu - reanimate < 0 # tried reanimate-1.1.4.0, but its *library* requires the disabled package: hgeometry - reanimate < 0 # tried reanimate-1.1.4.0, but its *library* requires the disabled package: hgeometry-combinatorial - redis-io < 0 # tried redis-io-1.1.0, but its *library* requires the disabled package: operational @@ -6404,7 +6386,6 @@ packages: - rollbar-hs < 0 # tried rollbar-hs-0.3.1.0, but its *library* does not support: network-3.1.2.5 - rollbar-hs < 0 # tried rollbar-hs-0.3.1.0, but its *library* does not support: time-1.9.3 - rss-conduit < 0 # tried rss-conduit-0.6.0.1, but its *library* requires the disabled package: atom-conduit - - rvar < 0 # tried rvar-0.2.0.6, but its *library* requires the disabled package: random-source - safe-tensor < 0 # tried safe-tensor-0.2.1.1, but its *library* does not support: singletons-3.0.1 - salak-toml < 0 # tried salak-toml-0.3.5.3, but its *library* requires the disabled package: tomland - sandwich-webdriver < 0 # tried sandwich-webdriver-0.1.0.6, but its *library* requires the disabled package: webdriver @@ -6534,14 +6515,14 @@ packages: - swagger2 < 0 # tried swagger2-2.7, but its *library* does not support: aeson-1.5.6.0 - sweet-egison < 0 # tried sweet-egison-0.1.1.3, but its *library* requires the disabled package: egison-pattern-src - sweet-egison < 0 # tried sweet-egison-0.1.1.3, but its *library* requires the disabled package: egison-pattern-src-th-mode - - taffybar < 0 # tried taffybar-3.3.0, but its *library* requires the disabled package: gi-gdk + - taffybar < 0 # tried taffybar-3.3.0, but its *library* requires the disabled package: broadcast-chan - tasty-stats < 0 # tried tasty-stats-0.2.0.4, but its *library* does not support: containers-0.6.4.1 - tasty-stats < 0 # tried tasty-stats-0.2.0.4, but its *library* does not support: tasty-1.4.2.1 - tasty-stats < 0 # tried tasty-stats-0.2.0.4, but its *library* does not support: time-1.9.3 - tcp-streams-openssl < 0 # tried tcp-streams-openssl-1.0.1.0, but its *library* does not support: network-3.1.2.5 - termbox < 0 # tried termbox-0.3.0, but its *library* does not support: base-4.15.0.0 - termcolor < 0 # tried termcolor-0.2.0.0, but its *executable* requires the disabled package: cli - - termonad < 0 # tried termonad-4.2.0.0, but its *library* requires the disabled package: gi-gdk + - termonad < 0 # tried termonad-4.2.0.0, but its *library* requires the disabled package: xml-html-qq - test-fixture < 0 # tried test-fixture-0.5.1.0, but its *library* does not support: template-haskell-2.17.0.0 - test-framework-th < 0 # tried test-framework-th-0.2.4, but its *library* requires the disabled package: language-haskell-extract - testing-feat < 0 # tried testing-feat-1.1.0.0, but its *library* requires the disabled package: size-based @@ -6636,7 +6617,6 @@ packages: - writer-cps-full < 0 # tried writer-cps-full-0.1.0.0, but its *library* requires the disabled package: writer-cps-morph - writer-cps-lens < 0 # tried writer-cps-lens-0.1.0.1, but its *library* does not support: lens-5.0.1 - ws < 0 # tried ws-0.0.5, but its *library* requires the disabled package: attoparsec-uri - - xdg-desktop-entry < 0 # tried xdg-desktop-entry-0.1.1.1, but its *library* requires the disabled package: ConfigFile - xml-html-qq < 0 # tried xml-html-qq-0.1.0.1, but its *library* requires the disabled package: heterocephalus - xml-isogen < 0 # tried xml-isogen-0.3.0, but its *library* requires the disabled package: dom-parser - yeshql < 0 # tried yeshql-4.2.0.0, but its *library* does not support: yeshql-core-4.2.0.0 @@ -7073,10 +7053,11 @@ skipped-tests: - clay # tried clay-0.13.3, but its *test-suite* does not support: hspec-2.8.5 - clay # tried clay-0.13.3, but its *test-suite* does not support: hspec-discover-2.8.5 - colour # tried colour-2.3.6, but its *test-suite* does not support: random-1.2.1 + - conduit-algorithms # tried conduit-algorithms-0.0.11.0, but its *test-suite* requires the disabled package: test-framework-th - csg # tried csg-0.1.0.6, but its *test-suite* does not support: doctest-0.18.2 - csg # tried csg-0.1.0.6, but its *test-suite* does not support: tasty-1.4.2.1 - darcs # tried darcs-2.16.4, but its *test-suite* does not support: QuickCheck-2.14.2 - - dhall-lsp-server # tried dhall-lsp-server-1.0.16, but its *test-suite* does not support: lsp-test-0.14.0.1 + - dhall-lsp-server # tried dhall-lsp-server-1.0.17, but its *test-suite* does not support: lsp-test-0.14.0.1 - distributed-process-lifted # tried distributed-process-lifted-0.3.0.1, but its *test-suite* does not support: network-transport-tcp-0.8.0 - distributed-process-lifted # tried distributed-process-lifted-0.3.0.1, but its *test-suite* requires the disabled package: rematch - doldol # tried doldol-0.4.1.2, but its *test-suite* requires the disabled package: test-framework-th @@ -7818,7 +7799,6 @@ skipped-benchmarks: - regex-applicative # tried regex-applicative-0.3.4, but its *benchmarks* requires the disabled package: parsers-megaparsec - sbv # tried sbv-8.17, but its *benchmarks* requires the disabled package: bench-show - servant-auth-cookie # tried servant-auth-cookie-0.6.0.3, but its *benchmarks* does not support: criterion-1.5.11.0 - - stm-hamt # tried stm-hamt-1.2.0.6, but its *benchmarks* does not support: mwc-random-0.15.0.2 - superbuffer # tried superbuffer-0.3.1.1, but its *benchmarks* does not support: criterion-1.5.11.0 - ttrie # tried ttrie-0.1.2.2, but its *benchmarks* requires the disabled package: criterion-plus - ttrie # tried ttrie-0.1.2.2, but its *benchmarks* requires the disabled package: stm-stats