From 55bc96477d77aa7f42b2d0b5918725a9ef66a7ba Mon Sep 17 00:00:00 2001 From: Ben Orchard Date: Sun, 13 Oct 2024 17:00:11 +0100 Subject: [PATCH 01/13] edit raehik's maintainer name --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 7eb8d6c0..b1cfb50f 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5137,7 +5137,7 @@ packages: "Clemens Schmid @nevrome": - currycarbon - "Benjamin Orchard @raehik": + "Ben Orchard @raehik": - mt19937 - defun-core # https://github.com/phadej/defun/issues/4 - symparsec From 10b6306c14ddd4939f2da77dea495a1140196bde Mon Sep 17 00:00:00 2001 From: Tony Day Date: Mon, 14 Oct 2024 12:12:43 +1000 Subject: [PATCH 02/13] harpie inclusion in stack build --- build-constraints.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 7eb8d6c0..15d1ab23 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3773,8 +3773,9 @@ packages: - validation "Tony Day @tonyday567": - - chart-svg < 0.7 # https://github.com/commercialhaskell/stackage/issues/7535 - # - harpie # required by chart-svg + - chart-svg + - formatn + - harpie - markup-parse - numhask - numhask-array @@ -5432,7 +5433,6 @@ packages: - fin - fingertree - fmlist - - formatn - friendly-time - functor-classes-compat - functor-combinators From aa6f0a1c58f3f981309ccd380693340a3fc3bef7 Mon Sep 17 00:00:00 2001 From: Tony Day Date: Tue, 15 Oct 2024 08:56:25 +1000 Subject: [PATCH 03/13] added packages: - box - box-socket - cabal-fix - dotparse - harpie-numhask - mealy - prettychart - web-rep --- build-constraints.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 15d1ab23..30a2c555 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3773,14 +3773,22 @@ packages: - validation "Tony Day @tonyday567": + - box + - box-socket + - cabal-fix - chart-svg + - dotparse - formatn - harpie + - harpie-numhask - markup-parse + - mealy - numhask - numhask-array - numhask-space - perf + - prettychart + - web-rep "Iphigenia Df @iphydf": - data-msgpack From 74fd692a6d170fd9d5f394b77920aee11c3e009c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 20 Oct 2024 17:15:23 +0800 Subject: [PATCH 04/13] build.sh: rename work/lts-XX to work/ltsXX (ie same as TAG) --- automated/build.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/automated/build.sh b/automated/build.sh index 61d76eec..44ebc385 100755 --- a/automated/build.sh +++ b/automated/build.sh @@ -23,7 +23,6 @@ SHORTNAME=$(echo $TARGET | cut -d- -f 1) if [ $SHORTNAME = "lts" ] then TAG=$(echo $TARGET | sed 's@^lts-\([0-9]*\)\.[0-9]*@lts\1@') - WORKDIR=$ROOT/work/$(echo $TARGET | sed 's@^lts-\([0-9]*\)\.[0-9]*@lts-\1@') if [ -n "${NOPLAN:-}" ] then echo '* DO NOT EDIT work/ files: commit to lts-haskell/build-constraints! *' @@ -31,10 +30,9 @@ then fi else TAG=$SHORTNAME - WORKDIR=$ROOT/work/$TAG fi +WORKDIR=$ROOT/work/$TAG -#IMAGE=commercialhaskell/stackage:$TAG IMAGE=ghcr.io/commercialhaskell/stackage/build:$TAG docker pull $IMAGE From 3d5403249f2954656abe9175cc24d8ddf778ea66 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 20 Oct 2024 17:29:48 +0800 Subject: [PATCH 05/13] build.sh: fix quoting of combined "..." and '...' shell blocks Though really wish for a simple way to make a single block here. --- automated/build.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/automated/build.sh b/automated/build.sh index 44ebc385..8b380e2f 100755 --- a/automated/build.sh +++ b/automated/build.sh @@ -138,11 +138,12 @@ docker run $ARGS_PREBUILD $IMAGE /bin/bash -c " # # * Check that the snapshot is valid # * Fetch and unpack all needed tarballs (the build step does not have write access to the tarball directory) - GHCVER=$(sed -n 's/^ghc-version: \(.*\)/\1/p' constraints.yaml) + "' + GHCVER=$(sed -n "s/^ghc-version: \(.*\)/\1/p" constraints.yaml) stack setup ghc-$GHCVER --verbosity=error stack exec --resolver=ghc-$GHCVER curator check-snapshot curator unpack - " + ' case $SHORTNAME in lts) JOBS=16 ;; From e2c2e7f2b410728de079c9b1ef0eb66bc30a5a2e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 20 Oct 2024 17:39:55 +0800 Subject: [PATCH 06/13] extra < 1.8 (#7539) --- build-constraints.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 4927e4ac..e3971561 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -8002,6 +8002,8 @@ packages: # https://github.com/commercialhaskell/stackage/issues/7534 - wai-logger < 2.5 + # https://github.com/commercialhaskell/stackage/issues/7539 + - extra < 1.8 # end of Stackage upper bounds # end of packages From ac92e9bd06754bf7fea189ba7ac3affae479f3c5 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 20 Oct 2024 17:49:07 +0800 Subject: [PATCH 07/13] commenter bounds update --- build-constraints.yaml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index e3971561..59d13324 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -6415,7 +6415,7 @@ packages: - bcp47 < 0 # tried bcp47-0.2.0.6, but its *library* requires the disabled package: country - bcp47-orphans < 0 # tried bcp47-orphans-0.1.0.6, but its *library* requires the disabled package: bcp47 - beam-mysql < 0 # tried beam-mysql-0.2.0.0, but its *library* requires aeson >=0.11 && < 1.5 and the snapshot contains aeson-2.2.3.0 - - beam-mysql < 0 # tried beam-mysql-0.2.0.0, but its *library* requires beam-core >=0.8 && < 0.9 and the snapshot contains beam-core-0.10.2.0 + - beam-mysql < 0 # tried beam-mysql-0.2.0.0, but its *library* requires beam-core >=0.8 && < 0.9 and the snapshot contains beam-core-0.10.3.0 - beam-mysql < 0 # tried beam-mysql-0.2.0.0, but its *library* requires bytestring >=0.10 && < 0.11 and the snapshot contains bytestring-0.12.1.0 - beam-mysql < 0 # tried beam-mysql-0.2.0.0, but its *library* requires free >=4.12 && < 5.2 and the snapshot contains free-5.2 - beam-mysql < 0 # tried beam-mysql-0.2.0.0, but its *library* requires hashable >=1.1 && < 1.3 and the snapshot contains hashable-1.4.7.0 @@ -6600,7 +6600,7 @@ packages: - data-accessor-template < 0 # tried data-accessor-template-0.2.1.16, but its *library* requires template-haskell >=2.11 && < 2.17 and the snapshot contains template-haskell-2.21.0.0 - data-compat < 0 # tried data-compat-0.1.0.4, but its *library* requires base >=4.12.0.0 && < 4.18 and the snapshot contains base-4.19.1.0 - data-compat < 0 # tried data-compat-0.1.0.4, but its *library* requires constraints >=0.10 && < 0.14 and the snapshot contains constraints-0.14.2 - - data-default-extra < 0 # tried data-default-extra-0.1.0, but its *library* requires data-default-instances-containers >=0.0 && < 0.1 and the snapshot contains data-default-instances-containers-0.1.0.2 + - data-default-extra < 0 # tried data-default-extra-0.1.0, but its *library* requires data-default-instances-containers >=0.0 && < 0.1 and the snapshot contains data-default-instances-containers-0.1.0.3 - data-default-extra < 0 # tried data-default-extra-0.1.0, but its *library* requires the disabled package: data-default-instances-new-base - data-default-instances-text < 0 # tried data-default-instances-text-0.0.1, but its *library* requires text >=0.2 && < 2 and the snapshot contains text-2.1.1 - data-forest < 0 # tried data-forest-0.1.0.12, but its *library* requires base ^>=4.16 || ^>=4.17 || ^>=4.18 and the snapshot contains base-4.19.1.0 @@ -6625,7 +6625,6 @@ packages: - dhall-yaml < 0 # tried dhall-yaml-1.2.12, but its *library* requires aeson >=1.0.0.0 && < 2.2 and the snapshot contains aeson-2.2.3.0 - dhall-yaml < 0 # tried dhall-yaml-1.2.12, but its *library* requires bytestring < 0.12 and the snapshot contains bytestring-0.12.1.0 - dhall-yaml < 0 # tried dhall-yaml-1.2.12, but its *library* requires text >=0.11.1.0 && < 2.1 and the snapshot contains text-2.1.1 - - diagrams-builder < 0 # tried diagrams-builder-0.8.0.6, but its *library* requires lens >=4.0 && < 5.3 and the snapshot contains lens-5.3.2 - diagrams-gtk < 0 # tried diagrams-gtk-1.4, but its *library* requires base >=4.2 && < 4.19 and the snapshot contains base-4.19.1.0 - diagrams-html5 < 0 # tried diagrams-html5-1.4.2, but its *library* requires base >=4.7 && < 4.19 and the snapshot contains base-4.19.1.0 - diagrams-html5 < 0 # tried diagrams-html5-1.4.2, but its *library* requires lens >=4.0 && < 5.3 and the snapshot contains lens-5.3.2 @@ -6684,7 +6683,7 @@ packages: - exception-via < 0 # tried exception-via-0.2.0.0, but its *library* requires template-haskell >=2.9.0.0 && < 2.21 and the snapshot contains template-haskell-2.21.0.0 - failable < 0 # tried failable-1.2.4.0, but its *library* requires mtl >=2.2 && < 2.3 and the snapshot contains mtl-2.3.1 - failable < 0 # tried failable-1.2.4.0, but its *library* requires transformers >=0.4.2 && < 0.6 and the snapshot contains transformers-0.6.1.0 - - fakedata < 0 # tried fakedata-1.0.3, but its *library* requires the disabled package: string-random + - fakedata < 0 # tried fakedata-1.0.5, but its *library* requires the disabled package: string-random - fakedata-quickcheck < 0 # tried fakedata-quickcheck-0.2.0, but its *library* requires the disabled package: fakedata - fasta < 0 # tried fasta-0.10.4.2, but its *library* requires the disabled package: pipes-text - fastmemo < 0 # tried fastmemo-0.1.1, but its *library* requires base >=4.7 && < 4.18 and the snapshot contains base-4.19.1.0 @@ -7186,7 +7185,7 @@ packages: - log-warper < 0 # tried log-warper-1.9.0, but its *library* requires o-clock ^>=1.1 and the snapshot contains o-clock-1.4.0 - log-warper < 0 # tried log-warper-1.9.0, but its *library* requires text ^>=1.2.2.0 and the snapshot contains text-2.1.1 - log-warper < 0 # tried log-warper-1.9.0, but its *library* requires transformers ^>=0.5.2 and the snapshot contains transformers-0.6.1.0 - - log-warper < 0 # tried log-warper-1.9.0, but its *library* requires universum ^>=1.6.0 and the snapshot contains universum-1.8.2.1 + - log-warper < 0 # tried log-warper-1.9.0, but its *library* requires universum ^>=1.6.0 and the snapshot contains universum-1.8.2.2 - log-warper < 0 # tried log-warper-1.9.0, but its *library* requires vector ^>=0.12 and the snapshot contains vector-0.13.1.0 - loopbreaker < 0 # tried loopbreaker-0.1.1.1, but its *library* requires ghc >=8.6 && < 8.9 and the snapshot contains ghc-9.8.2 - lxd-client < 0 # tried lxd-client-0.1.0.6, but its *library* requires aeson >=1.0.2.1 && < 2 and the snapshot contains aeson-2.2.3.0 @@ -7741,7 +7740,7 @@ packages: - systemd-socket-activation < 0 # tried systemd-socket-activation-1.1.0.1, but its *library* requires base ^>=4.16 || ^>=4.17 || ^>=4.18 and the snapshot contains base-4.19.1.0 - systemd-socket-activation < 0 # tried systemd-socket-activation-1.1.0.1, but its *library* requires network ^>=3.1.2 and the snapshot contains network-3.2.4.0 - systemd-socket-activation < 0 # tried systemd-socket-activation-1.1.0.1, but its *library* requires text ^>=1.2.4 || ^>=2.0 and the snapshot contains text-2.1.1 - - taffybar < 0 # tried taffybar-4.0.2, but its *library* requires scotty >=0.11 && < 0.22 and the snapshot contains scotty-0.22 + - taffybar < 0 # tried taffybar-4.0.3, but its *library* requires the disabled package: broadcast-chan - tasty-hunit-compat < 0 # tried tasty-hunit-compat-0.2.0.1, but its *library* requires tasty < 1.5 and the snapshot contains tasty-1.5 - tasty-stats < 0 # tried tasty-stats-0.2.0.4, but its *library* requires containers >=0.4 && < 0.6 and the snapshot contains containers-0.6.8 - tasty-stats < 0 # tried tasty-stats-0.2.0.4, but its *library* requires tasty >=0.11.2 && < 1.2 and the snapshot contains tasty-1.5 @@ -8334,7 +8333,7 @@ skipped-tests: - aws-cloudfront-signed-cookies # tried aws-cloudfront-signed-cookies-0.2.0.12, but its *test-suite* requires hedgehog ^>=1.0.5 || ^>=1.1 || ^>=1.2 and the snapshot contains hedgehog-1.5 - barrier # tried barrier-0.1.1, but its *test-suite* requires tasty >=0.10 && < 1.5 and the snapshot contains tasty-1.5 - base32 # tried base32-0.4, but its *test-suite* requires bytestring ^>=0.11 and the snapshot contains bytestring-0.12.1.0 - - beam-postgres # tried beam-postgres-0.5.4.0, but its *test-suite* requires the disabled package: testcontainers + - beam-postgres # tried beam-postgres-0.5.4.1, but its *test-suite* requires the disabled package: testcontainers - binary-parser # tried binary-parser-0.5.7.6, but its *test-suite* requires tasty-quickcheck ^>=0.10 and the snapshot contains tasty-quickcheck-0.11 - bits-extra # tried bits-extra-0.0.2.3, but its *test-suite* requires hedgehog >=0.5.3 && < 1.5 and the snapshot contains hedgehog-1.5 - bitvec # tried bitvec-1.1.5.0, but its *test-suite* requires primitive >=0.5 && < 0.9 and the snapshot contains primitive-0.9.0.0 @@ -8600,7 +8599,7 @@ skipped-tests: - wave # tried wave-0.2.1, but its *test-suite* requires bytestring >=0.2 && < 0.12 and the snapshot contains bytestring-0.12.1.0 - xml-parser # tried xml-parser-0.1.1.1, but its *test-suite* requires tasty-quickcheck >=0.9 && < 0.11 and the snapshot contains tasty-quickcheck-0.11 - yesod-core # tried yesod-core-1.6.26.0, but its *test-suite* requires cookie >=0.4.1 && < 0.5 and the snapshot contains cookie-0.5.0 - - yesod-static-angular # tried yesod-static-angular-0.1.8, but its *test-suite* requires yesod-test >=1.2 && < 1.6 and the snapshot contains yesod-test-1.6.16 + - yesod-static-angular # tried yesod-static-angular-0.1.8, but its *test-suite* requires yesod-test >=1.2 && < 1.6 and the snapshot contains yesod-test-1.6.19 - zenc # tried zenc-0.1.2, but its *test-suite* requires hedgehog >=1.0 && < 1.1 and the snapshot contains hedgehog-1.5 - zenc # tried zenc-0.1.2, but its *test-suite* requires hspec >=2.8 && < 2.9 and the snapshot contains hspec-2.11.9 - zenc # tried zenc-0.1.2, but its *test-suite* requires hspec-hedgehog >=0.0 && < 0.1 and the snapshot contains hspec-hedgehog-0.3.0.0 From 536c25daf59389ea959714ab132bddc56bf8b604 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 20 Oct 2024 17:49:53 +0800 Subject: [PATCH 08/13] drop jacinda due to happy version In the dependencies for jacinda-3.2.0.0: * happy must match >=1.17.1 && <2.1, but happy-2.1 is in the Stack configuration (latest matching version is 2.0.2). * regex-rure must match >=0.1.2.0, but no version is in the Stack configuration (latest matching version is 0.1.2.0). --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 59d13324..c04a738e 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5520,7 +5520,6 @@ packages: - io-streams-haproxy - iproute - ixset-typed - - jacinda - jsaddle-dom - json - json-alt From d840de2a1025138ac029373c599cc7a34c019635 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 21 Oct 2024 14:04:13 +0800 Subject: [PATCH 09/13] yesod-test < 1.6.19 (yesodweb/yesod#1848) --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index c04a738e..0149374a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -871,7 +871,7 @@ packages: - yesod-newsfeed - yesod-sitemap - yesod-static - - yesod-test + - yesod-test < 1.6.19 # https://github.com/yesodweb/yesod/issues/1848 - yesod-websockets - cereal-conduit - binary-conduit From c4b5e3dd86ce60c391c0c604aaec0728c2e15cb6 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 21 Oct 2024 14:25:13 +0800 Subject: [PATCH 10/13] disable sydtest-mongo: NorfairKing/sydtest#99 --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 0149374a..4cf95d49 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4334,7 +4334,7 @@ packages: - sydtest-hedgehog - sydtest-hedis - sydtest-hspec - - sydtest-mongo + - sydtest-mongo < 0 # https://github.com/NorfairKing/sydtest/issues/99 - sydtest-persistent - sydtest-persistent-postgresql - sydtest-persistent-sqlite From b8f6e4eb662feee05636d907067fbcba04f7220f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 21 Oct 2024 14:26:53 +0800 Subject: [PATCH 11/13] disable tmp-proc-rabbitmq: adetokunbo/tmp-proc#114 --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 4cf95d49..c34d3f74 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5091,7 +5091,7 @@ packages: - tmp-proc - tmp-proc-postgres - tmp-proc-redis - - tmp-proc-rabbitmq + - tmp-proc-rabbitmq < 0 # https://github.com/adetokunbo/tmp-proc/issues/114 - wai-middleware-delegate "Francisco Vallarino @fjvallarino": From 46a4254d124df3106b097d25de10525dc8a220f4 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 21 Oct 2024 14:33:12 +0800 Subject: [PATCH 12/13] constrain happy < 2.1 since it is marked deprecated https://github.com/haskell/happy/issues/320 https://github.com/camfort/fortran-src/issues/293 --- build-constraints.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index c34d3f74..c5039481 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5254,8 +5254,8 @@ packages: - lsql-csv "Sebastian Graf @sgraf812": - - happy-lib - - happy + - happy-lib < 2.1 # latest 2.1 is marked deprecated + - happy < 2.1 # latest 2.1 is marked deprecated "Max Ulidtko @ulidtko": - cabal-doctest From ffddc70d5dad21fb008a6653af5994a4814d7b96 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 21 Oct 2024 15:25:31 +0800 Subject: [PATCH 13/13] allow fortran-src testsuite failure (camfort/fortran-src#293) --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index c5039481..d87d7f43 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -8643,6 +8643,7 @@ expected-test-failures: - cryptohash # 0.11.9 Stack builds test and benchmarks in one pass so benchmark could prevent tests from getting built - do-notation # 0.1.0.2 - fields-and-cases # 0.2.0.0 https://github.com/m-bock/fields-and-cases/issues/1 + - fortran-src # 0.16.3 https://github.com/camfort/fortran-src/issues/293 - generic-lens # https://github.com/commercialhaskell/stackage/issues/6377 - ghc-byteorder # 4.11.0.0.10 https://github.com/haskell-hvr/ghc-byteorder/issues/1 - ghc-prof # Regression tests: /usr/bin/ld.gold: error: cannot find -lHStemporary-1.3-51ST9z47bmaL2YkhqqBGqn_p ...