From 590d2d55833b3f18b3bf9c33e99cac45bc1d0a44 Mon Sep 17 00:00:00 2001 From: Athan Clark Date: Sat, 26 Jan 2019 00:47:47 -0700 Subject: [PATCH 001/316] fixing #3551 --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 0d15b5b7..af1f6532 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1874,7 +1874,7 @@ packages: - composition-extra - every - extractable-singleton - - follow-file < 0 # https://github.com/fpco/stackage/issues/3551 + - follow-file - HSet - markup < 0 # GHC 8.4 via clay - monad-control-aligned From e9b69c41c8e048aba4e5188a11813f9f7f19a4ea Mon Sep 17 00:00:00 2001 From: Flavio Corpa Date: Thu, 6 Feb 2020 10:21:19 +0100 Subject: [PATCH 002/316] Add language-avro to Stackage --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 0b6fadfa..dfe2ff66 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1315,6 +1315,9 @@ packages: - wl-pprint - AC-Angle - language-protobuf + + "Flavio Corpa @kutyel": + - language-avro "Matvey Aksenov @supki": - terminal-size From 9510b890fa591e8510059f55ca52c01b06fe8533 Mon Sep 17 00:00:00 2001 From: Jonathan Knowles Date: Thu, 6 Feb 2020 17:37:09 +0800 Subject: [PATCH 003/316] Update build-constraints.yaml Add the `bech32` package. --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 0b6fadfa..b7eefb32 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3252,6 +3252,7 @@ packages: - port-utils "Jonathan Knowles @jonathanknowles": + - bech32 - roc-id "Mahdi Dibaiee @mdibaiee": From 8b1ad18f5c8beaf0a808f19b70f1a46f51deee4c Mon Sep 17 00:00:00 2001 From: "Scott N. Walck" Date: Thu, 6 Feb 2020 09:19:04 -0500 Subject: [PATCH 004/316] reintroduce gloss gloss and gloss rendering were multiply listed in build-constraints.yaml --- build-constraints.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 0b6fadfa..784ac6c0 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1892,8 +1892,6 @@ packages: - bmp # @benl23x5 - ekg-statsd < 0 # @tibbe via base-4.13.0.0 & time-1.9.3 - - gloss < 0 # @benl23x5 # via base-4.13.0.0 - - gloss-rendering < 0 # @benl23x5 # via base-4.13.0.0 - gpolyline # @fegu - postgresql-simple-migration < 0 # via time-1.9.3 # @ameingast - statestack From 8db7c5f5cf9729bb8cc98b9971ff7642b5259913 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 6 Feb 2020 22:15:55 +0800 Subject: [PATCH 005/316] enable graphviz, wl-pprint-text, bimaps, misc bio and various blocking comments bio: + ClustalParser + BiobaseEnsembl + DPutils + ForestStructures + OrderedBits + PrimitiveArray + Taxonomy + either-unwrap + elm-export + streaming-bytestring + haskell-import-graph + algebraic-graphs + graphite + servant-elm --- build-constraints.yaml | 47 ++++++++++++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 16 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 0b6fadfa..e1466b5b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1173,7 +1173,7 @@ packages: - openpgp-asciiarmor - MusicBrainz - DAV - - hopenpgp-tools < 0 # via graphviz + - hopenpgp-tools < 0 # hOpenPGP & ixset-typed - opensource - debian < 0 # via bzlib - cabal-debian < 0 # via debian @@ -1208,15 +1208,30 @@ packages: - biopsl < 0 # GHC 8.4 via biocore - seqloc < 0 # GHC 8.4 via biocore - bioalign < 0 # build failure with GHC 8.4 - # - BlastHTTP # https://github.com/eggzilla/BlastHTTP/issues/1 + # - BlastHTTP # network-2.8 "Florian Eggenhofer @eggzilla": - # - ClustalParser - # - EntrezHTTP # graphviz via Taxonomy + - ClustalParser + # - EntrezHTTP # biocore - Genbank < 0 # build failure with GHC 8.4 - # - RNAlien # graphviz via Taxonomy - # - Taxonomy # graphviz + # - RNAlien # aeson<=1.4.2 + # - biocore # base + - bimaps + # - BiobaseBlast # SciBaseTypes + # - BiobaseENA # BiobaseTypes + - BiobaseEnsembl + # - BiobaseFasta # BiobaseTypes + # - BiobaseHTTP + # - BiobaseTypes # SciBaseTypes + # - BiobaseXNA # BiobaseTypes & PrimitiveArray + - DPutils + - ForestStructures + - OrderedBits + - PrimitiveArray < 0.10.0.0 + # - SciBaseTypes # log-domain-0.12 + - Taxonomy - ViennaRNAParser + - either-unwrap "Silk ": - aeson-utils @@ -1918,7 +1933,7 @@ packages: "William Casarin @jb55": - bson-lens < 0 # via bson - cased - - elm-export < 0 # via wl-pprint-text + - elm-export # - elm-export-persistent # https://github.com/jb55/elm-export-persistent/issues/2 - pipes-csv - pipes-mongodb < 0 # GHC 8.4 via mongoDB @@ -2125,7 +2140,7 @@ packages: "Daniel Cartwright @chessai": - streaming - - streaming-bytestring < 0 # via streaming + - streaming-bytestring - country < 0 # via base-4.13.0.0 - semirings - torsor @@ -2443,8 +2458,8 @@ packages: "Ivan Miljenovic @ivan-m": - fgl - - graphviz < 0 # via polyparse-1.13 - - wl-pprint-text < 0 # via base-compat-0.11.0 + - graphviz + - wl-pprint-text - servant-pandoc < 0 # blocks http-media https://github.com/commercialhaskell/stackage/issues/4483 "Sharif Olorin @olorin": @@ -2964,7 +2979,7 @@ packages: - oblivious-transfer < 0 # via protolude - pairing < 0 # #4758 - libraft < 0 # via concurrency & ejafu & kg & kg-core & onad-metrics & ostgresql-simple-url & rotolude & uickcheck-state-machine & asty-dejafu - - galois-field < 0 # via protolude & wl-pprint-text + - galois-field < 0 # via protolude "Daishi Nakajima @nakaji-dayo": - api-field-json-th @@ -3384,7 +3399,7 @@ packages: "ncaq @ncaq": - debug-trace-var - # - haskell-import-graph # fgl via graphviz + - haskell-import-graph - string-transform - uniq-deep - yesod-form-bootstrap4 < 0 # via yesod-core @@ -3456,7 +3471,7 @@ packages: - wai-middleware-rollbar < 0 # aeson "Andrey Mokhov @snowleopard": - - algebraic-graphs < 0 # via base-compat-0.11.0 + - algebraic-graphs "Albert Krewinkel @tarleb": - hslua @@ -3596,7 +3611,7 @@ packages: - currencies - alerts - yesod-alerts < 0 # via yesod-core - - graphite < 0 # via graphviz + - graphite "José Lorenzo Rodríguez @lorenzo": - wrecker < 0 # GHC 8.4 via ansigraph @@ -3804,7 +3819,7 @@ packages: - servant-auth-client < 0 # via warp-3.3.2 - servant-auth-swagger < 0 # via base-4.13.0.0 - servant-auth-docs < 0 # via base-4.13.0.0 - - servant-elm < 0 # via wl-pprint-text + - servant-elm - streaming-wai < 0 # via streaming - systemd < 0 # socketToFd is ambiguous @@ -4309,7 +4324,7 @@ packages: - inspection-testing - integer-logarithms - io-streams-haproxy - - ixset-typed < 0 # via safecopy-0.10.0 + - ixset-typed < 0 # via safecopy-0.10.0 and template-haskell - json < 0 # via base-4.13.0.0 - json-alt - kleene < 0 # via regex-applicative From c7987f17c221026e44420692d045943d9a957beb Mon Sep 17 00:00:00 2001 From: Alessandro Marrella Date: Thu, 6 Feb 2020 16:53:54 +0000 Subject: [PATCH 006/316] Add kubernetes-webhook-haskell --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index e1466b5b..b6585d08 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4109,6 +4109,9 @@ packages: - vformat-aeson - hkd-default + "Alessandro Marrella @amarrella": + - kubernetes-webhook-haskell + "Grandfathered dependencies": - network - Boolean From 77651e69ade73a89ce4d3aab5c4a8cc194eff46b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 7 Feb 2020 10:44:11 +0800 Subject: [PATCH 007/316] backout BiobaseEnsembl DPutils OrderedBits and hence PrimitiveArray --- build-constraints.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index e1466b5b..4f16f495 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1219,15 +1219,15 @@ packages: - bimaps # - BiobaseBlast # SciBaseTypes # - BiobaseENA # BiobaseTypes - - BiobaseEnsembl + # - BiobaseEnsembl # - BiobaseFasta # BiobaseTypes # - BiobaseHTTP # - BiobaseTypes # SciBaseTypes # - BiobaseXNA # BiobaseTypes & PrimitiveArray - - DPutils + # - DPutils - ForestStructures - - OrderedBits - - PrimitiveArray < 0.10.0.0 + # - OrderedBits + # - PrimitiveArray < 0.10.0.0 # - SciBaseTypes # log-domain-0.12 - Taxonomy - ViennaRNAParser From 6f535da18ad487c94e6e269c42fa2dc41a95d91a Mon Sep 17 00:00:00 2001 From: 8c6794b6 <8c6794b6@gmail.com> Date: Sat, 8 Feb 2020 03:34:46 +0900 Subject: [PATCH 008/316] Add hpc-codecov --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index b587e3e9..eb7b6214 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4114,6 +4114,9 @@ packages: "Alessandro Marrella @amarrella": - kubernetes-webhook-haskell + "8c6794b6 <8c6794b6@gmail.com> @8c6794b6": + - hpc-codecov + "Grandfathered dependencies": - network - Boolean From 7e694f84ccdafb9232c8946410a1c76732cddf54 Mon Sep 17 00:00:00 2001 From: Jacob Stanley Date: Sat, 8 Feb 2020 04:28:43 +0800 Subject: [PATCH 009/316] Relax pretty-show (#5118 resolved) --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index b587e3e9..c8a68767 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4394,7 +4394,7 @@ packages: - postgresql-simple - postgresql-simple-url < 0 # via postgresql-simple - pretty-hex - - pretty-show < 1.10 # https://github.com/commercialhaskell/stackage/issues/5118 + - pretty-show - prettyprinter-convert-ansi-wl-pprint - primes - primitive From 09da8355d35cb82a2bbc8849cfe9e902a5e7272e Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sat, 8 Feb 2020 19:39:41 +0200 Subject: [PATCH 010/316] Upper bound on ghc-lib-parser-ex for #5137 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index c6470154..085fe647 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4657,6 +4657,9 @@ packages: - servant-mock < 0.8.6 - servant-swagger < 1.1.8 - aur < 6.3.0 + + # https://github.com/commercialhaskell/stackage/issues/5137 + - ghc-lib-parser-ex < 8.8.5 # end of packages # Package flags are applied to individual packages, and override the values of From a61850dc25b088798303302135e21f365536aa0a Mon Sep 17 00:00:00 2001 From: Bodigrim Date: Sat, 8 Feb 2020 18:53:34 +0000 Subject: [PATCH 011/316] Add integer-roots --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 085fe647..8952cf21 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3106,6 +3106,7 @@ packages: - vector-rotcev - mod - tasty-rerun + - integer-roots "Ashley Yakeley @AshleyYakeley": - countable From 031afc2f420345a87ce10a795b198078332f758a Mon Sep 17 00:00:00 2001 From: "Scott N. Walck" Date: Sat, 8 Feb 2020 19:57:06 -0500 Subject: [PATCH 012/316] reintroduce learn-physics --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 085fe647..036ebf1d 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -151,7 +151,7 @@ packages: "Scott N. Walck @walck": - cyclotomic - - learn-physics < 0 # via base-4.13.0.0 + - learn-physics - TypeCompose # @ghorn From 1ba4697817b8728eed1e63a2c992c2000142c8d1 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 9 Feb 2020 08:13:59 +0200 Subject: [PATCH 013/316] Revert "Expect Haddock build failure alanz/haskell-lsp#220" This reverts commit a8aa4590c56513c32b7bf1b907bd7d4380008373. --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 91ab2630..936a4ca8 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5488,9 +5488,6 @@ expected-haddock-failures: - vault # commercialhaskell/stackage#4904 - monoid-subclasses - - # https://github.com/alanz/haskell-lsp/issues/220 - - haskell-lsp # end of expected-haddock-failures # For packages with haddock issues From 860facc9b39b1e19deefd1289f7e81460412d25a Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 9 Feb 2020 10:09:30 +0000 Subject: [PATCH 014/316] Build script improvements --- automated/build-next.sh | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/automated/build-next.sh b/automated/build-next.sh index facbe406..202ce065 100755 --- a/automated/build-next.sh +++ b/automated/build-next.sh @@ -19,10 +19,8 @@ fi IMAGE=commercialhaskell/stackage:$TAG -CABAL_DIR=$ROOT/cabal PANTRY_DIR=$ROOT/pantry -STACK_DIR=$ROOT/stack-$TAG -GHC_DIR=$ROOT/ghc +STACK_DIR=$ROOT/stack DOT_STACKAGE_DIR=$ROOT/dot-stackage WORKDIR=$ROOT/$TAG/work # ssh key is used for committing snapshots (and their constraints) to Github @@ -30,10 +28,8 @@ SSH_DIR=$ROOT/ssh USERID=$(id -u) mkdir -p \ - "$CABAL_DIR" \ "$PANTRY_DIR" \ "$STACK_DIR" \ - "$GHC_DIR" \ "$DOT_STACKAGE_DIR" \ "$WORKDIR" \ "$SSH_DIR" @@ -63,14 +59,16 @@ require_400_file "$HACKAGE_CREDS" mkdir -p $ROOT/bin BINDIR=$(cd $ROOT/bin ; pwd) ( -# See etc/curator-exes/README.md -CURATOR_EXES=84f6e06e11e1bcdab6ec1a302d40213e406748e64ae455bd4ed09a205651a7fd cd $BINDIR rm -f curator stack *.bz2 -wget "https://s3.amazonaws.com/download.fpcomplete.com/curator-exes/curator-exes-$CURATOR_EXES.tar.bz2" -tar xf "curator-exes-$CURATOR_EXES.tar.bz2" + +curl "https://download.fpcomplete.com/stackage-curator-2/curator-85b021a53833ff310fc66b3fdc5ca3f7828ce18b.bz2" | bunzip2 > curator +chmod +x curator echo -n "curator version: " docker run --rm -v $(pwd)/curator:/exe $IMAGE /exe --version + +curl "https://download.fpcomplete.com/stackage-curator-2/stack-4033c93815477e5b565d9a2a61b54e04da0863ef.bz2" | bunzip2 > stack +chmod +x stack echo -n "stack version: " docker run --rm -v $(pwd)/stack:/exe $IMAGE /exe --version ) @@ -79,11 +77,11 @@ docker run --rm -v $(pwd)/stack:/exe $IMAGE /exe --version # is stored separately (because e.g. Ubuntu releases between LTS and nightly # could differ). Also the order of binds is important. ARGS_COMMON="--rm -v $WORKDIR:$HOME/work -w $HOME/work -v $BINDIR/curator:/usr/bin/curator:ro -v /etc/passwd:/etc/passwd:ro -v /etc/group:/etc/group:ro -v $BINDIR/stack:/usr/bin/stack:ro -v $STACK_DIR:$HOME/.stack -v $PANTRY_DIR:$HOME/.stack/pantry" -ARGS_PREBUILD="$ARGS_COMMON -u $USERID -e HOME=$HOME -v $CABAL_DIR:$HOME/.cabal -v $GHC_DIR:$HOME/.ghc -v $DOT_STACKAGE_DIR:$HOME/.stackage" -ARGS_BUILD="$ARGS_COMMON -v $CABAL_DIR:$HOME/.cabal:ro -v $GHC_DIR:$HOME/.ghc:ro" +ARGS_PREBUILD="$ARGS_COMMON -u $USERID -e HOME=$HOME -v $DOT_STACKAGE_DIR:$HOME/.stackage" +ARGS_BUILD="$ARGS_COMMON" # instance-data is an undocumented feature of S3 used by amazonka, # see https://github.com/brendanhay/amazonka/issues/271 -ARGS_UPLOAD="$ARGS_COMMON -u $USERID -e HOME=$HOME -v $HACKAGE_CREDS:/hackage-creds:ro -v $DOT_STACKAGE_DIR:$HOME/.stackage -v $SSH_DIR:$HOME/.ssh:ro -v $GITCONFIG:$HOME/.gitconfig:ro -v $CABAL_DIR:$HOME/.cabal:ro -e AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID -e AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY" +ARGS_UPLOAD="$ARGS_COMMON -u $USERID -e HOME=$HOME -v $HACKAGE_CREDS:/hackage-creds:ro -v $DOT_STACKAGE_DIR:$HOME/.stackage -v $SSH_DIR:$HOME/.ssh:ro -v $GITCONFIG:$HOME/.gitconfig:ro -e AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID -e AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY" # Make sure we actually need this snapshot. We only check this for LTS releases # since, for nightlies, we'd like to run builds even if they are unnecessary to @@ -139,9 +137,10 @@ docker run $ARGS_UPLOAD $IMAGE /bin/bash -c "exec curator check-target-available # # * Upload the docs to S3 # * Upload the new snapshot .yaml file to the appropriate Github repo, also upload its constraints -# * Register as a new Hackage distro (currently disabled) -docker run $ARGS_UPLOAD $IMAGE /bin/bash -c "curator upload-docs --target $TARGET && curator upload-github --target $TARGET && exec curator hackage-distro --target $TARGET" -# information about the new snapshots on Hackage +docker run $ARGS_UPLOAD $IMAGE /bin/bash -c "curator upload-docs --target $TARGET && curator upload-github --target $TARGET" + +# For some reason, registering on Hackage fails with inscrutable error messages. Disabling. +# docker run $ARGS_UPLOAD $IMAGE /bin/bash -c "exec curator hackage-distro --target $TARGET" $BINDIR/curator legacy-bulk --stackage-snapshots dot-stackage/curator/stackage-snapshots/ --lts-haskell dot-stackage/curator/lts-haskell/ --stackage-nightly dot-stackage/curator/stackage-nightly/ From e2a65a0e8df1c4ab6a3bb1bd2b2f469449e2c558 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 9 Feb 2020 13:14:23 +0200 Subject: [PATCH 015/316] Switch to Bionic --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index b37bd3b2..0ee7b9df 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ # Disable Docker stuff to try to make it faster sudo: true +dist: bionic # Choose a lightweight base image; we provide our own build tools. language: generic From 087d05308de9dea6c4aabde7d19bd5eabc1e406a Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 9 Feb 2020 12:04:24 +0200 Subject: [PATCH 016/316] Use newer curator --- .travis.yml | 7 +------ etc/ci-script.sh | 25 ------------------------- etc/curator-2-check.sh | 2 +- 3 files changed, 2 insertions(+), 32 deletions(-) delete mode 100755 etc/ci-script.sh diff --git a/.travis.yml b/.travis.yml index 0ee7b9df..3dc9707f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,14 +11,9 @@ addons: packages: - libgmp-dev -matrix: - include: - #- env: CHECK_SCRIPT="./etc/ci-script.sh" - - env: CHECK_SCRIPT="./etc/curator-2-check.sh" - # Edit etc/ci-script.sh to change GHC version script: -- $CHECK_SCRIPT +- ./etc/curator-2-check.sh # Caching doesn't work with sudo: true #cache: diff --git a/etc/ci-script.sh b/etc/ci-script.sh deleted file mode 100755 index 192b2a9b..00000000 --- a/etc/ci-script.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -set -euxo pipefail - -export GHCVER=8.8.1 - -# Download and unpack the stack executable -mkdir -p ~/.local/bin -export PATH=$HOME/.local/bin:$PATH -curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack' - -# Get stackage-curator -wget https://s3.amazonaws.com/stackage-travis/stackage-curator/stackage-curator.bz2 -bunzip2 stackage-curator.bz2 -chmod +x stackage-curator -mv stackage-curator ~/.local/bin - -# Install GHC -stack setup $GHCVER - -# Update the index -stack update - -# Check -exec stack --resolver ghc-$GHCVER exec stackage-curator check diff --git a/etc/curator-2-check.sh b/etc/curator-2-check.sh index ac95ec8c..b006df08 100755 --- a/etc/curator-2-check.sh +++ b/etc/curator-2-check.sh @@ -11,7 +11,7 @@ export PATH=$HOME/.local/bin:$PATH curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack' # Get new Stackage curator -CURATOR2=stackage-curator-2-f6258124cff9a7e92bcb5704164a70e149080e88 +CURATOR2=curator-85b021a53833ff310fc66b3fdc5ca3f7828ce18b.bz2 wget "https://download.fpcomplete.com/stackage-curator-2/$CURATOR2.bz2" bunzip2 "$CURATOR2.bz2" chmod +x $CURATOR2 From d4457719f806dacd2883598206f2d54dab02c92f Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 9 Feb 2020 12:15:15 +0200 Subject: [PATCH 017/316] Missing arg --- .travis.yml | 2 +- etc/{curator-2-check.sh => check.sh} | 17 +++++++---------- 2 files changed, 8 insertions(+), 11 deletions(-) rename etc/{curator-2-check.sh => check.sh} (58%) diff --git a/.travis.yml b/.travis.yml index 3dc9707f..fae1766b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ addons: # Edit etc/ci-script.sh to change GHC version script: -- ./etc/curator-2-check.sh +- ./etc/check.sh # Caching doesn't work with sudo: true #cache: diff --git a/etc/curator-2-check.sh b/etc/check.sh similarity index 58% rename from etc/curator-2-check.sh rename to etc/check.sh index b006df08..78a5345f 100755 --- a/etc/curator-2-check.sh +++ b/etc/check.sh @@ -11,11 +11,8 @@ export PATH=$HOME/.local/bin:$PATH curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack' # Get new Stackage curator -CURATOR2=curator-85b021a53833ff310fc66b3fdc5ca3f7828ce18b.bz2 -wget "https://download.fpcomplete.com/stackage-curator-2/$CURATOR2.bz2" -bunzip2 "$CURATOR2.bz2" -chmod +x $CURATOR2 -mv $CURATOR2 ~/.local/bin/stackage-curator-2 +curl "https://download.fpcomplete.com/stackage-curator-2/curator-85b021a53833ff310fc66b3fdc5ca3f7828ce18b.bz2" | bunzip2 > curator +chmod +x curator # Install GHC stack setup $GHCVER @@ -24,8 +21,8 @@ stack setup $GHCVER # because of a different constraints handling in minor LTS version bumps NIGHTLY="nightly-$(date +%Y-%m-%d)" # New curator check -stackage-curator-2 update && - stackage-curator-2 constraints --target=$NIGHTLY && - stackage-curator-2 snapshot-incomplete && - stackage-curator-2 snapshot && - stack --resolver ghc-$GHCVER exec stackage-curator-2 check-snapshot +./curator update && + ./curator constraints --target=$NIGHTLY && + ./curator snapshot-incomplete --target=$NIGHTLY && + ./curator snapshot && + stack --resolver ghc-$GHCVER exec ./curator check-snapshot From a258bcdc29795923b83524f1e0a0fbc3ce34b499 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 5 Feb 2020 10:32:40 +0200 Subject: [PATCH 018/316] Use Cabal shipped with GHC --- build-constraints.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 936a4ca8..6dbdbeb7 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2854,8 +2854,8 @@ packages: - xlsx-tabular "Mikhail Glushenkov @23Skidoo": - - Cabal - - cabal-install < 0 # via base-4.13.0.0 + # Take Cabal shipped with GHC - Cabal + - cabal-install # - pointful # haskell-src-exts "Lennart Kolmodin @kolmodin": From b07c52c2e691bf306709eac2be784e5613c81095 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 9 Feb 2020 14:02:30 +0200 Subject: [PATCH 019/316] legacy-bulk inside Docker --- automated/build-next.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automated/build-next.sh b/automated/build-next.sh index 202ce065..27adc744 100755 --- a/automated/build-next.sh +++ b/automated/build-next.sh @@ -142,7 +142,7 @@ docker run $ARGS_UPLOAD $IMAGE /bin/bash -c "curator upload-docs --target $TARGE # For some reason, registering on Hackage fails with inscrutable error messages. Disabling. # docker run $ARGS_UPLOAD $IMAGE /bin/bash -c "exec curator hackage-distro --target $TARGET" -$BINDIR/curator legacy-bulk --stackage-snapshots dot-stackage/curator/stackage-snapshots/ --lts-haskell dot-stackage/curator/lts-haskell/ --stackage-nightly dot-stackage/curator/stackage-nightly/ +docker run $ARGS_UPLOAD $IMAGE curator legacy-bulk --stackage-snapshots dot-stackage/curator/stackage-snapshots/ --lts-haskell dot-stackage/curator/lts-haskell/ --stackage-nightly dot-stackage/curator/stackage-nightly/ ( From 953281e263a51d77434d557b3f52490c9ffeff21 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 9 Feb 2020 14:08:59 +0200 Subject: [PATCH 020/316] More cleanups to build script --- automated/.gitignore | 13 ++--- automated/{build-next.sh => build.sh} | 7 ++- automated/check-cabal.sh | 72 ------------------------ automated/cron.sh | 24 -------- automated/new-stackage-format/convert.sh | 35 ------------ automated/nix-build/README.md | 5 -- automated/nix-build/build.sh | 12 ---- automated/nix-build/fetch-nixpkgs.nix | 23 -------- automated/nix-build/nixpkgs-src.json | 6 -- automated/nix-build/snapshot-fixed.nix | 41 -------------- automated/run-nightly.sh | 5 +- 11 files changed, 10 insertions(+), 233 deletions(-) rename automated/{build-next.sh => build.sh} (96%) delete mode 100755 automated/check-cabal.sh delete mode 100755 automated/cron.sh delete mode 100755 automated/new-stackage-format/convert.sh delete mode 100644 automated/nix-build/README.md delete mode 100644 automated/nix-build/build.sh delete mode 100644 automated/nix-build/fetch-nixpkgs.nix delete mode 100644 automated/nix-build/nixpkgs-src.json delete mode 100644 automated/nix-build/snapshot-fixed.nix diff --git a/automated/.gitignore b/automated/.gitignore index 9c4d36e6..c43ceb23 100644 --- a/automated/.gitignore +++ b/automated/.gitignore @@ -1,12 +1,9 @@ -/auth-token /bin/ /gitconfig /hackage-creds -/ssh-nightly/ -/ssh-lts/ -/nighlty/ -/lts-*/ -/stackage-curator/ -/stackage-update/ +/ssh/ +/work/ /aws.sh -/crondir/ +/pantry/ +/stack/ +/dot-stackage/ diff --git a/automated/build-next.sh b/automated/build.sh similarity index 96% rename from automated/build-next.sh rename to automated/build.sh index 27adc744..b077babf 100755 --- a/automated/build-next.sh +++ b/automated/build.sh @@ -12,17 +12,18 @@ source aws.sh SHORTNAME=$(echo $TARGET | cut -d- -f 1) if [ $SHORTNAME = "lts" ] then - TAG=$(echo $TARGET | sed 's@^lts-\([0-9]*\)\.[0-9]*@lts\1@') + 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@') else TAG=$SHORTNAME + WORKDIR=$ROOT/work/$TAG fi IMAGE=commercialhaskell/stackage:$TAG -PANTRY_DIR=$ROOT/pantry +PANTRY_DIR=$ROOT/stack/pantry STACK_DIR=$ROOT/stack DOT_STACKAGE_DIR=$ROOT/dot-stackage -WORKDIR=$ROOT/$TAG/work # ssh key is used for committing snapshots (and their constraints) to Github SSH_DIR=$ROOT/ssh USERID=$(id -u) diff --git a/automated/check-cabal.sh b/automated/check-cabal.sh deleted file mode 100755 index c920f98a..00000000 --- a/automated/check-cabal.sh +++ /dev/null @@ -1,72 +0,0 @@ -#!/usr/bin/env bash - -# This script is intended for testing Cabal HEAD against a Stackage snapshot. - -set -eux - -ROOT=$(cd $(dirname $0) ; pwd) -TARGET=$1 - -# For nightly-YYYY-MM-DD, tag should be nightly -# For lts-X.Y, tag should be ltsX -SHORTNAME=$(echo $TARGET | cut -d- -f 1) -if [ $SHORTNAME = "lts" ] -then - TAG=$(echo $TARGET | sed 's@^lts-\([0-9]*\)\.[0-9]*@lts\1@') - PLAN_URL=https://raw.githubusercontent.com/fpco/lts-haskell/master/$TARGET.yaml -else - TAG=$SHORTNAME - PLAN_URL=https://raw.githubusercontent.com/fpco/stackage-nightly/master/$TARGET.yaml -fi - -IMAGE=snoyberg/stackage:$TAG - -PLAN_FILE=$TARGET-plan.yaml -DOCMAP_FILE=$TARGET-docmap.yaml -BUNDLE_FILE=$TARGET.bundle= - -CABAL_DIR=$ROOT/cabal -STACK_DIR=$ROOT/stack -GHC_DIR=$ROOT/ghc -DOT_STACKAGE_DIR=$ROOT/dot-stackage -WORKDIR=$ROOT/$TAG/work -EXTRA_BIN_DIR=$ROOT/extra-bin - -mkdir -p \ - "$CABAL_DIR" \ - "$STACK_DIR" \ - "$GHC_DIR" \ - "$DOT_STACKAGE_DIR" \ - "$WORKDIR" \ - "$EXTRA_BIN_DIR" - -curl "$PLAN_URL" > $WORKDIR/$PLAN_FILE - -mkdir -p $ROOT/bin -BINDIR=$(cd $ROOT/bin ; pwd) -( -cd $BINDIR -rm -f stackage-curator stackage-curator.bz2 -wget https://s3.amazonaws.com/stackage-travis/stackage-curator/stackage-curator.bz2 -bunzip2 stackage-curator.bz2 -chmod +x stackage-curator -) - -ARGS_COMMON="--rm -v $WORKDIR:/home/stackage/work -w /home/stackage/work -v $BINDIR/stackage-curator:/usr/bin/stackage-curator:ro -v /etc/passwd:/etc/passwd:ro -v /etc/group:/etc/group:ro -v $EXTRA_BIN_DIR:/home/stackage/bin:ro" -ARGS_PREBUILD="$ARGS_COMMON -u $USER -v $CABAL_DIR:/home/stackage/.cabal -v $STACK_DIR:/home/stackage/.stack -v $GHC_DIR:/home/stackage/.ghc -v $DOT_STACKAGE_DIR:/home/stackage/.stackage" -ARGS_BUILD="$ARGS_COMMON -v $CABAL_DIR:/home/stackage/.cabal:ro -v $STACK_DIR:/home/stackage/.stack:ro -v $GHC_DIR:/home/stackage/.ghc:ro" - -# Get latest stack -curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C $EXTRA_BIN_DIR '*/stack' - -# Do all of the pre-build actions: -# -# * Update the package index -# * Fetch all needed tarballs (the build step does not have write access to the tarball directory) -# * Do a single unpack to create the package index cache (again due to directory perms) -docker run $ARGS_PREBUILD $IMAGE /bin/bash -c "/home/stackage/bin/stack update && stackage-curator fetch --plan-file $PLAN_FILE && cd /tmp && /home/stackage/bin/stack unpack random" - -# Now do the actual build. We need to first set the owner of the home directory -# correctly, so we run the command as root, change owner, and then use sudo to -# switch back to the current user -docker run $ARGS_BUILD $IMAGE /bin/bash -c "chown $USER /home/stackage && sudo -E -u $USER env \"PATH=\$PATH:/home/stackage/bin\" stackage-curator make-bundle --plan-file $PLAN_FILE --docmap-file $DOCMAP_FILE --bundle-file $BUNDLE_FILE --target $TARGET --cabal-from-head" diff --git a/automated/cron.sh b/automated/cron.sh deleted file mode 100755 index 2d804ad8..00000000 --- a/automated/cron.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -set -eux - -cd "$(dirname "${BASH_SOURCE[0]}")" - -CRONDIR=$(pwd)/crondir -mkdir -p $CRONDIR -source aws.sh - -IMAGE=fpco/stackage-server-prod:latest -docker pull $IMAGE - -stack update - -date -echo "Running stackage-server-cron..." -docker run --rm \ - -v $CRONDIR:/home/ubuntu \ - -v $HOME/.stack/indices:/home/ubuntu/.stack/indices:ro \ - --workdir /home/ubuntu \ - -p 17834:17834 \ - $IMAGE \ - bash -c "useradd $(whoami) -u $(id -u); sudo -u $(whoami) env HOME=/home/ubuntu AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY bash -c '/usr/local/bin/stackage-server-cron 2>&1 | tee -a /home/ubuntu/stackage-server-cron.log'" diff --git a/automated/new-stackage-format/convert.sh b/automated/new-stackage-format/convert.sh deleted file mode 100755 index 092b293a..00000000 --- a/automated/new-stackage-format/convert.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env bash - -set -eux - -if [[ ! -f convert ]] -then - curl https://s3.amazonaws.com/www.snoyman.com/convert-old-stackage-c9c4d06b31cb7aafedd23aa316b8008c45e4d4dd.bz2 > convert.bz2 - chmod +x convert.bz2 - bunzip2 convert.bz2 -fi - -cd $(dirname ${BASH_SOURCE[0]}) - -for d in lts-haskell stackage-nightly stackage-snapshots -do - if [[ ! -d "$d" ]] - then - git clone https://github.com/commercialhaskell/$d - else - (cd "$d" && git pull || echo "Git pull failed, ignoring") - fi -done - -( -export HOME=$(pwd) -./convert -) - -cd stackage-snapshots -git add lts nightly -git diff-index --quiet HEAD && echo No changes && exit 0 -git config user.name "Stackage build server" -git config user.email "michael@snoyman.com" -git commit -m "More conversions $(date)" -GIT_SSH_COMMAND='ssh -i ../../ssh-lts/id_rsa' git push git@github.com:commercialhaskell/stackage-snapshots master diff --git a/automated/nix-build/README.md b/automated/nix-build/README.md deleted file mode 100644 index 56901b26..00000000 --- a/automated/nix-build/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# Building Stackage with Nix - -The script `build.sh` is supposed to be run in a directory where `curator unpack` -was run - it assumes existence of `unpack-dir` directory with a Stackage -snapshot `stack.yaml` and unpacked packages in it. diff --git a/automated/nix-build/build.sh b/automated/nix-build/build.sh deleted file mode 100644 index 62918fe5..00000000 --- a/automated/nix-build/build.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -set -eu +x - -NIX_VERSION="2.0.4" -curl https://nixos.org/releases/nix/nix-$NIX_VERSION/install | sh - -# no code to install stack2nix yet - -stack2nix --cabal2nix-args="--no-hpack" unpack-dir > snapshot.nix - -nix build -f snapshot-fixed.nix diff --git a/automated/nix-build/fetch-nixpkgs.nix b/automated/nix-build/fetch-nixpkgs.nix deleted file mode 100644 index 29cac91f..00000000 --- a/automated/nix-build/fetch-nixpkgs.nix +++ /dev/null @@ -1,23 +0,0 @@ -let - spec = builtins.fromJSON (builtins.readFile ./nixpkgs-src.json); - src = import { - url = "https://github.com/${spec.owner}/${spec.repo}/archive/${spec.rev}.tar.gz"; - inherit (spec) sha256; - }; - nixcfg = import ; -in builtins.derivation { - system = builtins.currentSystem; - name = "${src.name}-unpacked"; - builder = builtins.storePath nixcfg.shell; - inherit src; - args = [ - (builtins.toFile "builder" '' - $coreutils/mkdir $out - cd $out - $gzip -d < $src | $tar -x --strip-components=1 - '') - ]; - coreutils = builtins.storePath nixcfg.coreutils; - tar = builtins.storePath nixcfg.tar; - gzip = builtins.storePath nixcfg.gzip; -} diff --git a/automated/nix-build/nixpkgs-src.json b/automated/nix-build/nixpkgs-src.json deleted file mode 100644 index 00ed9d5d..00000000 --- a/automated/nix-build/nixpkgs-src.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c2950341d038995bf46a7b72db961bb3d3e9ac12", - "sha256": "0ghirjm6xvsihci3fladrn4nrnh2yr529v7c406hmw0yp25kv0i4" -} diff --git a/automated/nix-build/snapshot-fixed.nix b/automated/nix-build/snapshot-fixed.nix deleted file mode 100644 index bac92a89..00000000 --- a/automated/nix-build/snapshot-fixed.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ pkgs ? import (import ./fetch-nixpkgs.nix) {} -, compiler ? pkgs.haskell.packages.ghc863 -}: -let - snapshot = import ./snapshot.nix { pkgs = pkgs; compiler = compiler; }; -in - snapshot.override (with pkgs.haskell.lib; { - overrides = self: super: { - # disabling packages from non-hackage-packages.nix - futhark = null; - multi-ghc-travis = null; - vaultenv = null; - # native deps - check-email = super.check-email.override { resolv = null; }; - flac = super.flac.override { FLAC = pkgs.flac; }; - freenect = super.freenect.override { freenect_sync = null; libfreenect = null; }; - haskell-gi = super.haskell-gi.override { gobject-introspection = pkgs.gnome3.gobjectIntrospection; }; - HDBC-mysql = super.HDBC-mysql.override { mysqlclient = pkgs.mysql;}; - libffi = super.libffi.override { ffi = null; }; - # fixes - blas-ffi = overrideCabal super.blas-ffi ( - old: { libraryPkgconfigDepends = old.libraryPkgconfigDepends ++ [ pkgs.openblasCompat ]; } - ); - odbc = overrideCabal super.odbc ( - old: { librarySystemDepends = old.librarySystemDepends ++ [ pkgs.freetds ]; } - ); - html-entities = null; # https://github.com/nikita-volkov/html-entities/issues/8 - category = null; # conflict in Prelude.hs - constraint = null; # because of category - lame = null; # fails with 'Total ticks: 451489' - proto-lens-protobuf-types = overrideCabal super.proto-lens-protobuf-types ( - old: { libraryToolDepends = old.libraryToolDepends ++ [ pkgs.protobuf ]; } - ); - # libraft = null; # xxx/postgres/entries.sql: openFile: does not exist (No such file or directory) in libraft-0.2.0.0 - xmlbf-xeno = null; # because of html-entities - xmonad = null; # xmonad requires extra patches for Nix - xmonad-contrib = null; - xmonad-extras = null; - hlibgit2 = disableHardening super.hlibgit2 [ "format" ]; - }; - }) diff --git a/automated/run-nightly.sh b/automated/run-nightly.sh index 7b7ca37a..9f21bd98 100755 --- a/automated/run-nightly.sh +++ b/automated/run-nightly.sh @@ -3,12 +3,9 @@ cd "$(dirname "${BASH_SOURCE[0]}")" while true; do - ./build-next.sh nightly-$(date -u +%F) + ./build.sh nightly-$(date -u +%F) date - #./new-stackage-format/convert.sh > /dev/null 2> /dev/null - #date - sleep 30m echo done From 98b227a06f2709f861f568d47b632c1067f5db93 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 9 Feb 2020 14:10:12 +0200 Subject: [PATCH 021/316] Reversed dash logic --- automated/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/automated/build.sh b/automated/build.sh index b077babf..b0d27c19 100755 --- a/automated/build.sh +++ b/automated/build.sh @@ -12,8 +12,8 @@ source aws.sh 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@') + 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@') else TAG=$SHORTNAME WORKDIR=$ROOT/work/$TAG From 0fecc4e52281de85b91a2e500df745699169c77f Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 9 Feb 2020 12:15:01 +0000 Subject: [PATCH 022/316] Cleaner dir structure --- automated/build.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/automated/build.sh b/automated/build.sh index b0d27c19..985d4873 100755 --- a/automated/build.sh +++ b/automated/build.sh @@ -5,7 +5,7 @@ set -eu +x -o pipefail ROOT=$(cd $(dirname $0) ; pwd) TARGET=$1 -source aws.sh +source work/aws.sh # For nightly-YYYY-MM-DD, tag should be nightly # For lts-X.Y, tag should be ltsX @@ -21,11 +21,11 @@ fi IMAGE=commercialhaskell/stackage:$TAG -PANTRY_DIR=$ROOT/stack/pantry -STACK_DIR=$ROOT/stack -DOT_STACKAGE_DIR=$ROOT/dot-stackage +PANTRY_DIR=$ROOT/work/stack/pantry +STACK_DIR=$ROOT/work/stack +DOT_STACKAGE_DIR=$ROOT/work/dot-stackage # ssh key is used for committing snapshots (and their constraints) to Github -SSH_DIR=$ROOT/ssh +SSH_DIR=$ROOT/work/ssh USERID=$(id -u) mkdir -p \ @@ -35,14 +35,14 @@ mkdir -p \ "$WORKDIR" \ "$SSH_DIR" -GITCONFIG=$ROOT/gitconfig +GITCONFIG=$ROOT/work/gitconfig cat >$GITCONFIG < Date: Sun, 9 Feb 2020 12:21:32 +0000 Subject: [PATCH 023/316] Ignore log files --- automated/.gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/automated/.gitignore b/automated/.gitignore index c43ceb23..9ab7c2d4 100644 --- a/automated/.gitignore +++ b/automated/.gitignore @@ -7,3 +7,6 @@ /pantry/ /stack/ /dot-stackage/ + +/lts-build.log +/nightly-build.log From 15fff9b9760875bbc9de39b2a174d5b18b9ac639 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 9 Feb 2020 14:24:13 +0200 Subject: [PATCH 024/316] Reduce ignore list --- automated/.gitignore | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/automated/.gitignore b/automated/.gitignore index 9ab7c2d4..ee0d0037 100644 --- a/automated/.gitignore +++ b/automated/.gitignore @@ -1,12 +1,2 @@ -/bin/ -/gitconfig -/hackage-creds -/ssh/ /work/ -/aws.sh -/pantry/ -/stack/ -/dot-stackage/ - -/lts-build.log -/nightly-build.log +/*-build.log From 5275742881e34cd5c47e2bef1163e06e7eda9424 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 9 Feb 2020 14:30:41 +0200 Subject: [PATCH 025/316] Revert "Use Cabal shipped with GHC" This reverts commit a258bcdc29795923b83524f1e0a0fbc3ce34b499. --- build-constraints.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 6dbdbeb7..936a4ca8 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2854,8 +2854,8 @@ packages: - xlsx-tabular "Mikhail Glushenkov @23Skidoo": - # Take Cabal shipped with GHC - Cabal - - cabal-install + - Cabal + - cabal-install < 0 # via base-4.13.0.0 # - pointful # haskell-src-exts "Lennart Kolmodin @kolmodin": From 3679a5346aa051c7d5aa6b2909d132a3977c0943 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 10 Feb 2020 07:34:26 +0200 Subject: [PATCH 026/316] Revert "Upper bound on ghc-lib-parser-ex for #5137" This reverts commit 09da8355d35cb82a2bbc8849cfe9e902a5e7272e. Closes #5137 --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 936a4ca8..263dfcc5 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4658,9 +4658,6 @@ packages: - servant-mock < 0.8.6 - servant-swagger < 1.1.8 - aur < 6.3.0 - - # https://github.com/commercialhaskell/stackage/issues/5137 - - ghc-lib-parser-ex < 8.8.5 # end of packages # Package flags are applied to individual packages, and override the values of From afb3d22f05fe55c48b08705c929d10d7daf7a855 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 10 Feb 2020 08:03:34 +0200 Subject: [PATCH 027/316] Drop some packages that ship with GHC --- build-constraints.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 263dfcc5..2f22c0ef 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -871,7 +871,7 @@ packages: - monadic-arrays - monad-products - monad-st - - mtl + # - mtl take the one that ships with GHC - nats - numeric-extras - parsers @@ -2854,7 +2854,7 @@ packages: - xlsx-tabular "Mikhail Glushenkov @23Skidoo": - - Cabal + # - Cabal take the one that ships with GHC - cabal-install < 0 # via base-4.13.0.0 # - pointful # haskell-src-exts @@ -4385,7 +4385,6 @@ packages: - options - optparse-applicative - parallel - - parsec - path-pieces - pcg-random - persistable-record From 303b1c06030ef736111804778524463a8d4ff163 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 10 Feb 2020 07:06:01 +0000 Subject: [PATCH 028/316] Fix legacy conversion script --- automated/build.sh | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/automated/build.sh b/automated/build.sh index 985d4873..fb7e0899 100755 --- a/automated/build.sh +++ b/automated/build.sh @@ -82,7 +82,7 @@ ARGS_PREBUILD="$ARGS_COMMON -u $USERID -e HOME=$HOME -v $DOT_STACKAGE_DIR:$HOME/ ARGS_BUILD="$ARGS_COMMON" # instance-data is an undocumented feature of S3 used by amazonka, # see https://github.com/brendanhay/amazonka/issues/271 -ARGS_UPLOAD="$ARGS_COMMON -u $USERID -e HOME=$HOME -v $HACKAGE_CREDS:/hackage-creds:ro -v $DOT_STACKAGE_DIR:$HOME/.stackage -v $SSH_DIR:$HOME/.ssh:ro -v $GITCONFIG:$HOME/.gitconfig:ro -e AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID -e AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY" +ARGS_UPLOAD="$ARGS_COMMON -u $USERID -e HOME=$HOME -v $HACKAGE_CREDS:/hackage-creds:ro -v $DOT_STACKAGE_DIR:$HOME/.stackage -v $SSH_DIR:$HOME/.ssh:ro -v $GITCONFIG:$HOME/.gitconfig:ro -e AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID -e AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY -v $DOT_STACKAGE_DIR:/dot-stackage" # Make sure we actually need this snapshot. We only check this for LTS releases # since, for nightlies, we'd like to run builds even if they are unnecessary to @@ -143,15 +143,14 @@ docker run $ARGS_UPLOAD $IMAGE /bin/bash -c "curator upload-docs --target $TARGE # For some reason, registering on Hackage fails with inscrutable error messages. Disabling. # docker run $ARGS_UPLOAD $IMAGE /bin/bash -c "exec curator hackage-distro --target $TARGET" -docker run $ARGS_UPLOAD $IMAGE curator legacy-bulk --stackage-snapshots dot-stackage/curator/stackage-snapshots/ --lts-haskell dot-stackage/curator/lts-haskell/ --stackage-nightly dot-stackage/curator/stackage-nightly/ +docker run $ARGS_UPLOAD $IMAGE curator legacy-bulk --stackage-snapshots /dot-stackage/curator/stackage-snapshots/ --lts-haskell /dot-stackage/curator/lts-haskell/ --stackage-nightly /dot-stackage/curator/stackage-nightly/ ( - if [ $SHORTNAME = "lts" ] then - cd dot-stackage/curator/lts-haskell + cd $DOT_STACKAGE_DIR/curator/lts-haskell else - cd dot-stackage/curator/stackage-nightly + cd $DOT_STACKAGE_DIR/curator/stackage-nightly fi git add *.yaml @@ -159,14 +158,7 @@ git diff-index --quiet HEAD && echo No changes && exit 0 git config user.name "Stackage build server" git config user.email "michael@snoyman.com" git commit -a -m "More conversions $(date)" - -if [ $SHORTNAME = "lts" ] -then - GIT_SSH_COMMAND="ssh -i $ROOT/ssh-lts/id_rsa" git push origin master -else - GIT_SSH_COMMAND="ssh -i $ROOT/ssh-nightly/id_rsa" git push origin master -fi - +GIT_SSH_COMMAND="ssh -i $SSH_DIR/id_rsa" git push origin master ) echo -n "Completed at " From 997ab28b969f917a9c258cb4e3a925b785ad4b8a Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Mon, 10 Feb 2020 17:46:48 -0800 Subject: [PATCH 029/316] Upper bound bz2 (#5149) --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 2f22c0ef..1c5b6d5a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -319,7 +319,7 @@ packages: - sexpr-parser < 0 # via base-4.13.0.0 "Vanessa McHale @vmchale": - - bz2 + - bz2 < 1.0.0.2 # https://github.com/commercialhaskell/stackage/issues/5149 "Henning Thielemann @thielema": - accelerate-arithmetic < 0 # GHC 8.4 via accelerate From a1a468c8f96cc7cbe33a6beb9428c5476fb63932 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Mon, 10 Feb 2020 17:50:43 -0800 Subject: [PATCH 030/316] Upper bound genvalidity-* packages (#5150) --- build-constraints.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 1c5b6d5a..e6c7f22c 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3723,7 +3723,7 @@ packages: - genvalidity - genvalidity-aeson - genvalidity-bytestring - - genvalidity-containers + - genvalidity-containers < 0.8.0.2 # https://github.com/commercialhaskell/stackage/issues/5150 - genvalidity-hspec - genvalidity-hspec-aeson - genvalidity-hspec-binary @@ -3734,7 +3734,7 @@ packages: - genvalidity-property - genvalidity-scientific - genvalidity-text < 0.7.0.1 # commercialhaskell/stackage#5013 - - genvalidity-time + - genvalidity-time < 0.8.0.2 # https://github.com/commercialhaskell/stackage/issues/5150 - genvalidity-unordered-containers - genvalidity-uuid - genvalidity-vector From d9a2bf03fde05c773ec163a7181c1e12f3ad5939 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Mon, 10 Feb 2020 17:58:12 -0800 Subject: [PATCH 031/316] Use the proper upper bound for genvalidity-time (#5150) --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index e6c7f22c..83d402df 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3734,7 +3734,7 @@ packages: - genvalidity-property - genvalidity-scientific - genvalidity-text < 0.7.0.1 # commercialhaskell/stackage#5013 - - genvalidity-time < 0.8.0.2 # https://github.com/commercialhaskell/stackage/issues/5150 + - genvalidity-time < 0.2.1.2 # https://github.com/commercialhaskell/stackage/issues/5150 - genvalidity-unordered-containers - genvalidity-uuid - genvalidity-vector From 0220848150bd0e5d30cc7bf267fc022dc3f29f8b Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Mon, 10 Feb 2020 19:10:53 -0800 Subject: [PATCH 032/316] Expect test failure for `haskell-src-exts` (#5151)" ; --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 83d402df..623543c2 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5320,6 +5320,7 @@ expected-test-failures: - loopbreaker # https://github.com/polysemy-research/loopbreaker/issues/10 - nettle # https://github.com/stbuehler/haskell-nettle/issues/10 - persistent-sqlite # https://github.com/yesodweb/persistent/issues/989 + - haskell-src-exts # https://github.com/commercialhaskell/stackage/issues/5151 # Compilation failures - ListLike # No issue tracker, e-mail sent to maintainer From b23d0a4e5718b1bfce4f559fe75a057907b31c2a Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Mon, 10 Feb 2020 19:27:11 -0800 Subject: [PATCH 033/316] Expect test failure for `genvalidity-containers` (#5152) --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 623543c2..9de02d16 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5321,6 +5321,7 @@ expected-test-failures: - nettle # https://github.com/stbuehler/haskell-nettle/issues/10 - persistent-sqlite # https://github.com/yesodweb/persistent/issues/989 - haskell-src-exts # https://github.com/commercialhaskell/stackage/issues/5151 + - genvalidity-containers # https://github.com/commercialhaskell/stackage/issues/5152 # Compilation failures - ListLike # No issue tracker, e-mail sent to maintainer From a4114cf9b25d0631e7d215f7fa76aff2c250aa3f Mon Sep 17 00:00:00 2001 From: Hiromi ISHII Date: Sun, 9 Feb 2020 22:29:13 +0900 Subject: [PATCH 034/316] Adds equational-reasoning, ghc-typelits-presburger, singletons-presburger and sized --- build-constraints.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 9de02d16..63fe99c0 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4117,6 +4117,12 @@ packages: "8c6794b6 <8c6794b6@gmail.com> @8c6794b6": - hpc-codecov + + "Hiromi Ishii @konn": + - equational-reasoning + - ghc-typelits-presburger + - type-natural + - sized "Grandfathered dependencies": - network From 7c19527f19b15d289a167b5f5a3240740ebf119f Mon Sep 17 00:00:00 2001 From: Hiromi ISHII Date: Sun, 9 Feb 2020 22:34:34 +0900 Subject: [PATCH 035/316] Adds singletons-presburger --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 63fe99c0..13205fa3 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4121,6 +4121,7 @@ packages: "Hiromi Ishii @konn": - equational-reasoning - ghc-typelits-presburger + - singletons-presburger - type-natural - sized From 41d2ef8ddf977681c1d84ae6fe69c447b88dc4ed Mon Sep 17 00:00:00 2001 From: Jorah Gao Date: Sun, 9 Feb 2020 23:12:32 +0800 Subject: [PATCH 036/316] Add aeson-default and remove hkd-default --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 13205fa3..770a3060 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4107,10 +4107,10 @@ packages: - linenoise "Jorah Gao @gqk007": + - aeson-default - vformat - vformat-time - vformat-aeson - - hkd-default "Alessandro Marrella @amarrella": - kubernetes-webhook-haskell From b3d5b5f5f413632c90291e795c36cbd819cebde7 Mon Sep 17 00:00:00 2001 From: Kostiantyn Rybnikov Date: Mon, 10 Feb 2020 19:20:33 +0200 Subject: [PATCH 037/316] Re-add hedis --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 770a3060..6df539b0 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2157,7 +2157,7 @@ packages: - friday < 0 - friday-juicypixels < 0 - hbeanstalk < 0 # sClose not in scope - - hedis < 0 # via test-framework + - hedis - hprotoc < 0 # compilation failure - hsyslog-udp < 0 - iso3166-country-codes From c56cb126493f386f4f827785a0d04208a2c340df Mon Sep 17 00:00:00 2001 From: Maxim Koltsov Date: Tue, 11 Feb 2020 14:43:18 +0300 Subject: [PATCH 038/316] Add _old-network: false for bson & mongoDB Packages "bson" and "mongoDB" are compatible with newer network, but require a flag for it. --- build-constraints.yaml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 6df539b0..45bea95e 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3114,8 +3114,8 @@ packages: - open-witness < 0 # MonadFail "Victor Denisov @VictorDenisov": - - mongoDB < 0 # via network-3.1.1.0 - - bson < 0 # via network-3.1.1.0 + - mongoDB + - bson "Alexis King @lexi-lambda": - freer-simple @@ -4767,6 +4767,12 @@ package-flags: hsdev: docs: false + bson: + _old-network: false + + mongoDB: + _old-network: false + # end of package-flags # Special configure options for individual packages From 6074921b62ccccb047ee700745cea3730385f3b1 Mon Sep 17 00:00:00 2001 From: Maxim Koltsov Date: Tue, 11 Feb 2020 14:44:36 +0300 Subject: [PATCH 039/316] Re-enable hyraxAbif Package "hyraxAbif" was released with version 0.2.3.21, which adds compatibility with GHC-8.8. --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 45bea95e..db98001b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3829,7 +3829,6 @@ packages: "Andre Van Der Merwe @andrevdm": - bhoogle < 0 - hyraxAbif - - hyraxAbif < 0 # via binary-0.8.7.0 "David Millar-Durrant @DavidM-D": - indexed-list-literals From 5f55ec17f2acbd042f83135de8a0740709989ba0 Mon Sep 17 00:00:00 2001 From: Maxim Koltsov Date: Tue, 11 Feb 2020 16:05:47 +0300 Subject: [PATCH 040/316] Update comment for mongoDB disabled tests --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index db98001b..6767f6b3 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5264,7 +5264,7 @@ expected-test-failures: - mangopay # https://github.com/prowdsponsor/mangopay/issues/30 - memcached-binary # memcached - milena - - mongoDB # mongoDB - https://github.com/mongodb-haskell/mongodb/issues/61 + - mongoDB # Requires local MongoDB server - mysql # MySQL - mysql-haskell # Requires local mysql server with a test account, and binlog enabled. - mysql-simple # MySQL From 830b47fb142128897715491f0a703195e875dc73 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Tue, 11 Feb 2020 07:03:47 -0800 Subject: [PATCH 041/316] genvalidity and related packages (fix #5013, fix #5150, fix #5152, close #5145) --- build-constraints.yaml | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 6767f6b3..89125260 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3720,29 +3720,44 @@ packages: - gym-http-api < 0 # via servant servant-client "Tom Sydney Kerckhove @NorfairKing": + - cursor + - cursor-brick + - cursor-fuzzy-time + - cursor-gen + - fuzzy-time - genvalidity - genvalidity-aeson - genvalidity-bytestring - - genvalidity-containers < 0.8.0.2 # https://github.com/commercialhaskell/stackage/issues/5150 + - genvalidity-containers + - genvalidity-criterion - genvalidity-hspec - genvalidity-hspec-aeson - genvalidity-hspec-binary - genvalidity-hspec-cereal - genvalidity-hspec-hashable - genvalidity-hspec-optics + - genvalidity-hspec-persistent + - genvalidity-mergeful + - genvalidity-mergeless - genvalidity-path - genvalidity-property - genvalidity-scientific - - genvalidity-text < 0.7.0.1 # commercialhaskell/stackage#5013 - - genvalidity-time < 0.2.1.2 # https://github.com/commercialhaskell/stackage/issues/5150 + - genvalidity-text + - genvalidity-time + - genvalidity-typed-uuid - genvalidity-unordered-containers - genvalidity-uuid - genvalidity-vector + - mergeful + - mergeless + - pretty-relative-time + - typed-uuid - validity - validity-aeson - validity-bytestring - validity-containers - validity-path + - validity-primitive - validity-scientific - validity-text - validity-time @@ -5333,7 +5348,6 @@ expected-test-failures: - nettle # https://github.com/stbuehler/haskell-nettle/issues/10 - persistent-sqlite # https://github.com/yesodweb/persistent/issues/989 - haskell-src-exts # https://github.com/commercialhaskell/stackage/issues/5151 - - genvalidity-containers # https://github.com/commercialhaskell/stackage/issues/5152 # Compilation failures - ListLike # No issue tracker, e-mail sent to maintainer From 4c0c3a57f8dedc4b913c8231cf978254480de61f Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Tue, 11 Feb 2020 07:39:21 -0800 Subject: [PATCH 042/316] Disable broken packages, expect test failures (#5154, #5155, #5156, #5157, #5158) --- build-constraints.yaml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 89125260..1f1b9bfb 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3724,7 +3724,7 @@ packages: - cursor-brick - cursor-fuzzy-time - cursor-gen - - fuzzy-time + - fuzzy-time < 0 # https://github.com/commercialhaskell/stackage/issues/5154 - genvalidity - genvalidity-aeson - genvalidity-bytestring @@ -3749,9 +3749,9 @@ packages: - genvalidity-uuid - genvalidity-vector - mergeful - - mergeless + - mergeless < 0 # https://github.com/commercialhaskell/stackage/issues/5157 - pretty-relative-time - - typed-uuid + - typed-uuid < 0 # https://github.com/commercialhaskell/stackage/issues/5156 - validity - validity-aeson - validity-bytestring @@ -5456,6 +5456,13 @@ expected-test-failures: # Test-runner expects a cabal-style 'dist-newstyle' directory - hjsmin + + # https://github.com/commercialhaskell/stackage/issues/5155 + - pretty-relative-time + + # https://github.com/commercialhaskell/stackage/issues/5158 + - genvalidity-mergeful + - cursor-gen # end of expected-test-failures # Benchmarks which are known not to build. Note that, currently we do not run From 5362f6f7391ef8a5f06829be0c22eada49cb138a Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Tue, 11 Feb 2020 07:46:30 -0800 Subject: [PATCH 043/316] Bounds from previous commit (4c0c3a57) --- build-constraints.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 1f1b9bfb..e85dde27 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3722,7 +3722,7 @@ packages: "Tom Sydney Kerckhove @NorfairKing": - cursor - cursor-brick - - cursor-fuzzy-time + - cursor-fuzzy-time < 0 # via fuzzy-time - cursor-gen - fuzzy-time < 0 # https://github.com/commercialhaskell/stackage/issues/5154 - genvalidity @@ -3738,13 +3738,13 @@ packages: - genvalidity-hspec-optics - genvalidity-hspec-persistent - genvalidity-mergeful - - genvalidity-mergeless + - genvalidity-mergeless < 0 # via mergeless - genvalidity-path - genvalidity-property - genvalidity-scientific - genvalidity-text - genvalidity-time - - genvalidity-typed-uuid + - genvalidity-typed-uuid < 0 # via typed-uuid and mergeless - genvalidity-unordered-containers - genvalidity-uuid - genvalidity-vector From ba75fc0b26959846a83b5693e9b5ea96586f44a1 Mon Sep 17 00:00:00 2001 From: vrom911 Date: Mon, 10 Feb 2020 21:51:13 +0000 Subject: [PATCH 044/316] Add membrain --- build-constraints.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index e85dde27..9140370a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1330,7 +1330,7 @@ packages: - wl-pprint - AC-Angle - language-protobuf - + "Flavio Corpa @kutyel": - language-avro @@ -3591,6 +3591,7 @@ packages: - co-log-polysemy - first-class-patterns - ilist + - membrain - relude - shellmet - shortcut-links From e14835ad150f119769340b95e117d681160c859b Mon Sep 17 00:00:00 2001 From: Jasper Woudenberg Date: Mon, 10 Feb 2020 19:49:54 +0000 Subject: [PATCH 045/316] add junit-xml --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 9140370a..83049f4b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4114,6 +4114,7 @@ packages: "Jasper Woudenberg @jasperwoudnberg": - bugsnag-hs + - junit-xml "Eric Conlon @ejconlon": - blanks From 3d9a05fccda1e42e9f484aed515358227821a4fd Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Tue, 11 Feb 2020 16:21:43 -0800 Subject: [PATCH 046/316] Upper bound `generic-lens` (#5161) --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 83049f4b..c317d732 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3692,7 +3692,7 @@ packages: - milena < 0 "Csongor Kiss @kcsongor": - - generic-lens + - generic-lens < 2.0.0.0 # https://github.com/commercialhaskell/stackage/issues/5161 "Bogdan Neterebskii @ozzzzz": - cast From e333ce752ec1679133c30ef21d12d8dbc6943cfa Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Tue, 11 Feb 2020 18:18:40 -0800 Subject: [PATCH 047/316] Skip tests for `servant-rawm` (#5162) --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index c317d732..d2b85ff4 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5176,6 +5176,7 @@ skipped-tests: - bugsnag-haskell # https://github.com/commercialhaskell/stackage/issues/4759 - genvalidity-hspec-cereal # https://github.com/commercialhaskell/stackage/issues/4909 - genvalidity-hspec-optics # https://github.com/commercialhaskell/stackage/issues/4910 + - servant-rawm # https://github.com/commercialhaskell/stackage/issues/5162 # end of skipped-tests # Tests listed in expected-test-failures configure correctly but may fail to run From 4f56879127ee32b737d0c2677855e23f3081d63b Mon Sep 17 00:00:00 2001 From: Neil Mitchell Date: Tue, 11 Feb 2020 21:43:36 +0000 Subject: [PATCH 048/316] Add fuzzy, remove debug --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index d2b85ff4..e89d784b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -673,12 +673,12 @@ packages: - hexml - weeder - profiterole - - debug < 0 # via Hoed - record-dot-preprocessor - filepattern - record-hasfield - rattle - hie-bios + - fuzzy "Digital Asset ": - ghc-lib From 54f31e2012f890557c0b68763650408f040140bc Mon Sep 17 00:00:00 2001 From: Pavan Rikhi Date: Tue, 11 Feb 2020 11:52:06 -0500 Subject: [PATCH 049/316] Add stack-templatizer --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index e89d784b..927406c3 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4029,6 +4029,7 @@ packages: - mx-state-codes - sitemap-gen - tasty-wai + - stack-templatizer "David Baynard @dbaynard": - time-qq < 0 # see christian-marie/time-qq#3 From c9240400cc64770504413faa60f366d3c745ac69 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 12 Feb 2020 08:46:55 +0000 Subject: [PATCH 050/316] Add new packages to constraints, not snapshot-incomplete --- CURATORS.md | 2 +- automated/build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CURATORS.md b/CURATORS.md index 37398cef..f9b14f90 100644 --- a/CURATORS.md +++ b/CURATORS.md @@ -299,7 +299,7 @@ First run `build-next.sh` to regenerate updated `ltsXX/work/constraints.yaml` an For an LTS minor bump, you'll typically want to: * Add constraints to package `range:` fields _under_ the `source:` field in that `constraints.yaml`. -* Add new packages versioned to `snapshot-incomplete.yaml` (the `@` suffix is optional) +* Add new packages to the `constraints.yaml` file * Test, benchmark, haddock failures can also be added to package fields in the `constraints.yaml` if necessary, though it should be avoided if possible for LTS. Then run `NOPLAN=1 build-next.sh` to build the generate an updated snapshot. diff --git a/automated/build.sh b/automated/build.sh index fb7e0899..d6fdd77e 100755 --- a/automated/build.sh +++ b/automated/build.sh @@ -107,7 +107,7 @@ then docker run $ARGS_PREBUILD $IMAGE /bin/bash -c "curator update && curator constraints --target $TARGET && curator snapshot-incomplete --target $TARGET && curator snapshot" fi else - docker run $ARGS_PREBUILD $IMAGE /bin/bash -c "curator snapshot" + docker run $ARGS_PREBUILD $IMAGE /bin/bash -c "curator snapshot-incomplete --target $TARGET && curator snapshot" fi From 15ba7d45257a8abb0b9560a8336a617ce272a479 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Wed, 12 Feb 2020 06:38:22 -0800 Subject: [PATCH 051/316] Add `gi-*` packages. Merge #5143 manually --- build-constraints.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 927406c3..a8c021db 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3030,15 +3030,18 @@ packages: "Iñaki García Etxebarria @garetxe": - haskell-gi - haskell-gi-base - - gi-atk < 0 # via haskell-gi - - gi-cairo < 0 # via haskell-gi - - gi-glib < 0 # via haskell-gi - - gi-gio < 0 # via haskell-gi - - gi-gobject < 0 # via haskell-gi - - gi-gtk < 0 # via gi-graphene + - gi-atk + - gi-cairo + - gi-gdk < 4 + - gi-gdkpixbuf + - gi-gio + - gi-glib + - gi-gobject + - gi-gtk < 4 - gi-gtk-hs < 0 # via base-compat-0.11.0 - gi-gtksource < 0 # via gi-gdk-4.0.1 & gi-gtk-4.0.1 - gi-javascriptcore < 0 # via haskell-gi + - gi-pango - gi-vte < 0 # via gi-gdk-4.0.1 & gi-gtk-4.0.1 # - gi-webkit2 # https://github.com/fpco/stackage/issues/3415 @@ -4302,9 +4305,6 @@ packages: - ghc-compact - ghc-paths - ghc-prof - - gi-gdk < 0 # via haskell-gi - - gi-gdkpixbuf < 0 # via haskell-gi - - gi-pango < 0 # via haskell-gi - github < 0 # via http-client-0.6.1 - github - groom From d3dfe76b9f5c85187b346d319e67b6fb5746e2f4 Mon Sep 17 00:00:00 2001 From: Jonas Date: Wed, 12 Feb 2020 22:48:17 +0900 Subject: [PATCH 052/316] Re-enable apecs and co. --- build-constraints.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index a8c021db..06547434 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2430,9 +2430,9 @@ packages: - GPipe < 0 # GHC 8.4 via base-4.11.0.0 "Jonas Carpay @jonascarpay": - - apecs < 0 # Template Haskell changes - - apecs-gloss < 0 # via gloss - - apecs-physics < 0 # via inline-c + - apecs + - apecs-gloss + - apecs-physics "Spencer Janssen @spencerjanssen": - Xauth From 4a0ed07646bcef66dd4cfeabe51bf85baf769b4b Mon Sep 17 00:00:00 2001 From: nilsalex Date: Wed, 12 Feb 2020 11:32:02 +0100 Subject: [PATCH 053/316] readd sparse-tensor --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 06547434..180b099f 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -27,7 +27,7 @@ packages: - generic-monoid "Tobias Reinhart @TobiReinhart": - - sparse-tensor < 0 # https://github.com/commercialhaskell/stackage/issues/5125 + - sparse-tensor "Stephan Schiffels @stschiff": - sequence-formats From aa8bbb09569473d4cf18d9ccc0a0f64e4e8f25d3 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Wed, 12 Feb 2020 17:01:55 -0800 Subject: [PATCH 054/316] Try `genvalidity-*` packages again --- build-constraints.yaml | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 180b099f..5361d9c5 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3728,7 +3728,7 @@ packages: - cursor-brick - cursor-fuzzy-time < 0 # via fuzzy-time - cursor-gen - - fuzzy-time < 0 # https://github.com/commercialhaskell/stackage/issues/5154 + - fuzzy-time - genvalidity - genvalidity-aeson - genvalidity-bytestring @@ -3742,20 +3742,20 @@ packages: - genvalidity-hspec-optics - genvalidity-hspec-persistent - genvalidity-mergeful - - genvalidity-mergeless < 0 # via mergeless + - genvalidity-mergeless - genvalidity-path - genvalidity-property - genvalidity-scientific - genvalidity-text - genvalidity-time - - genvalidity-typed-uuid < 0 # via typed-uuid and mergeless + - genvalidity-typed-uuid - genvalidity-unordered-containers - genvalidity-uuid - genvalidity-vector - mergeful - - mergeless < 0 # https://github.com/commercialhaskell/stackage/issues/5157 + - mergeless - pretty-relative-time - - typed-uuid < 0 # https://github.com/commercialhaskell/stackage/issues/5156 + - typed-uuid - validity - validity-aeson - validity-bytestring @@ -5074,7 +5074,6 @@ skipped-tests: # Compilation failures - snappy # https://github.com/bos/snappy/issues/1 - - genvalidity-time # https://github.com/NorfairKing/validity/issues/51 - cron # Could not deduce (SOP.All (SOP.All Arbitrary) xss) arising from a use of ‘SOP.hcpure’ - config-ini # https://github.com/aisamanra/config-ini/issues/22 - polysemy-plugin # https://github.com/commercialhaskell/stackage/issues/4733 @@ -5175,8 +5174,6 @@ skipped-tests: - envelope # https://github.com/commercialhaskell/stackage/issues/4669 - algebraic-graphs # https://github.com/commercialhaskell/stackage/issues/4670 - bugsnag-haskell # https://github.com/commercialhaskell/stackage/issues/4759 - - genvalidity-hspec-cereal # https://github.com/commercialhaskell/stackage/issues/4909 - - genvalidity-hspec-optics # https://github.com/commercialhaskell/stackage/issues/4910 - servant-rawm # https://github.com/commercialhaskell/stackage/issues/5162 # end of skipped-tests @@ -5463,10 +5460,6 @@ expected-test-failures: # https://github.com/commercialhaskell/stackage/issues/5155 - pretty-relative-time - - # https://github.com/commercialhaskell/stackage/issues/5158 - - genvalidity-mergeful - - cursor-gen # end of expected-test-failures # Benchmarks which are known not to build. Note that, currently we do not run @@ -5602,7 +5595,6 @@ skipped-benchmarks: - fclabels - foldl - generic-lens - - genvalidity-path - hashable - histogram-fill - hmatrix-morpheus From cf3dbaea82734707130aea63cdb39c8c5a556369 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Wed, 12 Feb 2020 17:12:45 -0800 Subject: [PATCH 055/316] Also test again `pretty-relative-time` --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 5361d9c5..262ae87a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5457,9 +5457,6 @@ expected-test-failures: # Test-runner expects a cabal-style 'dist-newstyle' directory - hjsmin - - # https://github.com/commercialhaskell/stackage/issues/5155 - - pretty-relative-time # end of expected-test-failures # Benchmarks which are known not to build. Note that, currently we do not run From ea7d81e009f5ad1a4903ac5d8894defd8e33d563 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Wed, 12 Feb 2020 18:08:22 -0800 Subject: [PATCH 056/316] Don't be too eager --- build-constraints.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 262ae87a..f6ace0ac 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5457,6 +5457,10 @@ expected-test-failures: # Test-runner expects a cabal-style 'dist-newstyle' directory - hjsmin + + # https://github.com/commercialhaskell/stackage/issues/5158 + - genvalidity-mergeful + - cursor-gen # end of expected-test-failures # Benchmarks which are known not to build. Note that, currently we do not run @@ -5476,6 +5480,7 @@ expected-benchmark-failures: - raaz # https://github.com/commercialhaskell/stackage/issues/4766 - thyme - xmlgen # https://github.com/skogsbaer/xmlgen/issues/6 + - genvalidity-mergeless # https://github.com/commercialhaskell/stackage/issues/5157 # end of expected-benchmark-failures From 9f671da7329e1fbf631b710cb098da4d017fb73c Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Wed, 12 Feb 2020 18:57:33 -0800 Subject: [PATCH 057/316] More packages not yet fixed (#5156) --- build-constraints.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index f6ace0ac..8ed38f05 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3748,14 +3748,14 @@ packages: - genvalidity-scientific - genvalidity-text - genvalidity-time - - genvalidity-typed-uuid + - genvalidity-typed-uuid < 0 # via typed-uuid - genvalidity-unordered-containers - genvalidity-uuid - genvalidity-vector - mergeful - mergeless - pretty-relative-time - - typed-uuid + - typed-uuid < 0 # https://github.com/commercialhaskell/stackage/issues/5156 - validity - validity-aeson - validity-bytestring From c73c4b9a4350e6c40558d46c1407e41272319155 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Wed, 12 Feb 2020 19:02:55 -0800 Subject: [PATCH 058/316] Now build should proceed --- build-constraints.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 8ed38f05..9f0377e7 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5459,8 +5459,9 @@ expected-test-failures: - hjsmin # https://github.com/commercialhaskell/stackage/issues/5158 - - genvalidity-mergeful - cursor-gen + - genvalidity-mergeful + - genvalidity-mergeless # end of expected-test-failures # Benchmarks which are known not to build. Note that, currently we do not run From 3ba4f77c7aa28ae652114ed1c848af5fd53fac7e Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Thu, 13 Feb 2020 07:07:43 -0800 Subject: [PATCH 059/316] Enable more `genvalidity-*` packages --- build-constraints.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 9f0377e7..c6489c4a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3726,7 +3726,7 @@ packages: "Tom Sydney Kerckhove @NorfairKing": - cursor - cursor-brick - - cursor-fuzzy-time < 0 # via fuzzy-time + - cursor-fuzzy-time - cursor-gen - fuzzy-time - genvalidity @@ -3748,14 +3748,14 @@ packages: - genvalidity-scientific - genvalidity-text - genvalidity-time - - genvalidity-typed-uuid < 0 # via typed-uuid + - genvalidity-typed-uuid - genvalidity-unordered-containers - genvalidity-uuid - genvalidity-vector - mergeful - mergeless - pretty-relative-time - - typed-uuid < 0 # https://github.com/commercialhaskell/stackage/issues/5156 + - typed-uuid - validity - validity-aeson - validity-bytestring @@ -5481,7 +5481,6 @@ expected-benchmark-failures: - raaz # https://github.com/commercialhaskell/stackage/issues/4766 - thyme - xmlgen # https://github.com/skogsbaer/xmlgen/issues/6 - - genvalidity-mergeless # https://github.com/commercialhaskell/stackage/issues/5157 # end of expected-benchmark-failures From eabaa5d7dd999ae5bc02b51d7d08afbfffcf19f5 Mon Sep 17 00:00:00 2001 From: David Johnson Date: Wed, 12 Feb 2020 20:53:04 -0500 Subject: [PATCH 060/316] Update miso --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index c6489c4a..0c4cca1d 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -536,7 +536,7 @@ packages: - mbug < 0 # via http-client-0.6.1 "David Johnson @dmjio": - - miso < 0 # via servant + - miso - envy - s3-signer < 0 # via http-types # - google-translate # servant 0.12 From 9546d2c0b5dfebf9a7f8cb135b9aeb94d5409577 Mon Sep 17 00:00:00 2001 From: Naoto Shimazaki Date: Thu, 13 Feb 2020 11:00:36 +0900 Subject: [PATCH 061/316] add thread-supervisor, remove cisco-spark-api --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 0c4cca1d..34163934 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3652,8 +3652,8 @@ packages: "Naoto Shimazaki @nshimaza": - thread-hierarchy + - thread-supervisor - bitset-word8 - - cisco-spark-api - webex-teams-api - webex-teams-conduit - webex-teams-pipes From 344f03e1e3df140b6a50941d0cb1f3c8323c26a6 Mon Sep 17 00:00:00 2001 From: Pranay Sashank Date: Tue, 11 Feb 2020 15:32:11 +0530 Subject: [PATCH 062/316] Add fusion-plugin. --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 34163934..40d4aebb 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -510,6 +510,9 @@ packages: - unicode-transforms - xls + "Pranay Sashank @pranaysashank": + - fusion-plugin + "Aleksey Uimanov @s9gf4ult": # - postgresql-query # haskell-src-exts via derive - hreader From 798df5fffe7308c68255eb9b930907731c177cf8 Mon Sep 17 00:00:00 2001 From: Brandon Hamilton Date: Thu, 13 Feb 2020 14:23:03 +0200 Subject: [PATCH 063/316] Re-enable network-simple and dependent packages --- build-constraints.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 40d4aebb..d8482240 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -165,7 +165,7 @@ packages: "Matthew Ahrens @mpahrens": - forkable-monad - - butter < 0 # via network-simple + - butter < 0 # MonadFail "Iris Ward @AdituV": - typenums @@ -1554,13 +1554,13 @@ packages: - di-monad - exinst < 0 # compilation failure - flay < 0 - - network-simple < 0 # via network-bsd - - network-simple-tls < 0 # via network-simple + - network-simple + - network-simple-tls - pipes-aeson - pipes-attoparsec - pipes-binary - - pipes-network < 0 # via network-simple - - pipes-network-tls < 0 # via network-simple-tls + - pipes-network + - pipes-network-tls - safe-money - vector-bytes-instances - xmlbf-xeno < 0 # via xmlbf @@ -1605,8 +1605,8 @@ packages: - bitcoin-tx < 0 # via hexstring - bitcoin-types < 0 # via base58string & hexstring - hexstring - - network-attoparsec < 0 # via network-simple - - network-anonymous-i2p < 0 # via network-simple + - network-attoparsec < 0 # MonadFail + - network-anonymous-i2p < 0 # via network-attoparsec - network-anonymous-tor < 0 # build failure w/ socks 0.6, see https://github.com/solatis/haskell-network-anonymous-tor/issues/14 "Timothy Jones @zmthy": From 9c9b381d2a2d813d7960fad2d9d34dadb1c9f043 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Thu, 13 Feb 2020 07:12:05 -0800 Subject: [PATCH 064/316] `cursor-fuzzy-time` still fails (#5171) --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index d8482240..d5ee9da9 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3729,7 +3729,7 @@ packages: "Tom Sydney Kerckhove @NorfairKing": - cursor - cursor-brick - - cursor-fuzzy-time + - cursor-fuzzy-time < 0 # https://github.com/commercialhaskell/stackage/issues/5171 - cursor-gen - fuzzy-time - genvalidity From 77790c7bcb21fd8875871245df5c5c39a55ec0c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20L=C3=BCtke-Stetzkamp?= Date: Thu, 13 Feb 2020 13:34:41 +0100 Subject: [PATCH 065/316] Add more `gi-*` packages to be maintained by @garetxe as agreed. See haskell-gi/haskell-gi#273 --- build-constraints.yaml | 7 ++++++- debian-bootstrap.sh | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index d5ee9da9..51fb1e2e 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3035,18 +3035,23 @@ packages: - haskell-gi-base - gi-atk - gi-cairo + - gi-dbusmenu + - gi-dbusmenugtk3 - gi-gdk < 4 - gi-gdkpixbuf + - gi-gdkx11 < 4 - gi-gio - gi-glib - gi-gobject + - gi-graphene - gi-gtk < 4 - - gi-gtk-hs < 0 # via base-compat-0.11.0 + - gi-gtk-hs - gi-gtksource < 0 # via gi-gdk-4.0.1 & gi-gtk-4.0.1 - gi-javascriptcore < 0 # via haskell-gi - gi-pango - gi-vte < 0 # via gi-gdk-4.0.1 & gi-gtk-4.0.1 # - gi-webkit2 # https://github.com/fpco/stackage/issues/3415 + - gi-xlib "Brandon Simmons @jberryman": - directory-tree diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh index f487b160..cb9556f3 100755 --- a/debian-bootstrap.sh +++ b/debian-bootstrap.sh @@ -52,6 +52,8 @@ apt-get install -y \ libclang-3.9-dev \ libcurl4-openssl-dev \ libcwiid-dev \ + libdbusmenu-glib-dev \ + libdbusmenu-gtk3-dev \ libdevil-dev \ libedit-dev \ libedit2 \ @@ -66,6 +68,7 @@ apt-get install -y \ libglu1-mesa-dev \ libgmp3-dev \ libgnutls28-dev \ + libgraphene-1.0-dev \ libgsasl7-dev \ libgsl-dev \ libgtk-3-dev \ From 6d09854ff73308686df367c79ef334961157378f Mon Sep 17 00:00:00 2001 From: Csongor Kiss Date: Thu, 13 Feb 2020 18:34:44 +0000 Subject: [PATCH 066/316] Add generic-optics and generic-lens-core --- build-constraints.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 51fb1e2e..9a70988d 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3703,7 +3703,9 @@ packages: - milena < 0 "Csongor Kiss @kcsongor": - - generic-lens < 2.0.0.0 # https://github.com/commercialhaskell/stackage/issues/5161 + - generic-lens + - generic-optics + - generic-lens-core "Bogdan Neterebskii @ozzzzz": - cast From d6b16c49a941394e0cfa8f3e576af8967b16a80a Mon Sep 17 00:00:00 2001 From: Jeff Happily Date: Fri, 14 Feb 2020 11:29:11 +0800 Subject: [PATCH 067/316] Migrate dockerfiles from stack --- automated/dockerfiles/README.md | 36 +++++ automated/dockerfiles/build.sh | 170 +++++++++++++++++++++ automated/dockerfiles/lts-10.0/Dockerfile | 67 ++++++++ automated/dockerfiles/lts-10.1/Dockerfile | 3 + automated/dockerfiles/lts-10.5/Dockerfile | 3 + automated/dockerfiles/lts-11.0/Dockerfile | 67 ++++++++ automated/dockerfiles/lts-11.22/Dockerfile | 3 + automated/dockerfiles/lts-11.6/Dockerfile | 3 + automated/dockerfiles/lts-12.0/Dockerfile | 69 +++++++++ automated/dockerfiles/lts-12.13/Dockerfile | 3 + automated/dockerfiles/lts-12.15/Dockerfile | 14 ++ automated/dockerfiles/lts-12.21/Dockerfile | 3 + automated/dockerfiles/lts-12.26/Dockerfile | 89 +++++++++++ automated/dockerfiles/lts-13.0/Dockerfile | 69 +++++++++ automated/dockerfiles/lts-13.12/Dockerfile | 93 +++++++++++ automated/dockerfiles/lts-13.20/Dockerfile | 93 +++++++++++ automated/dockerfiles/lts-13.25/Dockerfile | 3 + automated/dockerfiles/lts-13.27/Dockerfile | 9 ++ automated/dockerfiles/lts-13.3/Dockerfile | 10 ++ automated/dockerfiles/lts-14.0/Dockerfile | 89 +++++++++++ automated/dockerfiles/lts-9.0/Dockerfile | 55 +++++++ automated/dockerfiles/lts-9.20/Dockerfile | 3 + automated/dockerfiles/lts-9.21/Dockerfile | 3 + 23 files changed, 957 insertions(+) create mode 100644 automated/dockerfiles/README.md create mode 100755 automated/dockerfiles/build.sh create mode 100644 automated/dockerfiles/lts-10.0/Dockerfile create mode 100644 automated/dockerfiles/lts-10.1/Dockerfile create mode 100644 automated/dockerfiles/lts-10.5/Dockerfile create mode 100644 automated/dockerfiles/lts-11.0/Dockerfile create mode 100644 automated/dockerfiles/lts-11.22/Dockerfile create mode 100644 automated/dockerfiles/lts-11.6/Dockerfile create mode 100644 automated/dockerfiles/lts-12.0/Dockerfile create mode 100644 automated/dockerfiles/lts-12.13/Dockerfile create mode 100644 automated/dockerfiles/lts-12.15/Dockerfile create mode 100644 automated/dockerfiles/lts-12.21/Dockerfile create mode 100644 automated/dockerfiles/lts-12.26/Dockerfile create mode 100644 automated/dockerfiles/lts-13.0/Dockerfile create mode 100644 automated/dockerfiles/lts-13.12/Dockerfile create mode 100644 automated/dockerfiles/lts-13.20/Dockerfile create mode 100644 automated/dockerfiles/lts-13.25/Dockerfile create mode 100644 automated/dockerfiles/lts-13.27/Dockerfile create mode 100644 automated/dockerfiles/lts-13.3/Dockerfile create mode 100644 automated/dockerfiles/lts-14.0/Dockerfile create mode 100644 automated/dockerfiles/lts-9.0/Dockerfile create mode 100644 automated/dockerfiles/lts-9.20/Dockerfile create mode 100644 automated/dockerfiles/lts-9.21/Dockerfile diff --git a/automated/dockerfiles/README.md b/automated/dockerfiles/README.md new file mode 100644 index 00000000..9fb1ec3d --- /dev/null +++ b/automated/dockerfiles/README.md @@ -0,0 +1,36 @@ +dockerfiles/stack-build +======================= + +Build [fpco/stack-build](https://hub.docker.com/r/fpco/stack-build/) Docker +images. This script and its Dockerfiles are used for building images for LTS >= +8.0. + +Usage +----- + + ./build.sh [--push] [--dry-run] [--small] lts-X.Y|lts-X|lts]" + +Options +------- + +`--help`: show this help + +`--push`: push the image after building/tagging it + +`--dry-run`: print the important commands that will be run, but don't actually + run them + +`--small`: build the small variant of the image + +Argument +--------- + +If you specify and exact LTS version, that image will be built. If you only +specify the major version, then an image for the latest minor version for that +major version will be built. If you specify 'lts', an image for the latest LTS +snapshot is built. + +This searches for a Dockerfile for the selected snapshot in +`lts-X.Y/Dockerfile`, and if one isn't found reuses the same image as built the +most recent `lts-X.Y/Dockerfile` found for earlier minor versions of the same +major version. diff --git a/automated/dockerfiles/build.sh b/automated/dockerfiles/build.sh new file mode 100755 index 00000000..7c337949 --- /dev/null +++ b/automated/dockerfiles/build.sh @@ -0,0 +1,170 @@ +#!/usr/bin/env bash + +set -eu +cd "$(dirname "$0")" + +# +# Constants and defaults +# + +DOCKER_REPO=fpco/stack-build +PUSH=false +DRY=false +VARIANT=build + +# +# Functions +# + +# Print usage information and exit with failure status. First argument is an +# error message. +usage() { + echo "$0: $1" >&2 + echo + echo "Usage: $0 [--push] [--dry-run] [--small] lts-X.Y|lts-X|lts]" + echo "See README.md for more information." + echo + exit 1 +} + +# Print a command, and if --dry-run disabled also run it +dry() { + echo ">>> $*" + [[ $DRY = true ]] || "$@" +} + +# Push an image if --push is enabled (otherwise do nothing) +push() { + [[ $PUSH = false ]] || dry docker push "$1" +} + +# Tag an image, and then push it if --push is enabled +tagpush() { + dry docker tag "$1" "$2" + push "$2" +} + +# +# Parse command-line +# + +LTS_SLUG_ARG= +while [[ $# -gt 0 ]]; do + case "$1" in + --push) + PUSH=true + shift + ;; + --dry-run) + DRY=true + shift + ;; + --small) + VARIANT=small + DOCKER_REPO=fpco/stack-build-small + shift + ;; + -*) + usage "Unknown option: $1" + ;; + *) + if [[ -n "$LTS_SLUG_ARG" ]]; then + usage "Cannot specify multiple snaphots: $1" + fi + LTS_SLUG_ARG="$1" + shift + ;; + esac +done + +# +# Determine actual snapshot version from aliases +# + +SNAPSHOTS="$(mktemp "lts-snapshots.json.XXXXXX")" +trap "rm -f \"$SNAPSHOTS\"" EXIT +wget -qO- https://www.stackage.org/download/lts-snapshots.json >"$SNAPSHOTS" + +case "$LTS_SLUG_ARG" in + "") + usage "Missing argument: snapshot or alias" + ;; + lts-*.*) + LTS_SLUG="$LTS_SLUG_ARG" + ;; + *) + LTS_SLUG=$(jq -r ".[\"$LTS_SLUG_ARG\"]" "$SNAPSHOTS") + if [[ -z "$LTS_SLUG" || "$LTS_SLUG" = "null" ]]; then + echo "$0: Cannot find LTS version for slug: $LTS_SLUG_ARG" >&2 + exit 1 + fi + ;; +esac + +LTS_VERSION="${LTS_SLUG#lts-}" +LTS_MAJOR="${LTS_VERSION%.*}" +LTS_MINOR="${LTS_VERSION#*.}" + +# +# Determine latest LTS version +# + +LATEST_LTS_SLUG=$(jq -r ".[\"lts\"]" $SNAPSHOTS) +LATEST_LTS_VERSION="${LATEST_LTS_SLUG#lts-}" +LATEST_LTS_MAJOR="${LATEST_LTS_VERSION%.*}" +LATEST_LTS_MINOR="${LATEST_LTS_VERSION#*.}" + +# +# Determine latest minor version of the selected major version +# + +MAJOR_LATEST_LTS_SLUG=$(jq -r ".[\"lts-$LTS_MAJOR\"]" $SNAPSHOTS) +MAJOR_LATEST_LTS_VERSION="${MAJOR_LATEST_LTS_SLUG#lts-}" +MAJOR_LATEST_LTS_MAJOR="${MAJOR_LATEST_LTS_VERSION%.*}" +MAJOR_LATEST_LTS_MINOR="${MAJOR_LATEST_LTS_VERSION#*.}" + +# +# Find the Dockerfile for the selected snapshot +# + +if [[ -s "$LTS_SLUG/Dockerfile" ]]; then + + # If there is an exact match, build and push that image + + sed "s/\\\$DOCKER_REPO/$(echo $DOCKER_REPO|sed 's/\//\\\//')/g" "$LTS_SLUG/Dockerfile" >"$LTS_SLUG/Dockerfile.sub" + dry docker build -t "$DOCKER_REPO:$LTS_SLUG" --build-arg "DOCKER_REPO=$DOCKER_REPO" --build-arg "LTS_SLUG=$LTS_SLUG" --build-arg "VARIANT=$VARIANT" -f "$LTS_SLUG/Dockerfile.sub" "$LTS_SLUG" + rm -f "$LTS_SLUG/Dockerfile.sub" + push "$DOCKER_REPO:$LTS_SLUG" +else + + # If no exact match, find a dockerfile for any earlier minor version of the + # selected major version, and just create a new tag from version's image with the selected + # minor version (assuming that nothing needs to change), and push it. + + minor=$(( LTS_MINOR - 1 )) + while [[ ! -s "lts-$LTS_MAJOR.$minor/Dockerfile" && $minor -ge 0 ]]; do + minor=$(( minor - 1 )) + done + if [[ $minor -lt 0 ]]; then + echo "$0: Cannot find any Dockerfile for LTS major version" >&2 + exit 1 + fi + dry docker pull "$DOCKER_REPO:lts-$LTS_MAJOR.$minor" || true + tagpush "$DOCKER_REPO:lts-$LTS_MAJOR.$minor" "$DOCKER_REPO:$LTS_SLUG" +fi + +# +# Create and push additional tags +# + +# If we select the latest minor version for the selected major version, then +# also create and push an 'lts-X' tag. +if [[ "$MAJOR_LATEST_LTS_VERSION" = "$LTS_VERSION" ]]; then + tagpush "$DOCKER_REPO:$LTS_SLUG" "$DOCKER_REPO:lts-$LTS_MAJOR" +fi + +# If we selected the latest LTS snapshot, also create and push the 'lts' and 'latest' tags. +if [[ "$LATEST_LTS_VERSION" = "$LTS_VERSION" ]]; then + tagpush "$DOCKER_REPO:$LTS_SLUG" "$DOCKER_REPO:lts" + tagpush "$DOCKER_REPO:$LTS_SLUG" "$DOCKER_REPO:latest" +fi diff --git a/automated/dockerfiles/lts-10.0/Dockerfile b/automated/dockerfiles/lts-10.0/Dockerfile new file mode 100644 index 00000000..7a0b4172 --- /dev/null +++ b/automated/dockerfiles/lts-10.0/Dockerfile @@ -0,0 +1,67 @@ +FROM ubuntu:16.04 + +MAINTAINER Emanuel Borsboom + +ARG GHC_VERSION=8.2.2 +ARG LTS_SLUG=lts-10.0 +ARG PID1_VERSION=0.1.0.1 +ARG STACK_VERSION=1.6.3 +ARG BOOTSTRAP_COMMIT=a8234cb586c3022099a3b0155275ed067df00f72 +ARG DEBIAN_FRONTEND=noninteractive + +# +# 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/.cabal/bin:/root/.local/bin:/opt/ghc/$GHC_VERSION/bin:$PATH + +# +# Use Stackage's debian-bootstrap.sh script to install system libraries and +# tools required to build any Stackage package. +# + +RUN apt-get update && \ + apt-get install -y wget && \ + wget -qO- https://raw.githubusercontent.com/fpco/stackage/$BOOTSTRAP_COMMIT/debian-bootstrap.sh | bash && \ + rm -rf /var/lib/apt/lists/* + +# +# Create symlink to help tools find GHC documentation +# + +RUN ln -s ghc /opt/ghc/$GHC_VERSION/share/doc/ghc-$GHC_VERSION + +# +# 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 --system-ghc --resolver=$LTS_SLUG --local-bin-path=/usr/local/bin install \ + cabal-install happy alex cpphs gtk2hs-buildtools hscolour && \ + cd $HOME/.stack && \ + find . -type f -not -path './snapshots/*/share/*' -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/pid1%2F$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 + +# +# Install Stack +# + +RUN 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/local/bin '*/stack' + +# +# Set up pid1 entrypoint and default command +# + +ENTRYPOINT ["/usr/local/sbin/pid1"] +CMD ["bash"] diff --git a/automated/dockerfiles/lts-10.1/Dockerfile b/automated/dockerfiles/lts-10.1/Dockerfile new file mode 100644 index 00000000..3ffce11c --- /dev/null +++ b/automated/dockerfiles/lts-10.1/Dockerfile @@ -0,0 +1,3 @@ +FROM fpco/stack-build:lts-10.0 +ARG STACK_VERSION=1.6.3 +RUN 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/local/bin '*/stack' diff --git a/automated/dockerfiles/lts-10.5/Dockerfile b/automated/dockerfiles/lts-10.5/Dockerfile new file mode 100644 index 00000000..d2e8ba14 --- /dev/null +++ b/automated/dockerfiles/lts-10.5/Dockerfile @@ -0,0 +1,3 @@ +FROM fpco/stack-build:lts-10.0 +ARG STACK_VERSION=1.6.5 +RUN 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/local/bin '*/stack' diff --git a/automated/dockerfiles/lts-11.0/Dockerfile b/automated/dockerfiles/lts-11.0/Dockerfile new file mode 100644 index 00000000..093286da --- /dev/null +++ b/automated/dockerfiles/lts-11.0/Dockerfile @@ -0,0 +1,67 @@ +FROM ubuntu:16.04 + +MAINTAINER Emanuel Borsboom + +ARG GHC_VERSION=8.2.2 +ARG LTS_SLUG=lts-11.0 +ARG PID1_VERSION=0.1.0.1 +ARG STACK_VERSION=1.6.5 +ARG BOOTSTRAP_COMMIT=13ab2b86779c98598e96af7f4c4b9653ba280be5 +ARG DEBIAN_FRONTEND=noninteractive + +# +# 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/.cabal/bin:/root/.local/bin:/opt/ghc/$GHC_VERSION/bin:$PATH + +# +# Use Stackage's debian-bootstrap.sh script to install system libraries and +# tools required to build any Stackage package. +# + +RUN apt-get update && \ + apt-get install -y wget && \ + wget -qO- https://raw.githubusercontent.com/fpco/stackage/$BOOTSTRAP_COMMIT/debian-bootstrap.sh | bash && \ + rm -rf /var/lib/apt/lists/* + +# +# Create symlink to help tools find GHC documentation +# + +RUN ln -s ghc /opt/ghc/$GHC_VERSION/share/doc/ghc-$GHC_VERSION + +# +# 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 --system-ghc --resolver=$LTS_SLUG --local-bin-path=/usr/local/bin install \ + cabal-install happy alex cpphs gtk2hs-buildtools hscolour && \ + cd $HOME/.stack && \ + find . -type f -not -path './snapshots/*/share/*' -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/pid1%2F$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 + +# +# Install Stack +# + +RUN 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/local/bin '*/stack' + +# +# Set up pid1 entrypoint and default command +# + +ENTRYPOINT ["/usr/local/sbin/pid1"] +CMD ["bash"] diff --git a/automated/dockerfiles/lts-11.22/Dockerfile b/automated/dockerfiles/lts-11.22/Dockerfile new file mode 100644 index 00000000..b2065306 --- /dev/null +++ b/automated/dockerfiles/lts-11.22/Dockerfile @@ -0,0 +1,3 @@ +FROM fpco/stack-build:lts-11.6 +ARG STACK_VERSION=1.9.3 +RUN 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/local/bin '*/stack' diff --git a/automated/dockerfiles/lts-11.6/Dockerfile b/automated/dockerfiles/lts-11.6/Dockerfile new file mode 100644 index 00000000..83c5d691 --- /dev/null +++ b/automated/dockerfiles/lts-11.6/Dockerfile @@ -0,0 +1,3 @@ +FROM fpco/stack-build:lts-11.5 +ARG STACK_VERSION=1.7.1 +RUN 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/local/bin '*/stack' diff --git a/automated/dockerfiles/lts-12.0/Dockerfile b/automated/dockerfiles/lts-12.0/Dockerfile new file mode 100644 index 00000000..827941ee --- /dev/null +++ b/automated/dockerfiles/lts-12.0/Dockerfile @@ -0,0 +1,69 @@ +FROM ubuntu:16.04 + +MAINTAINER Emanuel Borsboom + +ARG GHC_VERSION=8.4.3 +ARG LTS_SLUG=lts-12.0 +ARG PID1_VERSION=0.1.2.0 +ARG STACK_VERSION=1.7.1 +ARG CUDA_VERSION=8.0 +ARG BOOTSTRAP_COMMIT=56c62ccbf31229ee2b09d3a0b4cd2ad94e7406a8 +ARG DEBIAN_FRONTEND=noninteractive + +# +# 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/.cabal/bin:/root/.local/bin:/usr/local/cuda-$CUDA_VERSION/bin:/opt/ghc/$GHC_VERSION/bin:$PATH \ + CUDA_PATH=/usr/local/cuda-$CUDA_VERSION \ + LD_LIBRARY_PATH=/usr/local/cuda-$CUDA_VERSION/lib64:/usr/local/cuda-$CUDA_VERSION/nvvm/lib64 +# +# Use Stackage's debian-bootstrap.sh script to install system libraries and +# tools required to build any Stackage package. +# + +RUN apt-get update && \ + apt-get install -y wget && \ + wget -qO- https://raw.githubusercontent.com/fpco/stackage/$BOOTSTRAP_COMMIT/debian-bootstrap.sh | bash && \ + rm -rf /var/lib/apt/lists/* + +# +# Create symlink to help tools find GHC documentation +# + +RUN ln -s ghc /opt/ghc/$GHC_VERSION/share/doc/ghc-$GHC_VERSION + +# +# 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 --system-ghc --resolver=$LTS_SLUG --local-bin-path=/usr/local/bin install \ + cabal-install happy alex cpphs gtk2hs-buildtools hscolour && \ + cd $HOME/.stack && \ + find . -type f -not -path './snapshots/*/share/*' -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 + +# +# Install Stack +# + +RUN 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/local/bin '*/stack' + +# +# Set up pid1 entrypoint and default command +# + +ENTRYPOINT ["/usr/local/sbin/pid1"] +CMD ["bash"] diff --git a/automated/dockerfiles/lts-12.13/Dockerfile b/automated/dockerfiles/lts-12.13/Dockerfile new file mode 100644 index 00000000..23617aa9 --- /dev/null +++ b/automated/dockerfiles/lts-12.13/Dockerfile @@ -0,0 +1,3 @@ +FROM fpco/stack-build:lts-12.0 +ARG STACK_VERSION=1.9.1 +RUN 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/local/bin '*/stack' diff --git a/automated/dockerfiles/lts-12.15/Dockerfile b/automated/dockerfiles/lts-12.15/Dockerfile new file mode 100644 index 00000000..7d309271 --- /dev/null +++ b/automated/dockerfiles/lts-12.15/Dockerfile @@ -0,0 +1,14 @@ +FROM fpco/stack-build:lts-12.0 +ARG STACK_VERSION=1.9.1 +ARG GHC_VERSION=8.4.4 +RUN apt-get update && \ + apt-get install -y \ + ghc-$GHC_VERSION \ + ghc-$GHC_VERSION-dyn \ + ghc-$GHC_VERSION-htmldocs \ + ghc-$GHC_VERSION-prof && \ + rm -rf /var/lib/apt/lists/* +RUN 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/local/bin '*/stack' +RUN ln -s ghc-$GHC_VERSION /opt/ghc/$GHC_VERSION/share/doc/ghc +ARG CUDA_VERSION=8.0 +ENV PATH=/root/.cabal/bin:/root/.local/bin:/usr/local/cuda-$CUDA_VERSION/bin:/opt/ghc/$GHC_VERSION/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin diff --git a/automated/dockerfiles/lts-12.21/Dockerfile b/automated/dockerfiles/lts-12.21/Dockerfile new file mode 100644 index 00000000..b8f3e821 --- /dev/null +++ b/automated/dockerfiles/lts-12.21/Dockerfile @@ -0,0 +1,3 @@ +FROM fpco/stack-build:lts-12.15 +ARG STACK_VERSION=1.9.3 +RUN 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/local/bin '*/stack' diff --git a/automated/dockerfiles/lts-12.26/Dockerfile b/automated/dockerfiles/lts-12.26/Dockerfile new file mode 100644 index 00000000..edaab49b --- /dev/null +++ b/automated/dockerfiles/lts-12.26/Dockerfile @@ -0,0 +1,89 @@ +FROM ubuntu:16.04 + +MAINTAINER Emanuel Borsboom + +ARG GHC_VERSION=8.4.4 +ARG LTS_SLUG=lts-12.0 +ARG PID1_VERSION=0.1.2.0 +ARG STACK_VERSION=1.9.3 +ARG CUDA_VERSION=8.0 +ARG BOOTSTRAP_COMMIT=7f982f63a3734ddb2a7cbbc52b8cec983c496efa +ARG DEBIAN_FRONTEND=noninteractive +ARG VARIANT=build + +# +# 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/.cabal/bin:/root/.local/bin:/usr/local/cuda-$CUDA_VERSION/bin:/opt/ghc/$GHC_VERSION/bin:$PATH \ + CUDA_PATH=/usr/local/cuda-$CUDA_VERSION \ + LD_LIBRARY_PATH=/usr/local/cuda-$CUDA_VERSION/lib64:/usr/local/cuda-$CUDA_VERSION/nvvm/lib64 +# +# Use Stackage's debian-bootstrap.sh script to install system libraries and +# tools required to build any Stackage package. +# + +RUN apt-get update && \ + apt-get install -y --no-install-recommends wget netbase ca-certificates && \ + if [ "$VARIANT" = "small" ]; then \ + echo "deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main" >>/etc/apt/sources.list && \ + echo "deb-src http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main" >>/etc/apt/sources.list && \ + apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 063DAB2BDC0B3F9FCEBC378BFF3AEACEF6F88286 && \ + apt-get update && \ + apt-get install -y --no-install-recommends \ + ghc-$GHC_VERSION ghc-$GHC_VERSION-htmldocs \ + g++ gcc libc6-dev libffi-dev libgmp-dev make xz-utils zlib1g-dev git gnupg \ + libtinfo-dev; \ + else \ + wget -qO- https://raw.githubusercontent.com/fpco/stackage/$BOOTSTRAP_COMMIT/debian-bootstrap.sh | bash; \ + fi && \ + rm -rf /var/lib/apt/lists/* + +# +# Create symlink to help tools find GHC documentation +# + +RUN ln -s ghc /opt/ghc/$GHC_VERSION/share/doc/ghc-$GHC_VERSION + +# +# Install Stack +# + +RUN 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/local/bin '*/stack' + +# +# 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 export STACK_ROOT=/usr/local/lib/stack && \ + stack --resolver=$LTS_SLUG --local-bin-path=/usr/local/bin install \ + cabal-install happy alex cpphs gtk2hs-buildtools hscolour hlint hindent && \ + cd $STACK_ROOT && \ + find . -type f -not -path './snapshots/*/share/*' -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"] diff --git a/automated/dockerfiles/lts-13.0/Dockerfile b/automated/dockerfiles/lts-13.0/Dockerfile new file mode 100644 index 00000000..3fc6836c --- /dev/null +++ b/automated/dockerfiles/lts-13.0/Dockerfile @@ -0,0 +1,69 @@ +FROM ubuntu:16.04 + +MAINTAINER Emanuel Borsboom + +ARG GHC_VERSION=8.6.3 +ARG LTS_SLUG=lts-13.0 +ARG PID1_VERSION=0.1.2.0 +ARG STACK_VERSION=1.9.3 +ARG CUDA_VERSION=10.0 +ARG BOOTSTRAP_COMMIT=26b29f2862462afd47fb916ed0a2c2a6844ebca9 +ARG DEBIAN_FRONTEND=noninteractive + +# +# 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/.cabal/bin:/root/.local/bin:/usr/local/cuda-$CUDA_VERSION/bin:/opt/ghc/$GHC_VERSION/bin:$PATH \ + CUDA_PATH=/usr/local/cuda-$CUDA_VERSION \ + LD_LIBRARY_PATH=/usr/local/cuda-$CUDA_VERSION/lib64:/usr/local/cuda-$CUDA_VERSION/nvvm/lib64 +# +# Use Stackage's debian-bootstrap.sh script to install system libraries and +# tools required to build any Stackage package. +# + +RUN apt-get update && \ + apt-get install -y wget && \ + wget -qO- https://raw.githubusercontent.com/fpco/stackage/$BOOTSTRAP_COMMIT/debian-bootstrap.sh | bash && \ + rm -rf /var/lib/apt/lists/* + +# +# Create symlink to help tools find GHC documentation +# + +RUN ln -s ghc /opt/ghc/$GHC_VERSION/share/doc/ghc-$GHC_VERSION + +# +# 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 --system-ghc --resolver=$LTS_SLUG --local-bin-path=/usr/local/bin install \ + cabal-install happy alex cpphs gtk2hs-buildtools hscolour && \ + cd $HOME/.stack && \ + find . -type f -not -path './snapshots/*/share/*' -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 + +# +# Install Stack +# + +RUN 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/local/bin '*/stack' + +# +# Set up pid1 entrypoint and default command +# + +ENTRYPOINT ["/usr/local/sbin/pid1"] +CMD ["bash"] diff --git a/automated/dockerfiles/lts-13.12/Dockerfile b/automated/dockerfiles/lts-13.12/Dockerfile new file mode 100644 index 00000000..c85a6eba --- /dev/null +++ b/automated/dockerfiles/lts-13.12/Dockerfile @@ -0,0 +1,93 @@ +FROM ubuntu:16.04 + +MAINTAINER Emanuel Borsboom + +ARG GHC_VERSION=8.6.4 +ARG LTS_SLUG=lts-13.11 +ARG PID1_VERSION=0.1.2.0 +ARG STACK_VERSION=1.9.3 +ARG CUDA_VERSION=10.0 +ARG BOOTSTRAP_COMMIT=9f2b7ab95c711794257b059604e80ab9ad3c0c45 +ARG DEBIAN_FRONTEND=noninteractive +ARG VARIANT=build + +# +# 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/.cabal/bin:/root/.local/bin:/usr/local/cuda-$CUDA_VERSION/bin:/opt/ghc/$GHC_VERSION/bin:$PATH \ + CUDA_PATH=/usr/local/cuda-$CUDA_VERSION \ + LD_LIBRARY_PATH=/usr/local/cuda-$CUDA_VERSION/lib64:/usr/local/cuda-$CUDA_VERSION/nvvm/lib64 + +# +# Use Stackage's debian-bootstrap.sh script to install system libraries and +# tools required to build any Stackage package. +# + +RUN apt-get update && \ + apt-get install -y --no-install-recommends wget netbase ca-certificates && \ + if [ "$VARIANT" = "small" ]; then \ + echo "deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main" >>/etc/apt/sources.list && \ + echo "deb-src http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main" >>/etc/apt/sources.list && \ + apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 063DAB2BDC0B3F9FCEBC378BFF3AEACEF6F88286 && \ + apt-get update && \ + apt-get install -y --no-install-recommends \ + ghc-$GHC_VERSION ghc-$GHC_VERSION-htmldocs \ + g++ gcc libc6-dev libffi-dev libgmp-dev make xz-utils zlib1g-dev git gnupg \ + libtinfo-dev; \ + else \ + wget -qO- https://raw.githubusercontent.com/fpco/stackage/$BOOTSTRAP_COMMIT/debian-bootstrap.sh | sed "s/^GHCVER=8.6.3$/GHCVER=$GHC_VERSION/" | bash && \ + # Add g++ version required for building 'double-conversion' \ + # (see https://github.com/commercialhaskell/stack/issues/4470) \ + apt-get install -y g++-7; \ + fi && \ + rm -rf /var/lib/apt/lists/* + +# +# Create symlink to help tools find GHC documentation +# + +RUN ln -s ghc /opt/ghc/$GHC_VERSION/share/doc/ghc-$GHC_VERSION + +# +# Install Stack +# + +RUN 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/local/bin '*/stack' + +# +# 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 export STACK_ROOT=/usr/local/lib/stack && \ + stack --resolver=$LTS_SLUG --local-bin-path=/usr/local/bin install \ + cabal-install happy alex cpphs gtk2hs-buildtools hscolour hlint hindent && \ + cd $STACK_ROOT && \ + find . -type f -not -path './snapshots/*/share/*' -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"] diff --git a/automated/dockerfiles/lts-13.20/Dockerfile b/automated/dockerfiles/lts-13.20/Dockerfile new file mode 100644 index 00000000..0ac78fcb --- /dev/null +++ b/automated/dockerfiles/lts-13.20/Dockerfile @@ -0,0 +1,93 @@ +FROM ubuntu:16.04 + +MAINTAINER Emanuel Borsboom + +ARG GHC_VERSION=8.6.5 +ARG LTS_SLUG=lts-13.20 +ARG PID1_VERSION=0.1.2.0 +ARG STACK_VERSION=1.9.3 +ARG CUDA_VERSION=10.0 +ARG BOOTSTRAP_COMMIT=9f2b7ab95c711794257b059604e80ab9ad3c0c45 +ARG DEBIAN_FRONTEND=noninteractive +ARG VARIANT=build + +# +# 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/.cabal/bin:/root/.local/bin:/usr/local/cuda-$CUDA_VERSION/bin:/opt/ghc/$GHC_VERSION/bin:$PATH \ + CUDA_PATH=/usr/local/cuda-$CUDA_VERSION \ + LD_LIBRARY_PATH=/usr/local/cuda-$CUDA_VERSION/lib64:/usr/local/cuda-$CUDA_VERSION/nvvm/lib64 + +# +# Use Stackage's debian-bootstrap.sh script to install system libraries and +# tools required to build any Stackage package. +# + +RUN apt-get update && \ + apt-get install -y --no-install-recommends wget netbase ca-certificates && \ + if [ "$VARIANT" = "small" ]; then \ + echo "deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main" >>/etc/apt/sources.list && \ + echo "deb-src http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main" >>/etc/apt/sources.list && \ + apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 063DAB2BDC0B3F9FCEBC378BFF3AEACEF6F88286 && \ + apt-get update && \ + apt-get install -y --no-install-recommends \ + ghc-$GHC_VERSION ghc-$GHC_VERSION-htmldocs \ + g++ gcc libc6-dev libffi-dev libgmp-dev make xz-utils zlib1g-dev git gnupg \ + libtinfo-dev; \ + else \ + wget -qO- https://raw.githubusercontent.com/fpco/stackage/$BOOTSTRAP_COMMIT/debian-bootstrap.sh | sed "s/^GHCVER=8.6.3$/GHCVER=$GHC_VERSION/" | bash && \ + # Add g++ version required for building 'double-conversion' \ + # (see https://github.com/commercialhaskell/stack/issues/4470) \ + apt-get install -y g++-7; \ + fi && \ + rm -rf /var/lib/apt/lists/* + +# +# Create symlink to help tools find GHC documentation +# + +RUN ln -s ghc /opt/ghc/$GHC_VERSION/share/doc/ghc-$GHC_VERSION + +# +# Install Stack +# + +RUN 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/local/bin '*/stack' + +# +# 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 export STACK_ROOT=/usr/local/lib/stack && \ + stack --resolver=$LTS_SLUG --local-bin-path=/usr/local/bin install \ + cabal-install happy alex cpphs gtk2hs-buildtools hscolour hlint hindent && \ + cd $STACK_ROOT && \ + find . -type f -not -path './snapshots/*/share/*' -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"] diff --git a/automated/dockerfiles/lts-13.25/Dockerfile b/automated/dockerfiles/lts-13.25/Dockerfile new file mode 100644 index 00000000..94e2439c --- /dev/null +++ b/automated/dockerfiles/lts-13.25/Dockerfile @@ -0,0 +1,3 @@ +FROM $DOCKER_REPO:lts-13.24 +ARG STACK_VERSION=2.1.1 +RUN 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/local/bin '*/stack' diff --git a/automated/dockerfiles/lts-13.27/Dockerfile b/automated/dockerfiles/lts-13.27/Dockerfile new file mode 100644 index 00000000..a8d1204e --- /dev/null +++ b/automated/dockerfiles/lts-13.27/Dockerfile @@ -0,0 +1,9 @@ +FROM $DOCKER_REPO:lts-13.26 +ARG VARIANT +RUN if [ "$VARIANT" = "small" ]; then \ + apt-get update && \ + apt-get install -y --no-install-recommends sudo && \ + rm -rf /var/lib/apt/lists/*; \ + fi +ARG STACK_VERSION=2.1.3 +RUN wget -qO- https://github.com/commercialhaskell/stack/releases/download/v$STACK_VERSION/stack-$STACK_VERSION-linux-x86_64-static.tar.gz | tar xz --wildcards --strip-components=1 -C /usr/local/bin '*/stack' diff --git a/automated/dockerfiles/lts-13.3/Dockerfile b/automated/dockerfiles/lts-13.3/Dockerfile new file mode 100644 index 00000000..78e92de7 --- /dev/null +++ b/automated/dockerfiles/lts-13.3/Dockerfile @@ -0,0 +1,10 @@ +FROM fpco/stack-build:lts-13.0 + +# +# Add g++ version required for building 'double-conversion' +# (see https://github.com/commercialhaskell/stack/issues/4470) +# + +RUN apt-get update && \ + apt-get install -y g++-7 && \ + rm -rf /var/lib/apt/lists/* diff --git a/automated/dockerfiles/lts-14.0/Dockerfile b/automated/dockerfiles/lts-14.0/Dockerfile new file mode 100644 index 00000000..9905a75d --- /dev/null +++ b/automated/dockerfiles/lts-14.0/Dockerfile @@ -0,0 +1,89 @@ +FROM ubuntu:18.04 + +LABEL maintainer="manny@fpcomplete.com" + +ARG GHC_VERSION=8.6.5 +ARG LTS_SLUG=lts-14.0 +ARG PID1_VERSION=0.1.2.0 +ARG STACK_VERSION=2.1.3 +ARG CUDA_VERSION=10.0 +ARG JVM_PATH=/usr/lib/jvm/java-8-openjdk-amd64 +ARG LLVM_VERSION=3.9 +ARG BOOTSTRAP_COMMIT=d4143f1845f26e8e99d0a1a8134d6ff535ab98b2 +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:/usr/lib/llvm-$LLVM_VERSION/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 && \ + rm -rf /var/lib/apt/lists/* + +# +# Use Stackage's debian-bootstrap.sh script to install system libraries and +# tools required to build any Stackage package. +# Re-installs 'stack' *after* running debian-bootstrap.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/fpco/stackage/$BOOTSTRAP_COMMIT/debian-bootstrap.sh | sed "s/^GHCVER=8.6.5$/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"] diff --git a/automated/dockerfiles/lts-9.0/Dockerfile b/automated/dockerfiles/lts-9.0/Dockerfile new file mode 100644 index 00000000..d5a479ae --- /dev/null +++ b/automated/dockerfiles/lts-9.0/Dockerfile @@ -0,0 +1,55 @@ +FROM ubuntu:16.04 + +MAINTAINER Emanuel Borsboom + +ARG GHC_VERSION=8.0.2 +ARG LTS_SLUG=lts-9.0 +ARG PID1_VERSION=0.1.0.1 +ARG BOOTSTRAP_COMMIT=1bc67bb54eda08c90d8421bc11d257354a379d11 +ARG DEBIAN_FRONTEND=noninteractive + +# +# 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/.cabal/bin:/root/.local/bin:/opt/ghc/$GHC_VERSION/bin:$PATH + +# +# Use Stackage's debian-bootstrap.sh script to install system libraries and +# tools required to build any Stackage package. +# + +RUN apt-get update && \ + apt-get install -y wget && \ + wget -qO- https://raw.githubusercontent.com/fpco/stackage/$BOOTSTRAP_COMMIT/debian-bootstrap.sh | bash && \ + ln -s ghc /opt/ghc/$GHC_VERSION/share/doc/ghc-$GHC_VERSION && \ + rm -rf /var/lib/apt/lists/* + +# +# 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 --system-ghc --resolver=$LTS_SLUG --local-bin-path=/usr/local/bin install \ + cabal-install happy alex cpphs gtk2hs-buildtools hscolour && \ + cd $HOME/.stack && \ + find . -type f -not -path './snapshots/*/share/*' -exec rm '{}' \; && \ + find . -type d -print0 |sort -rz |xargs -0 rmdir 2>/dev/null || true + +# +# Install proper 'pid1' init daemon +# + +RUN wget -O- "https://github.com/fpco/pid1/releases/download/pid1%2F$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"] diff --git a/automated/dockerfiles/lts-9.20/Dockerfile b/automated/dockerfiles/lts-9.20/Dockerfile new file mode 100644 index 00000000..b524e980 --- /dev/null +++ b/automated/dockerfiles/lts-9.20/Dockerfile @@ -0,0 +1,3 @@ +FROM fpco/stack-build:lts-9.0 +ARG STACK_VERSION=1.6.1 +RUN 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/local/bin '*/stack' diff --git a/automated/dockerfiles/lts-9.21/Dockerfile b/automated/dockerfiles/lts-9.21/Dockerfile new file mode 100644 index 00000000..4a875c91 --- /dev/null +++ b/automated/dockerfiles/lts-9.21/Dockerfile @@ -0,0 +1,3 @@ +FROM fpco/stack-build:lts-9.0 +ARG STACK_VERSION=1.6.5 +RUN 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/local/bin '*/stack' From 0f114e0414058bdd82cb77aa1a585a1be9ad7a6d Mon Sep 17 00:00:00 2001 From: Jeff Happily Date: Fri, 14 Feb 2020 12:04:53 +0800 Subject: [PATCH 068/316] Modify docker build script --- automated/build.sh | 9 ++ automated/dockerfiles/README.md | 7 +- automated/dockerfiles/build.sh | 52 ++--------- automated/dockerfiles/lts-14.0/Dockerfile.sub | 89 +++++++++++++++++++ 4 files changed, 109 insertions(+), 48 deletions(-) create mode 100644 automated/dockerfiles/lts-14.0/Dockerfile.sub diff --git a/automated/build.sh b/automated/build.sh index d6fdd77e..5815fe4f 100755 --- a/automated/build.sh +++ b/automated/build.sh @@ -145,6 +145,15 @@ docker run $ARGS_UPLOAD $IMAGE /bin/bash -c "curator upload-docs --target $TARGE docker run $ARGS_UPLOAD $IMAGE curator legacy-bulk --stackage-snapshots /dot-stackage/curator/stackage-snapshots/ --lts-haskell /dot-stackage/curator/lts-haskell/ --stackage-nightly /dot-stackage/curator/stackage-nightly/ +# Build and push docker image fpco/stack-build & fpco/stack-build-small for current release + +if [ $SHORTNAME = "lts" ] +then + $ROOT/dockerfiles/build.sh $TARGET + $ROOT/dockerfiles/build.sh --push $TARGET + $ROOT/dockerfiles/build.sh --push --small $TARGET +fi + ( if [ $SHORTNAME = "lts" ] then diff --git a/automated/dockerfiles/README.md b/automated/dockerfiles/README.md index 9fb1ec3d..9fd65199 100644 --- a/automated/dockerfiles/README.md +++ b/automated/dockerfiles/README.md @@ -8,7 +8,7 @@ images. This script and its Dockerfiles are used for building images for LTS >= Usage ----- - ./build.sh [--push] [--dry-run] [--small] lts-X.Y|lts-X|lts]" + ./build.sh [--push] [--dry-run] [--small] lts-X.Y" Options ------- @@ -25,10 +25,7 @@ Options Argument --------- -If you specify and exact LTS version, that image will be built. If you only -specify the major version, then an image for the latest minor version for that -major version will be built. If you specify 'lts', an image for the latest LTS -snapshot is built. +The image for the selected LTS version will be built. This searches for a Dockerfile for the selected snapshot in `lts-X.Y/Dockerfile`, and if one isn't found reuses the same image as built the diff --git a/automated/dockerfiles/build.sh b/automated/dockerfiles/build.sh index 7c337949..d80d4823 100755 --- a/automated/dockerfiles/build.sh +++ b/automated/dockerfiles/build.sh @@ -21,7 +21,7 @@ VARIANT=build usage() { echo "$0: $1" >&2 echo - echo "Usage: $0 [--push] [--dry-run] [--small] lts-X.Y|lts-X|lts]" + echo "Usage: $0 [--push] [--dry-run] [--small] lts-X.Y]" echo "See README.md for more information." echo exit 1 @@ -77,27 +77,16 @@ while [[ $# -gt 0 ]]; do esac done -# -# Determine actual snapshot version from aliases -# - -SNAPSHOTS="$(mktemp "lts-snapshots.json.XXXXXX")" -trap "rm -f \"$SNAPSHOTS\"" EXIT -wget -qO- https://www.stackage.org/download/lts-snapshots.json >"$SNAPSHOTS" - case "$LTS_SLUG_ARG" in "") - usage "Missing argument: snapshot or alias" + usage "Missing argument: snapshot" ;; lts-*.*) LTS_SLUG="$LTS_SLUG_ARG" ;; *) - LTS_SLUG=$(jq -r ".[\"$LTS_SLUG_ARG\"]" "$SNAPSHOTS") - if [[ -z "$LTS_SLUG" || "$LTS_SLUG" = "null" ]]; then - echo "$0: Cannot find LTS version for slug: $LTS_SLUG_ARG" >&2 - exit 1 - fi + echo "$0: Wrong snapshot format: $LTS_SLUG_ARG" >&2 + exit 1 ;; esac @@ -105,24 +94,6 @@ LTS_VERSION="${LTS_SLUG#lts-}" LTS_MAJOR="${LTS_VERSION%.*}" LTS_MINOR="${LTS_VERSION#*.}" -# -# Determine latest LTS version -# - -LATEST_LTS_SLUG=$(jq -r ".[\"lts\"]" $SNAPSHOTS) -LATEST_LTS_VERSION="${LATEST_LTS_SLUG#lts-}" -LATEST_LTS_MAJOR="${LATEST_LTS_VERSION%.*}" -LATEST_LTS_MINOR="${LATEST_LTS_VERSION#*.}" - -# -# Determine latest minor version of the selected major version -# - -MAJOR_LATEST_LTS_SLUG=$(jq -r ".[\"lts-$LTS_MAJOR\"]" $SNAPSHOTS) -MAJOR_LATEST_LTS_VERSION="${MAJOR_LATEST_LTS_SLUG#lts-}" -MAJOR_LATEST_LTS_MAJOR="${MAJOR_LATEST_LTS_VERSION%.*}" -MAJOR_LATEST_LTS_MINOR="${MAJOR_LATEST_LTS_VERSION#*.}" - # # Find the Dockerfile for the selected snapshot # @@ -157,14 +128,9 @@ fi # Create and push additional tags # -# If we select the latest minor version for the selected major version, then -# also create and push an 'lts-X' tag. -if [[ "$MAJOR_LATEST_LTS_VERSION" = "$LTS_VERSION" ]]; then - tagpush "$DOCKER_REPO:$LTS_SLUG" "$DOCKER_REPO:lts-$LTS_MAJOR" -fi +# Create and push an 'lts-X' tag. +tagpush "$DOCKER_REPO:$LTS_SLUG" "$DOCKER_REPO:lts-$LTS_MAJOR" -# If we selected the latest LTS snapshot, also create and push the 'lts' and 'latest' tags. -if [[ "$LATEST_LTS_VERSION" = "$LTS_VERSION" ]]; then - tagpush "$DOCKER_REPO:$LTS_SLUG" "$DOCKER_REPO:lts" - tagpush "$DOCKER_REPO:$LTS_SLUG" "$DOCKER_REPO:latest" -fi +# Create and push the 'lts' and 'latest' tags. +tagpush "$DOCKER_REPO:$LTS_SLUG" "$DOCKER_REPO:lts" +tagpush "$DOCKER_REPO:$LTS_SLUG" "$DOCKER_REPO:latest" diff --git a/automated/dockerfiles/lts-14.0/Dockerfile.sub b/automated/dockerfiles/lts-14.0/Dockerfile.sub new file mode 100644 index 00000000..9905a75d --- /dev/null +++ b/automated/dockerfiles/lts-14.0/Dockerfile.sub @@ -0,0 +1,89 @@ +FROM ubuntu:18.04 + +LABEL maintainer="manny@fpcomplete.com" + +ARG GHC_VERSION=8.6.5 +ARG LTS_SLUG=lts-14.0 +ARG PID1_VERSION=0.1.2.0 +ARG STACK_VERSION=2.1.3 +ARG CUDA_VERSION=10.0 +ARG JVM_PATH=/usr/lib/jvm/java-8-openjdk-amd64 +ARG LLVM_VERSION=3.9 +ARG BOOTSTRAP_COMMIT=d4143f1845f26e8e99d0a1a8134d6ff535ab98b2 +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:/usr/lib/llvm-$LLVM_VERSION/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 && \ + rm -rf /var/lib/apt/lists/* + +# +# Use Stackage's debian-bootstrap.sh script to install system libraries and +# tools required to build any Stackage package. +# Re-installs 'stack' *after* running debian-bootstrap.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/fpco/stackage/$BOOTSTRAP_COMMIT/debian-bootstrap.sh | sed "s/^GHCVER=8.6.5$/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 b042207abe4969d36f6fb5ec4604e64630aa97c5 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Thu, 13 Feb 2020 20:34:34 -0800 Subject: [PATCH 069/316] Disable some `gi-*` packages (#5174) --- build-constraints.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 51fb1e2e..25a5a05e 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3035,15 +3035,15 @@ packages: - haskell-gi-base - gi-atk - gi-cairo - - gi-dbusmenu - - gi-dbusmenugtk3 + - gi-dbusmenu < 0 # https://github.com/commercialhaskell/stackage/issues/5174 + - gi-dbusmenugtk3 < 0 # via gi-dbusmenu - gi-gdk < 4 - gi-gdkpixbuf - gi-gdkx11 < 4 - gi-gio - gi-glib - gi-gobject - - gi-graphene + - gi-graphene < 0 # https://github.com/commercialhaskell/stackage/issues/5174 - gi-gtk < 4 - gi-gtk-hs - gi-gtksource < 0 # via gi-gdk-4.0.1 & gi-gtk-4.0.1 From d2e0696e7ab8653974535eebd65edcf2f43143d4 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Fri, 14 Feb 2020 06:36:47 -0800 Subject: [PATCH 070/316] Test on the new docker container --- build-constraints.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 25a5a05e..51fb1e2e 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3035,15 +3035,15 @@ packages: - haskell-gi-base - gi-atk - gi-cairo - - gi-dbusmenu < 0 # https://github.com/commercialhaskell/stackage/issues/5174 - - gi-dbusmenugtk3 < 0 # via gi-dbusmenu + - gi-dbusmenu + - gi-dbusmenugtk3 - gi-gdk < 4 - gi-gdkpixbuf - gi-gdkx11 < 4 - gi-gio - gi-glib - gi-gobject - - gi-graphene < 0 # https://github.com/commercialhaskell/stackage/issues/5174 + - gi-graphene - gi-gtk < 4 - gi-gtk-hs - gi-gtksource < 0 # via gi-gdk-4.0.1 & gi-gtk-4.0.1 From ce61cacda34d261da74ba79475676350e517efd4 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Fri, 14 Feb 2020 07:02:12 -0800 Subject: [PATCH 071/316] Run some tests for old issues (#4848, #4707) --- build-constraints.yaml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 51fb1e2e..ebb5c0e9 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3436,7 +3436,7 @@ packages: - dvorak "OnRock Engineering ": - - github-webhooks < 0 # unknown + - github-webhooks # 0 # unknown "Pavel Yakovlev @zmactep": - hasbolt < 0 # via hex @@ -5443,9 +5443,6 @@ expected-test-failures: # Cannot reproduce locally, looks like it may be a bug in Stack or curator - shake-language-c - # https://github.com/commercialhaskell/stackage/issues/4707 - - blaze-colonnade - # https://github.com/commercialhaskell/stackage/issues/4722 - tasty-discover @@ -5534,7 +5531,7 @@ skipped-haddocks: - sparkle # Java function failures tweag/sparkle#144 - polysemy-zoo # Needs polysemy-plugin GHC plugin - haskell-lsp-types # 0.13.0.0 https://github.com/commercialhaskell/stackage/issues/4563#issuecomment-493899809 -- bitvec # https://github.com/commercialhaskell/stackage/issues/4848 +# bitvec # https://github.com/commercialhaskell/stackage/issues/4848 - hw-ip # https://github.com/commercialhaskell/stackage/issues/5014 # end of skipped-haddocks From 65480d791ac3ec2794b18acb9fba5d195709160a Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Fri, 14 Feb 2020 07:09:26 -0800 Subject: [PATCH 072/316] Cleanup from previous tests --- build-constraints.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index ebb5c0e9..e711cef1 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3436,7 +3436,7 @@ packages: - dvorak "OnRock Engineering ": - - github-webhooks # 0 # unknown + - github-webhooks < 0 # unknown "Pavel Yakovlev @zmactep": - hasbolt < 0 # via hex @@ -5531,7 +5531,6 @@ skipped-haddocks: - sparkle # Java function failures tweag/sparkle#144 - polysemy-zoo # Needs polysemy-plugin GHC plugin - haskell-lsp-types # 0.13.0.0 https://github.com/commercialhaskell/stackage/issues/4563#issuecomment-493899809 -# bitvec # https://github.com/commercialhaskell/stackage/issues/4848 - hw-ip # https://github.com/commercialhaskell/stackage/issues/5014 # end of skipped-haddocks From 7a8c07059d50daa982ce8db5f827bf8fd85d7c04 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Fri, 14 Feb 2020 07:15:49 -0800 Subject: [PATCH 073/316] More old issues tests (#4337, #4972, #4904) --- build-constraints.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index e711cef1..fd434865 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4831,7 +4831,7 @@ skipped-tests: - http-media # base-4.13 # fails with ghc 8.8 - - alex # as of alex-3.2.4 + # alex # as of alex-3.2.4 # Cyclic dependencies - base-orphans # via hspec @@ -5368,7 +5368,6 @@ expected-test-failures: - haddock - haskell-tools-builtin-refactorings - hweblib # https://github.com/aycanirican/hweblib/issues/3 - - libraft # https://github.com/commercialhaskell/stackage/issues/4337#issuecomment-462465921 - multiset # doctests require Glob, a hidden package - perf # https://github.com/fpco/stackage/pull/2859 - picosat # https://github.com/fpco/stackage/pull/2382 @@ -5522,7 +5521,7 @@ expected-haddock-failures: # https://github.com/haskell/haddock/issues/1091 - vault # commercialhaskell/stackage#4904 - - monoid-subclasses + # monoid-subclasses # end of expected-haddock-failures # For packages with haddock issues From 80f1a8bd8d5a480ca02ea9a4b5be2572cff81841 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Fri, 14 Feb 2020 07:32:48 -0800 Subject: [PATCH 074/316] `alex` still fails --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index fd434865..66b338e9 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4831,7 +4831,7 @@ skipped-tests: - http-media # base-4.13 # fails with ghc 8.8 - # alex # as of alex-3.2.4 + - alex # as of alex-3.2.4 # Cyclic dependencies - base-orphans # via hspec From 80c6c7cd87519862947b73b0999b67f464c4b30a Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Fri, 14 Feb 2020 07:40:27 -0800 Subject: [PATCH 075/316] Two more tests (#4984, #4995) --- build-constraints.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 66b338e9..9bbd9bba 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1172,7 +1172,7 @@ packages: - HandsomeSoup "Clint Adams @clinty": - - hOpenPGP < 0 # via bzlib + - hOpenPGP # 0 # via bzlib - openpgp-asciiarmor - MusicBrainz - DAV @@ -5206,7 +5206,7 @@ expected-test-failures: - distributed-process - distributed-process-execution # https://github.com/haskell-distributed/distributed-process-execution/issues/2 - distributed-process-task - - egison # https://github.com/commercialhaskell/stackage/issues/4984 + # egison # https://github.com/commercialhaskell/stackage/issues/4984 - foldl-statistics # https://github.com/data61/foldl-statistics/issues/2 - fsnotify # Often runs out of inotify handles - forma @@ -5520,8 +5520,6 @@ expected-haddock-failures: # https://github.com/haskell/haddock/issues/1091 - vault - # commercialhaskell/stackage#4904 - # monoid-subclasses # end of expected-haddock-failures # For packages with haddock issues From cb9648eb85cdc65d9bd96eca13b499d5fb31a9f7 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Fri, 14 Feb 2020 07:46:33 -0800 Subject: [PATCH 076/316] Keep bound on `hOpenPGP` (#5175, #4995) --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 9bbd9bba..19fb6a34 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1172,7 +1172,7 @@ packages: - HandsomeSoup "Clint Adams @clinty": - - hOpenPGP # 0 # via bzlib + - hOpenPGP < 0 # via bzlib, https://github.com/commercialhaskell/stackage/issues/5175 - openpgp-asciiarmor - MusicBrainz - DAV From d4d7a3c21a9012e61f5d05b53ee992e225d7e75b Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Fri, 14 Feb 2020 07:49:34 -0800 Subject: [PATCH 077/316] Cleanup --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 19fb6a34..d87a2227 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5206,7 +5206,6 @@ expected-test-failures: - distributed-process - distributed-process-execution # https://github.com/haskell-distributed/distributed-process-execution/issues/2 - distributed-process-task - # egison # https://github.com/commercialhaskell/stackage/issues/4984 - foldl-statistics # https://github.com/data61/foldl-statistics/issues/2 - fsnotify # Often runs out of inotify handles - forma From 0485f7dad5822ccec503871de497cfaef37f14ef Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Sat, 15 Feb 2020 07:30:19 -0800 Subject: [PATCH 078/316] Enable `cursor-fuzzy-time` (#5171) --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index d87a2227..fd96d631 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3734,7 +3734,7 @@ packages: "Tom Sydney Kerckhove @NorfairKing": - cursor - cursor-brick - - cursor-fuzzy-time < 0 # https://github.com/commercialhaskell/stackage/issues/5171 + - cursor-fuzzy-time - cursor-gen - fuzzy-time - genvalidity From 5573a606ef451797ca36f6a4c64337e65abfc1a4 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Sat, 15 Feb 2020 07:40:12 -0800 Subject: [PATCH 079/316] Update `CURATOR.md` to the current state --- CURATORS.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CURATORS.md b/CURATORS.md index f9b14f90..be2c7d93 100644 --- a/CURATORS.md +++ b/CURATORS.md @@ -280,13 +280,13 @@ we're just not there yet. ``` # Run a nightly build -/opt/stackage-build/stackage/automated/run-nightly.sh +/var/stackage/stackage/automated/run-nightly.sh # Run an LTS minor bump -/opt/stackage-build/stackage/automated/build-next.sh lts-14.17 +/var/stackage/stackage/automated/build.sh lts-15.1 # Run an LTS major bump -/opt/stackage-build/stackage/automated/build-next.sh lts-15.0 +/var/stackage/stackage/automated/build.sh lts-16.0 ``` Recommended: run these from inside a `tmux` session. If you get version bound @@ -294,7 +294,7 @@ problems on nightly or LTS major, you need to fix build-constraints.yaml (see info above). ### Building LTS minor releases -First run `build-next.sh` to regenerate updated `ltsXX/work/constraints.yaml` and `ltsXX/work/snapshot-incomplete.yaml` files. +First run `build.sh` to regenerate updated `ltsXX/work/constraints.yaml` and `ltsXX/work/snapshot-incomplete.yaml` files. For an LTS minor bump, you'll typically want to: @@ -302,9 +302,9 @@ For an LTS minor bump, you'll typically want to: * Add new packages to the `constraints.yaml` file * Test, benchmark, haddock failures can also be added to package fields in the `constraints.yaml` if necessary, though it should be avoided if possible for LTS. -Then run `NOPLAN=1 build-next.sh` to build the generate an updated snapshot. +Then run `NOPLAN=1 build.sh` to build the generate an updated snapshot. -This replaces `CONSTRAINTS=...' /opt/stackage-build/stackage/automated/build.sh lts-x.y` for the old curator-1. +This replaces `CONSTRAINTS=...' /var/stackage/stackage/automated/build.sh lts-x.y` for the old curator-1. If a build fails for bounds reasons, see all of the advice above. If the code itself doesn't build, or tests fail, open up an issue and then either put in a From 43857f812ed09164180f5b4b5c410ce2a2eae82b Mon Sep 17 00:00:00 2001 From: Omari Norman Date: Sun, 16 Feb 2020 12:57:47 -0500 Subject: [PATCH 080/316] Add squeather to Omari Norman's packages --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index fd96d631..9410d0bf 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -658,6 +658,7 @@ packages: - ofx - accuerr - timelens + - squeather "Neil Mitchell @ndmitchell": - hlint From 9f98daf4c95914be24b94c1e3d0b26aca84c857a Mon Sep 17 00:00:00 2001 From: Dmitrii Kovanikov Date: Sun, 16 Feb 2020 20:32:20 +0000 Subject: [PATCH 081/316] Add colourista --- build-constraints.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index fd96d631..29542d3c 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3600,6 +3600,7 @@ packages: - co-log-core - co-log - co-log-polysemy + - colourista - first-class-patterns - ilist - membrain @@ -4145,7 +4146,7 @@ packages: "8c6794b6 <8c6794b6@gmail.com> @8c6794b6": - hpc-codecov - + "Hiromi Ishii @konn": - equational-reasoning - ghc-typelits-presburger From 4f510bb8f13c9d000a47d1f974c0f0a7918b683e Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Sun, 16 Feb 2020 14:32:26 -0800 Subject: [PATCH 082/316] Upper bounds for newest issues (#5181, #5182, #5183) --- build-constraints.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index fd96d631..60694231 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -67,7 +67,7 @@ packages: - configurator-pg < 0 # via base-4.13.0.0 "Sandy Maguire @isovector": - - polysemy + - polysemy < 1.3.0.0 # https://github.com/commercialhaskell/stackage/issues/5183 - polysemy-plugin < 0 # via polysemy - polysemy-zoo < 0 # via hedis - ecstasy @@ -2039,8 +2039,8 @@ packages: "Michael Thompson @michaelt": - pipes-text < 0 # GHC 8.4 via streaming-commons-0.2.0.0 - lens-simple < 0 # via lens-family-2.0.0 - - lens-family-core - - lens-family + - lens-family-core < 2.1.0 #https://github.com/commercialhaskell/stackage/issues/5182 + - lens-family < 2.1.0 #https://github.com/commercialhaskell/stackage/issues/5182 "Justin Le @mstksg": - advent-of-code-api @@ -2826,7 +2826,7 @@ packages: - doclayout < 0.3 # via pandoc-2.9.1.1 - doctemplates < 0.8.1 # via doclayout - emojis - - pandoc + - pandoc < 2.9.2 # https://github.com/commercialhaskell/stackage/issues/5181 - pandoc-citeproc - HsYAML-aeson - ipynb #< 0 # via aeson-diff From 5a75c29d82519330d2a1e35b90d0a1208e5bac97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 16 Feb 2020 04:25:44 +0100 Subject: [PATCH 083/316] bump domenkozar packages --- build-constraints.yaml | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index fd96d631..50a5dd2e 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2602,7 +2602,7 @@ packages: - rank1dynamic "Dave Tapley @dukedave": - - inline-c-cpp < 0 # via inline-c + - inline-c-cpp "Takahiro Himura @himura": - lens-regex @@ -2896,7 +2896,7 @@ packages: "Fraser Tweedale @frasertweedale": - concise - - jose < 0 # MonadFail + - jose "Yoshikuni Jujo @YoshikuniJujo": - zot @@ -3838,20 +3838,17 @@ packages: - transformers-fix "Domen Kozar @domenkozar": - - cachix < 0 # #4752 - - cachix-api < 0 # via http-media & protolude & servant-auth & servant-auth-server & servant-auth-swagger & swagger2 - - elm2nix < 0 # via req - - mixpanel-client < 0 + - elm2nix + - mixpanel-client - netrc - pretty-sop - - servant-auth < 0 # via base-4.13.0.0 - - servant-auth-server < 0 # via base-4.13.0.0 + - servant-auth + - servant-auth-server - servant-auth-client < 0 # via warp-3.3.2 - - servant-auth-swagger < 0 # via base-4.13.0.0 - - servant-auth-docs < 0 # via base-4.13.0.0 + - servant-auth-swagger + - servant-auth-docs - servant-elm - - streaming-wai < 0 # via streaming - - systemd < 0 # socketToFd is ambiguous + - systemd "Andre Van Der Merwe @andrevdm": - bhoogle < 0 From 92f939c6094464c2fefd1df4c3eda7289253785e Mon Sep 17 00:00:00 2001 From: Jeff Happily Date: Mon, 17 Feb 2020 16:06:48 +0800 Subject: [PATCH 084/316] Add dockerfile for lts 15 --- automated/dockerfiles/lts-15.0/Dockerfile | 89 +++++++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 automated/dockerfiles/lts-15.0/Dockerfile diff --git a/automated/dockerfiles/lts-15.0/Dockerfile b/automated/dockerfiles/lts-15.0/Dockerfile new file mode 100644 index 00000000..848c5d0e --- /dev/null +++ b/automated/dockerfiles/lts-15.0/Dockerfile @@ -0,0 +1,89 @@ +FROM ubuntu:18.04 + +LABEL maintainer="manny@fpcomplete.com" + +ARG GHC_VERSION=8.8.2 +ARG LTS_SLUG=lts-15.0 +ARG PID1_VERSION=0.1.2.0 +ARG STACK_VERSION=2.1.3 +ARG CUDA_VERSION=10.0 +ARG JVM_PATH=/usr/lib/jvm/java-8-openjdk-amd64 +ARG LLVM_PATH=/usr/lib/llvm-7 +ARG BOOTSTRAP_COMMIT=77790c7bcb21fd8875871245df5c5c39a55ec0c1 +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 && \ + rm -rf /var/lib/apt/lists/* + +# +# Use Stackage's debian-bootstrap.sh script to install system libraries and +# tools required to build any Stackage package. +# Re-installs 'stack' *after* running debian-bootstrap.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/fpco/stackage/$BOOTSTRAP_COMMIT/debian-bootstrap.sh | sed "s/^GHCVER=8.6.5$/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 3c9ab241adacb348fdb878942e1689af9d719e74 Mon Sep 17 00:00:00 2001 From: Ryan Scott Date: Mon, 17 Feb 2020 07:42:40 -0500 Subject: [PATCH 085/316] Enable linear-1.21 All of the dependencies listed in #5123 that were blocking version 1.21 of `linear` have been updated to allow building with it. Fixes #5123. --- build-constraints.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 3fe5f55e..eb92d8db 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -867,7 +867,7 @@ packages: - lens-action - lens-aeson - lens-properties - - linear < 1.21 # https://github.com/commercialhaskell/stackage/issues/5123 + - linear - linear-accelerate < 0 # GHC 8.4 via accelerate - log-domain - machines @@ -4142,7 +4142,7 @@ packages: "8c6794b6 <8c6794b6@gmail.com> @8c6794b6": - hpc-codecov - + "Hiromi Ishii @konn": - equational-reasoning - ghc-typelits-presburger From c5313ca0fb820e553d7f2bd3bac3c7e7a5d32531 Mon Sep 17 00:00:00 2001 From: Clint Adams Date: Mon, 17 Feb 2020 09:10:28 -0500 Subject: [PATCH 086/316] Re-enable debian, which has been switched to bz2 from bzlib --- build-constraints.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 3fe5f55e..083a3eba 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1172,13 +1172,13 @@ packages: - HandsomeSoup "Clint Adams @clinty": - - hOpenPGP < 0 # via bzlib, https://github.com/commercialhaskell/stackage/issues/5175 + - hOpenPGP < 0 # via ixset-typed, https://github.com/commercialhaskell/stackage/issues/5175 - openpgp-asciiarmor - MusicBrainz - DAV - hopenpgp-tools < 0 # hOpenPGP & ixset-typed - opensource - - debian < 0 # via bzlib + - debian - cabal-debian < 0 # via debian "Piyush P Kurur @piyush-kurur": From 5f56a304690ccf3e71305099b7a6b65440d38700 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Mon, 17 Feb 2020 15:38:55 +0100 Subject: [PATCH 087/316] Remove servant upper bound and close #5097 --- build-constraints.yaml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index fe1f9771..49fa8cdd 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4677,17 +4677,6 @@ packages: - haskeline < 0.8.0 - structured-cli < 2.6 - # https://github.com/commercialhaskell/stackage/issues/5097 - - servant < 0.17 - - servant-client < 0.17 - - servant-server < 0.17 - - servant-client-core < 0.17 - - servant-docs < 0.11.5 - - servant-foreign < 0.15.1 - - servant-lucid < 0.9.0.1 - - servant-mock < 0.8.6 - - servant-swagger < 1.1.8 - - aur < 6.3.0 # end of packages # Package flags are applied to individual packages, and override the values of From e06b88dc9f595f6e7ccf1893defa05b1ee2563b5 Mon Sep 17 00:00:00 2001 From: Emily Pillmore Date: Tue, 18 Feb 2020 00:03:58 -0500 Subject: [PATCH 088/316] add base16, base16-lens, base32, base32-lens --- build-constraints.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 49fa8cdd..0f2ff3fb 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -42,6 +42,10 @@ packages: - lens-regex-pcre < 0 # via pcre-heavy "Emily Pillmore @topos": + - base16 + - base16-lens + - base32 + - base32-lens - base64 - base64-lens - lens-process < 0 # via lens-4.18.1 From ca7a4f4d4cc133720b343fd7c0a1f3a54df855ff Mon Sep 17 00:00:00 2001 From: Leonhard Markert Date: Tue, 18 Feb 2020 09:59:02 +0100 Subject: [PATCH 089/316] Update build instructions ... to bring them closer to what's described in MAINTAINERS.md. In particular, the `cd` and `rm -f stack.yaml` steps were missing. --- .github/PULL_REQUEST_TEMPLATE.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index abff59f4..464d08c6 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -4,5 +4,6 @@ Checklist: - [ ] On your own machine, in a _new directory_, you have successfully run the following set of commands (replace `$package` with the name of the package that is submitted, and `$version` with the version of the package you want to get into Stackage): stack unpack $package-$version # $version is optional - stack init --resolver nightly + cd $package-$version + rm -f stack.yaml && stack init --resolver nightly stack build --resolver nightly --haddock --test --bench --no-run-benchmarks From 168e3c4b1224e97b81be6cbd702ef4b3c766215a Mon Sep 17 00:00:00 2001 From: Leonhard Markert Date: Tue, 18 Feb 2020 08:50:52 +0100 Subject: [PATCH 090/316] add monad-bayes --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 49fa8cdd..881a5567 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2565,6 +2565,9 @@ packages: - wave - zip + "Leonhard Markert @curiousleo": + - monad-bayes + "Emmanuel Touzery @emmanueltouzery": - app-settings - hsexif < 0 # via time-1.9.3 From d83e0c5cfea90bb6a1a4a6738bd48eaaed5e56a2 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Tue, 18 Feb 2020 19:10:39 +0100 Subject: [PATCH 091/316] Re-introduce servant upper bounds for #5191 --- build-constraints.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 881a5567..fd9ea702 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4680,6 +4680,18 @@ packages: - haskeline < 0.8.0 - structured-cli < 2.6 + # https://github.com/commercialhaskell/stackage/issues/5191 - compilation failures + - servant < 0.17 + - servant-client < 0.17 + - servant-server < 0.17 + - servant-client-core < 0.17 + - servant-docs < 0.11.5 + - servant-foreign < 0.15.1 + - servant-lucid < 0.9.0.1 + - servant-mock < 0.8.6 + - servant-swagger < 1.1.8 + - aur < 6.3.0 + # end of packages # Package flags are applied to individual packages, and override the values of From 38cb5f89d3812588b2f0fe83f32a4cbaec187b8a Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Tue, 18 Feb 2020 20:03:38 +0100 Subject: [PATCH 092/316] Expect egison tests to fail egison/egison#150 --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index fd9ea702..f6dfe27d 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5487,6 +5487,7 @@ expected-benchmark-failures: - raaz # https://github.com/commercialhaskell/stackage/issues/4766 - thyme - xmlgen # https://github.com/skogsbaer/xmlgen/issues/6 + - egison # https://github.com/egison/egison/issues/150 # end of expected-benchmark-failures From 0572d4ec28406012049f58cebed39c54ef6350d4 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Tue, 18 Feb 2020 20:05:30 +0100 Subject: [PATCH 093/316] Remove polysemy upper bound and close #5183 --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index f6dfe27d..966cbc6f 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -67,7 +67,7 @@ packages: - configurator-pg < 0 # via base-4.13.0.0 "Sandy Maguire @isovector": - - polysemy < 1.3.0.0 # https://github.com/commercialhaskell/stackage/issues/5183 + - polysemy - polysemy-plugin < 0 # via polysemy - polysemy-zoo < 0 # via hedis - ecstasy From 5fa02e3ff26e4da3e535247a71dd21bd8ef98994 Mon Sep 17 00:00:00 2001 From: Clint Adams Date: Tue, 18 Feb 2020 22:05:51 -0500 Subject: [PATCH 094/316] Re-enable cabal-debian, unblocked by debian's switch from bzlib to bz2 --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index df979e29..8668a391 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1184,7 +1184,7 @@ packages: - hopenpgp-tools < 0 # hOpenPGP & ixset-typed - opensource - debian - - cabal-debian < 0 # via debian + - cabal-debian "Piyush P Kurur @piyush-kurur": - raaz < 0 # via base-4.13.0.0 From 77cc3ceb298a96a90c0ae34bb7813431a6f25d28 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Wed, 19 Feb 2020 14:26:28 +0100 Subject: [PATCH 095/316] Add fusion-plugin-types --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index df979e29..a43b5f2c 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -515,6 +515,7 @@ packages: - xls "Pranay Sashank @pranaysashank": + - fusion-plugin-types - fusion-plugin "Aleksey Uimanov @s9gf4ult": From 55dd735a06d6799cd168a8c95808be004e1a2f58 Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Wed, 19 Feb 2020 10:03:32 +0100 Subject: [PATCH 096/316] add amqp-utils depends on magic, maybe @jgoerzen wants to take his part --- build-constraints.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index df979e29..9830b087 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4159,6 +4159,10 @@ packages: - type-natural - sized + "Frank Doepper @woffs": + - amqp-utils + - magic + "Grandfathered dependencies": - network - Boolean From 26690e66055fa1b28c98216da6a8e557d86ba451 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Wed, 19 Feb 2020 15:34:27 +0100 Subject: [PATCH 097/316] Revert "Re-enable cabal-debian, unblocked by debian's switch from bzlib to bz2" #5192 This reverts commit 5fa02e3ff26e4da3e535247a71dd21bd8ef98994. --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 5f63ef92..b41203e3 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1185,7 +1185,7 @@ packages: - hopenpgp-tools < 0 # hOpenPGP & ixset-typed - opensource - debian - - cabal-debian + - cabal-debian < 0 # build failure https://github.com/commercialhaskell/stackage/pull/5192#issuecomment-588263681 "Piyush P Kurur @piyush-kurur": - raaz < 0 # via base-4.13.0.0 From 1154569771c146c81ccb75e49d6bf1a8a6f62209 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Wed, 19 Feb 2020 16:14:04 +0100 Subject: [PATCH 098/316] Re-enable egison benchmarks egison/egison#150 --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index b41203e3..590dc575 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5496,7 +5496,6 @@ expected-benchmark-failures: - raaz # https://github.com/commercialhaskell/stackage/issues/4766 - thyme - xmlgen # https://github.com/skogsbaer/xmlgen/issues/6 - - egison # https://github.com/egison/egison/issues/150 # end of expected-benchmark-failures From eeb5b20cd9f97e4e604301edef90ab6cffe526d3 Mon Sep 17 00:00:00 2001 From: Brandon Chinn Date: Wed, 19 Feb 2020 16:12:45 -0800 Subject: [PATCH 099/316] Add hpc-lcov --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 590dc575..e97fadfa 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4103,6 +4103,7 @@ packages: "Brandon Chinn @brandon-leapyear": - aeson-schemas - github-rest + - hpc-lcov - th-test-utils "Akshay Mankar @akshaymankar": From c270b9936c3a2ae271a92dc764ad5d343f44e423 Mon Sep 17 00:00:00 2001 From: Alexey Kotlyarov Date: Thu, 20 Feb 2020 10:21:33 +1100 Subject: [PATCH 100/316] Add back serverless-haskell --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 590dc575..30d37ae1 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3826,7 +3826,7 @@ packages: "Alexey Kotlyarov @koterpillar": - appendmap - - serverless-haskell < 0 # via aeson-extra + - serverless-haskell "Guru Devanla @gdevanla": - pptable From bbc449d8dbeb73b1161f5367e7a7b732a28f7da0 Mon Sep 17 00:00:00 2001 From: Jonathan Knowles Date: Thu, 20 Feb 2020 09:43:59 +0800 Subject: [PATCH 101/316] Add `bech32-th` package. --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 590dc575..b3c717aa 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3290,6 +3290,7 @@ packages: "Jonathan Knowles @jonathanknowles": - bech32 + - bech32-th - roc-id "Mahdi Dibaiee @mdibaiee": From 83aa53c7f433a7573b720826e88b2c8b8ec66456 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 20 Feb 2020 14:31:55 +0800 Subject: [PATCH 102/316] add resolv --- build-constraints.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 590dc575..f7300116 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4474,6 +4474,7 @@ packages: - relapse - relational-schemas - rerebase + - resolv - resource-pool - resourcet - rfc5051 @@ -4987,6 +4988,7 @@ skipped-tests: - psqueues # via QuickCheck-2.12.6.1 - pure-zlib # via QuickCheck-2.12.6.1 - records-sop # via hspec-2.7.0 + - resolv # via tasty-1.2 - serialise - servant # via hspec-2.7.0 - servant-client # via hspec-2.7.0 From 776064c5175499ac889c5a4c717f387f523cb332 Mon Sep 17 00:00:00 2001 From: Pavel Krajcevski Date: Thu, 20 Feb 2020 22:23:02 -0800 Subject: [PATCH 103/316] Re-enable HCodecs after Mokosha/HCodecs#2 --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 1a2ef52d..084e897e 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1356,7 +1356,7 @@ packages: - netwire-input-glfw - yoga - freetype2 - - HCodecs < 0 # MonadFail + - HCodecs "Emanuel Borsboom @borsboom": - BoundedChan From fbd8e5a89d46e0307484a906ddde119cf9a648ee Mon Sep 17 00:00:00 2001 From: Clint Adams Date: Fri, 21 Feb 2020 08:59:55 -0500 Subject: [PATCH 104/316] Re-enable cabal-debian --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 084e897e..b2e9fe82 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1185,7 +1185,7 @@ packages: - hopenpgp-tools < 0 # hOpenPGP & ixset-typed - opensource - debian - - cabal-debian < 0 # build failure https://github.com/commercialhaskell/stackage/pull/5192#issuecomment-588263681 + - cabal-debian "Piyush P Kurur @piyush-kurur": - raaz < 0 # via base-4.13.0.0 From 111edfc7771ad6738082db29e95b9a8c05c17d3b Mon Sep 17 00:00:00 2001 From: TheMatten Date: Fri, 21 Feb 2020 18:54:35 +0100 Subject: [PATCH 105/316] Change contact person for `polysemy-*` packages --- build-constraints.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 881a5567..ab3c2526 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -67,9 +67,6 @@ packages: - configurator-pg < 0 # via base-4.13.0.0 "Sandy Maguire @isovector": - - polysemy < 1.3.0.0 # https://github.com/commercialhaskell/stackage/issues/5183 - - polysemy-plugin < 0 # via polysemy - - polysemy-zoo < 0 # via hedis - ecstasy - interpolatedstring-qq2 < 0 # via template-haskell-2.15.0.0 - prospect @@ -78,6 +75,9 @@ packages: - type-errors "Matej Niznik @TheMatten": + - polysemy + - polysemy-plugin < 0 # via polysemy + - polysemy-zoo < 0 # via hedis - loopbreaker "William Yao @williamyaoh": From d544bda4e30fe9bf0f6b1e8eee2d164b1537d7f3 Mon Sep 17 00:00:00 2001 From: TheMatten Date: Fri, 21 Feb 2020 19:01:57 +0100 Subject: [PATCH 106/316] Change email address of TheMatten --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index ab3c2526..82e8ada3 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -74,7 +74,7 @@ packages: - unagi-chan - type-errors - "Matej Niznik @TheMatten": + "Matej Niznik @TheMatten": - polysemy - polysemy-plugin < 0 # via polysemy - polysemy-zoo < 0 # via hedis From ca2cd4de6962267c17059f609cfdefbb0b26bcd8 Mon Sep 17 00:00:00 2001 From: Dmitry Dzhus Date: Fri, 21 Feb 2020 16:37:38 +0000 Subject: [PATCH 107/316] Re-enable static-text-0.2.0.5, add th-env, th-nowq --- build-constraints.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index b2e9fe82..09086ecc 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3871,8 +3871,9 @@ packages: "Dmitry Dzhus @dzhus": - csg < 0 # via QuickCheck https://github.com/commercialhaskell/stackage/issues/4444 - simple-vec3 - - static-text < 0 # via template-haskell-2.15.0.0 - - th-nowq < 0 # via time-1.9.3 + - static-text + - th-env + - th-nowq "Dan Fithian @dfithian": - oauthenticated From 1b19f4e4d5bb74b478e2b1694109140cc27827fc Mon Sep 17 00:00:00 2001 From: Kai Zhang Date: Fri, 21 Feb 2020 16:25:25 -0800 Subject: [PATCH 108/316] add haskell-igraph --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index b2e9fe82..ec07d9cb 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2127,6 +2127,7 @@ packages: "Kai Zhang @kaizhang": - matrices + - haskell-igraph "Michel Boucey @MichelBoucey": - IPv6Addr From c9ff3e17fe6682ab1ff63ee96e8aab3a7b6278bc Mon Sep 17 00:00:00 2001 From: Doug Burke Date: Sat, 22 Feb 2020 08:20:19 -0500 Subject: [PATCH 109/316] Re-enable swish-0.10.0.3 --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index b2e9fe82..20a6a295 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3706,7 +3706,7 @@ packages: - qm-interpolated-string "Douglas Burke @DougBurke": - - swish < 0 # via base-4.13.0.0 + - swish - hvega - ihaskell-hvega < 0 From 9fd10d4c09ae2e101e92e6309064ee97d85b3978 Mon Sep 17 00:00:00 2001 From: Ziyang Liu Date: Sat, 22 Feb 2020 08:40:27 -0800 Subject: [PATCH 110/316] add multi-containers --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index b2e9fe82..6c25d1fb 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4166,6 +4166,9 @@ packages: - amqp-utils - magic + "Ziyang Liu @zliu41": + - multi-containers + "Grandfathered dependencies": - network - Boolean From 0fd01b68622bf3fbaa2ee5daa19764cbcf805ff7 Mon Sep 17 00:00:00 2001 From: David Himmelstrup Date: Sun, 23 Feb 2020 17:50:09 +0800 Subject: [PATCH 111/316] Add chiphunk. --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index b2e9fe82..beb75fb5 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4069,6 +4069,7 @@ packages: - oeis2 "David Himmelstrup @lemmih": + - chiphunk - reanimate-svg - reanimate < 0 # via base-4.13.0.0 From cdbb13b836cf22d789bfdb5f93cb48005eddc409 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Mon, 24 Feb 2020 09:20:49 +0100 Subject: [PATCH 112/316] selective < 0.4 for #5206 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 4acddf94..dd59c806 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4708,6 +4708,9 @@ packages: - servant-swagger < 1.1.8 - aur < 6.3.0 + # https://github.com/commercialhaskell/stackage/issues/5206 + - selective < 0.4 + # end of packages # Package flags are applied to individual packages, and override the values of From af4c071a26d4d0fa4b38d9797ee2d4be44289794 Mon Sep 17 00:00:00 2001 From: Alexey Zabelin Date: Mon, 24 Feb 2020 14:59:57 -0800 Subject: [PATCH 113/316] Remove upper bound for selective, closes #5206 --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index b6eb2db6..09b98776 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4710,9 +4710,6 @@ packages: - servant-swagger < 1.1.8 - aur < 6.3.0 - # https://github.com/commercialhaskell/stackage/issues/5206 - - selective < 0.4 - # end of packages # Package flags are applied to individual packages, and override the values of From 774071bce050388cce5c9319b4e6d61b73b97320 Mon Sep 17 00:00:00 2001 From: Alexey Zabelin Date: Mon, 24 Feb 2020 15:11:12 -0800 Subject: [PATCH 114/316] Add upper bounds for rebase, selective, #5207 --- build-constraints.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 09b98776..47616c1a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4710,6 +4710,10 @@ packages: - servant-swagger < 1.1.8 - aur < 6.3.0 + # https://github.com/commercialhaskell/stackage/issues/5207 + - rebase < 1.5 + - selective < 0.4 + # end of packages # Package flags are applied to individual packages, and override the values of From b500563de0c4ba9373a6d4e89f8ca9144def4514 Mon Sep 17 00:00:00 2001 From: Alexey Zabelin Date: Mon, 24 Feb 2020 15:40:50 -0800 Subject: [PATCH 115/316] Add upper bounds for ghc-lib, ghc-lib-parser, #5208 --- build-constraints.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 47616c1a..aba08e5e 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4714,6 +4714,10 @@ packages: - rebase < 1.5 - selective < 0.4 + # https://github.com/commercialhaskell/stackage/issues/5208 + - ghc-lib-parser < 8.8.3.20200224 + - ghc-lib < 8.8.3.20200224 + # end of packages # Package flags are applied to individual packages, and override the values of From 503491fdae721d2d061eaf18742c93d1f58b4347 Mon Sep 17 00:00:00 2001 From: David Himmelstrup Date: Tue, 25 Feb 2020 09:21:32 +0800 Subject: [PATCH 116/316] Re-enable reanimate --- build-constraints.yaml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index aba08e5e..3420c8ac 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4073,7 +4073,7 @@ packages: "David Himmelstrup @lemmih": - chiphunk - reanimate-svg - - reanimate < 0 # via base-4.13.0.0 + - reanimate "Vitaly Bragilevsky @bravit": - Chart @@ -4710,14 +4710,9 @@ packages: - servant-swagger < 1.1.8 - aur < 6.3.0 - # https://github.com/commercialhaskell/stackage/issues/5207 - - rebase < 1.5 + # https://github.com/commercialhaskell/stackage/issues/5206 - selective < 0.4 - # https://github.com/commercialhaskell/stackage/issues/5208 - - ghc-lib-parser < 8.8.3.20200224 - - ghc-lib < 8.8.3.20200224 - # end of packages # Package flags are applied to individual packages, and override the values of From b4c61c225ac10a05997e25d7aa68c90eacf44009 Mon Sep 17 00:00:00 2001 From: Alexey Zabelin Date: Mon, 24 Feb 2020 21:11:48 -0800 Subject: [PATCH 117/316] Add HasBigDecimal --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index aba08e5e..8b2c2ac1 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4180,6 +4180,7 @@ packages: - FloatingHex - GenericPretty - Glob + - HasBigDecimal - HDBC < 0 # via time-1.9.3 - HDBC-session < 0 # via HDBC - HTTP From 4c68a7fcc9635d4e5aa4cd49cff5fa0ffd0632be Mon Sep 17 00:00:00 2001 From: Alexey Zabelin Date: Tue, 25 Feb 2020 11:08:12 -0800 Subject: [PATCH 118/316] Remove upper bounds for rebase, closes #5207 --- build-constraints.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 8b2c2ac1..3a91b8f8 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4711,10 +4711,6 @@ packages: - servant-swagger < 1.1.8 - aur < 6.3.0 - # https://github.com/commercialhaskell/stackage/issues/5207 - - rebase < 1.5 - - selective < 0.4 - # https://github.com/commercialhaskell/stackage/issues/5208 - ghc-lib-parser < 8.8.3.20200224 - ghc-lib < 8.8.3.20200224 From 90ec06aa102837fb1e9d77a256bd728220f0fcd7 Mon Sep 17 00:00:00 2001 From: Alexey Zabelin Date: Tue, 25 Feb 2020 11:13:15 -0800 Subject: [PATCH 119/316] Remove upper bounds for ghc-lib, closes #5208 --- build-constraints.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 3a91b8f8..cbaed472 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4711,10 +4711,6 @@ packages: - servant-swagger < 1.1.8 - aur < 6.3.0 - # https://github.com/commercialhaskell/stackage/issues/5208 - - ghc-lib-parser < 8.8.3.20200224 - - ghc-lib < 8.8.3.20200224 - # end of packages # Package flags are applied to individual packages, and override the values of From 90aad46e899a5951b304e66129bac22830749b55 Mon Sep 17 00:00:00 2001 From: Alexey Zabelin Date: Tue, 25 Feb 2020 11:49:23 -0800 Subject: [PATCH 120/316] Skip tests for primitive-extras, #5210 --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index cbaed472..7de54372 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5109,6 +5109,7 @@ skipped-tests: - config-ini # https://github.com/aisamanra/config-ini/issues/22 - polysemy-plugin # https://github.com/commercialhaskell/stackage/issues/4733 - persistent-typed-db # https://github.com/parsonsmatt/persistent-typed-db/pull/7 + - primitive-extras # https://github.com/commercialhaskell/stackage/issues/5210 # Runtime issues - blank-canvas # Never finishes https://github.com/ku-fpg/blank-canvas/issues/73 From d6f2820a3fca1acc16c38c1ecacb3f5964de19d5 Mon Sep 17 00:00:00 2001 From: Alexey Zabelin Date: Thu, 27 Feb 2020 17:09:50 -0800 Subject: [PATCH 121/316] Add upper bound for small-bytearray-builder, #5211 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 2a536023..63916965 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4711,6 +4711,9 @@ packages: - servant-swagger < 1.1.8 - aur < 6.3.0 + # https://github.com/commercialhaskell/stackage/issues/5211 + - small-bytearray-builder < 0.3.4 + # end of packages # Package flags are applied to individual packages, and override the values of From 5914906872a1484d887584810d965a2ec7bfb45f Mon Sep 17 00:00:00 2001 From: Travis Whitaker Date: Thu, 27 Feb 2020 17:24:51 -0800 Subject: [PATCH 122/316] Add data-compat, deepseq-instances. --- build-constraints.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index e231798b..ed31a24c 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3093,6 +3093,8 @@ packages: - cpuinfo - lmdb - rdf + - data-compat + - deepseq-instances "Michael Swan @michael-swan": - pcf-font From 821492ace7841cfbd1ab25322e737a1af9b7d4e5 Mon Sep 17 00:00:00 2001 From: Alexey Zabelin Date: Thu, 27 Feb 2020 17:36:39 -0800 Subject: [PATCH 123/316] Expect test failure for dhall-yaml, #5212 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 63916965..3affb828 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5492,6 +5492,9 @@ expected-test-failures: - cursor-gen - genvalidity-mergeful - genvalidity-mergeless + + # https://github.com/commercialhaskell/stackage/issues/5212 + - dhall-yaml # end of expected-test-failures # Benchmarks which are known not to build. Note that, currently we do not run From 00ef782af0cc8b7ddb6d7055fc856211267de001 Mon Sep 17 00:00:00 2001 From: Sibi Prabakaran Date: Sun, 1 Mar 2020 12:33:15 +0530 Subject: [PATCH 124/316] Add streamly-bytestring --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 85d207a4..5f0d6811 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -741,6 +741,7 @@ packages: - shelly - persistent-redis < 0 # GHC 8.4 via hedis - fakedata + - streamly-bytestring "haskell-openal": - OpenAL From 1ee4892814daa59cb9eb52bb44ecc0747a2aa7f1 Mon Sep 17 00:00:00 2001 From: Maxim Koltsov Date: Sun, 1 Mar 2020 12:13:10 +0300 Subject: [PATCH 125/316] Enable data-msgpack and related packages --- build-constraints.yaml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 85d207a4..8abb6640 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2760,10 +2760,10 @@ packages: - yes-precure5-command - th-strict-compat - main-tester - - skews < 0 # via websockets - - wss-client < 0 - - network-messagepack-rpc < 0 # via data-msgpack - - network-messagepack-rpc-websocket < 0 + - skews + - wss-client + - network-messagepack-rpc + - network-messagepack-rpc-websocket - unicode-show - deriveJsonNoPrefix @@ -3272,7 +3272,7 @@ packages: - perf < 0 "Iphigenia Df @iphydf": - - data-msgpack < 0 # via data-msgpack-types + - data-msgpack # - network-msgpack-rpc # conduit 1.3 "Dino Morelli @dino-": @@ -3454,7 +3454,7 @@ packages: "Pavel Yakovlev @zmactep": - hasbolt < 0 # via hex - uniprot-kb - - mmtf < 0 # via data-msgpack + - mmtf < 0 # MonadFail "Christopher A. Gorski @cgorski": - general-games @@ -4289,7 +4289,6 @@ packages: - data-inttrie - data-lens-light - data-memocombinators - - data-msgpack-types < 0 # MonadFail - data-msgpack-types - data-serializer - data-textual @@ -5071,7 +5070,6 @@ skipped-tests: - servant-cassava - siggy-chardust - simple-vec3 - - skews - skylighting-core - speedy-slice - static-text @@ -5497,6 +5495,9 @@ expected-test-failures: # https://github.com/commercialhaskell/stackage/issues/5212 - dhall-yaml + + # https://github.com/iij-ii/direct-hs/issues/100 + - skews # end of expected-test-failures # Benchmarks which are known not to build. Note that, currently we do not run From 805214e4ccad2e1c8de6e5a2cb1ffbf388828892 Mon Sep 17 00:00:00 2001 From: Marek Fajkus Date: Sun, 1 Mar 2020 16:11:42 +0100 Subject: [PATCH 126/316] Add aeson-combinators --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 85d207a4..5b9e166a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -92,6 +92,7 @@ packages: "Marek Fajkus @turboMaCk": - wai-enforce-https + - aeson-combinators "Fernando Freire @dogonthehorizon": [] From 6832810cfc00d680134ffc77584a34a6044864ac Mon Sep 17 00:00:00 2001 From: Pavan Rikhi Date: Mon, 2 Mar 2020 00:46:45 -0500 Subject: [PATCH 127/316] Add immortal-queue --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 85d207a4..0bd7f88f 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4053,6 +4053,7 @@ packages: - sitemap-gen - tasty-wai - stack-templatizer + - immortal-queue "David Baynard @dbaynard": - time-qq < 0 # see christian-marie/time-qq#3 From 172f397fbfe18ec16a39cf8c9b1fb6eeb9e2ce60 Mon Sep 17 00:00:00 2001 From: Alexey Zabelin Date: Sun, 1 Mar 2020 22:17:59 -0800 Subject: [PATCH 128/316] Add upper bound for unliftio-core, #5218 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 85d207a4..65c78785 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4716,6 +4716,9 @@ packages: # https://github.com/commercialhaskell/stackage/issues/5211 - small-bytearray-builder < 0.3.4 + # https://github.com/commercialhaskell/stackage/issues/5218 + - unliftio-core < 0.2 + # end of packages # Package flags are applied to individual packages, and override the values of From d64b69a2e9a5db85d4811de0367eeb8f97590079 Mon Sep 17 00:00:00 2001 From: Alexey Zabelin Date: Sun, 1 Mar 2020 22:22:58 -0800 Subject: [PATCH 129/316] Add upper bounds for hledger packages, #5219 --- build-constraints.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 65c78785..c26e1966 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4719,6 +4719,12 @@ packages: # https://github.com/commercialhaskell/stackage/issues/5218 - unliftio-core < 0.2 + # https://github.com/commercialhaskell/stackage/issues/5219 + - hledger-lib < 1.17 + - hledger < 1.17 + - hledger-ui < 1.17 + - hledger-web < 1.17 + # end of packages # Package flags are applied to individual packages, and override the values of From aa152d8378539e7141f3230d913e5c6e07ebebba Mon Sep 17 00:00:00 2001 From: Maxim Koltsov Date: Mon, 2 Mar 2020 14:19:22 +0300 Subject: [PATCH 130/316] Enable hasbolt --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 40355a15..c641820c 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3454,7 +3454,7 @@ packages: - github-webhooks < 0 # unknown "Pavel Yakovlev @zmactep": - - hasbolt < 0 # via hex + - hasbolt - uniprot-kb - mmtf < 0 # MonadFail From 33e76df11e3774ced3a98433a1b00f2448d27cd3 Mon Sep 17 00:00:00 2001 From: David Hewson Date: Mon, 2 Mar 2020 18:31:34 +0000 Subject: [PATCH 131/316] Re-enabled alarmclock and bank-holidays-england I'm now joint maintainer on both these packages and have released new versions that work on 8.8 --- build-constraints.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 40355a15..de240be2 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1457,8 +1457,8 @@ packages: - shake-language-c < 0 # via fclabels "David Turner @davecturner": - - alarmclock < 0 # via base-4.13.0.0 - - bank-holidays-england < 0 # via base-4.13.0.0 + - alarmclock + - bank-holidays-england "Haskell Servant ": - servant From ee098f767f46fcf17fd956a0e67dae37b5ddb519 Mon Sep 17 00:00:00 2001 From: Ziyang Liu Date: Tue, 3 Mar 2020 08:13:22 -0800 Subject: [PATCH 132/316] Add indexed-containers, math-extras and min-max-pqueue --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index eb17c913..12eefcee 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4175,6 +4175,9 @@ packages: - magic "Ziyang Liu @zliu41": + - indexed-containers + - math-extras + - min-max-pqueue - multi-containers "Grandfathered dependencies": From 88cbb5dae9445d2fcb3ee01a847f55f32d952322 Mon Sep 17 00:00:00 2001 From: Matt Parsons Date: Tue, 3 Mar 2020 09:24:10 -0700 Subject: [PATCH 133/316] Add hspec-hedgehog --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index eb17c913..54900c00 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2301,6 +2301,7 @@ packages: - persistent-typed-db - persistent-qq - persistent-pagination + - hspec-hedgehog "Matthew Pickering @mpickering": - refact From a643107c7828e8cbc7e032390a358b03810daf48 Mon Sep 17 00:00:00 2001 From: Matt Parsons Date: Tue, 3 Mar 2020 11:28:16 -0700 Subject: [PATCH 134/316] Remove persistent-typed-db from skipped-tests Issue is fixed in 0.1.0.1 --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index eb17c913..f2dfd401 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5123,7 +5123,6 @@ skipped-tests: - cron # Could not deduce (SOP.All (SOP.All Arbitrary) xss) arising from a use of ‘SOP.hcpure’ - config-ini # https://github.com/aisamanra/config-ini/issues/22 - polysemy-plugin # https://github.com/commercialhaskell/stackage/issues/4733 - - persistent-typed-db # https://github.com/parsonsmatt/persistent-typed-db/pull/7 - primitive-extras # https://github.com/commercialhaskell/stackage/issues/5210 # Runtime issues From 8658f5e75b1506802b2bfc584d592eb8a5840f8e Mon Sep 17 00:00:00 2001 From: Matt Parsons Date: Sun, 16 Feb 2020 10:05:19 -0700 Subject: [PATCH 135/316] Add hedgehog-fakedata --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index fd96d631..1d3d5d1d 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2289,6 +2289,7 @@ packages: - liboath-hs < 0 # via inline-c-0.8.0.1 - servant-quickcheck < 0 - esqueleto + - hedgehog-fakedata - persistent-typed-db - persistent-qq - persistent-pagination From 4c16c404604085509d82cdc230c83766ff1a5cf9 Mon Sep 17 00:00:00 2001 From: Daniel Casanueva Date: Wed, 4 Mar 2020 13:36:58 +0100 Subject: [PATCH 136/316] Bring back HaTeX to stackage --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index eb17c913..b210e2e8 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1045,7 +1045,7 @@ packages: - Clipboard - grouped-list < 0 # via base-4.13.0.0 - haskintex < 0 # via hint - - HaTeX < 0 # MonadFail + - HaTeX - include-file - matrix - pcre-light From 7303a94c94c5337d000317aa926f8c5d2db51b74 Mon Sep 17 00:00:00 2001 From: Chris Dornan Date: Fri, 6 Mar 2020 14:12:48 +0000 Subject: [PATCH 137/316] mini-egison, extra upper bounds --- build-constraints.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index eb17c913..2f39d3c9 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4137,6 +4137,8 @@ packages: "Satoshi Egi @egisatoshi": - egison - mini-egison + # - egison-pattern-src + # - egison-pattern-src-th-mode "Travis Cardwell @TravisCardwell": - ttc @@ -4727,6 +4729,13 @@ packages: - hledger-ui < 1.17 - hledger-web < 1.17 + # https://github.com/commercialhaskell/stackage/issues/new + - mini-egison <1.0.0 + + # + - extra < 1.7 + + # end of packages # Package flags are applied to individual packages, and override the values of From 08aa99de1f17a53d62584e306f8377c5055d6cd5 Mon Sep 17 00:00:00 2001 From: Vaclav Svejcar Date: Fri, 6 Mar 2020 20:47:39 +0100 Subject: [PATCH 138/316] Add headroom package --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 2f39d3c9..6e82f717 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4178,6 +4178,9 @@ packages: "Ziyang Liu @zliu41": - multi-containers + + "Vaclav Svejcar @vaclavsvejcar": + - headroom "Grandfathered dependencies": - network From 3ec7911c97dd7366321aafcf9204e333861ed92d Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Fri, 6 Mar 2020 16:25:56 -0800 Subject: [PATCH 139/316] allow hledger 1.17 hledger-iadd-1.3.10 has a revision for it now. --- build-constraints.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 2f39d3c9..4cd202ad 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4723,12 +4723,6 @@ packages: # https://github.com/commercialhaskell/stackage/issues/5218 - unliftio-core < 0.2 - # https://github.com/commercialhaskell/stackage/issues/5219 - - hledger-lib < 1.17 - - hledger < 1.17 - - hledger-ui < 1.17 - - hledger-web < 1.17 - # https://github.com/commercialhaskell/stackage/issues/new - mini-egison <1.0.0 From 7ab170b5beb416787d1adb69728b730f2dee8af9 Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Sat, 7 Mar 2020 12:16:30 +0100 Subject: [PATCH 140/316] Enable configurator-pg. Upper bound on base has been relaxed. --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 2f39d3c9..2a15ca91 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -68,7 +68,7 @@ packages: - small-bytearray-builder "Robert Vollmert @robx": - - configurator-pg < 0 # via base-4.13.0.0 + - configurator-pg "Sandy Maguire @isovector": - ecstasy From c5e7f511b8b54ebd8294798f07fa5bdccc54b225 Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Sat, 7 Mar 2020 12:56:26 +0100 Subject: [PATCH 141/316] Enable interpolatedstring-perl6. This was disabled in 33c842ddf91a199e5 as a miscellaneous GHC 8.8- related build failure. It builds fine for me now with nightly. --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 2f39d3c9..4a840f27 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1367,7 +1367,7 @@ packages: - here - hlibgit2 # - gitlib-libgit2 # via gitlib: https://github.com/jwiegley/gitlib/issues/72 - - interpolatedstring-perl6 < 0 + - interpolatedstring-perl6 - iproute - missing-foreign - MissingH < 0 # via array-0.5.4.0 & base-4.13.0.0 & containers-0.6.2.1 & directory-1.3.3.2 & filepath-1.4.2.1 & old-time-1.1.0.3 & process-1.6.5.1 & time-1.9.3 & unix-2.7.2.2 From 10041be07c6b809b8f57dd1c007b6095fcee9633 Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Sat, 7 Mar 2020 12:58:45 +0100 Subject: [PATCH 142/316] Enable string-interpolate. It was marked blocked by interpolatedstring-perl6, which is reenabled. --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 4a840f27..520e5f62 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -85,7 +85,7 @@ packages: - loopbreaker "William Yao @williamyaoh": - - string-interpolate < 0 # via interpolatedstring-perl6 + - string-interpolate "Roel van Dijk @roelvandijk": - terminal-progress-bar From 7df8cfccd8736533bc4a7964498eee3c32c7ca73 Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Sat, 7 Mar 2020 13:50:35 +0100 Subject: [PATCH 143/316] Enable hspec-wai-json. --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 2f39d3c9..1cce248e 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -921,7 +921,7 @@ packages: - hspec-core - hspec-discover - hspec-wai - - hspec-wai-json < 0 # via hspec-wai + - hspec-wai-json - aeson-qq - interpolate - doctest From d86c669576a09eb04704480178857efa2268a977 Mon Sep 17 00:00:00 2001 From: Dmitry Ivanov Date: Sat, 7 Mar 2020 20:48:45 +0100 Subject: [PATCH 144/316] Add more opentelemetry packages, remove abandoned yi packages --- build-constraints.yaml | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 2f39d3c9..27c76fc1 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2419,24 +2419,15 @@ packages: - io-storage - oo-prototypes - opentelemetry + - opentelemetry-wai + - opentelemetry-http-client + - opentelemetry-lightstep - planb-token-introspection - pointedlist - unordered-intmap - word-trie - xdg-basedir - - yi-core < 0 # GHC 8.4 build failure - - yi-frontend-vty < 0 # GHC 8.4 via yi-core - - yi-fuzzy-open < 0 # GHC 8.4 via yi-core - - yi-ireader < 0 # GHC 8.4 via yi-core - - yi-keymap-cua < 0 # GHC 8.4 via yi-core - - yi-keymap-emacs < 0 # GHC 8.4 via yi-core - - yi-keymap-vim < 0 # GHC 8.4 via yi-core - - yi-language < 0 # via regex-base-0.94.0.0 - - yi-misc-modes < 0 # GHC 8.4 via yi-core - - yi-mode-haskell < 0 # GHC 8.4 via yi-core - - yi-mode-javascript < 0 # GHC 8.4 via yi-core - yi-rope - - yi-snippet < 0 # GHC 8.4 via yi-core "Tobias Bexelius @tobbebex": - GPipe < 0 # GHC 8.4 via base-4.11.0.0 From b1899b0bc0704259462114285f31f5b73d29b287 Mon Sep 17 00:00:00 2001 From: Chris Dornan Date: Sun, 8 Mar 2020 14:56:47 +0000 Subject: [PATCH 145/316] rank2classes-1.4, fb-2.0.1 (bounds) --- build-constraints.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 2f39d3c9..f94ac424 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4722,6 +4722,7 @@ packages: # https://github.com/commercialhaskell/stackage/issues/5218 - unliftio-core < 0.2 + - fb < 2.0.1 # https://github.com/commercialhaskell/stackage/issues/5219 - hledger-lib < 1.17 @@ -4732,9 +4733,11 @@ packages: # https://github.com/commercialhaskell/stackage/issues/new - mini-egison <1.0.0 - # + # https://github.com/commercialhaskell/stackage/issues/5228 - extra < 1.7 + # https://github.com/commercialhaskell/stackage/issues/5236 + - rank2classes < 1.4 # end of packages From 8c0036bcfb5020ebd20c5fb4fc8f4247f35f4044 Mon Sep 17 00:00:00 2001 From: Chris Dornan Date: Sun, 8 Mar 2020 15:08:32 +0000 Subject: [PATCH 146/316] remove bounds constraints on doclayout, doctemplates, pandoc (#5181) --- build-constraints.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index f94ac424..bd181312 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2833,12 +2833,12 @@ packages: - texmath - highlighting-kate - skylighting - - pandoc-types > 1.19 # https://github.com/fpco/stackage/issues/2223 + - pandoc-types - zip-archive - - doclayout < 0.3 # via pandoc-2.9.1.1 - - doctemplates < 0.8.1 # via doclayout + - doclayout + - doctemplates - emojis - - pandoc < 2.9.2 # https://github.com/commercialhaskell/stackage/issues/5181 + - pandoc - pandoc-citeproc - HsYAML-aeson - ipynb #< 0 # via aeson-diff From 81ae77fce9055cfa74844973589eb8b452484774 Mon Sep 17 00:00:00 2001 From: Chris Dornan Date: Sun, 8 Mar 2020 18:06:24 +0000 Subject: [PATCH 147/316] first-class-families-0.8.0.0 bounds (#5237) --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index bd181312..f0ecea98 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -452,7 +452,7 @@ packages: "Li-yao Xia @Lysxia": - boltzmann-samplers - - first-class-families + - first-class-families < 0.8.0.0 - generic-data - generic-data-surgery < 0 # via generic-data - generic-random From 457ac7102771db9e41dccdaf6521db7647f75b9f Mon Sep 17 00:00:00 2001 From: Dan Burton Date: Mon, 9 Mar 2020 09:38:34 -0700 Subject: [PATCH 148/316] Correct instructions for rerogranized dirs --- CURATORS.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CURATORS.md b/CURATORS.md index be2c7d93..0fa768d2 100644 --- a/CURATORS.md +++ b/CURATORS.md @@ -335,8 +335,8 @@ 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: - * `rm -r /var/stackage/stackage/automated/lts*/work/unpack-dir/unpacked/` - * `rm -r /var/stackage/stackage/automated/nightly/work/unpack-dir/unpacked/` + * `rm -r /var/stackage/stackage/automated/work/lts*/unpack-dir/unpacked/` + * `rm -r /var/stackage/stackage/automated/work/nightly/unpack-dir/unpacked/` * (outdated) There are many temp files inside `/home/ubuntu/stackage-server-cron` that can be cleared out occasionally * (outdated) You can then manually run `/home/ubuntu/stackage-server-cron.sh`, or wait for the cron job to do it From cc033e384f368d2c295719579453733fa0b7b43d Mon Sep 17 00:00:00 2001 From: Dan Burton Date: Mon, 9 Mar 2020 09:43:49 -0700 Subject: [PATCH 149/316] Add bytestring-mmap --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index f0ecea98..70906053 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -477,6 +477,7 @@ packages: - matrix-market-attoparsec - mwc-probability-transition < 0 # via logging-effect - xeno + - bytestring-mmap # required by xeno - datasets < 0 # via req - lucid-extras - rigel-viz From 5e5dd7c8b1430eb2982ef48f839a8168d45b0483 Mon Sep 17 00:00:00 2001 From: Dan Burton Date: Mon, 9 Mar 2020 10:21:20 -0700 Subject: [PATCH 150/316] Upgrade to ghc 8.8.3, see #5238 --- build-constraints.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 46ec8247..63d033f1 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1,6 +1,6 @@ ghc-major-version: "8.8" # new curator is supposed to use exact GHC version -ghc-version: "8.8.2" +ghc-version: "8.8.3" # This affects which version of the Cabal file format we allow. We # should ensure that this is always no greater than the version @@ -518,7 +518,7 @@ packages: "Pranay Sashank @pranaysashank": - fusion-plugin-types - - fusion-plugin + - fusion-plugin < 0 # ghc-8.8.3 "Aleksey Uimanov @s9gf4ult": # - postgresql-query # haskell-src-exts via derive @@ -3862,7 +3862,7 @@ packages: "Andre Van Der Merwe @andrevdm": - bhoogle < 0 - - hyraxAbif + - hyraxAbif < 0 # directory-1.3.6.0 (ghc-8.8.3) "David Millar-Durrant @DavidM-D": - indexed-list-literals From dbdc2ea715d280a2cccd1555662a094c44b239ff Mon Sep 17 00:00:00 2001 From: Dan Burton Date: Tue, 10 Mar 2020 09:23:39 -0700 Subject: [PATCH 151/316] Add xeno to expected test failures per ocramz/xeno#37 --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 63d033f1..b727bb05 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5377,6 +5377,7 @@ expected-test-failures: - crypto-pubkey # https://github.com/vincenthz/hs-crypto-pubkey/issues/23 - doctest-discover # 0.1.0.9 https://github.com/karun012/doctest-discover/issues/22 - graylog # 0.1.0.1 https://github.com/fpco/stackage/pull/1254 + - xeno # 0.4 https://github.com/ocramz/xeno/issues/37 # Assertion failures, these can be real bugs or just limitations # in the test cases. From 1d87fb3ef2799f998c2be4cf82b776ef393a459c Mon Sep 17 00:00:00 2001 From: Dan Burton Date: Wed, 11 Mar 2020 10:22:34 -0700 Subject: [PATCH 152/316] Revert "Add xeno to expected test failures per ocramz/xeno#37" This reverts commit dbdc2ea715d280a2cccd1555662a094c44b239ff. --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index b727bb05..63d033f1 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5377,7 +5377,6 @@ expected-test-failures: - crypto-pubkey # https://github.com/vincenthz/hs-crypto-pubkey/issues/23 - doctest-discover # 0.1.0.9 https://github.com/karun012/doctest-discover/issues/22 - graylog # 0.1.0.1 https://github.com/fpco/stackage/pull/1254 - - xeno # 0.4 https://github.com/ocramz/xeno/issues/37 # Assertion failures, these can be real bugs or just limitations # in the test cases. From 9944d59b85fed6a06e2d65ca2efa059b173755e0 Mon Sep 17 00:00:00 2001 From: Dan Burton Date: Wed, 11 Mar 2020 10:27:46 -0700 Subject: [PATCH 153/316] Expect test failure per robx/configurator-pg#9 --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 63d033f1..4c144ba9 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5374,6 +5374,7 @@ expected-test-failures: # Missing test files in sdist # Hopefully gets fixed in the next release... + - configurator-pg # 0.2.0 https://github.com/robx/configurator-pg/issues/9 - crypto-pubkey # https://github.com/vincenthz/hs-crypto-pubkey/issues/23 - doctest-discover # 0.1.0.9 https://github.com/karun012/doctest-discover/issues/22 - graylog # 0.1.0.1 https://github.com/fpco/stackage/pull/1254 From d18878a7c72f91b13a900cc783303195b78effc1 Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Thu, 12 Mar 2020 11:07:19 +0100 Subject: [PATCH 154/316] Enable tests for configurator-pg Version 0.2.1 has been released adding the missing files. --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 4c144ba9..63d033f1 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5374,7 +5374,6 @@ expected-test-failures: # Missing test files in sdist # Hopefully gets fixed in the next release... - - configurator-pg # 0.2.0 https://github.com/robx/configurator-pg/issues/9 - crypto-pubkey # https://github.com/vincenthz/hs-crypto-pubkey/issues/23 - doctest-discover # 0.1.0.9 https://github.com/karun012/doctest-discover/issues/22 - graylog # 0.1.0.1 https://github.com/fpco/stackage/pull/1254 From 2072a84d03d2ddfcfc89d9bdfb1410684e4a1341 Mon Sep 17 00:00:00 2001 From: Pavan Rikhi Date: Fri, 13 Mar 2020 05:56:07 -0400 Subject: [PATCH 155/316] Add wai-middleware-clacks GNU Terry Pratchett --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 4c144ba9..a811185f 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4050,6 +4050,7 @@ packages: - tasty-wai - stack-templatizer - immortal-queue + - wai-middleware-clacks "David Baynard @dbaynard": - time-qq < 0 # see christian-marie/time-qq#3 From cfa2242a4e68a48aae65dfddf3132bfef64cb732 Mon Sep 17 00:00:00 2001 From: Dan Burton Date: Fri, 13 Mar 2020 16:25:28 -0400 Subject: [PATCH 156/316] Add constraint "jira-wiki-markup < 1.1" per #5241 --- build-constraints.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 4c144ba9..b547e152 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4175,7 +4175,7 @@ packages: - math-extras - min-max-pqueue - multi-containers - + "Vaclav Svejcar @vaclavsvejcar": - headroom @@ -4733,6 +4733,9 @@ packages: # https://github.com/commercialhaskell/stackage/issues/5236 - rank2classes < 1.4 + # https://github.com/commercialhaskell/stackage/issues/5241 + - jira-wiki-markup < 1.1 + # end of packages # Package flags are applied to individual packages, and override the values of From afddc5219138b319f862e65e1d28e4394f26b5ea Mon Sep 17 00:00:00 2001 From: Dan Burton Date: Fri, 13 Mar 2020 16:51:11 -0400 Subject: [PATCH 157/316] Block packages that are blocking upgrade, see #5161 --- build-constraints.yaml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 259bf753..fafebffe 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2934,8 +2934,8 @@ packages: - antiope-sns - antiope-sqs - arbor-lru-cache - - arbor-postgres - - asif + - arbor-postgres < 0 # generic-lens 2.0.0.0 + - asif < 0 # hw-ip due to generic-lens 2.0.0.0 - avro - bits-extra - hw-balancedparens @@ -2943,28 +2943,28 @@ packages: - hw-conduit - hw-conduit-merges - hw-diagnostics - - hw-dsv - - hw-eliasfano + - hw-dsv < 0 # generic-lens 2.0.0.0 + - hw-eliasfano < 0 # generic-lens 2.0.0.0 - hw-excess - hw-fingertree - hw-fingertree-strict - hw-hedgehog - hw-hspec-hedgehog - hw-int - - hw-ip - - hw-json - - hw-json-simple-cursor - - hw-json-standard-cursor + - hw-ip < 0 # generic-lens 2.0.0.0 + - hw-json < 0 # generic-lens 2.0.0.0 + - hw-json-simple-cursor < 0 # generic-lens 2.0.0.0 + - hw-json-standard-cursor < 0 # generic-lens 2.0.0.0 - hw-mquery - - hw-packed-vector + - hw-packed-vector < 0 # generic-lens 2.0.0.0 - hw-parser - hw-prim - - hw-rankselect + - hw-rankselect < 0 # generic-lens 2.0.0.0 - hw-rankselect-base - - hw-simd + - hw-simd < 0 # hw-rankselect due to generic-lens 2.0.0.0 - hw-streams - - hw-succinct - - hw-xml + - hw-succinct < 0 # hw-rankselect due to generic-lens 2.0.0.0 + - hw-xml < 0 # generic-lens 2.0.0.0 "George Wilson @gwils": - hedgehog-fn From 117ac9f8e75d4f2c5717b480f06985940f440298 Mon Sep 17 00:00:00 2001 From: Dan Burton Date: Fri, 13 Mar 2020 17:20:23 -0400 Subject: [PATCH 158/316] Restore broadcast-chan --- build-constraints.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index fafebffe..f3ac309f 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1363,7 +1363,6 @@ packages: "Emanuel Borsboom @borsboom": - BoundedChan - - broadcast-chan < 0 # compilation failure - fuzzcheck - here - hlibgit2 @@ -5629,7 +5628,6 @@ skipped-benchmarks: - bit-stream - bitset-word8 - blake2 - - broadcast-chan - bv-little - bytestring-conversion - case-insensitive From e6c83a73adcea112a965f8c87bc9a685f887c0fd Mon Sep 17 00:00:00 2001 From: Yo Eight Date: Sat, 14 Mar 2020 00:36:55 +0100 Subject: [PATCH 159/316] Add eventstore back. --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index f3ac309f..056a6201 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2667,7 +2667,7 @@ packages: - pusher-http-haskell "Yorick Laupa yo.eight@gmail.com @YoEight": - - eventstore < 0 # via dns + - eventstore - dotnet-timespan - eventsource-api < 0 # GHC 8.4 build failure - eventsource-geteventstore-store < 0 # GHC 8.4 via protolude From 5bbfa5c66c1c07e9a02772d4541bb20b4a7f7476 Mon Sep 17 00:00:00 2001 From: Sibi Prabakaran Date: Sat, 14 Mar 2020 15:02:30 +0530 Subject: [PATCH 160/316] fb package: Un-constrain fb to use latest version --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index f3ac309f..12732ed1 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4724,7 +4724,6 @@ packages: # https://github.com/commercialhaskell/stackage/issues/5218 - unliftio-core < 0.2 - - fb < 2.0.1 # https://github.com/commercialhaskell/stackage/issues/new - mini-egison <1.0.0 From 4c9dceb68d8c65b1ed1fcb52dd36f9b60c050d2f Mon Sep 17 00:00:00 2001 From: Sibi Prabakaran Date: Sat, 14 Mar 2020 15:04:01 +0530 Subject: [PATCH 161/316] yesod-fb - Remove the constraint to allow newer versions --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index f3ac309f..89e7d7d4 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -983,7 +983,7 @@ packages: # - serversession-frontend-yesod # conduit 1.3, yesod 1.6 # - thumbnail-plus # https://github.com/prowdsponsor/thumbnail-plus/issues/5 - yesod-auth-fb - - yesod-fb < 0 # via yesod-core + - yesod-fb "Alexander Altman @pthariensflame": # Maintaining on behalf of @roelvandijk: From 7537118a727e1aaa466b2e4f38a7ca9f0450cfb5 Mon Sep 17 00:00:00 2001 From: Dan Burton Date: Sun, 15 Mar 2020 21:43:38 -0700 Subject: [PATCH 162/316] Add more packages under @khibino --- build-constraints.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index f3ac309f..89fa819c 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2886,6 +2886,9 @@ packages: - json-rpc-generic - protocol-radius - protocol-radius-test + - th-bang-compat + - th-constraint-compat + - persistable-record "wren romano @wrengr": - bytestring-lexing @@ -4447,7 +4450,6 @@ packages: - parallel - path-pieces - pcg-random - - persistable-record - pipes-bytestring - pipes-group - placeholders From 67341a822a3f5036f5f21a6838f999a103f38f4e Mon Sep 17 00:00:00 2001 From: Eric Conlon Date: Mon, 16 Mar 2020 12:10:00 -0700 Subject: [PATCH 163/316] Re-enable ekg with 8.8 compatibility (ekg-0.4.0.15) --- build-constraints.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 89fa819c..1bfaeac0 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1308,9 +1308,6 @@ packages: - wai-middleware-caching - wai-middleware-caching-lru < 0 - wai-middleware-caching-redis < 0 # GHC 8.4 via hedis - # not package maintainer - - ekg < 0 # via base-4.13.0.0 - - ekg-json < 0 # via base-4.13.0.0 "Paul Rouse @paul-rouse": - mysql @@ -1920,7 +1917,6 @@ packages: - wuss - bmp # @benl23x5 - - ekg-statsd < 0 # @tibbe via base-4.13.0.0 & time-1.9.3 - gpolyline # @fegu - postgresql-simple-migration < 0 # via time-1.9.3 # @ameingast - statestack @@ -2165,7 +2161,6 @@ packages: - data-ordlist - digits - dns - - ekg-core < 0 # via base-4.13.0.0 - friday < 0 - friday-juicypixels < 0 - hbeanstalk < 0 # sClose not in scope @@ -4151,6 +4146,11 @@ packages: - climb - heart-core - linenoise + # Maintainership with @23Skidoo + - ekg + - ekg-core + - ekg-json + - ekg-statsd "Jorah Gao @gqk007": - aeson-default From b0b07e16b639181bbac641875d1068b491de9833 Mon Sep 17 00:00:00 2001 From: Eric Conlon Date: Tue, 17 Mar 2020 10:47:27 -0700 Subject: [PATCH 164/316] enable monad-metrics --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 1bfaeac0..9b93baa6 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2287,7 +2287,7 @@ packages: "Matt Parsons @parsonsmatt": - monad-logger-prefix - - monad-metrics < 0 # via ekg-core + - monad-metrics # - ekg-cloudwatch # http-conduit 2.3 via amazonka - smtp-mail < 0 # https://github.com/jhickner/smtp-mail/issues/24#issuecomment-499601949 - liboath-hs < 0 # via inline-c-0.8.0.1 From 52718334ae60827a58652d158f2f3eecd606e667 Mon Sep 17 00:00:00 2001 From: Sasha Bogicevic Date: Tue, 17 Mar 2020 22:19:13 +0100 Subject: [PATCH 165/316] Add plaid package --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index f3ac309f..62be86f8 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -9,6 +9,9 @@ cabal-format-version: "2.4" # Constraints for brand new builds packages: + "Sasha Bogicevic @v0d1ch": + - plaid + "Geoffrey Mainland @mainland": - exception-mtl - exception-transformers From 12c0dc03a198c7235c2eb86b26f91d1b19ed02af Mon Sep 17 00:00:00 2001 From: Alexey Kuleshevich Date: Wed, 18 Mar 2020 07:38:01 +0300 Subject: [PATCH 166/316] Add new package pvar --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 6784fcbd..89fdcfd0 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3356,6 +3356,7 @@ packages: - Color - safe-decimal - flush-queue + - pvar "Hans-Peter Deifel @hpdeifel": - hledger-iadd From 1e3798aed27dd8425756b665236371dac3f17ae2 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 18 Mar 2020 15:01:44 +0800 Subject: [PATCH 167/316] re-enable hyraxAbif (#5238) --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 00e3fb01..02b95ca6 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3865,7 +3865,7 @@ packages: "Andre Van Der Merwe @andrevdm": - bhoogle < 0 - - hyraxAbif < 0 # directory-1.3.6.0 (ghc-8.8.3) + - hyraxAbif "David Millar-Durrant @DavidM-D": - indexed-list-literals From 32e0a14d785c3187202808ad2a70767396dd8518 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 18 Mar 2020 15:35:41 +0800 Subject: [PATCH 168/316] revert "extra < 1.7" (#5228) --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 02b95ca6..b8d1301f 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4734,9 +4734,6 @@ packages: # https://github.com/commercialhaskell/stackage/issues/new - mini-egison <1.0.0 - # https://github.com/commercialhaskell/stackage/issues/5228 - - extra < 1.7 - # https://github.com/commercialhaskell/stackage/issues/5236 - rank2classes < 1.4 From eaabf0fb100c210722e7fad11881ce231f9c1ed5 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 18 Mar 2020 15:59:44 +0800 Subject: [PATCH 169/316] Revert "revert "extra < 1.7" (#5228)" intro still has low bound This reverts commit 32e0a14d785c3187202808ad2a70767396dd8518. --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index b8d1301f..02b95ca6 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4734,6 +4734,9 @@ packages: # https://github.com/commercialhaskell/stackage/issues/new - mini-egison <1.0.0 + # https://github.com/commercialhaskell/stackage/issues/5228 + - extra < 1.7 + # https://github.com/commercialhaskell/stackage/issues/5236 - rank2classes < 1.4 From 9ed4ffedb929a2a5b5e42a02d3cb51257d14370f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 18 Mar 2020 16:05:40 +0800 Subject: [PATCH 170/316] enable mini-egison and egison-pattern-src* (#5227) --- build-constraints.yaml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 02b95ca6..dc39a609 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4135,8 +4135,8 @@ packages: "Satoshi Egi @egisatoshi": - egison - mini-egison - # - egison-pattern-src - # - egison-pattern-src-th-mode + - egison-pattern-src + - egison-pattern-src-th-mode "Travis Cardwell @TravisCardwell": - ttc @@ -4731,9 +4731,6 @@ packages: # https://github.com/commercialhaskell/stackage/issues/5218 - unliftio-core < 0.2 - # https://github.com/commercialhaskell/stackage/issues/new - - mini-egison <1.0.0 - # https://github.com/commercialhaskell/stackage/issues/5228 - extra < 1.7 From 75049e08337d6ae265f4d9d187c24ab9a3995bf8 Mon Sep 17 00:00:00 2001 From: Veronika Romashkina Date: Wed, 18 Mar 2020 13:14:26 +0000 Subject: [PATCH 171/316] Add validation-selective --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index dc39a609..c17a13b4 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3620,6 +3620,7 @@ packages: - summoner < 0 # via base-4.13.0.0 - tomland - typerep-map + - validation-selective "Dmitrii Kovanikov @chshersh": - type-errors-pretty From 87231e307cbc0ec932dfb684fa94818f932d2d0f Mon Sep 17 00:00:00 2001 From: Clint Adams Date: Wed, 18 Mar 2020 17:09:22 -0400 Subject: [PATCH 172/316] Re-enable ixset-typed and revdeps hOpenPGP and hopenpgp-tools --- build-constraints.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index dc39a609..9b193bcb 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1184,11 +1184,11 @@ packages: - HandsomeSoup "Clint Adams @clinty": - - hOpenPGP < 0 # via ixset-typed, https://github.com/commercialhaskell/stackage/issues/5175 + - hOpenPGP - openpgp-asciiarmor - MusicBrainz - DAV - - hopenpgp-tools < 0 # hOpenPGP & ixset-typed + - hopenpgp-tools - opensource - debian - cabal-debian @@ -4400,7 +4400,7 @@ packages: - inspection-testing - integer-logarithms - io-streams-haproxy - - ixset-typed < 0 # via safecopy-0.10.0 and template-haskell + - ixset-typed - json < 0 # via base-4.13.0.0 - json-alt - kleene < 0 # via regex-applicative From d38e9bd4994412483ea5fb9e4463265c34a9f5f7 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 19 Mar 2020 19:09:42 +0800 Subject: [PATCH 173/316] revert "extra < 1.7" (#5228) --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index dc39a609..fc001634 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4731,9 +4731,6 @@ packages: # https://github.com/commercialhaskell/stackage/issues/5218 - unliftio-core < 0.2 - # https://github.com/commercialhaskell/stackage/issues/5228 - - extra < 1.7 - # https://github.com/commercialhaskell/stackage/issues/5236 - rank2classes < 1.4 From 51fc543d7e86da238d7cfb2114b73eb97bc40ad1 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 19 Mar 2020 19:12:58 +0800 Subject: [PATCH 174/316] higher-leveldb < 0.6.0.0 (#5218) --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 1750d2b5..44ec989b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4731,6 +4731,7 @@ packages: # https://github.com/commercialhaskell/stackage/issues/5218 - unliftio-core < 0.2 + - higher-leveldb < 0.6.0.0 # https://github.com/commercialhaskell/stackage/issues/5236 - rank2classes < 1.4 From 54b5ce262591370139b30c3b742ff920383c248f Mon Sep 17 00:00:00 2001 From: Pavan Rikhi Date: Thu, 19 Mar 2020 11:15:41 -0400 Subject: [PATCH 175/316] Add hledger-stockquotes --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 52ab3ea1..7f3d3f00 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4055,6 +4055,7 @@ packages: - stack-templatizer - immortal-queue - wai-middleware-clacks + - hledger-stockquotes "David Baynard @dbaynard": - time-qq < 0 # see christian-marie/time-qq#3 From 55ded216230e3b5ef7f52d01d4df16e1e9d5bf58 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 20 Mar 2020 13:55:04 +0800 Subject: [PATCH 176/316] hopenpgp-tools failed (#5250) --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 52ab3ea1..60ebc821 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1188,7 +1188,7 @@ packages: - openpgp-asciiarmor - MusicBrainz - DAV - - hopenpgp-tools + # - hopenpgp-tools # https://github.com/commercialhaskell/stackage/pull/5250 - opensource - debian - cabal-debian From 452bc05b6ce3aef6438f5120ef99472734084ad5 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 20 Mar 2020 14:08:11 +0800 Subject: [PATCH 177/316] enable protobuf by skipping testsuite since it depends on hex which doesn't build with base-4.13 --- build-constraints.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 60ebc821..2259870a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4473,7 +4473,7 @@ packages: - process-extras - product-isomorphic - project-template - - protobuf < 0 # via hex + - protobuf - pureMD5 - quickcheck-instances - quickcheck-io @@ -5022,6 +5022,7 @@ skipped-tests: - mmtf # via hspec-2.7.0 - next-ref # hspec 2.3 - partial-order # HUnit 1.6 + - protobuf # hex-0.1.2 - psqueues # via QuickCheck-2.12.6.1 - pure-zlib # via QuickCheck-2.12.6.1 - records-sop # via hspec-2.7.0 From 0f68a308b51cf4b89235c1e107e9fcfde3cb2be3 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 21 Mar 2020 11:24:32 +0800 Subject: [PATCH 178/316] cfenv testsuite failing (tomphp/haskell-cfenv#1) --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index b8e7ec41..73244d40 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5523,6 +5523,9 @@ expected-test-failures: # https://github.com/iij-ii/direct-hs/issues/100 - skews + + # https://github.com/tomphp/haskell-cfenv/issues/1 + - cfenv # end of expected-test-failures # Benchmarks which are known not to build. Note that, currently we do not run From 2a56201dbe93ece37c0e5b8e8efe2a23c3604eca Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 21 Mar 2020 11:51:29 +0800 Subject: [PATCH 179/316] Revert "hopenpgp-tools failed (#5250)" This reverts commit 55ded216230e3b5ef7f52d01d4df16e1e9d5bf58. --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 73244d40..54172516 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1188,7 +1188,7 @@ packages: - openpgp-asciiarmor - MusicBrainz - DAV - # - hopenpgp-tools # https://github.com/commercialhaskell/stackage/pull/5250 + - hopenpgp-tools - opensource - debian - cabal-debian From f469ef22df11d0cb44e0ccbdb4726ae4c02ebc47 Mon Sep 17 00:00:00 2001 From: aiya000 Date: Sat, 21 Mar 2020 16:36:33 +0900 Subject: [PATCH 180/316] Add character-cases --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 54172516..a8693a6a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3382,6 +3382,7 @@ packages: - socket-activation < 0 # via network-3.1.1.0 "aiya000 @aiya000": + - character-cases - throwable-exceptions "Mitsutoshi Aoe @maoe": From 7c1973571b4d1526c1edd3ecf462d37876182cb0 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 21 Mar 2020 22:14:49 +0800 Subject: [PATCH 181/316] haskell-lsp < 0.21 (#5253) --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 54172516..48161ba5 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4740,6 +4740,9 @@ packages: # https://github.com/commercialhaskell/stackage/issues/5241 - jira-wiki-markup < 1.1 + # https://github.com/commercialhaskell/stackage/issues/5253 + - haskell-lsp < 0.21 + - haskell-lsp-types < 0.21 # end of packages # Package flags are applied to individual packages, and override the values of From 25e9cd0beae741440e8cad1cb08d3c6dbbd0eb41 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 22 Mar 2020 21:28:27 +0800 Subject: [PATCH 182/316] Revert "haskell-lsp < 0.21" (closes #5253) This reverts commit 7c1973571b4d1526c1edd3ecf462d37876182cb0. --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 48161ba5..54172516 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4740,9 +4740,6 @@ packages: # https://github.com/commercialhaskell/stackage/issues/5241 - jira-wiki-markup < 1.1 - # https://github.com/commercialhaskell/stackage/issues/5253 - - haskell-lsp < 0.21 - - haskell-lsp-types < 0.21 # end of packages # Package flags are applied to individual packages, and override the values of From e57735b2f55b088c9152b6b1ebddcea8e7b3dfae Mon Sep 17 00:00:00 2001 From: Sibi Prabakaran Date: Sun, 22 Mar 2020 20:46:20 +0530 Subject: [PATCH 183/316] Add yesod-auth-fb package --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index a8693a6a..4941d706 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -738,7 +738,7 @@ packages: - tldr - fb - yesod-fb - - yesod-auth-fb < 0 # https://github.com/psibi/yesod-auth-fb/issues/4 + - yesod-auth-fb - hourglass-orphans - wai-slack-middleware - sysinfo From 71f423bfec3b98511094f1fd0e5c84c47f6fc7bd Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 23 Mar 2020 10:06:41 +0800 Subject: [PATCH 184/316] ghc-lib-parser-ex < 8.8.6.0 (#5255) --- build-constraints.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 4941d706..5c519535 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4741,6 +4741,8 @@ packages: # https://github.com/commercialhaskell/stackage/issues/5241 - jira-wiki-markup < 1.1 + # https://github.com/commercialhaskell/stackage/issues/5255 + - ghc-lib-parser-ex < 8.8.6.0 # end of packages # Package flags are applied to individual packages, and override the values of From 29b789c1700c4e1140a1014d4cba8e961d3c2ba9 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 23 Mar 2020 10:16:37 +0800 Subject: [PATCH 185/316] revert "haskell-src-exts < 1.23" (#5048) --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 5c519535..b0e792ac 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4361,7 +4361,7 @@ packages: - haskell-lexer - haskell-lsp-types - haskell-src - - haskell-src-exts < 1.23 # https://github.com/commercialhaskell/stackage/issues/5048 + - haskell-src-exts - haxl < 0 # via time-1.9.3 - heap - hex < 0 # via base-4.13.0.0 From dc587bf48c038886c8190eb703e808239d4a0629 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 23 Mar 2020 10:27:58 +0800 Subject: [PATCH 186/316] try enabling a bunch of h-s-e packages and update some --- build-constraints.yaml | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index b0e792ac..26dcd5e1 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -296,8 +296,8 @@ packages: - openexr-write "Pasqualino Assini @tittoassini": - # - zm # haskell-src-exts via derive - # - flat # haskell-src-exts via derive + # - zm + - flat - model < 0 # BuildFailureException Process exited with ExitFailure 1: ./Setup build "Jose Iborra @pepeiborra": @@ -310,7 +310,7 @@ packages: - floatshow - NoHoed - threepenny-editors < 0 # GHC 8.4 - # - clr-inline # haskell-src-exts via here # possibly nondeterministic failures, see https://github.com/fpco/stackage/issues/2510 + - clr-inline - strict-types < 0 # BuildFailureException Process exited with ExitFailure 1: ./Setup build "Roman Gonzalez @roman": @@ -524,7 +524,7 @@ packages: - fusion-plugin < 0 # ghc-8.8.3 "Aleksey Uimanov @s9gf4ult": - # - postgresql-query # haskell-src-exts via derive + - postgresql-query - hreader - hset @@ -1262,8 +1262,8 @@ packages: # - rest-client # http-types 0.12 - rest-core < 0 # GHC 8.4 via base-4.11.0.0 - rest-snap < 0 # GHC 8.4 via rest-core - # - rest-gen # haskell-src-exts - # - rest-happstack # haskell-src-exts via rest-gen + # - rest-gen + # - rest-happstack # containers - rest-stringmap < 0 # via aeson-1.4.0.0 - rest-types < 0 # GHC 8.4 via base-4.11.0.0 # - rest-wai # http-types 0.12 @@ -2341,7 +2341,7 @@ packages: - Spock-lucid < 0 # GHC 8.4 via Spock - charsetdetect-ae # - text-all # text-1.2.3.0 - - fmt < 0 # via doctest-discover + - fmt "Takano Akio tak@anoak.io @takano-akio": - fast-builder < 0 # via true-name @@ -2609,10 +2609,9 @@ packages: "Takahiro Himura @himura": - lens-regex - # haskell-src-exts via derive - # - twitter-conduit - # - twitter-types - # - twitter-types-lens + - twitter-conduit + - twitter-types + - twitter-types-lens "Robbin C. @robbinch": - zim-parser @@ -2705,17 +2704,17 @@ packages: "Jeremy Shaw @stepcut": - boomerang < 0 # GHC 8.4 via template-haskell-2.13.0.0 - # - happstack-hsp # haskell-src-exts via hsx2hs + # - happstack-hsp # harp - happstack-jmacro < 0 # GHC 8.4 via happstack-server - - happstack-server < 0 + - happstack-server - happstack-server-tls < 0 # GHC 8.4 via happstack-server - hsx-jmacro < 0 - ixset < 0 # GHC 8.4 via syb-with-class - - reform < 0 # build failure with GHC 8.4 - - reform-blaze < 0 # GHC 8.4 via reform - - reform-hamlet < 0 # GHC 8.4 via reform - - reform-happstack < 0 # GHC 8.4 via happstack-server - # - reform-hsp # haskell-src-exts via hsx2hs + - reform + - reform-blaze + - reform-hamlet + - reform-happstack + # - reform-hsp # hsx2hs - userid < 0 # GHC 8.4 via base-4.11.0.0 - web-plugins < 0 - web-routes < 0 # via http-types @@ -2862,7 +2861,7 @@ packages: "Mikhail Glushenkov @23Skidoo": # - Cabal take the one that ships with GHC - cabal-install < 0 # via base-4.13.0.0 - # - pointful # haskell-src-exts + # - pointful # haskell-src-exts-simple "Lennart Kolmodin @kolmodin": - binary-bits < 0 # MonadFail @@ -3602,7 +3601,7 @@ packages: - listsafe "Serokell @serokell": - # - importify # haskell-src-exts via haskell-names + # - importify - log-warper < 0 # GHC 8.4 via lifted-async-0.10.0.1 - o-clock - universum From a6634c7921601e3163a5b2f2d8414e0ea660865a Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 23 Mar 2020 10:28:37 +0800 Subject: [PATCH 187/316] bump Dockerfile to 8.8.3 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 94240b03..520b94ac 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM fpco/pid1:18.04 ENV HOME /home/stackage ENV LANG en_US.UTF-8 -ENV GHCVER 8.8.2 +ENV GHCVER 8.8.3 # NOTE: also update debian-bootstrap.sh when cuda version changes ENV PATH /home/stackage/.stack/programs/x86_64-linux/ghc-$GHCVER/bin:/usr/local/cuda-10.0/bin:/usr/sbin:/usr/bin:/sbin:/bin From 543a3057857ab29bb49ea8e10c2f4834059ec4bd Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 23 Mar 2020 10:45:46 +0800 Subject: [PATCH 188/316] enable cheapskate (jgm/cheapskate#33) --- build-constraints.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 26dcd5e1..32280070 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2334,8 +2334,8 @@ packages: - microlens-ghc - microlens-contra - shortcut-links < 0 # MonadFail - - cheapskate-highlight < 0 # cheapskate - - cheapskate-lucid < 0 # cheapskate + - cheapskate-highlight + - cheapskate-lucid - cmark-lucid - cmark-highlight < 0 # cmark-0.6 - Spock-lucid < 0 # GHC 8.4 via Spock @@ -2458,7 +2458,7 @@ packages: - core-text "Sean Hunt @ivan-m": - fgl @@ -3336,7 +3336,7 @@ packages: "Tom Nielsen @glutamate": - plotlyhs - - inliterate < 0 # cheapskate + - inliterate "Hyunje Jun @noraesae": - line < 0 # via scotty @@ -5736,7 +5736,6 @@ skipped-benchmarks: # These can also be checked for updates periodically. - o-clock # base-4.10 and time-1.8 via tiempo - minisat-solver # Cabal-2.2.0.1 via easyrender - - cmark-gfm # via cheapskate # Compilation failures - cipher-aes # https://github.com/vincenthz/hs-crypto-cipher/issues/46 From 1665b0081cb4837f573deb6956831169ab3a92ed Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 24 Mar 2020 00:46:34 +0800 Subject: [PATCH 189/316] redisable failing: flat, postgresql-query, twitter-types --- build-constraints.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 32280070..7565e404 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -297,7 +297,7 @@ packages: "Pasqualino Assini @tittoassini": # - zm - - flat + # - flat # fails to build - model < 0 # BuildFailureException Process exited with ExitFailure 1: ./Setup build "Jose Iborra @pepeiborra": @@ -524,7 +524,7 @@ packages: - fusion-plugin < 0 # ghc-8.8.3 "Aleksey Uimanov @s9gf4ult": - - postgresql-query + # - postgresql-query # build errors - hreader - hset @@ -2609,9 +2609,9 @@ packages: "Takahiro Himura @himura": - lens-regex - - twitter-conduit - - twitter-types - - twitter-types-lens + # - twitter-conduit # twitter-types + # - twitter-types # MonadFail + # - twitter-types-lens # "Robbin C. @robbinch": - zim-parser From 3615964bad926b846f6b85d4765b94ef19423bcb Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 24 Mar 2020 01:31:26 +0800 Subject: [PATCH 190/316] also redisable clr-inline Building test suite 'spec' for clr-inline-0.2.0.1.. [14 of 17] Compiling Clr.Inline.IEnumerable /var/stackage/work/unpack-dir/unpacked/clr-inline-0.2.0.1-bb74dca2b6dc4ff940300ceac868fdad61f49222a793f5bbc15c3aef92c8ce53/src/C lr/Inline/IEnumerable.hs:1:1: error: Illegal static expression: static Clr.Inline.Utils.Embed.ClrBytecode (Data.ByteString.pack [77, 90, 144, ....]) Use StaticPointers to enable this extension | 1 | {-# LANGUAGE DataKinds #-} | ^ --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 7565e404..5929c518 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -310,7 +310,7 @@ packages: - floatshow - NoHoed - threepenny-editors < 0 # GHC 8.4 - - clr-inline + # - clr-inline # Illegal static expression: static Clr.Inline.Utils.Embed.ClrBytecode - strict-types < 0 # BuildFailureException Process exited with ExitFailure 1: ./Setup build "Roman Gonzalez @roman": From df214e55b18dde817262892f723cfd9921018c00 Mon Sep 17 00:00:00 2001 From: Ivan Gromakovskii Date: Tue, 24 Mar 2020 21:21:53 +0300 Subject: [PATCH 191/316] Add with-utf8 --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 5929c518..bebc8ed3 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3605,6 +3605,7 @@ packages: - log-warper < 0 # GHC 8.4 via lifted-async-0.10.0.1 - o-clock - universum + - with-utf8 "Kowainik @chshersh @vrom911": - co-log-core From 1abe2a030d79c720b1f93fba47a2942e4c89a4ef Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 25 Mar 2020 12:24:49 +0800 Subject: [PATCH 192/316] enable base-noprelude for pandoc --- build-constraints.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 5929c518..c2890f45 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4224,6 +4224,7 @@ packages: - assoc - attoparsec - auto-update + - base-noprelude - base64-bytestring - base64-bytestring-type - base64-string @@ -4335,7 +4336,7 @@ packages: - fail - fast-logger - fast-math - - fib < 0 # via base-noprelude + - fib < 0 # via base-noprelude-4.13 - file-embed - file-embed-lzma - filemanip @@ -4676,7 +4677,6 @@ packages: # this is to prevent us from including them by accident. They can # be removed from this list if they are fixed. "Unmaintained packages with compilation failures": - - base-noprelude < 0 # via base-4.13.0.0 - doctest-discover-configurator < 0 - flexible-defaults < 0 # MonadFail - haskell-tools-builtin-refactorings < 0 # bounds failure From 45aabba144489ee7d55f32abcfb88703ae97b85d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 25 Mar 2020 12:36:32 +0800 Subject: [PATCH 193/316] feed testsuite should build now (bergmark/feed#43) --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index c2890f45..e6e7cdec 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5417,7 +5417,6 @@ expected-test-failures: - async-timer # https://github.com/mtesseract/async-timer/issues/8 - commutative # https://github.com/athanclark/commutative/issues/4 - conduit-throttle # https://github.com/mtesseract/conduit-throttle/issues/12 - - feed # https://github.com/bergmark/feed/issues/43 - haddock - haskell-tools-builtin-refactorings - hweblib # https://github.com/aycanirican/hweblib/issues/3 From db39449818ef87fe14746ef6971a2e09c4f2a306 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 25 Mar 2020 12:38:40 +0800 Subject: [PATCH 194/316] try re-enabling 'download' --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index e6e7cdec..5f99520e 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -732,7 +732,7 @@ packages: - hakyll < 0 # jaspervdj/hakyll#691 "Sibi Prabakaran @psibi": - - download < 0 # via feed + - download - textlocal - shell-conduit - tldr From 079e9f81be752f9990307b1b8104f81f2ee35ae4 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 25 Mar 2020 12:43:24 +0800 Subject: [PATCH 195/316] pandoc-2.9.2.1 allows jira-wiki-markup-1.1 (#5241) --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 5f99520e..2ee5069b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4737,9 +4737,6 @@ packages: # https://github.com/commercialhaskell/stackage/issues/5236 - rank2classes < 1.4 - # https://github.com/commercialhaskell/stackage/issues/5241 - - jira-wiki-markup < 1.1 - # https://github.com/commercialhaskell/stackage/issues/5255 - ghc-lib-parser-ex < 8.8.6.0 # end of packages From a35330146833dd69145cfae82e2e79e3dd838c2b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 25 Mar 2020 12:51:40 +0800 Subject: [PATCH 196/316] ghc-lib < 8.10.1.20200324 (#5257) --- build-constraints.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 2ee5069b..5dae82c6 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4739,6 +4739,10 @@ packages: # https://github.com/commercialhaskell/stackage/issues/5255 - ghc-lib-parser-ex < 8.8.6.0 + + # https://github.com/commercialhaskell/stackage/issues/5257 + - ghc-lib-parser < 8.10.1.20200324 + - ghc-lib < 8.10.1.20200324 # end of packages # Package flags are applied to individual packages, and override the values of From 16bc8236387379234cb869ee4541bc52c85e8790 Mon Sep 17 00:00:00 2001 From: Fumiaki Kinoshita Date: Wed, 25 Mar 2020 16:01:33 +0900 Subject: [PATCH 197/316] Update @fumieval's set --- build-constraints.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 5dae82c6..2333a22e 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2027,12 +2027,10 @@ packages: - boundingboxes - control-bool - drinkery - - extensible < 0 # compilation failure - monad-skeleton - - objective < 0 - - winery < 0 # via fast-builder - - witherable < 0 # via monoidal-containers - xml-lens + - witherable-class + - deriving-aeson "Peter Harpending @pharpend": - editor-open From 1de36c5caee347497f913ae71a8282b19a9a783c Mon Sep 17 00:00:00 2001 From: Veronika Romashkina Date: Wed, 25 Mar 2020 17:27:50 +0000 Subject: [PATCH 198/316] Add life-sync --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 5dae82c6..25bdfe28 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3613,6 +3613,7 @@ packages: - colourista - first-class-patterns - ilist + - life-sync - membrain - relude - shellmet From be97efb6b186cf29caed40551744b3adf38e7134 Mon Sep 17 00:00:00 2001 From: Joe Kachmar Date: Thu, 26 Mar 2020 00:33:12 +0000 Subject: [PATCH 199/316] Constrain packages that depend on GHC 8.10 --- build-constraints.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 5dae82c6..15627148 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2265,7 +2265,7 @@ packages: - deriving-compat - dotgen - echo - - eliminators + - eliminators < 0.7 # GHC 8.10 via base-4.14 & template-haskell-2.16 - generic-deriving - hashmap - invariant @@ -3069,7 +3069,7 @@ packages: "Richard Eisenberg @goldfirere": - th-desugar - - singletons + - singletons < 2.7 # GHC 8.10 via Cabal-3.2 & base-4.14 - HUnit-approx - units-parser < 0 # BuildFailureException Process exited with ExitFailure 1: dist/build/main/main From 0a075f02e0784ae00a9867411f629c7be936051b Mon Sep 17 00:00:00 2001 From: Joe Kachmar Date: Thu, 26 Mar 2020 00:34:00 +0000 Subject: [PATCH 200/316] Constrain th-desugar < 1.11 (#5260) --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 15627148..78c366dc 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3068,7 +3068,7 @@ packages: - hpio < 0 # GHC 8.4 via protolude "Richard Eisenberg @goldfirere": - - th-desugar + - th-desugar < 1.11 # https://github.com/commercialhaskell/stackage/issues/5260 - singletons < 2.7 # GHC 8.10 via Cabal-3.2 & base-4.14 - HUnit-approx - units-parser < 0 # BuildFailureException Process exited with ExitFailure 1: dist/build/main/main From 46ace1424a7294e5399459ea3f6b021c1bc07494 Mon Sep 17 00:00:00 2001 From: Joe Kachmar Date: Thu, 26 Mar 2020 00:38:00 +0000 Subject: [PATCH 201/316] Constrain hslua < 1.1.0 (#5261) --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 78c366dc..d45400d3 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3498,7 +3498,7 @@ packages: - algebraic-graphs "Albert Krewinkel @tarleb": - - hslua + - hslua < 1.1.0 # https://github.com/commercialhaskell/stackage/issues/5261 - hslua-aeson - hslua-module-system - hslua-module-text From 28eb21b0e677f2885fdb9dea391e346f37cdd976 Mon Sep 17 00:00:00 2001 From: Joe Kachmar Date: Thu, 26 Mar 2020 15:16:03 +0000 Subject: [PATCH 202/316] Drops language-avro (#5262) --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index d45400d3..4414c68a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1344,7 +1344,7 @@ packages: - language-protobuf "Flavio Corpa @kutyel": - - language-avro + - language-avro < 0 # avro-0.5.0.0 https://github.com/commercialhaskell/stackage/issues/5262 "Matvey Aksenov @supki": - terminal-size From cc7ad65c99d6b3fa7d92e81eff9029b00bfd9fc1 Mon Sep 17 00:00:00 2001 From: Joe Kachmar Date: Thu, 26 Mar 2020 15:24:19 +0000 Subject: [PATCH 203/316] Unconstraints th-desugar (#5260) --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 4414c68a..28e95af5 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3068,7 +3068,7 @@ packages: - hpio < 0 # GHC 8.4 via protolude "Richard Eisenberg @goldfirere": - - th-desugar < 1.11 # https://github.com/commercialhaskell/stackage/issues/5260 + - th-desugar - singletons < 2.7 # GHC 8.10 via Cabal-3.2 & base-4.14 - HUnit-approx - units-parser < 0 # BuildFailureException Process exited with ExitFailure 1: dist/build/main/main From 19cdd05b84124298141dbc5514bb4dea72cf77b4 Mon Sep 17 00:00:00 2001 From: Jeff Happily Date: Thu, 26 Mar 2020 23:23:52 +0800 Subject: [PATCH 204/316] Add dockerfile for lts-15.5 --- automated/dockerfiles/lts-15.5/Dockerfile | 89 +++++++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 automated/dockerfiles/lts-15.5/Dockerfile diff --git a/automated/dockerfiles/lts-15.5/Dockerfile b/automated/dockerfiles/lts-15.5/Dockerfile new file mode 100644 index 00000000..8826ddb2 --- /dev/null +++ b/automated/dockerfiles/lts-15.5/Dockerfile @@ -0,0 +1,89 @@ +FROM ubuntu:18.04 + +LABEL maintainer="manny@fpcomplete.com" + +ARG GHC_VERSION=8.8.3 +ARG LTS_SLUG=lts-15.0 +ARG PID1_VERSION=0.1.2.0 +ARG STACK_VERSION=2.1.3 +ARG CUDA_VERSION=10.0 +ARG JVM_PATH=/usr/lib/jvm/java-8-openjdk-amd64 +ARG LLVM_PATH=/usr/lib/llvm-7 +ARG BOOTSTRAP_COMMIT=77790c7bcb21fd8875871245df5c5c39a55ec0c1 +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 && \ + rm -rf /var/lib/apt/lists/* + +# +# Use Stackage's debian-bootstrap.sh script to install system libraries and +# tools required to build any Stackage package. +# Re-installs 'stack' *after* running debian-bootstrap.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/fpco/stackage/$BOOTSTRAP_COMMIT/debian-bootstrap.sh | sed "s/^GHCVER=8.6.5$/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 344eec021e08ffd346f76adbfc4287ee3dfe5ea6 Mon Sep 17 00:00:00 2001 From: Joe Kachmar Date: Thu, 26 Mar 2020 15:27:14 +0000 Subject: [PATCH 205/316] Reverts cc7ad65 --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 28e95af5..4414c68a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3068,7 +3068,7 @@ packages: - hpio < 0 # GHC 8.4 via protolude "Richard Eisenberg @goldfirere": - - th-desugar + - th-desugar < 1.11 # https://github.com/commercialhaskell/stackage/issues/5260 - singletons < 2.7 # GHC 8.10 via Cabal-3.2 & base-4.14 - HUnit-approx - units-parser < 0 # BuildFailureException Process exited with ExitFailure 1: dist/build/main/main From 8875bf28d4e47819143e7ce99a86df0aac20df5b Mon Sep 17 00:00:00 2001 From: Joe Kachmar Date: Thu, 26 Mar 2020 15:59:55 +0000 Subject: [PATCH 206/316] Updates th-desugar comment to explain constraint --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 4414c68a..5ceae41f 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3068,7 +3068,7 @@ packages: - hpio < 0 # GHC 8.4 via protolude "Richard Eisenberg @goldfirere": - - th-desugar < 1.11 # https://github.com/commercialhaskell/stackage/issues/5260 + - th-desugar < 1.11 # GHC 8.10 via singletons-2.7 & eliminators-0.7 - singletons < 2.7 # GHC 8.10 via Cabal-3.2 & base-4.14 - HUnit-approx - units-parser < 0 # BuildFailureException Process exited with ExitFailure 1: dist/build/main/main From c45ea76fe57fbd3955227f86638c7c01690dda94 Mon Sep 17 00:00:00 2001 From: Jeff Happily Date: Fri, 27 Mar 2020 17:21:06 +0800 Subject: [PATCH 207/316] Modify logic to allow building old version --- automated/dockerfiles/build.sh | 41 +++++++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 5 deletions(-) diff --git a/automated/dockerfiles/build.sh b/automated/dockerfiles/build.sh index d80d4823..3709664f 100755 --- a/automated/dockerfiles/build.sh +++ b/automated/dockerfiles/build.sh @@ -90,10 +90,36 @@ case "$LTS_SLUG_ARG" in ;; esac +# +# Determine if lts slug is latest +# + +SNAPSHOTS="$(mktemp "lts-snapshots.json.XXXXXX")" +trap "rm -f \"$SNAPSHOTS\"" EXIT +wget -qO- https://www.stackage.org/download/lts-snapshots.json >"$SNAPSHOTS" + LTS_VERSION="${LTS_SLUG#lts-}" LTS_MAJOR="${LTS_VERSION%.*}" LTS_MINOR="${LTS_VERSION#*.}" +# +# Determine latest LTS version +# + +LATEST_LTS_SLUG=$(jq -r ".[\"lts\"]" $SNAPSHOTS) +LATEST_LTS_VERSION="${LATEST_LTS_SLUG#lts-}" +LATEST_LTS_MAJOR="${LATEST_LTS_VERSION%.*}" +LATEST_LTS_MINOR="${LATEST_LTS_VERSION#*.}" + +# +# Determine latest minor version of the selected major version +# + +MAJOR_LATEST_LTS_SLUG=$(jq -r ".[\"lts-$LTS_MAJOR\"]" $SNAPSHOTS) +MAJOR_LATEST_LTS_VERSION="${MAJOR_LATEST_LTS_SLUG#lts-}" +MAJOR_LATEST_LTS_MAJOR="${MAJOR_LATEST_LTS_VERSION%.*}" +MAJOR_LATEST_LTS_MINOR="${MAJOR_LATEST_LTS_VERSION#*.}" + # # Find the Dockerfile for the selected snapshot # @@ -128,9 +154,14 @@ fi # Create and push additional tags # -# Create and push an 'lts-X' tag. -tagpush "$DOCKER_REPO:$LTS_SLUG" "$DOCKER_REPO:lts-$LTS_MAJOR" +# If we select the latest minor version for the selected major version, then +# also create and push an 'lts-X' tag. +if [[ $LTS_MINOR -ge $MAJOR_LATEST_LTS_MINOR ]]; then + tagpush "$DOCKER_REPO:$LTS_SLUG" "$DOCKER_REPO:lts-$LTS_MAJOR" +fi -# Create and push the 'lts' and 'latest' tags. -tagpush "$DOCKER_REPO:$LTS_SLUG" "$DOCKER_REPO:lts" -tagpush "$DOCKER_REPO:$LTS_SLUG" "$DOCKER_REPO:latest" +# If we selected the latest LTS snapshot, also create and push the 'lts' and 'latest' tags. +if [[ "$LTS_MAJOR" = "$LATEST_LTS_MAJOR" ]] && [[ $LTS_MINOR -ge $LATEST_LTS_MINOR ]]; then + tagpush "$DOCKER_REPO:$LTS_SLUG" "$DOCKER_REPO:lts" + tagpush "$DOCKER_REPO:$LTS_SLUG" "$DOCKER_REPO:latest" +fi From 9e105dd5ed88d1873f528149c2afbfe63c519808 Mon Sep 17 00:00:00 2001 From: Jeff Happily Date: Fri, 27 Mar 2020 17:56:08 +0800 Subject: [PATCH 208/316] Add message for LTS minor release --- CURATORS.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CURATORS.md b/CURATORS.md index 0fa768d2..42ce5bae 100644 --- a/CURATORS.md +++ b/CURATORS.md @@ -294,6 +294,8 @@ problems on nightly or LTS major, you need to fix build-constraints.yaml (see info above). ### Building LTS minor releases +Before running the build, please make sure that the Dockerfile in `automated/dockerfiles/lts-X.Y` is up to date, where X is the major version that you're building and Y is the latest minor version of X. If any changes need to be made, (eg, new GHC version), copy `lts-X.Y/Dockerfile` to `lts-X.Z/Dockerfile`, where Z is the minor version you're building, and include the new changes. + First run `build.sh` to regenerate updated `ltsXX/work/constraints.yaml` and `ltsXX/work/snapshot-incomplete.yaml` files. For an LTS minor bump, you'll typically want to: From 755b6558e45c5ef98f4838ac6286379c2f3efcc1 Mon Sep 17 00:00:00 2001 From: Flavio Corpa Date: Fri, 27 Mar 2020 13:21:09 +0100 Subject: [PATCH 209/316] Unconstraints language-avro Fixes #5262 --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 7df0141d..91cb54fc 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1344,7 +1344,7 @@ packages: - language-protobuf "Flavio Corpa @kutyel": - - language-avro < 0 # avro-0.5.0.0 https://github.com/commercialhaskell/stackage/issues/5262 + - language-avro "Matvey Aksenov @supki": - terminal-size From 7ae6d489875406cfec4d18f690ee151fab2da33e Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Fri, 27 Mar 2020 14:45:16 -0400 Subject: [PATCH 210/316] Re-enable mpi-hs I split mpi-hs into multiple packages. The base package has no dependency on "store" any more. I will submit the other packages to stackage once mpi-hs is active again. --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 7df0141d..d9ccfbff 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -133,7 +133,7 @@ packages: - PyF "Erik Schnetter @eschnett": - - mpi-hs < 0 # via store + - mpi-hs "Yang Bo @Atry": - control-dsl < 0 # via doctest-discover From 8c77cf8ed32ef317c96f2ef749237029f7c137a0 Mon Sep 17 00:00:00 2001 From: Joe Kachmar Date: Sat, 28 Mar 2020 00:04:11 +0000 Subject: [PATCH 211/316] Constraints ghc-exactprint (#5268) --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 7df0141d..762b933f 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -705,7 +705,7 @@ packages: - perfect-hash-generator "Alan Zimmerman @alanz": - - ghc-exactprint + - ghc-exactprint < 0.6.3 # https://github.com/commercialhaskell/stackage/issues/5268 - haskell-lsp - hjsmin - language-javascript From feda817ef857b6693a3a209c1b9b8f69d7e50868 Mon Sep 17 00:00:00 2001 From: Joe Kachmar Date: Sat, 28 Mar 2020 00:05:36 +0000 Subject: [PATCH 212/316] Unconstrains structured-cli and haskeline (#5037) --- build-constraints.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 762b933f..d36868eb 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4710,10 +4710,6 @@ packages: - Win32 == 2.6.1.0 "Stackage upper bounds": - # https://github.com/commercialhaskell/stackage/issues/5037 - - haskeline < 0.8.0 - - structured-cli < 2.6 - # https://github.com/commercialhaskell/stackage/issues/5191 - compilation failures - servant < 0.17 - servant-client < 0.17 From 64e5f0c321e944d39bb89720232f5e84ab7c7ccd Mon Sep 17 00:00:00 2001 From: Joe Kachmar Date: Sat, 28 Mar 2020 00:07:09 +0000 Subject: [PATCH 213/316] Fixes typo from 8c77cf8 --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index d36868eb..ad8672e7 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -705,7 +705,7 @@ packages: - perfect-hash-generator "Alan Zimmerman @alanz": - - ghc-exactprint < 0.6.3 # https://github.com/commercialhaskell/stackage/issues/5268 + - ghc-exactprint < 0.6.3 # https://github.com/commercialhaskell/stackage/issues/5268 - haskell-lsp - hjsmin - language-javascript From 7834173acb65b96230405a34df5d33d43b1b7364 Mon Sep 17 00:00:00 2001 From: Joe Kachmar Date: Sat, 28 Mar 2020 00:20:50 +0000 Subject: [PATCH 214/316] Restricts haskeline and structured-cli (#5269) --- build-constraints.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index ad8672e7..c8a880a9 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3513,7 +3513,7 @@ packages: - tensorflow-test - pier-core < 0 - pier < 0 - - haskeline + - haskeline < 0.8 # https://github.com/commercialhaskell/stackage/issues/5269 - ghc-source-gen "Christof Schramm ": @@ -4066,7 +4066,7 @@ packages: - failable - ttl-hashtables - radius - - structured-cli + - structured-cli < 2.6 # https://github.com/commercialhaskell/stackage/issues/5269 "Jan Path @janpath": - smallcheck-series < 0 # via base-4.13.0.0 From 0546d4cb207e27245d730ea8694b69a2fce871b7 Mon Sep 17 00:00:00 2001 From: Joe Kachmar Date: Sat, 28 Mar 2020 00:24:16 +0000 Subject: [PATCH 215/316] Restricts repline < 0.3 (#5269) --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index c8a880a9..12c4a3e4 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2976,7 +2976,7 @@ packages: "Stephen Diehl @sdiehl": - llvm-hs-pretty < 0 # compilation failure - protolude - - repline + - repline < 0.3 # https://github.com/commercialhaskell/stackage/issues/5269 - picosat < 0 - aos-signature < 0 # via protolude # https://github.com/commercialhaskell/stackage/issues/4682 From 0ddf655cf0c5d569cef11699dffc4f80b15cdcd3 Mon Sep 17 00:00:00 2001 From: Joe Kachmar Date: Sat, 28 Mar 2020 00:31:15 +0000 Subject: [PATCH 216/316] Restricts QuickCheck < 2.14 (#5271) --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 12c4a3e4..7c2c4fb8 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4209,7 +4209,7 @@ packages: - NumInstances - Only - ParsecTools - - QuickCheck + - QuickCheck < 2.14 # https://github.com/commercialhaskell/stackage/issues/5271 - RSA - aeson-compat - aeson-extra < 0 # via semialign From dca2bd9f78b87c27159a94deb1a4c830cbee78c0 Mon Sep 17 00:00:00 2001 From: Joe Kachmar Date: Sat, 28 Mar 2020 23:34:15 +0000 Subject: [PATCH 217/316] Constrains jira-wiki-markup < 1.2.0 (#5272) --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 7c2c4fb8..406dcdf6 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3500,7 +3500,7 @@ packages: - hslua-aeson - hslua-module-system - hslua-module-text - - jira-wiki-markup + - jira-wiki-markup < 1.2.0 # https://github.com/commercialhaskell/stackage/issues/5272 "Judah Jacobson @judah": - proto-lens-protobuf-types From 7063df2832c4a76e43c1afaccc32abd6841b0e58 Mon Sep 17 00:00:00 2001 From: Veronika Romashkina Date: Sun, 29 Mar 2020 13:26:30 +0100 Subject: [PATCH 218/316] Reenable summoner --- build-constraints.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 406dcdf6..a2bd19ed 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2263,7 +2263,7 @@ packages: - deriving-compat - dotgen - echo - - eliminators < 0.7 # GHC 8.10 via base-4.14 & template-haskell-2.16 + - eliminators < 0.7 # GHC 8.10 via base-4.14 & template-haskell-2.16 - generic-deriving - hashmap - invariant @@ -3616,7 +3616,7 @@ packages: - relude - shellmet - shortcut-links - - summoner < 0 # via base-4.13.0.0 + - summoner - tomland - typerep-map - validation-selective From f5665dab2fbea141d79c7bf9080831bf3602c317 Mon Sep 17 00:00:00 2001 From: Joe Kachmar Date: Sun, 29 Mar 2020 16:59:36 +0000 Subject: [PATCH 219/316] Constrains dhall < 1.31.0 (#5275) --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 406dcdf6..97e94fec 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1068,7 +1068,7 @@ packages: - turtle - foldl - bench - - dhall + - dhall < 1.31.0 # https://github.com/commercialhaskell/stackage/issues/5275 - dhall-bash - dhall-json - dhall-yaml From c1d7eeb568e50b8384ca4672e17a6b9f0b0568e3 Mon Sep 17 00:00:00 2001 From: Joe Kachmar Date: Sun, 29 Mar 2020 17:03:42 +0000 Subject: [PATCH 220/316] Additional constraints via dhall < 1.31.0 (#5275) --- build-constraints.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index f95ad807..715b247a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1069,9 +1069,9 @@ packages: - foldl - bench - dhall < 1.31.0 # https://github.com/commercialhaskell/stackage/issues/5275 - - dhall-bash - - dhall-json - - dhall-yaml + - dhall-bash < 1.0.29 # via dhall + - dhall-json < 1.6.3 # via dhall + - dhall-yaml < 1.0.3 # via dhall - aeson-yaml # req'd by dhall-json # - dhall-nix # deriving-compat via hnix From 208a62e6d25de7822a7e27fe49e3e61f07dad7a4 Mon Sep 17 00:00:00 2001 From: Joe Kachmar Date: Sun, 29 Mar 2020 21:48:36 +0000 Subject: [PATCH 221/316] Constrains tldr < 0.6.3 (#5277) --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 715b247a..0d9c2c71 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -735,7 +735,7 @@ packages: - download - textlocal - shell-conduit - - tldr + - tldr < 0.6.3 # https://github.com/commercialhaskell/stackage/issues/5277 - fb - yesod-fb - yesod-auth-fb From 50388f1b76beea1c2bbcf888ea067e6f44e501bc Mon Sep 17 00:00:00 2001 From: Joe Kachmar Date: Mon, 30 Mar 2020 00:31:50 +0000 Subject: [PATCH 222/316] Disable mpi-hs (#5278) --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 6e182c01..ef55000c 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -133,7 +133,7 @@ packages: - PyF "Erik Schnetter @eschnett": - - mpi-hs + - mpi-hs < 0 # https://github.com/commercialhaskell/stackage/issues/5278 "Yang Bo @Atry": - control-dsl < 0 # via doctest-discover From da55d91a420ab28629c71d250fc81c73e2a62074 Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Sun, 29 Mar 2020 21:51:36 -0400 Subject: [PATCH 223/316] Re-enable mpi-hs Switch MPI library dependency from OpenMPI to MPICH. (This is very likely fine since OpenMPI was added for mpi-hs.) We use MPICH since OpenMPI in Xenial does not support multi-threading yet. Closes #5278. --- build-constraints.yaml | 2 +- debian-bootstrap.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index ef55000c..6e182c01 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -133,7 +133,7 @@ packages: - PyF "Erik Schnetter @eschnett": - - mpi-hs < 0 # https://github.com/commercialhaskell/stackage/issues/5278 + - mpi-hs "Yang Bo @Atry": - control-dsl < 0 # via doctest-discover diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh index cb9556f3..05b9aa96 100755 --- a/debian-bootstrap.sh +++ b/debian-bootstrap.sh @@ -92,13 +92,13 @@ apt-get install -y \ libmono-2.0-dev \ libmp3lame-dev \ libmpfr-dev \ + libmpich-dev \ libmysqlclient-dev \ libncurses5-dev \ libnfc-dev \ liboath-dev \ libnotify-dev \ libopenal-dev \ - libopenmpi-dev \ libpango1.0-dev \ libpcap0.8-dev \ libpcre2-dev \ From df2aa07c89e18ed66910c0903cc616bdfdab1c06 Mon Sep 17 00:00:00 2001 From: Juan Paucar Date: Sun, 29 Mar 2020 21:50:47 -0500 Subject: [PATCH 224/316] Reenable hapistrano --- build-constraints.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index ef55000c..a01f9520 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2212,7 +2212,7 @@ packages: - atomic-write - dbcleaner < 0 # via postgresql-simple - dotenv - - hapistrano < 0 # via path-io-1.5.0 & time-1.9.3 + - hapistrano - hspec-golden - inflections - stache @@ -5852,7 +5852,6 @@ github-users: clckwrks: - stepcut stackbuilders: - - javcasas - jsl - sestrella - juanpaucar From 64a3abc83f1c4986baa65d6d6e5b729007d452f0 Mon Sep 17 00:00:00 2001 From: Neil Mitchell Date: Mon, 30 Mar 2020 07:20:59 +0100 Subject: [PATCH 225/316] Move the weeder owner --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index ef55000c..f56bf15a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -685,7 +685,6 @@ packages: - extra - ghcid - hexml - - weeder - profiterole - record-dot-preprocessor - filepattern @@ -2230,6 +2229,7 @@ packages: - network-carbon < 0 # GHC 8.4 via base-4.11.0.0 - logging-effect - dhall-to-cabal < 0 + - weeder # - reactive-banana # pqueue-1.4.1 "Antoni Silvestre @asilvestre": From 142bf62a3a368764e74e481acf954c4a5548031f Mon Sep 17 00:00:00 2001 From: Veronika Romashkina Date: Mon, 30 Mar 2020 09:02:33 +0100 Subject: [PATCH 226/316] Add summoner-tui --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index ef55000c..f3ced5cd 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3618,6 +3618,7 @@ packages: - shellmet - shortcut-links - summoner + - summoner-tui - tomland - typerep-map - validation-selective From 82cc9d3f15a8a1ed3f85668e4321cacc388a4ee1 Mon Sep 17 00:00:00 2001 From: Jeff Happily Date: Mon, 30 Mar 2020 21:33:08 +0800 Subject: [PATCH 227/316] Modify message --- CURATORS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CURATORS.md b/CURATORS.md index 42ce5bae..94baf7bf 100644 --- a/CURATORS.md +++ b/CURATORS.md @@ -294,7 +294,7 @@ problems on nightly or LTS major, you need to fix build-constraints.yaml (see info above). ### Building LTS minor releases -Before running the build, please make sure that the Dockerfile in `automated/dockerfiles/lts-X.Y` is up to date, where X is the major version that you're building and Y is the latest minor version of X. If any changes need to be made, (eg, new GHC version), copy `lts-X.Y/Dockerfile` to `lts-X.Z/Dockerfile`, where Z is the minor version you're building, and include the new changes. +Before running the build, please make sure that the Dockerfile in `automated/dockerfiles/lts-X.Y` is up to date, where X is the major version that you're building and Y is the latest minor version of X for which a Dockerfile exists. If any changes need to be made, (eg, new GHC version), copy `lts-X.Y/Dockerfile` to `lts-X.Z/Dockerfile`, where Z is the minor version you're building, and include the new changes. First run `build.sh` to regenerate updated `ltsXX/work/constraints.yaml` and `ltsXX/work/snapshot-incomplete.yaml` files. From 524eef541fb2e322f75b2ff50001dc282ff177fe Mon Sep 17 00:00:00 2001 From: Joe Kachmar Date: Mon, 30 Mar 2020 19:34:33 +0000 Subject: [PATCH 228/316] Drops mpi-hs (#5278) --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 98a5150e..f75d3760 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -133,7 +133,7 @@ packages: - PyF "Erik Schnetter @eschnett": - - mpi-hs + - mpi-hs < 0 # https://github.com/commercialhaskell/stackage/issues/5278 "Yang Bo @Atry": - control-dsl < 0 # via doctest-discover From 4b5dacc43bd189323c69bfdea442f35f74e5bc3a Mon Sep 17 00:00:00 2001 From: Pepe Iborra Date: Mon, 30 Mar 2020 22:47:59 +0100 Subject: [PATCH 229/316] Remove some of my packages and add ghc-check --- build-constraints.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index f75d3760..a1197b49 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -302,16 +302,11 @@ packages: "Jose Iborra @pepeiborra": # - arrowp-qq # build failure https://github.com/pepeiborra/arrowp/issues/8 - - clr-marshal - - clr-host - haskell-src-exts-util - hexml-lens - hp2pretty - floatshow - - NoHoed - - threepenny-editors < 0 # GHC 8.4 - # - clr-inline # Illegal static expression: static Clr.Inline.Utils.Embed.ClrBytecode - - strict-types < 0 # BuildFailureException Process exited with ExitFailure 1: ./Setup build + - ghc-check "Roman Gonzalez @roman": - componentm < 0 # transitive compilation failure From 614c915c5c512f36b45fa40cd8d324e1a0e3a39b Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Wed, 1 Apr 2020 15:00:25 -0600 Subject: [PATCH 230/316] Reenable loc --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index f75d3760..de005dd7 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3693,7 +3693,7 @@ packages: - colorize-haskell "Chris Martin @chris-martin": - - loc < 0 # via base-4.13.0.0 + - loc - partial-semigroup < 0 # via base-4.13.0.0 - path-text-utf8 < 0 # via base-4.13.0.0 From 9d5d164f43ed9d51a032d34c983bd3fcb04550ed Mon Sep 17 00:00:00 2001 From: Joe Kachmar Date: Thu, 2 Apr 2020 01:08:38 +0000 Subject: [PATCH 231/316] Restricts cabal2spec < 2.6 (#5264) --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index f75d3760..25ae0e93 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2470,7 +2470,7 @@ packages: "Peter Simons @peti": - cabal2nix < 0 # via hpack - - cabal2spec + - cabal2spec < 2.6 # GHC 8.10 via Cabal-3.2 - cgi < 0 # via multipart - distribution-nixpkgs - distribution-opensuse From 8748d0d5c9ce351d379dc10ba0b865e928038cff Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Wed, 1 Apr 2020 23:50:10 -0600 Subject: [PATCH 232/316] Reenable partial-semigroup --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index a86965f1..393dda1a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3689,7 +3689,7 @@ packages: "Chris Martin @chris-martin": - loc - - partial-semigroup < 0 # via base-4.13.0.0 + - partial-semigroup - path-text-utf8 < 0 # via base-4.13.0.0 "Type Classes @argumatronic @chris-martin": From 4a1c62d569e3906b7bb50d5234d00b9f8f2335d5 Mon Sep 17 00:00:00 2001 From: Dan Fithian Date: Thu, 2 Apr 2020 11:29:06 -0400 Subject: [PATCH 233/316] Add file-path-th --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index a86965f1..0d0fc3d2 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3878,6 +3878,7 @@ packages: - oauthenticated - datadog - interpolator + - file-path-th "Raghu Kaippully @rkaippully": - starter From e329c31214da80592669677446a77d49247c58da Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Thu, 2 Apr 2020 12:32:00 -0600 Subject: [PATCH 234/316] Reenable path-text-utf8 --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index a86965f1..a751f31e 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3690,7 +3690,7 @@ packages: "Chris Martin @chris-martin": - loc - partial-semigroup < 0 # via base-4.13.0.0 - - path-text-utf8 < 0 # via base-4.13.0.0 + - path-text-utf8 "Type Classes @argumatronic @chris-martin": - aws-cloudfront-signed-cookies From 884104d9e7094382c56cb2cf8a7d74baf7a70ea8 Mon Sep 17 00:00:00 2001 From: Joe Kachmar Date: Sat, 4 Apr 2020 18:32:28 +0000 Subject: [PATCH 235/316] Disable HsYAML and universe-base tests (#5271) --- build-constraints.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 97c44de3..332562e0 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5156,6 +5156,7 @@ skipped-tests: - cryptohash-sha1 - cryptohash-sha256 - cryptohash-sha512 + - HsYAML - lzma - resolv - token-bucket @@ -5196,6 +5197,7 @@ skipped-tests: - range-set-list - time-parsers - time-parsers + - universe-base - vec # Uses Cabal's "library internal" stanza feature From 551069dfdbf3d29b598d8712bdfcf140be90cefa Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sat, 4 Apr 2020 21:55:31 +0300 Subject: [PATCH 236/316] Follow redirects --- automated/build.sh | 4 ++-- etc/check.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/automated/build.sh b/automated/build.sh index 5815fe4f..ae7e515f 100755 --- a/automated/build.sh +++ b/automated/build.sh @@ -63,12 +63,12 @@ BINDIR=$(cd $ROOT/work/bin ; pwd) cd $BINDIR rm -f curator stack *.bz2 -curl "https://download.fpcomplete.com/stackage-curator-2/curator-85b021a53833ff310fc66b3fdc5ca3f7828ce18b.bz2" | bunzip2 > curator +curl -L "https://download.fpcomplete.com/stackage-curator-2/curator-85b021a53833ff310fc66b3fdc5ca3f7828ce18b.bz2" | bunzip2 > curator chmod +x curator echo -n "curator version: " docker run --rm -v $(pwd)/curator:/exe $IMAGE /exe --version -curl "https://download.fpcomplete.com/stackage-curator-2/stack-4033c93815477e5b565d9a2a61b54e04da0863ef.bz2" | bunzip2 > stack +curl -L "https://download.fpcomplete.com/stackage-curator-2/stack-4033c93815477e5b565d9a2a61b54e04da0863ef.bz2" | bunzip2 > stack chmod +x stack echo -n "stack version: " docker run --rm -v $(pwd)/stack:/exe $IMAGE /exe --version diff --git a/etc/check.sh b/etc/check.sh index 78a5345f..d571a9c1 100755 --- a/etc/check.sh +++ b/etc/check.sh @@ -11,7 +11,7 @@ export PATH=$HOME/.local/bin:$PATH curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack' # Get new Stackage curator -curl "https://download.fpcomplete.com/stackage-curator-2/curator-85b021a53833ff310fc66b3fdc5ca3f7828ce18b.bz2" | bunzip2 > curator +curl -L "https://download.fpcomplete.com/stackage-curator-2/curator-85b021a53833ff310fc66b3fdc5ca3f7828ce18b.bz2" | bunzip2 > curator chmod +x curator # Install GHC From 221bf7b6a724dad44ca09e4297dde5f667135439 Mon Sep 17 00:00:00 2001 From: Adrian Sieber <36796532+ad-si@users.noreply.github.com> Date: Sat, 4 Apr 2020 22:42:05 +0000 Subject: [PATCH 237/316] Add ulid --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 332562e0..c33704ae 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4187,6 +4187,9 @@ packages: "Vaclav Svejcar @vaclavsvejcar": - headroom + "Adrian Sieber @ad-si": + - ulid + "Grandfathered dependencies": - network - Boolean From a001947f3c585a04e8c8360962f1c337ae42153d Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 5 Apr 2020 10:40:20 +0300 Subject: [PATCH 238/316] Add back mpi-hs (closes #5278) --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index c33704ae..300c5eb4 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -133,7 +133,7 @@ packages: - PyF "Erik Schnetter @eschnett": - - mpi-hs < 0 # https://github.com/commercialhaskell/stackage/issues/5278 + - mpi-hs "Yang Bo @Atry": - control-dsl < 0 # via doctest-discover From 923aa1a3ed7264d972f7ccc1a504a6044be1c8e3 Mon Sep 17 00:00:00 2001 From: ncaq Date: Sun, 5 Apr 2020 19:43:30 +0900 Subject: [PATCH 239/316] added: Reenable: yesod-form-bootstrap4, yesod-recaptcha2 I tested these packages with new yesod-core. --- build-constraints.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 300c5eb4..cbd0014c 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3419,8 +3419,8 @@ packages: - haskell-import-graph - string-transform - uniq-deep - - yesod-form-bootstrap4 < 0 # via yesod-core - - yesod-recaptcha2 < 0 # via yesod-core + - yesod-form-bootstrap4 + - yesod-recaptcha2 "Andrei Barbu @abarbu": - nondeterminism From ca2b5947a3f477de9300ebea2233c10afd4bb0e6 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Mon, 6 Apr 2020 20:33:29 -0700 Subject: [PATCH 240/316] Upper bound haddock-library (#5293) --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index cbd0014c..da5a24d9 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4739,6 +4739,9 @@ packages: # https://github.com/commercialhaskell/stackage/issues/5257 - ghc-lib-parser < 8.10.1.20200324 - ghc-lib < 8.10.1.20200324 + + # https://github.com/commercialhaskell/stackage/issues/5293 + - haddock-library < 1.9.0 # end of packages # Package flags are applied to individual packages, and override the values of From e9b16909dcab88f59986bc431183335b8d4c332f Mon Sep 17 00:00:00 2001 From: Albert Krewinkel Date: Tue, 7 Apr 2020 13:42:07 +0200 Subject: [PATCH 241/316] Add hslua-module-doclayout --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index da5a24d9..2be8271b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3493,6 +3493,7 @@ packages: "Albert Krewinkel @tarleb": - hslua < 1.1.0 # https://github.com/commercialhaskell/stackage/issues/5261 - hslua-aeson + - hslua-module-doclayout - hslua-module-system - hslua-module-text - jira-wiki-markup < 1.2.0 # https://github.com/commercialhaskell/stackage/issues/5272 From 1c8ff80b363973671c9a79beb1fe281b4deb6e0e Mon Sep 17 00:00:00 2001 From: Ziyang Liu Date: Mon, 6 Apr 2020 13:54:36 -0700 Subject: [PATCH 242/316] Add hadoop-streaming --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index da5a24d9..680d7eb1 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4179,6 +4179,7 @@ packages: - magic "Ziyang Liu @zliu41": + - hadoop-streaming - indexed-containers - math-extras - min-max-pqueue From 7163f2f48de313897da40e00179ab470d32d1469 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Wed, 8 Apr 2020 15:43:33 -0700 Subject: [PATCH 243/316] Disable testing datadog (#5297) --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 680d7eb1..a0f0daad 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5119,6 +5119,7 @@ skipped-tests: - system-fileio # ansi-terminal-0.8 via chell - system-filepath # ansi-terminal-0.8 via chell - buffer-builder # per HTF per cpphs per polyparse (ghc 8.6 failure) + - datadog # https://github.com/commercialhaskell/stackage/issues/5297 # Blocked by stackage upper bounds. These can be re-enabled once # the relevant stackage upper bound is lifted. From c2c44b1af4f0ee6454b6b827f2174fcccab98d42 Mon Sep 17 00:00:00 2001 From: Will Sewell Date: Wed, 8 Apr 2020 22:44:20 +0100 Subject: [PATCH 244/316] Re-add benchpress The latest version (https://hackage.haskell.org/package/benchpress-0.2.2.13) is compatible up with base < 4.14 . --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index a0f0daad..d51574ef 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2653,7 +2653,7 @@ packages: - fuzzyset "Will Sewell @willsewell": - - benchpress < 0 # via base-4.13.0.0 + - benchpress - pusher-http-haskell "Yorick Laupa yo.eight@gmail.com @YoEight": From fed0dbaa0a3d37c905b734a8aa58b3dbb11f6571 Mon Sep 17 00:00:00 2001 From: Emily Pillmore Date: Wed, 8 Apr 2020 12:44:28 -0400 Subject: [PATCH 245/316] Add smash, smash-aeson, smash-microlens, smash-lens --- build-constraints.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index d51574ef..a88e117e 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -54,6 +54,10 @@ packages: - lens-process < 0 # via lens-4.18.1 - microlens-process - nonempty-vector + - smash + - smash-aeson + - smash-microlens + - smash-lens "Matthieu Monsch @mtth": - flags-applicative From 2ff8c92d83baa76c0087519b8cdc09f305553acc Mon Sep 17 00:00:00 2001 From: Dan Fithian Date: Thu, 9 Apr 2020 09:18:49 -0400 Subject: [PATCH 246/316] Update build-constraints.yaml --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index a88e117e..6c0ef3bd 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5123,7 +5123,6 @@ skipped-tests: - system-fileio # ansi-terminal-0.8 via chell - system-filepath # ansi-terminal-0.8 via chell - buffer-builder # per HTF per cpphs per polyparse (ghc 8.6 failure) - - datadog # https://github.com/commercialhaskell/stackage/issues/5297 # Blocked by stackage upper bounds. These can be re-enabled once # the relevant stackage upper bound is lifted. From defe4fb88794285141d75b056113ee5be02cd299 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Sat, 11 Apr 2020 06:58:49 -0700 Subject: [PATCH 247/316] Expect haddock failure for butcher (#5299) --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 6c0ef3bd..a22f7b33 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5588,6 +5588,9 @@ expected-haddock-failures: # https://github.com/haskell/haddock/issues/1091 - vault + + # https://github.com/commercialhaskell/stackage/issues/5299 + - butcher # end of expected-haddock-failures # For packages with haddock issues From 17ad793e382c42d5dc4bcbd7996e8c607ffaa630 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Sun, 12 Apr 2020 14:59:03 -0700 Subject: [PATCH 248/316] Test hpack, registry and butcher --- build-constraints.yaml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index a22f7b33..528cbf32 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1376,7 +1376,7 @@ packages: - ghc-events < 0 # build failure with GHC 8.4 - monad-extras - optparse-simple - - hpack < 0 # MonadFail https://github.com/sol/hpack/issues/371 + - hpack - bindings-uname - stack < 9.9.9 # see https://github.com/fpco/stackage/issues/3563 - stack < 0 # via hackage-security @@ -4019,7 +4019,7 @@ packages: - kazura-queue "Eric Torreborre @etorreborre": - - registry < 0 # also protolude, semigroups, universum + - registry "Ryota Kameoka @ryota-ka": - duration @@ -5588,9 +5588,6 @@ expected-haddock-failures: # https://github.com/haskell/haddock/issues/1091 - vault - - # https://github.com/commercialhaskell/stackage/issues/5299 - - butcher # end of expected-haddock-failures # For packages with haddock issues From c8bcb459878d71931e49f1d59a31cf5c83a49373 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Sun, 12 Apr 2020 15:05:08 -0700 Subject: [PATCH 249/316] Disable tests for registry (#5302) --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 528cbf32..f7ab6c42 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5244,6 +5244,9 @@ skipped-tests: - algebraic-graphs # https://github.com/commercialhaskell/stackage/issues/4670 - bugsnag-haskell # https://github.com/commercialhaskell/stackage/issues/4759 - servant-rawm # https://github.com/commercialhaskell/stackage/issues/5162 + + # https://github.com/commercialhaskell/stackage/issues/5302 + - registry # end of skipped-tests # Tests listed in expected-test-failures configure correctly but may fail to run From b12f77eb56fa0cddb7a8cef9f5ed44889b3104e2 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 13 Apr 2020 10:23:11 +0800 Subject: [PATCH 250/316] enable stack and bunch of packaging related packages like hackage-security --- build-constraints.yaml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index f7ab6c42..3fdd8e8f 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -173,7 +173,7 @@ packages: "Phil de Joux @philderbeast": - siggy-chardust - detour-via-sci - - hpack-dhall < 0 # via hpack + - hpack-dhall "Matthew Ahrens @mpahrens": - forkable-monad @@ -653,8 +653,8 @@ packages: - githash - time-manager - - pantry < 0 # via cryptonite-conduit & hackage-security & hpack & http-download & persistent & persistent-sqlite & persistent-template & rio-orphans & rio-prettyprint & tar-conduit & th-utilities - - mega-sdist < 0 # via pantry + - pantry + - mega-sdist - http-download - hi-file-parser - rio-prettyprint @@ -824,6 +824,8 @@ packages: - weigh - odbc # - structured-haskell-mode # https://github.com/chrisdone/structured-haskell-mode/issues/156 + - casa-client + - casa-types "Alberto G. Corona @agocorona": - RefSerialize @@ -1379,7 +1381,7 @@ packages: - hpack - bindings-uname - stack < 9.9.9 # see https://github.com/fpco/stackage/issues/3563 - - stack < 0 # via hackage-security + - stack "Michael Sloan @mgsloan": - th-orphans @@ -1521,6 +1523,7 @@ packages: - fedora-haskell-tools - hkgr - http-directory + - pagure-cli - rpmbuild-order - simple-cabal - simple-cmd @@ -2468,7 +2471,7 @@ packages: - nagios-check "Peter Simons @peti": - - cabal2nix < 0 # via hpack + - cabal2nix - cabal2spec < 2.6 # GHC 8.10 via Cabal-3.2 - cgi < 0 # via multipart - distribution-nixpkgs @@ -2857,7 +2860,7 @@ packages: "Mikhail Glushenkov @23Skidoo": # - Cabal take the one that ships with GHC - - cabal-install < 0 # via base-4.13.0.0 + - cabal-install #< 0 # via Cabal # - pointful # haskell-src-exts-simple "Lennart Kolmodin @kolmodin": @@ -4360,7 +4363,7 @@ packages: - github - groom - groups - - hackage-security < 0 # via base-4.13.0.0 + - hackage-security - hashable - haskell-gi-overloading - haskell-lexer @@ -4423,6 +4426,7 @@ packages: - lockfree-queue - log-base - logging-facade + - lukko - lrucache - lzma - managed @@ -4494,7 +4498,7 @@ packages: - readable - rebase - recursion-schemes - - regex-applicative-text < 0 # via regex-applicative + - regex-applicative-text - regex-base - regex-compat - regex-pcre From fb941c86688a78729bdc29a9435a91125fa0483a Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 13 Apr 2020 10:25:50 +0800 Subject: [PATCH 251/316] redisable cabal-install (needs Cabal-3.2) --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 3fdd8e8f..93562270 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2860,7 +2860,7 @@ packages: "Mikhail Glushenkov @23Skidoo": # - Cabal take the one that ships with GHC - - cabal-install #< 0 # via Cabal + - cabal-install < 0 # via Cabal # - pointful # haskell-src-exts-simple "Lennart Kolmodin @kolmodin": From 2ef343b5042df01df1e3c49021eca3804181ce60 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 13 Apr 2020 10:40:14 +0800 Subject: [PATCH 252/316] mega-sdist failed to build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Building executable 'mega-sdist' for mega-sdist-0.4.0.1.. [1 of 2] Compiling Paths_mega_sdist [2 of 2] Compiling Main /var/stackage/work/unpack-dir/unpacked/mega-sdist-0.4.0.1-b7dcfdabbabab05ba32d3e30197037e262eb4fac4bb168451d19ad14b25f1099/mega- sdist.hs:233:11: error: Not in scope: ‘rpmCabal’ | 233 | , rpmCabal = Nothing | ^^^^^^^^ --- build-constraints.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 93562270..8472d1a3 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -564,7 +564,6 @@ packages: "Michael Snoyman michael@snoyman.com @snoyberg": - bzlib-conduit - - mega-sdist - case-insensitive - classy-prelude-yesod - conduit-combinators @@ -654,7 +653,7 @@ packages: - time-manager - pantry - - mega-sdist + - mega-sdist < 0 # Cabal issues - http-download - hi-file-parser - rio-prettyprint From f1893a8d92411bd984bb94466caf85f0ca3e4de3 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 13 Apr 2020 10:43:29 +0800 Subject: [PATCH 253/316] stack-2.1 failed to build with Cabal-3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [1 of 2] Compiling Main ( /var/stackage/work/unpack-dir/unpacked/stack-2.1.3.1-ec7fb20d187731e0b610eb0567bf940e4c43c 690b8c611670d066e0a751660b5/Setup.hs, /var/stackage/work/unpack-dir/unpacked/stack-2.1.3.1-ec7fb20d187731e0b610eb0567bf940e4c43c690b 8c611670d066e0a751660b5/.stack-work/dist/x86_64-linux/Cabal-3.0.1.0/setup/Main.o ) /var/stackage/work/unpack-dir/unpacked/stack-2.1.3.1-ec7fb20d187731e0b610eb0567bf940e4c43c690b8c611670d066e0a751660b5/Setup.hs:6 :42: error: Module ‘Distribution.Package’ does not export ‘InstalledPackageId’ | 6 | import Distribution.Package ( PackageId, InstalledPackageId, packageVersion, packageName ) | ^^^^^^^^^^^^^^^^^^ /var/stackage/work/unpack-dir/unpacked/stack-2.1.3.1-ec7fb20d187731e0b610eb0567bf940e4c43c690b8c611670d066e0a751660b5/Setup.hs:8 :60: error: Module ‘Distribution.InstalledPackageInfo’ does not export ‘installedPackageId’ | 8 | import Distribution.InstalledPackageInfo (sourcePackageId, installedPackageId) | ^^^^^^^^^^^^^^^^^^ /var/stackage/work/unpack-dir/unpacked/stack-2.1.3.1-ec7fb20d187731e0b610eb0567bf940e4c43c690b8c611670d066e0a751660b5/Setup.hs:1 0:36: error: Module ‘Distribution.Simple.Utils’ does not export ‘rewriteFile’ | 10 | import Distribution.Simple.Utils ( rewriteFile, createDirectoryIfMissingVerbose ) | ^^^^^^^^^^^ /var/stackage/work/unpack-dir/unpacked/stack-2.1.3.1-ec7fb20d187731e0b610eb0567bf940e4c43c690b8c611670d066e0a751660b5/Setup.hs:1 1:41: error: Module ‘Distribution.Simple.BuildPaths’ does not export ‘autogenModulesDir’ | 11 | import Distribution.Simple.BuildPaths ( autogenModulesDir ) | ^^^^^^^^^^^^^^^^^ /var/stackage/work/unpack-dir/unpacked/stack-2.1.3.1-ec7fb20d187731e0b610eb0567bf940e4c43c690b8c611670d066e0a751660b5/Setup.hs:1 8:31: error: Module ‘Distribution.Version’ does not export ‘showVersion’ | 18 | import Distribution.Version ( showVersion ) | ^^^^^^^^^^^ --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 8472d1a3..50ea6664 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1380,7 +1380,7 @@ packages: - hpack - bindings-uname - stack < 9.9.9 # see https://github.com/fpco/stackage/issues/3563 - - stack + - stack < 0 # build issues with Cabal "Michael Sloan @mgsloan": - th-orphans From d49f32029152554a48171d9f3983dc1509e9c57d Mon Sep 17 00:00:00 2001 From: Mihai Giurgeanu Date: Sun, 12 Apr 2020 00:32:57 +0300 Subject: [PATCH 254/316] Add sqlcli, sqlcli-odbc, logging. --- build-constraints.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 50ea6664..53b60294 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -9,6 +9,12 @@ cabal-format-version: "2.4" # Constraints for brand new builds packages: + "Mihai Giurgeanu @mihaigiurgeanu": + - sqlcli + - sqlcli-odbc + # not a maintainer + - logging + "Sasha Bogicevic @v0d1ch": - plaid From 67d0b0dd04bbeafbb0c8742a0088462bb91af5e4 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Mon, 13 Apr 2020 16:18:08 -0700 Subject: [PATCH 255/316] re-enable hakyll cf jaspervdj/hakyll#730 --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 50ea6664..de3efe9a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -726,7 +726,7 @@ packages: - psqueues - websockets - websockets-snap - - hakyll < 0 # jaspervdj/hakyll#691 + - hakyll "Sibi Prabakaran @psibi": - download From 0b6ff790f4e046db3bf4b90649f19d2e578ca4ff Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Tue, 14 Apr 2020 19:44:10 +0200 Subject: [PATCH 256/316] ghc-syntax-highlighter upper bound #5257 --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 50ea6664..6f8530af 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4747,6 +4747,7 @@ packages: # https://github.com/commercialhaskell/stackage/issues/5257 - ghc-lib-parser < 8.10.1.20200324 - ghc-lib < 8.10.1.20200324 + - ghc-syntax-highlighter < 0.0.6.0 # https://github.com/commercialhaskell/stackage/issues/5293 - haddock-library < 1.9.0 From 7c99fc873fb8cd7c54dff45db5a8d13bd83cf9f2 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Tue, 14 Apr 2020 19:55:27 +0200 Subject: [PATCH 257/316] Re-enable haskell-lsp-types haddocks, closes #5305 --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 7dcb638c..e5b1ac5b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5603,7 +5603,6 @@ skipped-haddocks: - modular # https://github.com/haskell/haddock/issues/900 - sparkle # Java function failures tweag/sparkle#144 - polysemy-zoo # Needs polysemy-plugin GHC plugin -- haskell-lsp-types # 0.13.0.0 https://github.com/commercialhaskell/stackage/issues/4563#issuecomment-493899809 - hw-ip # https://github.com/commercialhaskell/stackage/issues/5014 # end of skipped-haddocks From 758621b6e0e23519985033ab4c3bdea11ac72651 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Tue, 14 Apr 2020 20:00:18 +0200 Subject: [PATCH 258/316] Disable urlpath #5300 --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index e5b1ac5b..32cc6240 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2016,7 +2016,7 @@ packages: - tries < 0 # GHC 8.4 via bytestring-trie - unit-constraint - unfoldable-restricted < 0 # via unfoldable - - urlpath + # - urlpath - wai-transformers < 0 # via wai-websockets - websockets-rpc < 0 # websockets-simple - websockets-simple < 0 # BuildFailureException with GHC 8.4 From 9e6a04b301d539bebecfad4203fc170e89d9be75 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Wed, 15 Apr 2020 07:17:08 +0200 Subject: [PATCH 259/316] arithmoi < 0.11.0.0 for #5306 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index f024f524..b309964b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4758,6 +4758,9 @@ packages: # https://github.com/commercialhaskell/stackage/issues/5293 - haddock-library < 1.9.0 + + # https://github.com/commercialhaskell/stackage/issues/5306 + - arithmoi < 0.11.0.0 # end of packages # Package flags are applied to individual packages, and override the values of From 065fee33d9d692cdf219a8d6c3695717aa8d4cb6 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Wed, 15 Apr 2020 07:26:20 +0200 Subject: [PATCH 260/316] Expect genvalidity-typed-uuid tests to fail NofairKing/typed-uuid#2 --- build-constraints.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index b309964b..892db357 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5285,8 +5285,9 @@ expected-test-failures: - distributed-process-execution # https://github.com/haskell-distributed/distributed-process-execution/issues/2 - distributed-process-task - foldl-statistics # https://github.com/data61/foldl-statistics/issues/2 - - fsnotify # Often runs out of inotify handles - forma + - fsnotify # Often runs out of inotify handles + - genvalidity-typed-uuid # https://github.com/NorfairKing/typed-uuid/issues/2 - hastache - idris # https://github.com/fpco/stackage/issues/1382 - ihaskell # https://github.com/gibiansky/IHaskell/issues/551 From 6412056356137ef7975c63872ad448bb19a38059 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Wed, 15 Apr 2020 18:33:05 +0200 Subject: [PATCH 261/316] Remove upper bounds and close #5257 --- build-constraints.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 892db357..8b494409 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4751,11 +4751,6 @@ packages: # https://github.com/commercialhaskell/stackage/issues/5255 - ghc-lib-parser-ex < 8.8.6.0 - # https://github.com/commercialhaskell/stackage/issues/5257 - - ghc-lib-parser < 8.10.1.20200324 - - ghc-lib < 8.10.1.20200324 - - ghc-syntax-highlighter < 0.0.6.0 - # https://github.com/commercialhaskell/stackage/issues/5293 - haddock-library < 1.9.0 From b3bd60a37bc88e227b2999bea34c38f7c19ce103 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 15 Apr 2020 21:33:37 +0300 Subject: [PATCH 262/316] Drop tracing transitive deps #5289 --- build-constraints.yaml | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 8b494409..56503454 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -69,16 +69,6 @@ packages: - flags-applicative - more-containers - tracing - # transitive dependencies for tracing - - ip - - byteslice - - bytesmith - - contiguous - - natural-arithmetic - - primitive-offset - - primitive-unlifted - - run-st - - small-bytearray-builder "Robert Vollmert @robx": - configurator-pg @@ -1406,7 +1396,7 @@ packages: - partial-handler - postgresql-binary - slave-thread < 0 - - stm-containers + - stm-containers < 0 # https://github.com/commercialhaskell/stackage/pull/5289#issuecomment-610353366 - refined < 0 # https://github.com/nikita-volkov/refined/issues/33 "Iustin Pop @iustin": @@ -4485,7 +4475,6 @@ packages: - prettyprinter-convert-ansi-wl-pprint - primes - primitive - - primitive-extras - primitive-unaligned - process-extras - product-isomorphic @@ -4555,7 +4544,6 @@ packages: - statistics - step-function - stm-delay - - stm-hamt - storable-complex - store-core < 0 # MonadFail - streaming-cassava < 0 # via streaming @@ -4738,9 +4726,6 @@ packages: - servant-swagger < 1.1.8 - aur < 6.3.0 - # https://github.com/commercialhaskell/stackage/issues/5211 - - small-bytearray-builder < 0.3.4 - # https://github.com/commercialhaskell/stackage/issues/5218 - unliftio-core < 0.2 - higher-leveldb < 0.6.0.0 @@ -5726,7 +5711,6 @@ skipped-benchmarks: - sorted-list - sourcemap - stache - - stm-hamt - tar - tar-conduit - text-builder From 7e94eb9f1e422dbb5dac22d02a4736f0fb6df381 Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Wed, 15 Apr 2020 21:39:02 +0200 Subject: [PATCH 263/316] Add postgrest --- build-constraints.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 8b494409..87fafa79 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -82,6 +82,7 @@ packages: "Robert Vollmert @robx": - configurator-pg + - postgrest "Sandy Maguire @isovector": - ecstasy @@ -5378,6 +5379,7 @@ expected-test-failures: - postgresql-simple-migration - postgresql-simple-queue - postgresql-typed # PostgreSQL + - postgrest # PostgreSQL - purescript # git 128 https://github.com/purescript/purescript/issues/2292 - rattle # needs fsatrace - redis-io From bc4fbc746abe9fbac4d057881ec77f51f40f4746 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 16 Apr 2020 08:39:33 +0300 Subject: [PATCH 264/316] Install AWS CLI --- debian-bootstrap.sh | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh index 05b9aa96..4d66a10a 100755 --- a/debian-bootstrap.sh +++ b/debian-bootstrap.sh @@ -17,9 +17,19 @@ mkdir -p /home/stackage export LANG=C.UTF-8 export DEBIAN_FRONTEND=noninteractive -# Get curl +# Get curl and unzip apt-get update -apt-get install -y curl +apt-get install -y curl unzip + +# Install AWS CLI +mkdir -p /tmp/awscli +( +cd /tmp/awscli +curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" +unzip awscliv2.zip +./aws/install +) +rm -rf /tmp/awscli # Get Stack and GHC curl -sSL https://get.haskellstack.org/ | sh -s - -d /usr/bin From 4b95ec4d7a1a17c0db75e9e19ec7efe71bbbcb5b Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Thu, 16 Apr 2020 08:58:00 +0200 Subject: [PATCH 265/316] CURATORS.md: curator has moved --- CURATORS.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CURATORS.md b/CURATORS.md index 94baf7bf..80da8441 100644 --- a/CURATORS.md +++ b/CURATORS.md @@ -18,7 +18,7 @@ This section sketches out at a high level how the entire Stackage build/curation process works: * [build-constraints.yaml](https://github.com/commercialhaskell/stackage/blob/master/build-constraints.yaml) specifies packages to be included in Stackage -* [curator](https://github.com/commercialhaskell/stack/tree/master/subs/curator) combines build-constraints.yaml with the current state of Hackage to create a build plan for a Stackage Nightly +* [curator](https://github.com/commercialhaskell/curator) combines build-constraints.yaml with the current state of Hackage to create a build plan for a Stackage Nightly * `curator` can check that build plan to ensure all version bounds are consistent * The [Travis job](https://github.com/commercialhaskell/stackage/blob/master/.travis.yml) performs these two steps to provide immediate feedback on pull requests * Docker Hub [builds](https://github.com/commercialhaskell/stackage/blob/master/Dockerfile) a [Docker image](https://hub.docker.com/r/commercialhaskell/stackage/) for running builds @@ -291,7 +291,7 @@ we're just not there yet. Recommended: run these from inside a `tmux` session. If you get version bound problems on nightly or LTS major, you need to fix build-constraints.yaml (see -info above). +info above). ### Building LTS minor releases Before running the build, please make sure that the Dockerfile in `automated/dockerfiles/lts-X.Y` is up to date, where X is the major version that you're building and Y is the latest minor version of X for which a Dockerfile exists. If any changes need to be made, (eg, new GHC version), copy `lts-X.Y/Dockerfile` to `lts-X.Z/Dockerfile`, where Z is the minor version you're building, and include the new changes. From c604da5af7734074339f61faa5d14837501b838c Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Thu, 16 Apr 2020 09:19:15 +0200 Subject: [PATCH 266/316] optics upper bounds for #5309 --- build-constraints.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 8b494409..dec45ee2 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4756,6 +4756,11 @@ packages: # https://github.com/commercialhaskell/stackage/issues/5306 - arithmoi < 0.11.0.0 + + # https://github.com/commercialhaskell/stackage/issues/5309 + - optics-core < 0.3 + - optics-extra < 0.3 + - optics-th < 0.3 # end of packages # Package flags are applied to individual packages, and override the values of From ccb816e2e23dc8f09d2796f027a756d5bf3ef53a Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Thu, 16 Apr 2020 09:31:59 +0200 Subject: [PATCH 267/316] optics < 0.3 for #5309 --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index dec45ee2..e37b787b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4758,6 +4758,7 @@ packages: - arithmoi < 0.11.0.0 # https://github.com/commercialhaskell/stackage/issues/5309 + - optics < 0.3 - optics-core < 0.3 - optics-extra < 0.3 - optics-th < 0.3 From 91150f1df2e0439bab670b7970a0a9fbc702ec19 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 16 Apr 2020 11:24:28 +0300 Subject: [PATCH 268/316] Upper bound on optics-vl --- build-constraints.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index e37b787b..11bd56c8 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4762,6 +4762,8 @@ packages: - optics-core < 0.3 - optics-extra < 0.3 - optics-th < 0.3 + - optics < 0.3 + - optics-vl < 0.2.1 # end of packages # Package flags are applied to individual packages, and override the values of From 1afd08ff0a3c3627f17eb1b928d35f337db40e08 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 16 Apr 2020 12:20:39 +0300 Subject: [PATCH 269/316] Newer curator --- automated/build.sh | 2 +- debian-bootstrap.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/automated/build.sh b/automated/build.sh index ae7e515f..d1d36efd 100755 --- a/automated/build.sh +++ b/automated/build.sh @@ -63,7 +63,7 @@ BINDIR=$(cd $ROOT/work/bin ; pwd) cd $BINDIR rm -f curator stack *.bz2 -curl -L "https://download.fpcomplete.com/stackage-curator-2/curator-85b021a53833ff310fc66b3fdc5ca3f7828ce18b.bz2" | bunzip2 > curator +curl -L "https://s3.amazonaws.com/haddock.stackage.org/curator/curator-80cd5b697f5b00ba13b1bba89cf31918201ce6f0.bz2" | bunzip2 > curator chmod +x curator echo -n "curator version: " docker run --rm -v $(pwd)/curator:/exe $IMAGE /exe --version diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh index 4d66a10a..e688b670 100755 --- a/debian-bootstrap.sh +++ b/debian-bootstrap.sh @@ -27,7 +27,7 @@ mkdir -p /tmp/awscli cd /tmp/awscli curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" unzip awscliv2.zip -./aws/install +./aws/install --bin-dir /usr/bin ) rm -rf /tmp/awscli From 4bb6147268dbf51f606688dd3f6b1ffc6b911017 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 16 Apr 2020 13:32:19 +0300 Subject: [PATCH 270/316] Newer curator exe --- automated/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automated/build.sh b/automated/build.sh index d1d36efd..9eb969cf 100755 --- a/automated/build.sh +++ b/automated/build.sh @@ -63,7 +63,7 @@ BINDIR=$(cd $ROOT/work/bin ; pwd) cd $BINDIR rm -f curator stack *.bz2 -curl -L "https://s3.amazonaws.com/haddock.stackage.org/curator/curator-80cd5b697f5b00ba13b1bba89cf31918201ce6f0.bz2" | bunzip2 > curator +curl -L "https://download.fpcomplete.com/stackage-curator-2/curator-7c719d6d48839c94a79dc2ad2ace89074e3dd997.bz2" | bunzip2 > curator chmod +x curator echo -n "curator version: " docker run --rm -v $(pwd)/curator:/exe $IMAGE /exe --version From abd3da2a0f329502ae6dd7fb7d0497b321aa5f4d Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Thu, 16 Apr 2020 12:20:57 -0600 Subject: [PATCH 271/316] Add d10 --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 11bd56c8..0880e286 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3707,6 +3707,7 @@ packages: "Type Classes @argumatronic @chris-martin": - aws-cloudfront-signed-cookies + - d10 - stripe-concepts - stripe-signature - stripe-scotty < 0 # via scotty From abec05978501021a897236d09bdf52c65a1ecd8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20B=C3=A4renz?= Date: Fri, 17 Apr 2020 13:59:15 +0200 Subject: [PATCH 272/316] Re-enable rhine* and essence-of-live-coding* The restrictive upper bounds have been removed in the latest hackage releases. --- build-constraints.yaml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 11bd56c8..e1412841 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -196,14 +196,13 @@ packages: "Manuel Bärenz @turion": - dunai - - rhine < 0 # via base-4.13.0.0 - - rhine-gloss < 0 # via base-4.13.0.0 - - dunai-core < 0 # via base-4.13.0.0 + - rhine + - rhine-gloss - finite-typelits - - essence-of-live-coding < 0 # via base-4.13.0.0 - - essence-of-live-coding-gloss < 0 # via base-4.13.0.0 - - essence-of-live-coding-pulse < 0 # via base-4.13.0.0 - - essence-of-live-coding-quickcheck < 0 # via base-4.13.0.0 + - essence-of-live-coding + - essence-of-live-coding-gloss + - essence-of-live-coding-pulse + - essence-of-live-coding-quickcheck - pulse-simple - simple-affine-space From beb64df8faf1c1b9e6bde33254dc7e98d0fd6374 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Fri, 17 Apr 2020 18:55:18 +0200 Subject: [PATCH 273/316] genvalidity-typed-uuid should be fixed NofairKing/typed-uuid#2 --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 11bd56c8..0602a6fd 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5290,7 +5290,6 @@ expected-test-failures: - foldl-statistics # https://github.com/data61/foldl-statistics/issues/2 - forma - fsnotify # Often runs out of inotify handles - - genvalidity-typed-uuid # https://github.com/NorfairKing/typed-uuid/issues/2 - hastache - idris # https://github.com/fpco/stackage/issues/1382 - ihaskell # https://github.com/gibiansky/IHaskell/issues/551 From 32247194830460aed8e835633dc37f6e6b78ad14 Mon Sep 17 00:00:00 2001 From: Kei Hibino Date: Sat, 18 Apr 2020 15:52:23 +0900 Subject: [PATCH 274/316] re-add packages about relational-record depend on HDBC. --- build-constraints.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index c9c06294..911fb100 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2869,9 +2869,9 @@ packages: - th-data-compat - th-reify-compat - relational-query - - relational-query-HDBC < 0 # via HDBC - - persistable-types-HDBC-pg < 0 # via HDBC - - relational-record < 0 # via relational-query-HDBC + - relational-query-HDBC + - persistable-types-HDBC-pg + - relational-record - text-ldap - debian-build - aeson-generic-compat @@ -4204,8 +4204,8 @@ packages: - GenericPretty - Glob - HasBigDecimal - - HDBC < 0 # via time-1.9.3 - - HDBC-session < 0 # via HDBC + - HDBC + - HDBC-session - HTTP - HsOpenSSL - HsYAML From 688c9d04ab22329d445141526460d67e3bf38218 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Sat, 18 Apr 2020 12:24:15 +0200 Subject: [PATCH 275/316] Re-enable MissingH and dependents --- build-constraints.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 911fb100..4b70c9a4 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1365,7 +1365,7 @@ packages: - interpolatedstring-perl6 - iproute - missing-foreign - - MissingH < 0 # via array-0.5.4.0 & base-4.13.0.0 & containers-0.6.2.1 & directory-1.3.3.2 & filepath-1.4.2.1 & old-time-1.1.0.3 & process-1.6.5.1 & time-1.9.3 & unix-2.7.2.2 + - MissingH - multimap - parallel-io - text-binary @@ -2723,7 +2723,7 @@ packages: "Pedro Tacla Yamada @yamadapc": - ascii-progress - drawille < 0 - - file-modules < 0 # via MissingH + - file-modules - frontmatter - read-editor # - list-prompt # https://github.com/yamadapc/list-prompt/issues/3 @@ -3893,7 +3893,7 @@ packages: "Avi Press @aviaviavi": - curl-runnings < 0 - - cryptocompare < 0 # via MissingH + - cryptocompare "Jack Kiefer @JackKiefer": - herms < 0 @@ -4028,7 +4028,7 @@ packages: - ghci-hexcalc "Nikos Karagianndis @nkarag": - - DBFunctor < 0 # via MissingH + - DBFunctor "Marat Khafizov @xafizoff": - n2o From d432eddf7249ec3f18616766b7222ad6f6bbd0ab Mon Sep 17 00:00:00 2001 From: Alexander Vershilov Date: Sat, 18 Apr 2020 21:14:57 +0300 Subject: [PATCH 276/316] add co-log-concurrent. --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 4b70c9a4..74575306 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3732,6 +3732,7 @@ packages: "Alexander Vershilov @qnikst": - stm-conduit + - co-log-concurrent "Tung Dao @tungd": - time-locale-vietnamese From 05a2e36a52d949e6a38a0d1f6088a0cff123c2c3 Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Sat, 18 Apr 2020 12:49:02 -0600 Subject: [PATCH 277/316] add data-forest --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 4b70c9a4..58652a73 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3691,6 +3691,7 @@ packages: - colorize-haskell "Chris Martin @chris-martin": + - data-forest - loc - partial-semigroup - path-text-utf8 From c116763e15cd32b1c20636435b6413dedb8e745e Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Sat, 18 Apr 2020 19:04:59 -0400 Subject: [PATCH 278/316] New packages mpi-hs-binary and mpi-hs-cereal There is also a package `mpi-hs-store`, but it depends on `store`, and that fell out of Stackage some time ago. --- build-constraints.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 4b70c9a4..51cb7808 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -135,6 +135,8 @@ packages: "Erik Schnetter @eschnett": - mpi-hs + - mpi-hs-binary + - mpi-hs-cereal "Yang Bo @Atry": - control-dsl < 0 # via doctest-discover From 1e02897cdce57887925fc3034c8b3e2a87027ac3 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Sun, 19 Apr 2020 13:58:59 +0200 Subject: [PATCH 279/316] dunai upper bound for #5316 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 63335f98..fb30ac45 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4754,6 +4754,9 @@ packages: - optics-th < 0.3 - optics < 0.3 - optics-vl < 0.2.1 + + # https://github.com/commercialhaskell/stackage/issues/5316 + - dunai < 0.7.0 # end of packages # Package flags are applied to individual packages, and override the values of From 2c9e89852c1fedda6d6013be3c1da09f2fada460 Mon Sep 17 00:00:00 2001 From: Guillaume Bouchard Date: Sun, 19 Apr 2020 20:31:02 +0200 Subject: [PATCH 280/316] Add krank and pretty-terminal `pretty-terminal` is a dependency of `krank`, so I'm adding it at the same time. It is a really simple package (with only dependency to `base` and `text`). --- build-constraints.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index fb30ac45..d74e5e3e 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -131,6 +131,8 @@ packages: - modular "Guillaume Bouchard @guibou": + - krank + - pretty-terminal - PyF "Erik Schnetter @eschnett": From f504eba90bf05e5d5e3071839427aea479d50990 Mon Sep 17 00:00:00 2001 From: kwannoel <47273164+kwannoel@users.noreply.github.com> Date: Mon, 20 Apr 2020 14:48:44 +0800 Subject: [PATCH 281/316] add servant-docs-simple --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index fb30ac45..4157bad9 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3631,6 +3631,9 @@ packages: "Holmusk @arbus": - elm-street < 0 # via base-4.13.0.0 & warp-3.3.2 + + "Noel Kwan @kwannoel": + - servant-docs-simple "Lorenz Moesenlechner @moesenle": - servant-websockets From 89d0bf88a3448aefb891cffab73b0ac9b41b8bab Mon Sep 17 00:00:00 2001 From: Alexey Zabelin Date: Mon, 20 Apr 2020 20:33:21 -0700 Subject: [PATCH 282/316] Remove upper bound for dunai, closes #5316 --- build-constraints.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index fb30ac45..a4aeb070 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4755,8 +4755,6 @@ packages: - optics < 0.3 - optics-vl < 0.2.1 - # https://github.com/commercialhaskell/stackage/issues/5316 - - dunai < 0.7.0 # end of packages # Package flags are applied to individual packages, and override the values of From a5361ec29c4b03971da02475c2281c85f4703d64 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 21 Apr 2020 07:15:40 +0300 Subject: [PATCH 283/316] Newer Stack executable with more debugging --- automated/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automated/build.sh b/automated/build.sh index 9eb969cf..f1344348 100755 --- a/automated/build.sh +++ b/automated/build.sh @@ -68,7 +68,7 @@ chmod +x curator echo -n "curator version: " docker run --rm -v $(pwd)/curator:/exe $IMAGE /exe --version -curl -L "https://download.fpcomplete.com/stackage-curator-2/stack-4033c93815477e5b565d9a2a61b54e04da0863ef.bz2" | bunzip2 > stack +curl -L "https://download.fpcomplete.com/stackage-curator-2/stack-fffc0a40e2253788f6b9cb7471c03fd571d69bde.bz2" | bunzip2 > stack chmod +x stack echo -n "stack version: " docker run --rm -v $(pwd)/stack:/exe $IMAGE /exe --version From d3aed566e695fd4f82b06bac83528b7c9528e869 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 21 Apr 2020 07:15:47 +0300 Subject: [PATCH 284/316] Skip newer typerep-map --- build-constraints.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index fc7a214d..287c2f3b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4760,6 +4760,8 @@ packages: - optics < 0.3 - optics-vl < 0.2.1 + # https://github.com/commercialhaskell/stack/issues/5264 + - typerep-map < 0.3.3 # end of packages # Package flags are applied to individual packages, and override the values of From 865e60af1902fb9259fb55f3d6c87034eb470d81 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 21 Apr 2020 07:20:11 +0300 Subject: [PATCH 285/316] Revert "Skip newer typerep-map" This reverts commit d3aed566e695fd4f82b06bac83528b7c9528e869. --- build-constraints.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 287c2f3b..fc7a214d 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4760,8 +4760,6 @@ packages: - optics < 0.3 - optics-vl < 0.2.1 - # https://github.com/commercialhaskell/stack/issues/5264 - - typerep-map < 0.3.3 # end of packages # Package flags are applied to individual packages, and override the values of From 462c766c2d95dcf75cfce8460197325468b95dc2 Mon Sep 17 00:00:00 2001 From: Alexey Zabelin Date: Wed, 22 Apr 2020 19:45:38 -0700 Subject: [PATCH 286/316] Add upper bound for protolude, #5319 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index fc7a214d..21d00b2b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4760,6 +4760,9 @@ packages: - optics < 0.3 - optics-vl < 0.2.1 + # https://github.com/commercialhaskell/stackage/issues/5319 + - protolude < 0.3 + # end of packages # Package flags are applied to individual packages, and override the values of From 6a58de5523d0b56295722b70e3c37b829d687617 Mon Sep 17 00:00:00 2001 From: Dmitry Ivanov Date: Thu, 23 Apr 2020 23:01:08 +0200 Subject: [PATCH 287/316] Update opentelemetry packages --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 21d00b2b..b2efbf6a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2418,8 +2418,8 @@ packages: - io-storage - oo-prototypes - opentelemetry + - opentelemetry-extra - opentelemetry-wai - - opentelemetry-http-client - opentelemetry-lightstep - planb-token-introspection - pointedlist From 721c6baf47232d8d24ec700f6a739c5b87c00b33 Mon Sep 17 00:00:00 2001 From: Alexey Zabelin Date: Thu, 23 Apr 2020 22:23:12 -0700 Subject: [PATCH 288/316] Add upper bound for swagger2, #5322 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 21d00b2b..0f11824e 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4763,6 +4763,9 @@ packages: # https://github.com/commercialhaskell/stackage/issues/5319 - protolude < 0.3 + # https://github.com/commercialhaskell/stackage/issues/5322 + - swagger2 < 2.6 + # end of packages # Package flags are applied to individual packages, and override the values of From 126ad50871091b834b4fc0498bb28d94c306dc2f Mon Sep 17 00:00:00 2001 From: Alexey Zabelin Date: Thu, 23 Apr 2020 22:36:52 -0700 Subject: [PATCH 289/316] Try enabling ghc-events --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 0f11824e..5f2875b7 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1374,7 +1374,7 @@ packages: - parallel-io - text-binary - Chart-cairo < 0 # GHC 8.4 via cairo - - ghc-events < 0 # build failure with GHC 8.4 + - ghc-events - monad-extras - optparse-simple - hpack From 72149c630159f57e71874073ac91660c1c422879 Mon Sep 17 00:00:00 2001 From: Alexey Zabelin Date: Fri, 24 Apr 2020 20:03:00 -0700 Subject: [PATCH 290/316] Add upper bound for base64-bytestring, #5323 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 7098cc5b..01471dd8 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4766,6 +4766,9 @@ packages: # https://github.com/commercialhaskell/stackage/issues/5322 - swagger2 < 2.6 + # https://github.com/commercialhaskell/stackage/issues/5323 + - base64-bytestring < 1.1 + # end of packages # Package flags are applied to individual packages, and override the values of From 49870510744e281cfa17be71042fa750d2b2c769 Mon Sep 17 00:00:00 2001 From: Alexey Zabelin Date: Sat, 25 Apr 2020 12:46:24 -0700 Subject: [PATCH 291/316] Add upper bound for cabal2nix, #5324 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 01471dd8..37a9db60 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4769,6 +4769,9 @@ packages: # https://github.com/commercialhaskell/stackage/issues/5323 - base64-bytestring < 1.1 + # https://github.com/commercialhaskell/stackage/issues/5324 + - cabal2nix < 2.15.2 + # end of packages # Package flags are applied to individual packages, and override the values of From edb909e1bedd71da19b508d6de27bdefcde90a84 Mon Sep 17 00:00:00 2001 From: Alexey Zabelin Date: Sat, 25 Apr 2020 12:48:37 -0700 Subject: [PATCH 292/316] Add upper bound for hw-balancedparens, #5325 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 37a9db60..498d3e80 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4772,6 +4772,9 @@ packages: # https://github.com/commercialhaskell/stackage/issues/5324 - cabal2nix < 2.15.2 + # https://github.com/commercialhaskell/stackage/issues/5325 + - hw-balancedparens < 0.4 + # end of packages # Package flags are applied to individual packages, and override the values of From 7608c23e42d41427dbf7f61a21f6f20aaa10bb03 Mon Sep 17 00:00:00 2001 From: Alexey Zabelin Date: Sat, 25 Apr 2020 21:14:53 -0700 Subject: [PATCH 293/316] Add upper bound for string-interpolate, #5326 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 498d3e80..8c715724 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4775,6 +4775,9 @@ packages: # https://github.com/commercialhaskell/stackage/issues/5325 - hw-balancedparens < 0.4 + # https://github.com/commercialhaskell/stackage/issues/5326 + - string-interpolate < 0.2.0.2 + # end of packages # Package flags are applied to individual packages, and override the values of From 064f745b9dcde15b0e53a428bd26fb1efe8d96b2 Mon Sep 17 00:00:00 2001 From: Alexey Zabelin Date: Sun, 26 Apr 2020 11:55:32 -0700 Subject: [PATCH 294/316] Remove upper bound for hw-balancedparens, closes #5325 --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 8c715724..0e66cbae 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4772,9 +4772,6 @@ packages: # https://github.com/commercialhaskell/stackage/issues/5324 - cabal2nix < 2.15.2 - # https://github.com/commercialhaskell/stackage/issues/5325 - - hw-balancedparens < 0.4 - # https://github.com/commercialhaskell/stackage/issues/5326 - string-interpolate < 0.2.0.2 From 6ad0bcb5431e35a0d892ac579f1cf99c5b70f4cc Mon Sep 17 00:00:00 2001 From: Alexey Zabelin Date: Sun, 26 Apr 2020 12:01:08 -0700 Subject: [PATCH 295/316] Remove upper bound for string-interpolate, closes #5326 --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 0e66cbae..37a9db60 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4772,9 +4772,6 @@ packages: # https://github.com/commercialhaskell/stackage/issues/5324 - cabal2nix < 2.15.2 - # https://github.com/commercialhaskell/stackage/issues/5326 - - string-interpolate < 0.2.0.2 - # end of packages # Package flags are applied to individual packages, and override the values of From 3970f257d62386c05d9d9a1a9e7d1805f355658b Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Sun, 26 Apr 2020 19:33:04 -0700 Subject: [PATCH 296/316] Revert "Restore broadcast-chan" This reverts commit 117ac9f8e75d4f2c5717b480f06985940f440298. --- build-constraints.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 37a9db60..3100bce3 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1362,6 +1362,7 @@ packages: "Emanuel Borsboom @borsboom": - BoundedChan + - broadcast-chan < 0 # compilation failure - fuzzcheck - here - hlibgit2 @@ -5670,6 +5671,7 @@ skipped-benchmarks: - bit-stream - bitset-word8 - blake2 + - broadcast-chan - bv-little - bytestring-conversion - case-insensitive From 813644c4dfcc193d4c11cf14ff8a541a2133c690 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Mon, 2 Mar 2020 12:21:01 -0800 Subject: [PATCH 297/316] Revert "Revert "Add taffybar and dependencies"" This reverts commit 227d11caa366055c777417e38404001d8bd67c6b. --- build-constraints.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 3100bce3..5479ef61 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4117,6 +4117,19 @@ packages: "Elben Shira @elben": - pencil < 0 # via hsass + "Ivan Malison @IvanMalison": + - ConfigFile + - dbus-hslogger + - gi-cairo-connector + - gi-cairo-render + - gtk-sni-tray + - gtk-strut + - rate-limit + - status-notifier-item + - taffybar + - time-units + - xml-helpers + "ARATA Mizuki @minoki": - unboxing-vector From f30b1f8776cc525639c23aa0bbfcc92450985388 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Sun, 26 Apr 2020 19:33:51 -0700 Subject: [PATCH 298/316] Restore broadcast-chan --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 5479ef61..4320ae15 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1362,7 +1362,7 @@ packages: "Emanuel Borsboom @borsboom": - BoundedChan - - broadcast-chan < 0 # compilation failure + - broadcast-chan - fuzzcheck - here - hlibgit2 From 4e62da12a26821d76c6b071625f6968dc9e9def1 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Mon, 27 Apr 2020 02:00:56 -0700 Subject: [PATCH 299/316] Add xdg-desktop-entry --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 4320ae15..2ebe41e1 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4129,6 +4129,7 @@ packages: - taffybar - time-units - xml-helpers + - xdg-desktop-entry "ARATA Mizuki @minoki": - unboxing-vector From 70efd119275d63b3e2989c890d482d5e4c7ee947 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Rze=C5=BAnicki?= Date: Tue, 28 Apr 2020 00:33:29 +0200 Subject: [PATCH 300/316] Add hspec-tables --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 37a9db60..d34a3909 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -9,6 +9,9 @@ cabal-format-version: "2.4" # Constraints for brand new builds packages: + "Marcin Rzeźnicki @marcin-rzeznicki": + - hspec-tables + "Mihai Giurgeanu @mihaigiurgeanu": - sqlcli - sqlcli-odbc From f0814c603d19d46d77e2c8e5e387830464c68501 Mon Sep 17 00:00:00 2001 From: Pranay Sashank Date: Wed, 29 Apr 2020 07:15:16 +0530 Subject: [PATCH 301/316] Re-enable fusion-plugin --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 37a9db60..b744dcab 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -520,7 +520,7 @@ packages: "Pranay Sashank @pranaysashank": - fusion-plugin-types - - fusion-plugin < 0 # ghc-8.8.3 + - fusion-plugin "Aleksey Uimanov @s9gf4ult": # - postgresql-query # build errors From 0823d679f343620829661d0068a3598a91cec517 Mon Sep 17 00:00:00 2001 From: Mauricio Fierro Date: Tue, 28 Apr 2020 22:30:51 -0500 Subject: [PATCH 302/316] Add dialogflow-fulfillment --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 37a9db60..c7a3f0d5 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -9,6 +9,9 @@ cabal-format-version: "2.4" # Constraints for brand new builds packages: + "Mauricio Fierro @mauriciofierrom": + - dialogflow-fulfillment + "Mihai Giurgeanu @mihaigiurgeanu": - sqlcli - sqlcli-odbc From 83359fa19db07c0feca75d44a55c1f5edf9c1d0e Mon Sep 17 00:00:00 2001 From: Chris Dornan Date: Wed, 29 Apr 2020 17:51:10 +0100 Subject: [PATCH 303/316] latest tldr (fixes #5277) --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 66faa0c0..5b575f12 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -738,7 +738,7 @@ packages: - download - textlocal - shell-conduit - - tldr < 0.6.3 # https://github.com/commercialhaskell/stackage/issues/5277 + - tldr - fb - yesod-fb - yesod-auth-fb From cdbfb5234a089565a8eed19acc3b5ebca786f05b Mon Sep 17 00:00:00 2001 From: Tomas Carnecky Date: Wed, 29 Apr 2020 21:54:15 +0200 Subject: [PATCH 304/316] Re-enable css-syntax --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 5b575f12..34783b6b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1586,7 +1586,7 @@ packages: - avers - avers-api < 0 # via servant - avers-server < 0 # via servant-server - - css-syntax < 0 # via base-4.13.0.0 + - css-syntax # - etcd # https://github.com/wereHamster/etcd-hs/issues/5 - github-types - github-webhook-handler < 0 # GHC 8.4 via base-4.11.0.0 From 9734fa9eca079a33b5b57301c20d9261d5a62046 Mon Sep 17 00:00:00 2001 From: Emanuel Borsboom Date: Wed, 29 Apr 2020 13:52:49 -0700 Subject: [PATCH 305/316] Add automated/dockerfiles/lts-15.10/Dockerfile For stack-2.3.1 --- automated/dockerfiles/lts-15.10/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 automated/dockerfiles/lts-15.10/Dockerfile diff --git a/automated/dockerfiles/lts-15.10/Dockerfile b/automated/dockerfiles/lts-15.10/Dockerfile new file mode 100644 index 00000000..a505626f --- /dev/null +++ b/automated/dockerfiles/lts-15.10/Dockerfile @@ -0,0 +1,3 @@ +FROM $DOCKER_REPO:lts-15.5 +ARG STACK_VERSION=2.3.1 +RUN 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/local/bin '*/stack' \ No newline at end of file From 6f80a8123d444cee09d4ed027425d6258e9ab543 Mon Sep 17 00:00:00 2001 From: Emanuel Borsboom Date: Wed, 29 Apr 2020 13:55:49 -0700 Subject: [PATCH 306/316] Remove 'stack' from expected-test-failures https://github.com/fpco/stackage/issues/3707 has been closed for some time, and stack no longer depends on 'store'. Note: stack is still disabled, so this change will have no practical effect. --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 5b575f12..a7199e56 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5425,7 +5425,6 @@ expected-test-failures: - serialport # "The tests need two serial ports as command line arguments" https://github.com/jputcu/serialport/issues/30 - serversession-backend-redis # redis - shake # Needs ghc on $PATH with some installed haskell packages - - stack # https://github.com/fpco/stackage/issues/3707 - stripe-http-streams # https://github.com/fpco/stackage/issues/2945, needs Stripe account - users-persistent # sqlite - users-postgresql-simple # PostgreSQL From 9423c46aa2a8eeacf059c2ac58d8edbc27a5db19 Mon Sep 17 00:00:00 2001 From: Emanuel Borsboom Date: Wed, 29 Apr 2020 16:16:36 -0700 Subject: [PATCH 307/316] Re-enable 'stack' --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index a7199e56..52de495d 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1387,7 +1387,6 @@ packages: - hpack - bindings-uname - stack < 9.9.9 # see https://github.com/fpco/stackage/issues/3563 - - stack < 0 # build issues with Cabal "Michael Sloan @mgsloan": - th-orphans From ceb9436a4f0e021266aa39ef09ab37de35340e8b Mon Sep 17 00:00:00 2001 From: Colin Woodbury Date: Fri, 1 May 2020 09:42:09 -0700 Subject: [PATCH 308/316] Lift `aur` bounds --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 5b575f12..d464e0d1 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4755,7 +4755,6 @@ packages: - servant-lucid < 0.9.0.1 - servant-mock < 0.8.6 - servant-swagger < 1.1.8 - - aur < 6.3.0 # https://github.com/commercialhaskell/stackage/issues/5218 - unliftio-core < 0.2 From 6c171ff8191f340898d1f6a000edf378640bb594 Mon Sep 17 00:00:00 2001 From: Preetham Gujjula Date: Sat, 2 May 2020 04:28:55 +0000 Subject: [PATCH 309/316] Add list-predicate --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 5b575f12..0086e8d7 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -135,6 +135,7 @@ packages: "Preetham Gujjula @pgujjula": - modular + - list-predicate "Guillaume Bouchard @guibou": - krank From 9cfa5d9221b4e0a3f43962102427516b7545014f Mon Sep 17 00:00:00 2001 From: Martijn Bastiaan Date: Sat, 2 May 2020 18:23:59 +0200 Subject: [PATCH 310/316] Add concurrent-supply --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 5b575f12..5c6f5b07 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -855,7 +855,7 @@ packages: - comonad - compensated - compressed < 0 - - concurrent-supply < 0 # hashable-1.3.0 + - concurrent-supply - constraints < 0.12 # https://github.com/commercialhaskell/stackage/issues/5124 - contravariant - distributive From 4aec71898c5e124cfdbe7768971713c120325ad1 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 3 May 2020 07:36:49 +0300 Subject: [PATCH 311/316] Install jq --- automated/dockerfiles/lts-15.5/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automated/dockerfiles/lts-15.5/Dockerfile b/automated/dockerfiles/lts-15.5/Dockerfile index 8826ddb2..9f0a5dce 100644 --- a/automated/dockerfiles/lts-15.5/Dockerfile +++ b/automated/dockerfiles/lts-15.5/Dockerfile @@ -31,7 +31,7 @@ ENV LANG=C.UTF-8 \ 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 && \ + make xz-utils zlib1g-dev git gnupg libtinfo-dev jq && \ rm -rf /var/lib/apt/lists/* # From a6d666a0bfae2008e8bc23fb00457ef75d28725c Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 3 May 2020 04:42:01 +0000 Subject: [PATCH 312/316] Download jq --- automated/dockerfiles/build.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/automated/dockerfiles/build.sh b/automated/dockerfiles/build.sh index 3709664f..489a8bbd 100755 --- a/automated/dockerfiles/build.sh +++ b/automated/dockerfiles/build.sh @@ -106,7 +106,11 @@ LTS_MINOR="${LTS_VERSION#*.}" # Determine latest LTS version # -LATEST_LTS_SLUG=$(jq -r ".[\"lts\"]" $SNAPSHOTS) +mkdir -p $HOME/.local/bin +curl -o $HOME/.local/bin/jq -L https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 +chmod +x $HOME/.local/bin/jq + +LATEST_LTS_SLUG=$($HOME/.local/bin/jq -r ".[\"lts\"]" $SNAPSHOTS) LATEST_LTS_VERSION="${LATEST_LTS_SLUG#lts-}" LATEST_LTS_MAJOR="${LATEST_LTS_VERSION%.*}" LATEST_LTS_MINOR="${LATEST_LTS_VERSION#*.}" From 3b4b4870d899787e308aa9fd105ea771577a0105 Mon Sep 17 00:00:00 2001 From: Chris Dornan Date: Sun, 3 May 2020 16:27:24 +0100 Subject: [PATCH 313/316] #5335 #5336 fixes #5255 --- build-constraints.yaml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 5b575f12..a8282ea2 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4764,9 +4764,6 @@ packages: # https://github.com/commercialhaskell/stackage/issues/5236 - rank2classes < 1.4 - # https://github.com/commercialhaskell/stackage/issues/5255 - - ghc-lib-parser-ex < 8.8.6.0 - # https://github.com/commercialhaskell/stackage/issues/5293 - haddock-library < 1.9.0 @@ -4793,6 +4790,13 @@ packages: # https://github.com/commercialhaskell/stackage/issues/5324 - cabal2nix < 2.15.2 + + - brick <0.53 + + + - colourista < 0.1.0.0 + + # end of packages # Package flags are applied to individual packages, and override the values of From 484acd1a44fd14c710b8dced028568ea4ab2bdf6 Mon Sep 17 00:00:00 2001 From: Chris Dornan Date: Sun, 3 May 2020 16:29:16 +0100 Subject: [PATCH 314/316] add issue comments --- build-constraints.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index a8282ea2..44275d75 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4790,10 +4790,10 @@ packages: # https://github.com/commercialhaskell/stackage/issues/5324 - cabal2nix < 2.15.2 - + # https://github.com/commercialhaskell/stackage/issues/5335 - brick <0.53 - + # https://github.com/commercialhaskell/stackage/issues/5336 - colourista < 0.1.0.0 From f86034b911efaab28516af29f85d6c286778ed1c Mon Sep 17 00:00:00 2001 From: Chris Dornan Date: Sun, 3 May 2020 17:33:23 +0100 Subject: [PATCH 315/316] cacphony test failure --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 44275d75..3dc7aba2 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5588,6 +5588,9 @@ expected-test-failures: # https://github.com/tomphp/haskell-cfenv/issues/1 - cfenv + + # https://github.com/centromere/cacophony/issues/15 + - cacophony # end of expected-test-failures # Benchmarks which are known not to build. Note that, currently we do not run From 1821bca7f7978b09ae47e86252c1d78132530815 Mon Sep 17 00:00:00 2001 From: Dan Burton Date: Tue, 5 May 2020 10:39:57 -0700 Subject: [PATCH 316/316] Add constraints for just one more nightly --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 8a216343..046dc709 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4795,6 +4795,9 @@ packages: # https://github.com/commercialhaskell/stackage/issues/5336 - colourista < 0.1.0.0 + # soon to be removed anyways, not creating an issue + - persistent-template < 2.8.3 + - validation-selective < 0.1.0.0 # end of packages