git.iko.soy/stackage
on master help sign in
Merge branch 'master' into add-ipa
commit6402d9eefc9670382858d7e51bb1ebfdc4791ad6 authorJens Petersen <juhpetersen@gmail.com> dateThu 15 Apr 2021, 14:07 (6 years ago) parent020af01169e614
5 files changed+209−36
compare with master
unifiedsplit
.github/workflows/check.yml−1 README.md+1−1 automated/dockerfiles/lts-17.0/Dockerfile+90 automated/dockerfiles/lts-17.3/Dockerfile+90 build-constraints.yaml+28−34
.github/workflows/check.yml−1
@@ -9,7 +9,6 @@ jobs:
99 - uses: haskell/actions/setup@v1
1010 with:
1111 ghc-version: '8.10'
12− cabal-version: '3.4'
1312 stack-version: '2.5'
1413 - uses: actions/cache@v2
1514 with:
README.md+1−1
@@ -25,7 +25,7 @@ We welcome all packages, provided:
2525Full 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).
2626
2727__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
2929bounds. If a pull request is marked as failed due to using an older version,
3030please close and reopen the PR to retrigger a Travis build.
3131
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:
31293129 - sv < 0 # via base-4.13.0.0
31303130 - sv-cassava < 0 # via sv-core
31313131 - 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
31333133
31343134 "Ismail Mustafa <ismailmustafa@rocketmail.com> @ismailmustafa":
31353135 - handwriting < 0
@@ -3765,30 +3765,6 @@ packages:
37653765 - with-utf8
37663766 - uncaught-exception
37673767
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−
37923768 "Holmusk <tech@holmusk.com> @arbus":
37933769 - elm-street < 0 # via base-4.13.0.0 & warp-3.3.2
37943770
@@ -4317,7 +4293,7 @@ packages:
43174293 # - msgpack-rpc # https://github.com/commercialhaskell/stackage/pull/4471
43184294 # - msgpack-idl # https://github.com/commercialhaskell/stackage/pull/4471
43194295 - msgpack-aeson < 0 # via msgpack
4320− - int-cast < 0 # ghc 8.10
4296+ - int-cast
43214297
43224298 "Akihito Kirisaki <kirisaki@klaraworks.net> @kirisaki":
43234299 - caster < 0 # via fast-builder
@@ -4461,7 +4437,7 @@ packages:
44614437 - slack-api
44624438
44634439 "Dobromir Nikolov <dnikolovv@hotmail.com> @dnikolovv":
4464− - it-has
4440+ - it-has < 0 # generic-lens 2.1
44654441
44664442 "Gabriele Sales <gbrsales@gmail.com> @gbrsales":
44674443 - cabal-appimage
@@ -4559,6 +4535,9 @@ packages:
45594535 "Rory Tyler Hayford <rory.hayford@protonmail.com> @ngua":
45604536 - ipa
45614537
4538+ "Andreas Herrmann <andreas.herrmann@tweag.io> @aherrmann":
4539+ - capability
4540+
45624541 "Grandfathered dependencies":
45634542 - Boolean
45644543 - Decimal
@@ -4633,6 +4612,8 @@ packages:
46334612 - classy-prelude-conduit
46344613 - clientsession
46354614 - cmark-gfm
4615+ - co-log-core
4616+ - co-log-polysemy < 0
46364617 - colour
46374618 - concurrent-extra
46384619 - conduit
@@ -4709,6 +4690,7 @@ packages:
47094690 - filemanip
47104691 - fin
47114692 - fingertree
4693+ - first-class-patterns
47124694 - fmlist
47134695 - friendly-time
47144696 - functor-classes-compat
@@ -4762,6 +4744,7 @@ packages:
47624744 - hxt-unicode
47634745 - iconv
47644746 - ieee754
4747+ - ilist
47654748 - indexed
47664749 - infer-license
47674750 - insert-ordered-containers
@@ -4788,6 +4771,7 @@ packages:
47884771 - lzma
47894772 - managed
47904773 - math-functions
4774+ - membrain
47914775 - mersenne-random-pure64
47924776 - mfsolve
47934777 - microstache
@@ -4864,6 +4848,7 @@ packages:
48644848 - regex-tdfa-text < 0 # via regex-base-0.94.0.0
48654849 - relapse
48664850 - relational-schemas
4851+ - relude < 1 # cabal version/parsing issue: https://github.com/commercialhaskell/stackage/issues/5921
48674852 - rerebase
48684853 - resolv
48694854 - resource-pool
@@ -4887,12 +4872,15 @@ packages:
48874872 - setenv
48884873 - shakespeare
48894874 - shell-escape
4875+ - shellmet
4876+ - shortcut-links
48904877 - silently
48914878 - simple-reflect
48924879 - simple-sendfile
48934880 - singleton-bool
48944881 - size-based < 0 # ghc 8.10
48954882 - skein
4883+ - slist
48964884 - snap-core
48974885 - some
48984886 - special-values
@@ -4952,14 +4940,17 @@ packages:
49524940 - timeit
49534941 - tls-session-manager
49544942 - token-bucket < 0 # via base-4.13.0.0
4943+ - tomland
49554944 - tonatona < 0 # via tonaparser
49564945 - transformers-base
49574946 - tree-diff
49584947 - trivial-constraint < 0 # ghc 8.10.1 #5447/closed
49594948 - true-name < 0 # MonadFail
49604949 - tuple-th
4950+ - type-errors-pretty
49614951 - type-fun < 0 # ghc 8.10.1 #5448/closed
49624952 - type-hint
4953+ - typerep-map
49634954 - uglymemo
49644955 - unbounded-delays
49654956 - universe
@@ -4975,6 +4966,7 @@ packages:
49754966 - utf8-light
49764967 - utf8-string
49774968 - uuid-types
4969+ - validation-selective
49784970 - vault
49794971 - vec
49804972 - vector
@@ -6845,11 +6837,6 @@ packages:
68456837 # https://github.com/commercialhaskell/stackage/issues/5836
68466838 - clock < 0.8.2
68476839
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−
68536840 # https://github.com/commercialhaskell/stackage/issues/5864
68546841 - parser-combinators < 1.3.0
68556842 - parser-combinators-tests < 1.3.0
@@ -6932,10 +6919,14 @@ packages:
69326919 - persistent-test < 2.12.0.0
69336920 - persistent-typed-db < 0.1.0.3
69346921
6935−
69366922 # https://github.com/commercialhaskell/stackage/issues/5969
69376923 - crackNum < 3
69386924
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
69396930# end of packages
69406931
69416932# Package flags are applied to individual packages, and override the values of
@@ -7440,6 +7431,7 @@ skipped-tests:
74407431 - binary-parsers # https://github.com/winterland1989/binary-parsers/issues/3
74417432 - simple-affine-space # https://github.com/commercialhaskell/stackage/issues/5110
74427433 - hw-kafka-client # https://github.com/commercialhaskell/stackage/pull/5542
7434+ - hpc-codecov # timeouts? https://github.com/commercialhaskell/stackage/issues/5976
74437435
74447436 # Missing foreign library
74457437 - symengine # symengine
@@ -7728,6 +7720,7 @@ expected-test-failures:
77287720 - character-cases # https://github.com/aiya000/hs-character-cases/issues/3
77297721 - lz4-frame-conduit # https://github.com/nh2/lz4-frame-conduit/issues/3
77307722 - dhall-yaml # https://github.com/commercialhaskell/stackage/issues/5640
7723+ - dl-fedora # https://github.com/commercialhaskell/stackage/issues/5977
77317724
77327725 # Assertion failures due to module name ambiguity
77337726 # (These _should_ be fixed by using the `hide` section of this file)
@@ -7773,7 +7766,6 @@ expected-test-failures:
77737766 - base16 # https://github.com/commercialhaskell/stackage/issues/5948
77747767 - prometheus-client # https://github.com/commercialhaskell/stackage/issues/5948
77757768
7776−
77777769 # Recursive deps https://github.com/fpco/stackage/issues/1818
77787770 - options
77797771 - text # 1.2.2.1
@@ -7890,6 +7882,8 @@ expected-test-failures:
78907882 - mmark
78917883 - mmark-ext
78927884
7885+ # https://github.com/kcsongor/generic-lens/issues/133
7886+ - generic-optics
78937887# end of expected-test-failures
78947888
78957889# Benchmarks which are known not to build. Note that, currently we do not run