From 4e1eb5e34d60ffbcc259266783ac75589c0fb7f8 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Fri, 18 Aug 2023 15:49:22 -0800 Subject: [PATCH 01/35] Test bound removal Signed-off-by: Mihai Maruseac --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index df3b42a8..600fe898 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -8055,7 +8055,7 @@ packages: - tasty-quickcheck < 0.10.3 # https://github.com/commercialhaskell/stackage/issues/7124 - - mpi-hs < 0.7.3 + # mpi-hs < 0.7.3 # https://github.com/commercialhaskell/stackage/issues/7129 - lpeg < 1.1 From 5246c1551d567608451315e7194be6956bee34cc Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Sat, 2 Sep 2023 15:49:22 -0800 Subject: [PATCH 02/35] Test bound removal Signed-off-by: Mihai Maruseac --- build-constraints.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 600fe898..58e102ec 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -8055,10 +8055,10 @@ packages: - tasty-quickcheck < 0.10.3 # https://github.com/commercialhaskell/stackage/issues/7124 - # mpi-hs < 0.7.3 + - mpi-hs < 0.7.3 # https://github.com/commercialhaskell/stackage/issues/7129 - - lpeg < 1.1 + # lpeg < 1.1 # https://github.com/commercialhaskell/stackage/issues/7144 # ghc9.8 - need base >= 4.19 From bac082f6dc7a6aea2749d19412d125790b721157 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Sun, 3 Sep 2023 15:49:22 -0800 Subject: [PATCH 03/35] Test bound removal Signed-off-by: Mihai Maruseac --- build-constraints.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 58e102ec..37d4b796 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -8058,19 +8058,19 @@ packages: - mpi-hs < 0.7.3 # https://github.com/commercialhaskell/stackage/issues/7129 - # lpeg < 1.1 + - lpeg < 1.1 # https://github.com/commercialhaskell/stackage/issues/7144 # ghc9.8 - need base >= 4.19 - - eliminators < 0.9.4 - - fourmolu < 0.14.1.0 - - ghc-lib < 9.8 - - ghc-lib-parser < 9.8 - - ghc-lib-parser-ex < 9.8 - - ormolu < 0.7.3.0 - - singletons-base < 3.3 - - singletons-th < 3.3 - - th-desugar < 1.16 + # eliminators < 0.9.4 + # fourmolu < 0.14.1.0 + # ghc-lib < 9.8 + # ghc-lib-parser < 9.8 + # ghc-lib-parser-ex < 9.8 + # ormolu < 0.7.3.0 + # singletons-base < 3.3 + # singletons-th < 3.3 + # th-desugar < 1.16 # https://github.com/commercialhaskell/stackage/issues/7146 - constraints < 0.14 From cc1f632c6dd117be148e28d3b660ab8ea4bf32f7 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Mon, 4 Sep 2023 15:49:22 -0800 Subject: [PATCH 04/35] Test bound removal Signed-off-by: Mihai Maruseac --- build-constraints.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 37d4b796..df3b42a8 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -8062,15 +8062,15 @@ packages: # https://github.com/commercialhaskell/stackage/issues/7144 # ghc9.8 - need base >= 4.19 - # eliminators < 0.9.4 - # fourmolu < 0.14.1.0 - # ghc-lib < 9.8 - # ghc-lib-parser < 9.8 - # ghc-lib-parser-ex < 9.8 - # ormolu < 0.7.3.0 - # singletons-base < 3.3 - # singletons-th < 3.3 - # th-desugar < 1.16 + - eliminators < 0.9.4 + - fourmolu < 0.14.1.0 + - ghc-lib < 9.8 + - ghc-lib-parser < 9.8 + - ghc-lib-parser-ex < 9.8 + - ormolu < 0.7.3.0 + - singletons-base < 3.3 + - singletons-th < 3.3 + - th-desugar < 1.16 # https://github.com/commercialhaskell/stackage/issues/7146 - constraints < 0.14 From 0c70f919ff8dbe1996d7b7bf72a25d5e71a7462f Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Tue, 26 Sep 2023 15:49:22 -0800 Subject: [PATCH 05/35] Test bound removal Signed-off-by: Mihai Maruseac --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index df3b42a8..b61cd5e0 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -8073,7 +8073,7 @@ packages: - th-desugar < 1.16 # https://github.com/commercialhaskell/stackage/issues/7146 - - constraints < 0.14 + # constraints < 0.14 # https://github.com/commercialhaskell/stackage/issues/7159 - Diff < 0.5 From 90e82db7d4bb3485b9ec966483db735616f1b4c8 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Wed, 27 Sep 2023 15:49:22 -0800 Subject: [PATCH 06/35] Test bound removal Signed-off-by: Mihai Maruseac --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index b61cd5e0..03cece22 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -8074,6 +8074,7 @@ packages: # https://github.com/commercialhaskell/stackage/issues/7146 # constraints < 0.14 + - capability < 0 # https://github.com/commercialhaskell/stackage/issues/7159 - Diff < 0.5 From 4208db3c2f15e2c7468e1eef6a7b43ce7ad31ce8 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Thu, 28 Sep 2023 15:49:22 -0800 Subject: [PATCH 07/35] Test bound removal Signed-off-by: Mihai Maruseac --- build-constraints.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 03cece22..df3b42a8 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -8073,8 +8073,7 @@ packages: - th-desugar < 1.16 # https://github.com/commercialhaskell/stackage/issues/7146 - # constraints < 0.14 - - capability < 0 + - constraints < 0.14 # https://github.com/commercialhaskell/stackage/issues/7159 - Diff < 0.5 From c2e02dcf1fbd44529ff946dc00aa688036fd0858 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Fri, 15 Dec 2023 19:39:55 -0800 Subject: [PATCH 08/35] Drop `capability` to solve #7146 Signed-off-by: Mihai Maruseac --- build-constraints.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index df3b42a8..ad50861e 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5080,7 +5080,7 @@ packages: - ipa "Andreas Herrmann @aherrmann": - - capability + - capability < 0 # https://github.com/commercialhaskell/stackage/issues/7146 "Dustin Sallings @dustin": - net-mqtt @@ -8072,9 +8072,6 @@ packages: - singletons-th < 3.3 - th-desugar < 1.16 - # https://github.com/commercialhaskell/stackage/issues/7146 - - constraints < 0.14 - # https://github.com/commercialhaskell/stackage/issues/7159 - Diff < 0.5 From fa7faf1938a6a199f72664b71c064bd5708c8e0c Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Sun, 15 Oct 2023 15:49:22 -0800 Subject: [PATCH 09/35] Test bound removal Signed-off-by: Mihai Maruseac --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index ad50861e..8bbe48dc 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -8073,7 +8073,7 @@ packages: - th-desugar < 1.16 # https://github.com/commercialhaskell/stackage/issues/7159 - - Diff < 0.5 + # Diff < 0.5 # https://github.com/commercialhaskell/stackage/issues/7168 - jose < 0.11 From 73323e2539cd280829f74469d0c24d0c7ec6dd50 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Fri, 1 Dec 2023 15:49:22 -0800 Subject: [PATCH 10/35] Test bound removal Signed-off-by: Mihai Maruseac --- build-constraints.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 8bbe48dc..dde1c79b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -8073,10 +8073,10 @@ packages: - th-desugar < 1.16 # https://github.com/commercialhaskell/stackage/issues/7159 - # Diff < 0.5 + - Diff < 0.5 # https://github.com/commercialhaskell/stackage/issues/7168 - - jose < 0.11 + # jose < 0.11 # https://github.com/commercialhaskell/stackage/issues/7178 - cassava-megaparsec < 2.1 From 52653a09d07e815fc7c9c47bc22ea5d3e2f6ac15 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Sat, 2 Dec 2023 15:49:22 -0800 Subject: [PATCH 11/35] Test bound removal Signed-off-by: Mihai Maruseac --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index dde1c79b..40130605 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -8077,6 +8077,7 @@ packages: # https://github.com/commercialhaskell/stackage/issues/7168 # jose < 0.11 + - webgear-core < 0 # https://github.com/commercialhaskell/stackage/issues/7178 - cassava-megaparsec < 2.1 From c0ddf6800dc33388220bbbbcf172ce15aa8d18a3 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Sat, 9 Dec 2023 15:49:22 -0800 Subject: [PATCH 12/35] Test bound removal Signed-off-by: Mihai Maruseac --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 40130605..ec08d9e6 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -8078,6 +8078,7 @@ packages: # https://github.com/commercialhaskell/stackage/issues/7168 # jose < 0.11 - webgear-core < 0 + - webgear-openapi < 0 # https://github.com/commercialhaskell/stackage/issues/7178 - cassava-megaparsec < 2.1 From f98cd1bfe9f7c73805ee33f577e70589a69c4c25 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Sun, 10 Dec 2023 15:49:22 -0800 Subject: [PATCH 13/35] Test bound removal Signed-off-by: Mihai Maruseac --- build-constraints.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index ec08d9e6..ad50861e 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -8076,9 +8076,7 @@ packages: - Diff < 0.5 # https://github.com/commercialhaskell/stackage/issues/7168 - # jose < 0.11 - - webgear-core < 0 - - webgear-openapi < 0 + - jose < 0.11 # https://github.com/commercialhaskell/stackage/issues/7178 - cassava-megaparsec < 2.1 From 4987105791982a6f68368e651b261d427367ef42 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Fri, 15 Dec 2023 20:39:44 -0800 Subject: [PATCH 14/35] Remove `webgear-*` and fix #7168 Signed-off-by: Mihai Maruseac --- build-constraints.yaml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index ad50861e..97a8b279 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4575,8 +4575,8 @@ packages: - file-path-th "Raghu Kaippully @rkaippully": - - webgear-core - - webgear-openapi + - webgear-core < 0 # https://github.com/commercialhaskell/stackage/issues/7168 + - webgear-openapi < 0 # https://github.com/commercialhaskell/stackage/issues/7168 - webgear-server < 0 # 1.0.5 compile fail https://github.com/haskell-webgear/webgear/issues/16 "Alex Washburn @recursion-ninja": @@ -8075,9 +8075,6 @@ packages: # https://github.com/commercialhaskell/stackage/issues/7159 - Diff < 0.5 - # https://github.com/commercialhaskell/stackage/issues/7168 - - jose < 0.11 - # https://github.com/commercialhaskell/stackage/issues/7178 - cassava-megaparsec < 2.1 # end of Stackage upper bounds From 7245bf7d2fde2426967b402d44db07017c73462e Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Fri, 15 Dec 2023 21:40:53 -0800 Subject: [PATCH 15/35] Prepare for new LTS Signed-off-by: Mihai Maruseac --- .github/workflows/image.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml index e0a68122..37686055 100644 --- a/.github/workflows/image.yml +++ b/.github/workflows/image.yml @@ -5,6 +5,7 @@ on: branches: - nightly - lts21 + - lts22 jobs: push: From 0ffb61bf7500cc47b561d0658d7ca1695524a250 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Fri, 15 Dec 2023 21:51:57 -0800 Subject: [PATCH 16/35] Prepare Dockerfile Signed-off-by: Mihai Maruseac --- automated/dockerfiles/lts-22.0/Dockerfile | 90 +++++++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 automated/dockerfiles/lts-22.0/Dockerfile diff --git a/automated/dockerfiles/lts-22.0/Dockerfile b/automated/dockerfiles/lts-22.0/Dockerfile new file mode 100644 index 00000000..c55d2b67 --- /dev/null +++ b/automated/dockerfiles/lts-22.0/Dockerfile @@ -0,0 +1,90 @@ +FROM ubuntu:22.04 + +LABEL maintainer="manny@fpcomplete.com" + +ARG GHC_VERSION=9.6.3 +ARG LTS_SLUG=lts-22.0 +ARG PID1_VERSION=0.1.2.0 +ARG STACK_VERSION=2.11.1 +ARG CUDA_VERSION=10.0 +ARG JVM_PATH=/usr/lib/jvm/java-8-openjdk-amd64 +ARG LLVM_PATH=/usr/lib/llvm-9 +ARG BOOTSTRAP_COMMIT=56d27e1cfead1a37ff55942a9d2f14c0733459c9 + +ARG DEBIAN_FRONTEND=noninteractive +ARG VARIANT=build +ARG STACK_ROOT=/home/stackage/.stack + +# +# Set encoding to UTF-8 and PATH to find GHC and cabal/stack-installed binaries. +# + +ENV LANG=C.UTF-8 \ + LC_ALL=C.UTF-8 \ + PATH=/root/.local/bin:/usr/local/cuda-$CUDA_VERSION/bin:$STACK_ROOT/programs/x86_64-linux/ghc-$GHC_VERSION/bin:$PATH \ + CUDA_PATH=/usr/local/cuda-$CUDA_VERSION \ + CPATH=$JVM_PATH/include:$JVM_PATH/include/linux:$LLVM_PATH/include + +# +# Install pre-requisites +# + +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + wget netbase ca-certificates g++ gcc libc6-dev libffi-dev libgmp-dev \ + make xz-utils zlib1g-dev git gnupg libtinfo-dev jq && \ + rm -rf /var/lib/apt/lists/* + +# +# Use Stackage's docker/*.sh scripts to install system libraries and +# tools required to build any Stackage package. +# Re-installs 'stack' *after* running docker/*.sh since that may have +# installed a different version. +# In the case of 'small' image, just install Stack and GHC. +# + +RUN if [ "$VARIANT" != "small" ]; then \ + wget -qO- https://raw.githubusercontent.com/commercialhaskell/stackage/$BOOTSTRAP_COMMIT/docker/01-build-server.sh https://raw.githubusercontent.com/commercialhaskell/stackage/$BOOTSTRAP_COMMIT/docker/02-apt-get-install.sh https://raw.githubusercontent.com/commercialhaskell/stackage/$BOOTSTRAP_COMMIT/docker/03-custom-install.sh https://raw.githubusercontent.com/commercialhaskell/stackage/$BOOTSTRAP_COMMIT/docker/04-cleanup.sh | sed "s/^GHCVER=9.0.1$/GHCVER=$GHC_VERSION/" | GHCVER=$GHC_VERSION bash; \ + fi && \ + wget -qO- https://github.com/commercialhaskell/stack/releases/download/v$STACK_VERSION/stack-$STACK_VERSION-linux-x86_64.tar.gz | tar xz --wildcards --strip-components=1 -C /usr/bin '*/stack' && \ + if [ "$VARIANT" = "small" ]; then \ + stack setup --resolver ghc-$GHC_VERSION; \ + fi && \ + rm -rf /var/lib/apt/lists/* && \ + cd $STACK_ROOT && \ + find . -type f -not -path "./programs/x86_64-linux/ghc-$GHC_VERSION/*" -exec rm '{}' \; && \ + find . -type d -print0 |sort -rz |xargs -0 rmdir 2>/dev/null || true + +# +# Configure Stack to use the GHC installed in the Docker image rather than installing its own +# + +RUN mkdir /etc/stack/ && \ + echo "system-ghc: true" >/etc/stack/config.yaml + +# +# Use 'stack' to install basic Haskell tools like alex, happy, and cpphs. We +# remove most of the STACK_ROOT afterward to save space, but keep the 'share' +# files that some of these tools require. +# + +RUN stack --resolver=$LTS_SLUG --local-bin-path=/usr/bin install \ + happy alex cpphs gtk2hs-buildtools hscolour hlint hindent && \ + cd $STACK_ROOT && \ + find . -type f -not -path './snapshots/*/share/*' -and -not -path "./programs/x86_64-linux/ghc-$GHC_VERSION/*" -exec rm '{}' \; && \ + find . -type d -print0 |sort -rz |xargs -0 rmdir 2>/dev/null || true + +# +# Install 'pid1' init daemon +# + +RUN wget -O- "https://github.com/fpco/pid1/releases/download/v$PID1_VERSION/pid1-$PID1_VERSION-linux-x86_64.tar.gz" | tar xzf - -C /usr/local && \ + chown root:root /usr/local/sbin && \ + chown root:root /usr/local/sbin/pid1 + +# +# Set up pid1 entrypoint and default command +# + +ENTRYPOINT ["/usr/local/sbin/pid1"] +CMD ["bash"] From 47e0a3e8ae71f83e9565286e2c2f856a3cf190b5 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Sat, 16 Dec 2023 09:18:56 -0800 Subject: [PATCH 17/35] Test `krank` Signed-off-by: Mihai Maruseac --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 97a8b279..c302157d 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -321,7 +321,7 @@ packages: - primecount "Guillaume Bouchard @guibou": - - krank < 0 # 0.3.0 https://github.com/guibou/krank/issues/97 + - krank # 0 # 0.3.0 https://github.com/guibou/krank/issues/97 - pretty-terminal - PyF From e47be6d152a0dc5a30796d96353cee72e6356e15 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Sat, 16 Dec 2023 09:38:41 -0800 Subject: [PATCH 18/35] Undo Signed-off-by: Mihai Maruseac --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index c302157d..97a8b279 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -321,7 +321,7 @@ packages: - primecount "Guillaume Bouchard @guibou": - - krank # 0 # 0.3.0 https://github.com/guibou/krank/issues/97 + - krank < 0 # 0.3.0 https://github.com/guibou/krank/issues/97 - pretty-terminal - PyF From 9148aeab87bd460272de4c5eadcd98f1fae6a2cb Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Sat, 16 Dec 2023 09:42:03 -0800 Subject: [PATCH 19/35] Try re-enabling `sydtest` tests Signed-off-by: Mihai Maruseac --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 97a8b279..c97497d9 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -9014,7 +9014,7 @@ expected-test-failures: - sqids - stateWriter # 0.4.0 https://github.com/bartavelle/stateWriter/issues/6 - subcategories - - sydtest # https://github.com/commercialhaskell/stackage/issues/6729 + # sydtest # https://github.com/commercialhaskell/stackage/issues/6729 - sydtest-yesod # https://github.com/commercialhaskell/stackage/issues/6798 - tasty-fail-fast - tasty-html # https://github.com/commercialhaskell/stackage/issues/6966 From 8d197e880dd8c23730089d37502aed03268336e3 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Sat, 16 Dec 2023 10:10:15 -0800 Subject: [PATCH 20/35] Revert Signed-off-by: Mihai Maruseac --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index c97497d9..97a8b279 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -9014,7 +9014,7 @@ expected-test-failures: - sqids - stateWriter # 0.4.0 https://github.com/bartavelle/stateWriter/issues/6 - subcategories - # sydtest # https://github.com/commercialhaskell/stackage/issues/6729 + - sydtest # https://github.com/commercialhaskell/stackage/issues/6729 - sydtest-yesod # https://github.com/commercialhaskell/stackage/issues/6798 - tasty-fail-fast - tasty-html # https://github.com/commercialhaskell/stackage/issues/6966 From ed6420dc8c66169d420854936e82bc931dd6af7f Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Sat, 16 Dec 2023 10:10:30 -0800 Subject: [PATCH 21/35] Re-enable tests for `sydtest`, fix #6729 Signed-off-by: Mihai Maruseac --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 97a8b279..39027835 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -9014,7 +9014,6 @@ expected-test-failures: - sqids - stateWriter # 0.4.0 https://github.com/bartavelle/stateWriter/issues/6 - subcategories - - sydtest # https://github.com/commercialhaskell/stackage/issues/6729 - sydtest-yesod # https://github.com/commercialhaskell/stackage/issues/6798 - tasty-fail-fast - tasty-html # https://github.com/commercialhaskell/stackage/issues/6966 From c58f2ab93ee977a449c3e9fe2bf8e57d3b6f9060 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Sat, 16 Dec 2023 10:11:56 -0800 Subject: [PATCH 22/35] Drop stalled package, fix #6762 Signed-off-by: Mihai Maruseac --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 39027835..5ef783f5 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -650,7 +650,6 @@ packages: - cabal-plan - topograph - ix-shapable - - hsshellscript < 0 # 3.5.0 compile fail https://github.com/commercialhaskell/stackage/issues/6762 - hyper - storable-endian - glpk-headers From f8e27ce51518c85d6c61600932583fbe1ec6a3bf Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Sat, 16 Dec 2023 10:13:10 -0800 Subject: [PATCH 23/35] Drop stale packages, fix #6764 Signed-off-by: Mihai Maruseac --- build-constraints.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 5ef783f5..e31063d6 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3040,9 +3040,6 @@ packages: - tree-fun - random-tree - clumpiness - - find-clumpiness - - blosum < 0 # 0.1.1.4 compile fail - - rank-product < 0 # 0.2.2.0 compile fail "Simon Marechal @bartavelle": - compactmap @@ -5510,7 +5507,6 @@ packages: - heap - here - hex - - hierarchical-clustering < 0 # 0.4.7 compile fail https://github.com/commercialhaskell/stackage/issues/6764 - hjsonpointer - hjsonschema - hlibgit2 @@ -6121,7 +6117,6 @@ packages: - RNAlien < 0 # tried RNAlien-1.7.0, but its *library* requires network < =2.8.0.0 and the snapshot contains network-3.1.4.0 - RNAlien < 0 # tried RNAlien-1.7.0, but its *library* requires the disabled package: BiobaseBlast - RNAlien < 0 # tried RNAlien-1.7.0, but its *library* requires the disabled package: Taxonomy - - RNAlien < 0 # tried RNAlien-1.7.0, but its *library* requires the disabled package: hierarchical-clustering - Spintax < 0 # tried Spintax-0.3.6, but its *library* requires mtl >=2.2.1 && < 2.3 and the snapshot contains mtl-2.3.1 - Spintax < 0 # tried Spintax-0.3.6, but its *library* requires text >=1.2.2 && < 1.3 and the snapshot contains text-2.0.2 - Spock < 0 # tried Spock-0.14.0.0, but its *library* requires the disabled package: Spock-core @@ -6548,7 +6543,6 @@ packages: - fib < 0 # tried fib-0.1.0.1, but its *library* requires the disabled package: base-noprelude - filecache < 0 # tried filecache-0.4.1, but its *library* requires fsnotify ==0.3.* and the snapshot contains fsnotify-0.4.1.0 - filecache < 0 # tried filecache-0.4.1, but its *library* requires mtl >=2.1 && < 2.3 and the snapshot contains mtl-2.3.1 - - find-clumpiness < 0 # tried find-clumpiness-0.2.3.2, but its *library* requires the disabled package: hierarchical-clustering - first-class-patterns < 0 # tried first-class-patterns-0.3.2.5, but its *library* requires transformers >=0.1.0 && < 0.6 and the snapshot contains transformers-0.6.1.0 - flat-mcmc < 0 # tried flat-mcmc-1.5.2, but its *library* requires text >=1.2 && < 2 and the snapshot contains text-2.0.2 - flat-mcmc < 0 # tried flat-mcmc-1.5.2, but its *library* requires transformers >=0.2 && < 0.6 and the snapshot contains transformers-0.6.1.0 From e334e348ceb641ff1fc770e3d07dd5883a6b9600 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Sat, 16 Dec 2023 10:14:01 -0800 Subject: [PATCH 24/35] Try `heist` Signed-off-by: Mihai Maruseac --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index e31063d6..b444d771 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -8958,7 +8958,7 @@ expected-test-failures: - generic-optics # 2.2.1.0 optimization output https://github.com/kcsongor/generic-lens/issues/133 - github-types # https://github.com/commercialhaskell/stackage/issues/6549 - haskoin-node # https://github.com/commercialhaskell/stackage/issues/6769 - - heist # https://github.com/commercialhaskell/stackage/issues/6765 + # heist # https://github.com/commercialhaskell/stackage/issues/6765 - hgeometry-combinatorial # 0.14 - hruby # 0.5.1.0 - hspec-golden-aeson # 0.9.0.0 From df352b1a91708069521d6be4d40635c5bb5cdf75 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Sat, 16 Dec 2023 10:37:59 -0800 Subject: [PATCH 25/35] revert Signed-off-by: Mihai Maruseac --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index b444d771..e31063d6 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -8958,7 +8958,7 @@ expected-test-failures: - generic-optics # 2.2.1.0 optimization output https://github.com/kcsongor/generic-lens/issues/133 - github-types # https://github.com/commercialhaskell/stackage/issues/6549 - haskoin-node # https://github.com/commercialhaskell/stackage/issues/6769 - # heist # https://github.com/commercialhaskell/stackage/issues/6765 + - heist # https://github.com/commercialhaskell/stackage/issues/6765 - hgeometry-combinatorial # 0.14 - hruby # 0.5.1.0 - hspec-golden-aeson # 0.9.0.0 From ffd916cccf45981da7584aa36878cb28a275b0e7 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Sat, 16 Dec 2023 10:38:18 -0800 Subject: [PATCH 26/35] Re-enable tests for heist, fix #6765 Signed-off-by: Mihai Maruseac --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index e31063d6..9fd5c0d4 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -8958,7 +8958,6 @@ expected-test-failures: - generic-optics # 2.2.1.0 optimization output https://github.com/kcsongor/generic-lens/issues/133 - github-types # https://github.com/commercialhaskell/stackage/issues/6549 - haskoin-node # https://github.com/commercialhaskell/stackage/issues/6769 - - heist # https://github.com/commercialhaskell/stackage/issues/6765 - hgeometry-combinatorial # 0.14 - hruby # 0.5.1.0 - hspec-golden-aeson # 0.9.0.0 From c9fc346b1706e5f6618b80c09d450b57a2b2b53e Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Sat, 16 Dec 2023 10:42:18 -0800 Subject: [PATCH 27/35] Remove stale package, close #6766 Signed-off-by: Mihai Maruseac --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 9fd5c0d4..22afcb4c 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5111,7 +5111,6 @@ packages: - hgal "Rickard Andersson @GoNZooo": - - gotyno-hs < 0 # 1.1.0 compile fail https://github.com/commercialhaskell/stackage/issues/6766 - reddit-scrape "James Cranch @jcranch": From be1ba8212a6a6bcd9331ae4522e78b196f3c2df6 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Sat, 16 Dec 2023 10:43:24 -0800 Subject: [PATCH 28/35] Test `http-api-data` Signed-off-by: Mihai Maruseac --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 22afcb4c..efdba62b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3090,7 +3090,7 @@ packages: - slack-web "Nickolay Kudasov @fizruk": - - http-api-data < 0.6 # https://github.com/commercialhaskell/stackage/issues/7032 + - http-api-data # 0.6 # https://github.com/commercialhaskell/stackage/issues/7032 - swagger2 - telegram-bot-simple - rzk From 841e1d34ab61c14bd58ac8628349a9a78a4392d4 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Sat, 16 Dec 2023 10:48:46 -0800 Subject: [PATCH 29/35] Revert Signed-off-by: Mihai Maruseac --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index efdba62b..22afcb4c 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3090,7 +3090,7 @@ packages: - slack-web "Nickolay Kudasov @fizruk": - - http-api-data # 0.6 # https://github.com/commercialhaskell/stackage/issues/7032 + - http-api-data < 0.6 # https://github.com/commercialhaskell/stackage/issues/7032 - swagger2 - telegram-bot-simple - rzk From 2939f1a1b619c2afcbcce8806d6e573a95920db1 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Sat, 16 Dec 2023 10:49:07 -0800 Subject: [PATCH 30/35] Re-enable `http-api-data`, close #7032 Signed-off-by: Mihai Maruseac --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 22afcb4c..c05434d1 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3090,7 +3090,7 @@ packages: - slack-web "Nickolay Kudasov @fizruk": - - http-api-data < 0.6 # https://github.com/commercialhaskell/stackage/issues/7032 + - http-api-data - swagger2 - telegram-bot-simple - rzk From c352b35353f3553d81ea98e8aef56f16e3af2451 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Sat, 16 Dec 2023 17:15:17 -0800 Subject: [PATCH 31/35] Remove some stale `<0` lines Signed-off-by: Mihai Maruseac --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index c05434d1..e46f2fa2 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -63,8 +63,6 @@ packages: - buttplug-hs-core "Manuel Schneckenreither @schnecki": - - experimenter < 0 # 0.1.0.14 https://github.com/schnecki/experimenter/issues/1 - - api-maker < 0 # 0.1.0.6 https://github.com/schnecki/api-maker/issues/1 - easy-logger - welford-online-mean-variance @@ -72,7 +70,6 @@ packages: - error-or - error-or-utils - inbox - - mock-time < 0 # 0.1.0 compile fail https://github.com/luntain/error-or-bundle/issues/4 "Liang-Ting Chen @L-TChen": - geniplate-mirror From 1a9e4ab6e773689fe1c058e431a40e4e8dc7432e Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Sat, 16 Dec 2023 17:25:19 -0800 Subject: [PATCH 32/35] Remove superfluous lower bound Signed-off-by: Mihai Maruseac --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index e46f2fa2..db581e3f 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -87,7 +87,7 @@ packages: - java-adt - Sit - - alex > 3.2.7 + - alex - happy < 1.21.0 || > 1.21.0 - haskell-src - ListLike From 6c8763c17c07a570388b324956b85f436aeb5bad Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Sat, 16 Dec 2023 17:34:46 -0800 Subject: [PATCH 33/35] Remove some stale `<0` lines Signed-off-by: Mihai Maruseac --- build-constraints.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index db581e3f..99a6bc2a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -318,7 +318,6 @@ packages: - primecount "Guillaume Bouchard @guibou": - - krank < 0 # 0.3.0 https://github.com/guibou/krank/issues/97 - pretty-terminal - PyF @@ -363,7 +362,6 @@ packages: "Matthew Ahrens @mpahrens": - forkable-monad - - butter < 0 # 0.1.0.6 text 1.2.5.0 exports `elem` https://github.com/System-Indystress/Butter/issues/4 "Iris Ward @AdituV": - typenums From 10412dd23c1c5db6a6f461d3c981c209c1bf5a42 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Sun, 17 Dec 2023 08:49:23 -0800 Subject: [PATCH 34/35] Try removal Signed-off-by: Mihai Maruseac --- build-constraints.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 99a6bc2a..7535f432 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5349,7 +5349,7 @@ packages: - bindings-DSL - bindings-uname - bitarray - - blank-canvas + - blank-canvas < 0 - blaze-svg - blaze-textual - bloomfilter @@ -5552,7 +5552,7 @@ packages: - json - json-alt - jsonrpc-tinyclient - - kansas-comet + - kansas-comet < 0 - kleene - knob - language-haskell-extract From 92b6ac56b60b85f919e1e9c880a47cbbfcf83d7f Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Sun, 17 Dec 2023 08:52:45 -0800 Subject: [PATCH 35/35] Add an upper bound to `scotty` (#7208) Signed-off-by: Mihai Maruseac --- build-constraints.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 7535f432..9c304e82 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1169,7 +1169,7 @@ packages: - zlib-lens "Andrew Farmer @xich": - - scotty + - scotty < 0.21 # https://github.com/commercialhaskell/stackage/issues/7208 - wai-middleware-static "Simon Hengel @sol": @@ -5349,7 +5349,7 @@ packages: - bindings-DSL - bindings-uname - bitarray - - blank-canvas < 0 + - blank-canvas - blaze-svg - blaze-textual - bloomfilter @@ -5552,7 +5552,7 @@ packages: - json - json-alt - jsonrpc-tinyclient - - kansas-comet < 0 + - kansas-comet - kleene - knob - language-haskell-extract