on master help sign in
Merge branch 'master' into add-ipa
6402d9eJens Petersen
.github/workflows/check.yml−1
@@ -9,7 +9,6 @@ jobs:
9 - uses: haskell/actions/setup@v1
9 - uses: haskell/actions/setup@v1
10 with:
10 with:
11 ghc-version: '8.10'
11 ghc-version: '8.10'
12− cabal-version: '3.4'
13 stack-version: '2.5'
12 stack-version: '2.5'
14 - uses: actions/cache@v2
13 - uses: actions/cache@v2
15 with:
14 with:
README.md+1−1
@@ -25,7 +25,7 @@ We welcome all packages, provided:
25Full details on how to add and test a package can be found in the [maintainers agreement](https://github.com/commercialhaskell/stackage/blob/master/MAINTAINERS.md#adding-a-package).
25Full details on how to add and test a package can be found in the [maintainers agreement](https://github.com/commercialhaskell/stackage/blob/master/MAINTAINERS.md#adding-a-package).
26
26
27__NOTE__: There is an approximate 30 minute delay between a package uploading
27__NOTE__: There is an approximate 30 minute delay between a package uploading
28−to Hackage and being available to the Travis build script to check upper
28+to Hackage and being available to the Github workflow action to check upper
29bounds. If a pull request is marked as failed due to using an older version,
29bounds. If a pull request is marked as failed due to using an older version,
30please close and reopen the PR to retrigger a Travis build.
30please close and reopen the PR to retrigger a Travis build.
31
31
automated/dockerfiles/lts-17.0/Dockerfilenew file+90
@@ -0,0 +1,90 @@
1+FROM ubuntu:18.04
2+
3+LABEL maintainer="manny@fpcomplete.com"
4+
5+ARG GHC_VERSION=8.8.3
6+ARG LTS_SLUG=lts-17.0
7+ARG PID1_VERSION=0.1.2.0
8+ARG STACK_VERSION=2.5.1
9+ARG CUDA_VERSION=10.0
10+ARG JVM_PATH=/usr/lib/jvm/java-8-openjdk-amd64
11+ARG LLVM_PATH=/usr/lib/llvm-7
12+ARG BOOTSTRAP_COMMIT=1afd08ff0a3c3627f17eb1b928d35f337db40e08
13+
14+ARG DEBIAN_FRONTEND=noninteractive
15+ARG VARIANT=build
16+ARG STACK_ROOT=/home/stackage/.stack
17+
18+#
19+# Set encoding to UTF-8 and PATH to find GHC and cabal/stack-installed binaries.
20+#
21+
22+ENV LANG=C.UTF-8 \
23+ LC_ALL=C.UTF-8 \
24+ PATH=/root/.local/bin:/usr/local/cuda-$CUDA_VERSION/bin:$STACK_ROOT/programs/x86_64-linux/ghc-$GHC_VERSION/bin:$PATH \
25+ CUDA_PATH=/usr/local/cuda-$CUDA_VERSION \
26+ CPATH=$JVM_PATH/include:$JVM_PATH/include/linux:$LLVM_PATH/include
27+
28+#
29+# Install pre-requisites
30+#
31+
32+RUN apt-get update && \
33+ apt-get install -y --no-install-recommends \
34+ wget netbase ca-certificates g++ gcc libc6-dev libffi-dev libgmp-dev \
35+ make xz-utils zlib1g-dev git gnupg libtinfo-dev jq && \
36+ rm -rf /var/lib/apt/lists/*
37+
38+#
39+# Use Stackage's debian-bootstrap.sh script to install system libraries and
40+# tools required to build any Stackage package.
41+# Re-installs 'stack' *after* running debian-bootstrap.sh since that may have
42+# installed a different version.
43+# In the case of 'small' image, just install Stack and GHC.
44+#
45+
46+RUN if [ "$VARIANT" != "small" ]; then \
47+ 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; \
48+ fi && \
49+ 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' && \
50+ if [ "$VARIANT" = "small" ]; then \
51+ stack setup --resolver ghc-$GHC_VERSION; \
52+ fi && \
53+ rm -rf /var/lib/apt/lists/* && \
54+ cd $STACK_ROOT && \
55+ find . -type f -not -path "./programs/x86_64-linux/ghc-$GHC_VERSION/*" -exec rm '{}' \; && \
56+ find . -type d -print0 |sort -rz |xargs -0 rmdir 2>/dev/null || true
57+
58+#
59+# Configure Stack to use the GHC installed in the Docker image rather than installing its own
60+#
61+
62+RUN mkdir /etc/stack/ && \
63+ echo "system-ghc: true" >/etc/stack/config.yaml
64+
65+#
66+# Use 'stack' to install basic Haskell tools like alex, happy, and cpphs. We
67+# remove most of the STACK_ROOT afterward to save space, but keep the 'share'
68+# files that some of these tools require.
69+#
70+
71+RUN stack --resolver=$LTS_SLUG --local-bin-path=/usr/bin install \
72+ happy alex cpphs gtk2hs-buildtools hscolour hlint hindent && \
73+ cd $STACK_ROOT && \
74+ find . -type f -not -path './snapshots/*/share/*' -and -not -path "./programs/x86_64-linux/ghc-$GHC_VERSION/*" -exec rm '{}' \; && \
75+ find . -type d -print0 |sort -rz |xargs -0 rmdir 2>/dev/null || true
76+
77+#
78+# Install 'pid1' init daemon
79+#
80+
81+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 && \
82+ chown root:root /usr/local/sbin && \
83+ chown root:root /usr/local/sbin/pid1
84+
85+#
86+# Set up pid1 entrypoint and default command
87+#
88+
89+ENTRYPOINT ["/usr/local/sbin/pid1"]
90+CMD ["bash"]
automated/dockerfiles/lts-17.3/Dockerfilenew file+90
@@ -0,0 +1,90 @@
1+FROM ubuntu:18.04
2+
3+LABEL maintainer="manny@fpcomplete.com"
4+
5+ARG GHC_VERSION=8.8.4
6+ARG LTS_SLUG=lts-17.3
7+ARG PID1_VERSION=0.1.2.0
8+ARG STACK_VERSION=2.5.1
9+ARG CUDA_VERSION=10.0
10+ARG JVM_PATH=/usr/lib/jvm/java-8-openjdk-amd64
11+ARG LLVM_PATH=/usr/lib/llvm-7
12+ARG BOOTSTRAP_COMMIT=1afd08ff0a3c3627f17eb1b928d35f337db40e08
13+
14+ARG DEBIAN_FRONTEND=noninteractive
15+ARG VARIANT=build
16+ARG STACK_ROOT=/home/stackage/.stack
17+
18+#
19+# Set encoding to UTF-8 and PATH to find GHC and cabal/stack-installed binaries.
20+#
21+
22+ENV LANG=C.UTF-8 \
23+ LC_ALL=C.UTF-8 \
24+ PATH=/root/.local/bin:/usr/local/cuda-$CUDA_VERSION/bin:$STACK_ROOT/programs/x86_64-linux/ghc-$GHC_VERSION/bin:$PATH \
25+ CUDA_PATH=/usr/local/cuda-$CUDA_VERSION \
26+ CPATH=$JVM_PATH/include:$JVM_PATH/include/linux:$LLVM_PATH/include
27+
28+#
29+# Install pre-requisites
30+#
31+
32+RUN apt-get update && \
33+ apt-get install -y --no-install-recommends \
34+ wget netbase ca-certificates g++ gcc libc6-dev libffi-dev libgmp-dev \
35+ make xz-utils zlib1g-dev git gnupg libtinfo-dev jq && \
36+ rm -rf /var/lib/apt/lists/*
37+
38+#
39+# Use Stackage's debian-bootstrap.sh script to install system libraries and
40+# tools required to build any Stackage package.
41+# Re-installs 'stack' *after* running debian-bootstrap.sh since that may have
42+# installed a different version.
43+# In the case of 'small' image, just install Stack and GHC.
44+#
45+
46+RUN if [ "$VARIANT" != "small" ]; then \
47+ 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; \
48+ fi && \
49+ 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' && \
50+ if [ "$VARIANT" = "small" ]; then \
51+ stack setup --resolver ghc-$GHC_VERSION; \
52+ fi && \
53+ rm -rf /var/lib/apt/lists/* && \
54+ cd $STACK_ROOT && \
55+ find . -type f -not -path "./programs/x86_64-linux/ghc-$GHC_VERSION/*" -exec rm '{}' \; && \
56+ find . -type d -print0 |sort -rz |xargs -0 rmdir 2>/dev/null || true
57+
58+#
59+# Configure Stack to use the GHC installed in the Docker image rather than installing its own
60+#
61+
62+RUN mkdir /etc/stack/ && \
63+ echo "system-ghc: true" >/etc/stack/config.yaml
64+
65+#
66+# Use 'stack' to install basic Haskell tools like alex, happy, and cpphs. We
67+# remove most of the STACK_ROOT afterward to save space, but keep the 'share'
68+# files that some of these tools require.
69+#
70+
71+RUN stack --resolver=$LTS_SLUG --local-bin-path=/usr/bin install \
72+ happy alex cpphs gtk2hs-buildtools hscolour hlint hindent && \
73+ cd $STACK_ROOT && \
74+ find . -type f -not -path './snapshots/*/share/*' -and -not -path "./programs/x86_64-linux/ghc-$GHC_VERSION/*" -exec rm '{}' \; && \
75+ find . -type d -print0 |sort -rz |xargs -0 rmdir 2>/dev/null || true
76+
77+#
78+# Install 'pid1' init daemon
79+#
80+
81+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 && \
82+ chown root:root /usr/local/sbin && \
83+ chown root:root /usr/local/sbin/pid1
84+
85+#
86+# Set up pid1 entrypoint and default command
87+#
88+
89+ENTRYPOINT ["/usr/local/sbin/pid1"]
90+CMD ["bash"]
build-constraints.yaml+28−34
@@ -3129,7 +3129,7 @@ packages:
3129 - sv < 0 # via base-4.13.0.0
3129 - sv < 0 # via base-4.13.0.0
3130 - sv-cassava < 0 # via sv-core
3130 - sv-cassava < 0 # via sv-core
3131 - sv-core < 0 # via base-4.13.0.0
3131 - sv-core < 0 # via base-4.13.0.0
3132− - tasty-hedgehog
3132+ - tasty-hedgehog < 1.1.0.0 # https://github.com/commercialhaskell/stackage/issues/5973
3133
3133
3134 "Ismail Mustafa <ismailmustafa@rocketmail.com> @ismailmustafa":
3134 "Ismail Mustafa <ismailmustafa@rocketmail.com> @ismailmustafa":
3135 - handwriting < 0
3135 - handwriting < 0
@@ -3765,30 +3765,6 @@ packages:
3765 - with-utf8
3765 - with-utf8
3766 - uncaught-exception
3766 - uncaught-exception
3767
3767
3768− "Kowainik <xrom.xkov@gmail.com> @chshersh @vrom911":
3769− - co-log-core
3770− - co-log < 0 # ansi-terminal 0.11
3771− - co-log-polysemy < 0
3772− - colourista < 0 # ansi-terminal 0.11
3773− - first-class-patterns
3774− - ilist
3775− - life-sync < 0 # optparse-applicative 0.16.1
3776− - membrain
3777− - relude < 1 # cabal version/parsing issue: https://github.com/commercialhaskell/stackage/issues/5921
3778− - shellmet
3779− - shortcut-links
3780− - summoner < 0 # neat-interpolation-0.4
3781− - summoner-tui < 0 # neat-interpolation-0.4 via summoner
3782− - tomland
3783− - typerep-map
3784− - validation-selective
3785−
3786− "Dmitrii Kovanikov <kovanikov@gmail.com> @chshersh":
3787− - type-errors-pretty
3788−
3789− "Veronika Romashkina <vrom911@gmail.com> @vrom911":
3790− - slist
3791−
3792 "Holmusk <tech@holmusk.com> @arbus":
3768 "Holmusk <tech@holmusk.com> @arbus":
3793 - elm-street < 0 # via base-4.13.0.0 & warp-3.3.2
3769 - elm-street < 0 # via base-4.13.0.0 & warp-3.3.2
3794
3770
@@ -4317,7 +4293,7 @@ packages:
4317 # - msgpack-rpc # https://github.com/commercialhaskell/stackage/pull/4471
4293 # - msgpack-rpc # https://github.com/commercialhaskell/stackage/pull/4471
4318 # - msgpack-idl # https://github.com/commercialhaskell/stackage/pull/4471
4294 # - msgpack-idl # https://github.com/commercialhaskell/stackage/pull/4471
4319 - msgpack-aeson < 0 # via msgpack
4295 - msgpack-aeson < 0 # via msgpack
4320− - int-cast < 0 # ghc 8.10
4296+ - int-cast
4321
4297
4322 "Akihito Kirisaki <kirisaki@klaraworks.net> @kirisaki":
4298 "Akihito Kirisaki <kirisaki@klaraworks.net> @kirisaki":
4323 - caster < 0 # via fast-builder
4299 - caster < 0 # via fast-builder
@@ -4461,7 +4437,7 @@ packages:
4461 - slack-api
4437 - slack-api
4462
4438
4463 "Dobromir Nikolov <dnikolovv@hotmail.com> @dnikolovv":
4439 "Dobromir Nikolov <dnikolovv@hotmail.com> @dnikolovv":
4464− - it-has
4440+ - it-has < 0 # generic-lens 2.1
4465
4441
4466 "Gabriele Sales <gbrsales@gmail.com> @gbrsales":
4442 "Gabriele Sales <gbrsales@gmail.com> @gbrsales":
4467 - cabal-appimage
4443 - cabal-appimage
@@ -4559,6 +4535,9 @@ packages:
4559 "Rory Tyler Hayford <rory.hayford@protonmail.com> @ngua":
4535 "Rory Tyler Hayford <rory.hayford@protonmail.com> @ngua":
4560 - ipa
4536 - ipa
4561
4537
4538+ "Andreas Herrmann <andreas.herrmann@tweag.io> @aherrmann":
4539+ - capability
4540+
4562 "Grandfathered dependencies":
4541 "Grandfathered dependencies":
4563 - Boolean
4542 - Boolean
4564 - Decimal
4543 - Decimal
@@ -4633,6 +4612,8 @@ packages:
4633 - classy-prelude-conduit
4612 - classy-prelude-conduit
4634 - clientsession
4613 - clientsession
4635 - cmark-gfm
4614 - cmark-gfm
4615+ - co-log-core
4616+ - co-log-polysemy < 0
4636 - colour
4617 - colour
4637 - concurrent-extra
4618 - concurrent-extra
4638 - conduit
4619 - conduit
@@ -4709,6 +4690,7 @@ packages:
4709 - filemanip
4690 - filemanip
4710 - fin
4691 - fin
4711 - fingertree
4692 - fingertree
4693+ - first-class-patterns
4712 - fmlist
4694 - fmlist
4713 - friendly-time
4695 - friendly-time
4714 - functor-classes-compat
4696 - functor-classes-compat
@@ -4762,6 +4744,7 @@ packages:
4762 - hxt-unicode
4744 - hxt-unicode
4763 - iconv
4745 - iconv
4764 - ieee754
4746 - ieee754
4747+ - ilist
4765 - indexed
4748 - indexed
4766 - infer-license
4749 - infer-license
4767 - insert-ordered-containers
4750 - insert-ordered-containers
@@ -4788,6 +4771,7 @@ packages:
4788 - lzma
4771 - lzma
4789 - managed
4772 - managed
4790 - math-functions
4773 - math-functions
4774+ - membrain
4791 - mersenne-random-pure64
4775 - mersenne-random-pure64
4792 - mfsolve
4776 - mfsolve
4793 - microstache
4777 - microstache
@@ -4864,6 +4848,7 @@ packages:
4864 - regex-tdfa-text < 0 # via regex-base-0.94.0.0
4848 - regex-tdfa-text < 0 # via regex-base-0.94.0.0
4865 - relapse
4849 - relapse
4866 - relational-schemas
4850 - relational-schemas
4851+ - relude < 1 # cabal version/parsing issue: https://github.com/commercialhaskell/stackage/issues/5921
4867 - rerebase
4852 - rerebase
4868 - resolv
4853 - resolv
4869 - resource-pool
4854 - resource-pool
@@ -4887,12 +4872,15 @@ packages:
4887 - setenv
4872 - setenv
4888 - shakespeare
4873 - shakespeare
4889 - shell-escape
4874 - shell-escape
4875+ - shellmet
4876+ - shortcut-links
4890 - silently
4877 - silently
4891 - simple-reflect
4878 - simple-reflect
4892 - simple-sendfile
4879 - simple-sendfile
4893 - singleton-bool
4880 - singleton-bool
4894 - size-based < 0 # ghc 8.10
4881 - size-based < 0 # ghc 8.10
4895 - skein
4882 - skein
4883+ - slist
4896 - snap-core
4884 - snap-core
4897 - some
4885 - some
4898 - special-values
4886 - special-values
@@ -4952,14 +4940,17 @@ packages:
4952 - timeit
4940 - timeit
4953 - tls-session-manager
4941 - tls-session-manager
4954 - token-bucket < 0 # via base-4.13.0.0
4942 - token-bucket < 0 # via base-4.13.0.0
4943+ - tomland
4955 - tonatona < 0 # via tonaparser
4944 - tonatona < 0 # via tonaparser
4956 - transformers-base
4945 - transformers-base
4957 - tree-diff
4946 - tree-diff
4958 - trivial-constraint < 0 # ghc 8.10.1 #5447/closed
4947 - trivial-constraint < 0 # ghc 8.10.1 #5447/closed
4959 - true-name < 0 # MonadFail
4948 - true-name < 0 # MonadFail
4960 - tuple-th
4949 - tuple-th
4950+ - type-errors-pretty
4961 - type-fun < 0 # ghc 8.10.1 #5448/closed
4951 - type-fun < 0 # ghc 8.10.1 #5448/closed
4962 - type-hint
4952 - type-hint
4953+ - typerep-map
4963 - uglymemo
4954 - uglymemo
4964 - unbounded-delays
4955 - unbounded-delays
4965 - universe
4956 - universe
@@ -4975,6 +4966,7 @@ packages:
4975 - utf8-light
4966 - utf8-light
4976 - utf8-string
4967 - utf8-string
4977 - uuid-types
4968 - uuid-types
4969+ - validation-selective
4978 - vault
4970 - vault
4979 - vec
4971 - vec
4980 - vector
4972 - vector
@@ -6845,11 +6837,6 @@ packages:
6845 # https://github.com/commercialhaskell/stackage/issues/5836
6837 # https://github.com/commercialhaskell/stackage/issues/5836
6846 - clock < 0.8.2
6838 - clock < 0.8.2
6847
6839
6848− # https://github.com/commercialhaskell/stackage/issues/5842
6849− - generic-lens < 2.1.0.0
6850− - generic-lens-core < 2.1.0.0
6851− - generic-optics < 2.1.0.0
6852−
6853 # https://github.com/commercialhaskell/stackage/issues/5864
6840 # https://github.com/commercialhaskell/stackage/issues/5864
6854 - parser-combinators < 1.3.0
6841 - parser-combinators < 1.3.0
6855 - parser-combinators-tests < 1.3.0
6842 - parser-combinators-tests < 1.3.0
@@ -6932,10 +6919,14 @@ packages:
6932 - persistent-test < 2.12.0.0
6919 - persistent-test < 2.12.0.0
6933 - persistent-typed-db < 0.1.0.3
6920 - persistent-typed-db < 0.1.0.3
6934
6921
6935−
6936 # https://github.com/commercialhaskell/stackage/issues/5969
6922 # https://github.com/commercialhaskell/stackage/issues/5969
6937 - crackNum < 3
6923 - crackNum < 3
6938
6924
6925+ # https://github.com/commercialhaskell/stackage/issues/5975
6926+ - singleton-bool < 0.1.6
6927+
6928+ # https://github.com/commercialhaskell/stackage/issues/5982
6929+ - versions < 5.0
6939# end of packages
6930# end of packages
6940
6931
6941# Package flags are applied to individual packages, and override the values of
6932# Package flags are applied to individual packages, and override the values of
@@ -7440,6 +7431,7 @@ skipped-tests:
7440 - binary-parsers # https://github.com/winterland1989/binary-parsers/issues/3
7431 - binary-parsers # https://github.com/winterland1989/binary-parsers/issues/3
7441 - simple-affine-space # https://github.com/commercialhaskell/stackage/issues/5110
7432 - simple-affine-space # https://github.com/commercialhaskell/stackage/issues/5110
7442 - hw-kafka-client # https://github.com/commercialhaskell/stackage/pull/5542
7433 - hw-kafka-client # https://github.com/commercialhaskell/stackage/pull/5542
7434+ - hpc-codecov # timeouts? https://github.com/commercialhaskell/stackage/issues/5976
7443
7435
7444 # Missing foreign library
7436 # Missing foreign library
7445 - symengine # symengine
7437 - symengine # symengine
@@ -7728,6 +7720,7 @@ expected-test-failures:
7728 - character-cases # https://github.com/aiya000/hs-character-cases/issues/3
7720 - character-cases # https://github.com/aiya000/hs-character-cases/issues/3
7729 - lz4-frame-conduit # https://github.com/nh2/lz4-frame-conduit/issues/3
7721 - lz4-frame-conduit # https://github.com/nh2/lz4-frame-conduit/issues/3
7730 - dhall-yaml # https://github.com/commercialhaskell/stackage/issues/5640
7722 - dhall-yaml # https://github.com/commercialhaskell/stackage/issues/5640
7723+ - dl-fedora # https://github.com/commercialhaskell/stackage/issues/5977
7731
7724
7732 # Assertion failures due to module name ambiguity
7725 # Assertion failures due to module name ambiguity
7733 # (These _should_ be fixed by using the `hide` section of this file)
7726 # (These _should_ be fixed by using the `hide` section of this file)
@@ -7773,7 +7766,6 @@ expected-test-failures:
7773 - base16 # https://github.com/commercialhaskell/stackage/issues/5948
7766 - base16 # https://github.com/commercialhaskell/stackage/issues/5948
7774 - prometheus-client # https://github.com/commercialhaskell/stackage/issues/5948
7767 - prometheus-client # https://github.com/commercialhaskell/stackage/issues/5948
7775
7768
7776−
7777 # Recursive deps https://github.com/fpco/stackage/issues/1818
7769 # Recursive deps https://github.com/fpco/stackage/issues/1818
7778 - options
7770 - options
7779 - text # 1.2.2.1
7771 - text # 1.2.2.1
@@ -7890,6 +7882,8 @@ expected-test-failures:
7890 - mmark
7882 - mmark
7891 - mmark-ext
7883 - mmark-ext
7892
7884
7885+ # https://github.com/kcsongor/generic-lens/issues/133
7886+ - generic-optics
7893# end of expected-test-failures
7887# end of expected-test-failures
7894
7888
7895# Benchmarks which are known not to build. Note that, currently we do not run
7889# Benchmarks which are known not to build. Note that, currently we do not run