Skip to content

Commit a564ffb

Browse files
committed
Merge remote-tracking branch 'origin/master' into cleanup-pantry-exports
2 parents c25822d + 8e6d451 commit a564ffb

40 files changed

Lines changed: 380 additions & 197 deletions

.gitlab-ci.yml

Lines changed: 0 additions & 41 deletions
This file was deleted.

ChangeLog.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,8 @@ Behavior changes:
131131
`recommend-stack-upgrade: false` to bypass this. See
132132
[#1681](https://github.com/commercialhaskell/stack/issues/1681).
133133

134+
* `stack list-dependencies` has been removed in favour of `stack ls dependencies`.
135+
134136
Other enhancements:
135137

136138
* Support MX Linux in get-stack.sh. Fixes

doc/azure/azure-linux-template.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ jobs:
1010
stack-lts-13:
1111
BUILD: stack
1212
STACK_YAML: stack-lts-13.yaml
13-
cabal-8.4.3:
13+
cabal-8.4.4:
1414
BUILD: cabal
15-
GHCVER: 8.4.3
15+
GHCVER: 8.4.4
1616
CABALVER: 2.4
17-
cabal-8.6.3:
17+
cabal-8.6.5:
1818
BUILD: cabal
19-
GHCVER: 8.6.3
19+
GHCVER: 8.6.5
2020
CABALVER: 2.4
2121
nightly:
2222
BUILD: stack

doc/azure_ci.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,13 +168,13 @@ strategy:
168168
stack-lts-13:
169169
BUILD: stack
170170
STACK_YAML: stack-lts-13.yaml
171-
cabal-8.4.3:
171+
cabal-8.4.4:
172172
BUILD: cabal
173-
GHCVER: 8.4.3
173+
GHCVER: 8.4.4
174174
CABALVER: 2.4
175-
cabal-8.6.3:
175+
cabal-8.6.5:
176176
BUILD: cabal
177-
GHCVER: 8.6.3
177+
GHCVER: 8.6.5
178178
CABALVER: 2.4
179179
nightly:
180180
BUILD: stack

doc/build-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ specific package) and _general_ (general option `*` for flags is only available
7676
* A map from package name to package location, flags, GHC options,
7777
and if a package should be hidden. All package locations here
7878
are immutable.
79-
* A wanted compiler version, e.g. `ghc-8.4.3`
79+
* A wanted compiler version, e.g. `ghc-8.6.5`
8080
* If the `--compiler` CLI arg is set, or the `compiler` config value
8181
is set (and `--resolver` CLI arg is not set), ignore the wanted
8282
compiler from the snapshot and use the specified wanted compiler

doc/pantry.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ There are essentially four different ways of specifying a snapshot
3636
location:
3737

3838
* Via a compiler version, which is a "compiler only" snapshot. This
39-
could be, e.g., `resolver: ghc-8.4.3`.
39+
could be, e.g., `resolver: ghc-8.6.5`.
4040
* Via a URL pointing to a snapshot configuration file, e.g. `resolver: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2018/8/21.yaml`
4141
* Via a local file path pointing to a snapshot configuration file, e.g. `resolver: my-local-snapshot.yaml`
4242
* Via a _convenience synonym_, which provides a short form for some

doc/travis-complex.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ matrix:
6363
- env: BUILD=cabal GHCVER=8.4.4 CABALVER=2.2 HAPPYVER=1.19.5 ALEXVER=3.1.7
6464
compiler: ": #GHC 8.4.4"
6565
addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.4,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
66-
- env: BUILD=cabal GHCVER=8.6.3 CABALVER=2.4 HAPPYVER=1.19.5 ALEXVER=3.1.7
67-
compiler: ": #GHC 8.6.3"
68-
addons: {apt: {packages: [cabal-install-2.4,ghc-8.6.3,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
66+
- env: BUILD=cabal GHCVER=8.6.5 CABALVER=2.4 HAPPYVER=1.19.5 ALEXVER=3.1.7
67+
compiler: ": #GHC 8.6.5"
68+
addons: {apt: {packages: [cabal-install-2.4,ghc-8.6.5,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
6969

7070
# Build with the newest GHC and cabal-install. This is an accepted failure,
7171
# see below.
@@ -108,7 +108,7 @@ matrix:
108108
addons: {apt: {packages: [libgmp-dev]}}
109109

110110
- env: BUILD=stack ARGS="--resolver lts-13"
111-
compiler: ": #stack 8.6.3"
111+
compiler: ": #stack 8.6.5"
112112
addons: {apt: {packages: [libgmp-dev]}}
113113

114114
# Nightly builds are allowed to fail
@@ -151,7 +151,7 @@ matrix:
151151
os: osx
152152

153153
- env: BUILD=stack ARGS="--resolver lts-13"
154-
compiler: ": #stack 8.6.3 osx"
154+
compiler: ": #stack 8.6.5 osx"
155155
os: osx
156156

157157
- env: BUILD=stack ARGS="--resolver nightly"
Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
FROM ubuntu:16.04
2+
3+
MAINTAINER Emanuel Borsboom <manny@fpcomplete.com>
4+
5+
ARG GHC_VERSION=8.6.5
6+
ARG LTS_SLUG=lts-13.20
7+
ARG PID1_VERSION=0.1.2.0
8+
ARG STACK_VERSION=1.9.3
9+
ARG CUDA_VERSION=10.0
10+
ARG BOOTSTRAP_COMMIT=9f2b7ab95c711794257b059604e80ab9ad3c0c45
11+
ARG DEBIAN_FRONTEND=noninteractive
12+
ARG VARIANT=build
13+
14+
#
15+
# Set encoding to UTF-8 and PATH to find GHC and cabal/stack-installed binaries.
16+
#
17+
18+
ENV LANG=C.UTF-8 \
19+
LC_ALL=C.UTF-8 \
20+
PATH=/root/.cabal/bin:/root/.local/bin:/usr/local/cuda-$CUDA_VERSION/bin:/opt/ghc/$GHC_VERSION/bin:$PATH \
21+
CUDA_PATH=/usr/local/cuda-$CUDA_VERSION \
22+
LD_LIBRARY_PATH=/usr/local/cuda-$CUDA_VERSION/lib64:/usr/local/cuda-$CUDA_VERSION/nvvm/lib64
23+
24+
#
25+
# Use Stackage's debian-bootstrap.sh script to install system libraries and
26+
# tools required to build any Stackage package.
27+
#
28+
29+
RUN apt-get update && \
30+
apt-get install -y --no-install-recommends wget netbase ca-certificates && \
31+
if [ "$VARIANT" = "small" ]; then \
32+
echo "deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main" >>/etc/apt/sources.list && \
33+
echo "deb-src http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main" >>/etc/apt/sources.list && \
34+
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 063DAB2BDC0B3F9FCEBC378BFF3AEACEF6F88286 && \
35+
apt-get update && \
36+
apt-get install -y --no-install-recommends \
37+
ghc-$GHC_VERSION ghc-$GHC_VERSION-htmldocs \
38+
g++ gcc libc6-dev libffi-dev libgmp-dev make xz-utils zlib1g-dev git gnupg \
39+
libtinfo-dev; \
40+
else \
41+
wget -qO- https://raw.githubusercontent.com/fpco/stackage/$BOOTSTRAP_COMMIT/debian-bootstrap.sh | sed "s/^GHCVER=8.6.3$/GHCVER=$GHC_VERSION/" | bash && \
42+
# Add g++ version required for building 'double-conversion' \
43+
# (see https://github.com/commercialhaskell/stack/issues/4470) \
44+
apt-get install -y g++-7; \
45+
fi && \
46+
rm -rf /var/lib/apt/lists/*
47+
48+
#
49+
# Create symlink to help tools find GHC documentation
50+
#
51+
52+
RUN ln -s ghc /opt/ghc/$GHC_VERSION/share/doc/ghc-$GHC_VERSION
53+
54+
#
55+
# Install Stack
56+
#
57+
58+
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'
59+
60+
#
61+
# Configure Stack to use the GHC installed in the Docker image rather than installing its own
62+
#
63+
64+
RUN mkdir /etc/stack/ && \
65+
echo "system-ghc: true" >/etc/stack/config.yaml
66+
67+
#
68+
# Use 'stack' to install basic Haskell tools like alex, happy, and cpphs. We
69+
# remove most of the STACK_ROOT afterward to save space, but keep the 'share'
70+
# files that some of these tools require.
71+
#
72+
73+
RUN export STACK_ROOT=/usr/local/lib/stack && \
74+
stack --resolver=$LTS_SLUG --local-bin-path=/usr/local/bin install \
75+
cabal-install happy alex cpphs gtk2hs-buildtools hscolour hlint hindent && \
76+
cd $STACK_ROOT && \
77+
find . -type f -not -path './snapshots/*/share/*' -exec rm '{}' \; && \
78+
find . -type d -print0 |sort -rz |xargs -0 rmdir 2>/dev/null || true
79+
80+
#
81+
# Install 'pid1' init daemon
82+
#
83+
84+
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 && \
85+
chown root:root /usr/local/sbin && \
86+
chown root:root /usr/local/sbin/pid1
87+
88+
#
89+
# Set up pid1 entrypoint and default command
90+
#
91+
92+
ENTRYPOINT ["/usr/local/sbin/pid1"]
93+
CMD ["bash"]

etc/scripts/mirror-ghc-bindists-to-github.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
# Be sure to double check the SHA1 sums against those in
2020
# https://downloads.haskell.org/~ghc/X.Y.Z/.
2121
#
22-
GHCVER=8.6.4
22+
GHCVER=8.6.5
2323
if [[ -z "$GITHUB_AUTH_TOKEN" ]]; then
2424
echo "$0: GITHUB_AUTH_TOKEN environment variable is required" >&2
2525
exit 1
@@ -79,7 +79,7 @@ mirror x86_64-deb8-linux xz xz linux64 linux64-nopie
7979
#mirror x86_64-centos67-linux xz xz linux64-gmp4 linux64-gmp4-nopie
8080
mirror x86_64-fedora27-linux xz xz linux64-tinfo6 linux64-tinfo6-nopie
8181
mirror x86_64-apple-darwin xz bz2 macosx
82-
#mirror i386-unknown-mingw32 xz xz windows32
82+
mirror i386-unknown-mingw32 xz xz windows32
8383
mirror x86_64-unknown-mingw32 xz xz windows64
8484
#mirror x86_64-portbld-freebsd11 xz xz freebsd64-11
8585
#mirror aarch64-deb8-linux xz xz linux-aarch64

package.yaml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ homepage: http://haskellstack.org
1515
custom-setup:
1616
dependencies:
1717
- base >=4.10 && < 5
18-
- Cabal >= 2.4
18+
- Cabal
1919
- filepath
2020
extra-source-files:
2121
# note: leaving out 'package.yaml' because it causes confusion with hackage metadata revisions
@@ -38,10 +38,10 @@ ghc-options:
3838
- -fwarn-incomplete-record-updates
3939
- -optP-Wno-nonportable-include-path # workaround [Filename case on macOS · Issue #4739 · haskell/cabal](https://github.com/haskell/cabal/issues/4739)
4040
dependencies:
41-
- Cabal >= 2.4
41+
- Cabal
4242
- aeson
4343
- annotated-wl-pprint
44-
- ansi-terminal >= 0.8.1
44+
- ansi-terminal
4545
- array
4646
- async
4747
- attoparsec
@@ -77,8 +77,6 @@ dependencies:
7777
- memory
7878
- microlens
7979
- mintty
80-
# TODO remove dep when persistent drops monad-logger
81-
- monad-logger
8280
- mono-traversable
8381
- mtl
8482
- mustache
@@ -99,8 +97,8 @@ dependencies:
9997
- regex-applicative-text
10098
- resource-pool
10199
- resourcet
102-
- retry >= 0.7
103-
- rio >= 0.1.9.2
100+
- retry
101+
- rio
104102
- rio-prettyprint
105103
- semigroups
106104
- split
@@ -119,7 +117,7 @@ dependencies:
119117
- typed-process
120118
- unicode-transforms
121119
- unix-compat
122-
- unliftio >= 0.2.8.0
120+
- unliftio
123121
- unordered-containers
124122
- vector
125123
- yaml

0 commit comments

Comments
 (0)