From 608624056d9517d87ea838d8279de53c97788dc1 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 14 Jun 2021 02:22:23 +0800 Subject: [PATCH 01/10] allow yesod-form-1.7 again (closes #5983) and hledger revisions --- build-constraints.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index cc253dad..01082d00 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5176,9 +5176,6 @@ packages: # https://github.com/commercialhaskell/stackage/issues/5975 - singleton-bool < 0.1.6 - # https://github.com/commercialhaskell/stackage/issues/5983 - - yesod-form < 1.7 - # https://github.com/commercialhaskell/stackage/issues/6007 - memory < 0.16 @@ -6611,11 +6608,6 @@ no-revisions: - pantry - rio-prettyprint - hi-file-parser -# https://github.com/commercialhaskell/stackage/issues/3706: -- hledger -- hledger-lib -- hledger-ui -- hledger-web # Do not build these packages in parallel with others. Useful for high memory From d4bb98992a2c9e010513bb1ac3d0445f4e89fb40 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 14 Jun 2021 02:24:41 +0800 Subject: [PATCH 02/10] allow language-c-0.9 (closes #5633) --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 01082d00..017f0005 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5121,9 +5121,6 @@ packages: # https://github.com/commercialhaskell/stackage/issues/5598 - base64-bytestring < 1.2 - # https://github.com/commercialhaskell/stackage/issues/5633 - - language-c < 0.9 - # https://github.com/commercialhaskell/stackage/issues/5747 - http-client < 0.7 - http-client-openssl < 0.3.3 From 879889749ad365bca66f7f296e772d9137bea742 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 14 Jun 2021 18:11:52 +0800 Subject: [PATCH 03/10] fft testsuite failing with -11 --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 017f0005..aceadbee 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5775,6 +5775,7 @@ expected-test-failures: - distributed-process - distributed-process-execution # https://github.com/haskell-distributed/distributed-process-execution/issues/2 - distributed-process-task + - fft # test-fft: exited with: ExitFailure (-11) - foldl-statistics # https://github.com/data61/foldl-statistics/issues/2 - forma - fsnotify # Often runs out of inotify handles From b91382f2ff1f2775f4aa9d42c9a6b06b33e5904d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 14 Jun 2021 18:18:03 +0800 Subject: [PATCH 04/10] elynx-markov testsuite failing (dschrempf/elynx#2) --- build-constraints.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index aceadbee..b11e24d8 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -6108,6 +6108,8 @@ expected-test-failures: - poly + # https://github.com/dschrempf/elynx/issues/2 + - elynx-markov # end of expected-test-failures # Benchmarks which are known not to build. Note that, currently we do not run From f9539a434264984bdb43e6b5284a13325810dddd Mon Sep 17 00:00:00 2001 From: Jasper Woudenberg Date: Mon, 14 Jun 2021 14:51:24 +0200 Subject: [PATCH 05/10] add nri-http, nri-test-encoding, nri-redis --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index b11e24d8..6f1753b9 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4523,8 +4523,11 @@ packages: "NoRedInk ": - nri-env-parser + - nri-http - nri-observability - nri-prelude + - nri-redis + - nri-test-encoding "Behrang Norouzinia @behrang": - jalaali From a1aaec3a591f602a73d7bca98a76f48c5857e931 Mon Sep 17 00:00:00 2001 From: Dominik Schrempf Date: Mon, 14 Jun 2021 14:55:30 +0200 Subject: [PATCH 06/10] readd elynx-markov test --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index b11e24d8..63797fff 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -6107,9 +6107,6 @@ expected-test-failures: - sbv - poly - - # https://github.com/dschrempf/elynx/issues/2 - - elynx-markov # end of expected-test-failures # Benchmarks which are known not to build. Note that, currently we do not run From 211a81634f5ec3baccf2174a158cd1962f8fdc22 Mon Sep 17 00:00:00 2001 From: Dominik Schrempf Date: Mon, 14 Jun 2021 15:05:48 +0200 Subject: [PATCH 07/10] readd tests that had failed because of quickcheck-2.14 bounds --- build-constraints.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index b11e24d8..dc5f304d 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5459,14 +5459,12 @@ skipped-tests: - cabal-install # tasty 1.1 - cayley-client # via hspec-2.6.0 - cborg # via tasty-1.2 - - circular # QuickCHeck-2.14 - clay # via hspec-discover-2.6.0 - codec-rpm # via hspec-2.6.0 - colour # QuickCheck-2.11.3 - dhall-json # tasty-silver https://github.com/commercialhaskell/stackage/issues/5795 - drawille # hspec 2.4 - ed25519 # QuickCheck, hlint and more - - elynx-tree # QuickCheck-2.14 - exact-pi # QuickCHeck 2.12, tasty-1.2 - focuslist # via genvalidity, see https://github.com/commercialhaskell/stackage/pull/4436#issuecomment-475110614 - ghc-prof # via tasty-1.2 From 8841cede4de8c54be4627c04d74edf10ea2c03fa Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 15 Jun 2021 11:40:28 +0800 Subject: [PATCH 08/10] CURATORS: the lts branch has no dash and some trailing whitespace [skip ci] --- CURATORS.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CURATORS.md b/CURATORS.md index 29ac271a..fa3bf75a 100644 --- a/CURATORS.md +++ b/CURATORS.md @@ -239,7 +239,7 @@ For a new GHC version you should also delete the ~~cache~~ .stack-work snapshot ``` # for example -SNAP_SERIES=nightly # or lts16 +SNAP_SERIES=nightly # or lts16 OLD_GHCVER=8.10.1 rm -r work/$SNAP_SERIES/unpack-dir/.stack-work/install/x86_64-linux/*/$OLD_GHCVER/ ``` @@ -343,7 +343,7 @@ LTS minor bumps typically are run on Sundays. * You can detect the problem by running `df`. If you see that `/` is out of space, we have a problem. * If you see that `/var/stackage/` is out of space, you can: * run `./etc/diskspace/clean-old-stack-libs.sh [nightly|lts-XX]` - * If that is insufficient then remove all the old builds under the previous ghc/Cabal version: + * If that is insufficient then remove all the old builds under the previous ghc/Cabal version: * `rm -r /var/stackage/stackage/automated/work/[nightly|lts-XX]/unpack-dir/unpacked/*/.stack-work/dist/x86_64-linux/Cabal-X.Y.0.0/` optionally (not recommended?): @@ -447,7 +447,7 @@ Every 3-6 months, we make a new major release of LTS. The procedure we follow fo relaxed upper bounds. There will likely be some hard decisions to be made regarding relaxing a bound versus keeping more packages. All of these changes occur on master and affect nightly. -4. Once the estimated date hits, push a new `lts-XX` branch and trigger Docker +4. Once the estimated date hits, push a new `ltsXX` branch and trigger Docker Hub to build a Docker image for the new release. 5. Run the build procedure for the new LTS release. 6. After the LTS build completes, more aggressively prune upper bounds from From 74ef4aeecbd71d567866649a61a2d2080bd6b211 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 15 Jun 2021 11:59:21 +0800 Subject: [PATCH 09/10] sydtest-yesod tests should pass now (#5906 and NorfairKing/sydtest#11) --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index b11e24d8..347c8cd9 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5589,7 +5589,6 @@ skipped-tests: - sydtest-servant # https://github.com/commercialhaskell/stackage/issues/5901 - sydtest-persistent-sqlite # https://github.com/commercialhaskell/stackage/issues/5902 - - sydtest-yesod # https://github.com/commercialhaskell/stackage/issues/5906 - genvalidity-persistent # https://github.com/commercialhaskell/stackage/issues/5903 # Transitive outdated dependencies From 50870dbf2b4526d941d3d74da96309c41bbef29e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 16 Jun 2021 21:30:26 +0800 Subject: [PATCH 10/10] hosc < 0.19 (#6071) --- build-constraints.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index dd9fa2b6..cf71f039 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5197,6 +5197,8 @@ packages: # (doctest < 0.17) - numhask < 0.8.0.0 + # https://github.com/commercialhaskell/stackage/issues/6071 + - hosc < 0.19 # end of packages # Package flags are applied to individual packages, and override the values of