mirror of
https://github.com/commercialhaskell/stackage.git
synced 2026-01-12 23:38:29 +01:00
Update from parent
This commit is contained in:
commit
36560bac1e
@ -11,7 +11,7 @@ addons:
|
||||
- libgmp-dev
|
||||
|
||||
env:
|
||||
- GHCVER=8.0.2
|
||||
- GHCVER=8.2.1
|
||||
|
||||
install:
|
||||
# Download and unpack the stack executable
|
||||
|
||||
@ -382,6 +382,9 @@ will upgrade their packages to allow for the new GHC release.
|
||||
We prefer to prune packages causing upper bounds constraints **after** the LTS
|
||||
release to allow the maximum amount of packages to get into the newest LTS.
|
||||
|
||||
You will almost always need to update the Win32 package version listed in the
|
||||
build-constraints.yaml file.
|
||||
|
||||
After the first LTS release, the package pruning process may begin in the
|
||||
nightly build in order to move forward with getting the latest versions of
|
||||
packages compatible with the new GHC release.
|
||||
|
||||
@ -2,7 +2,7 @@ FROM fpco/pid1:16.04
|
||||
|
||||
ENV HOME /home/stackage
|
||||
ENV LANG en_US.UTF-8
|
||||
ENV PATH /opt/ghc/8.0.2/bin:/usr/sbin:/usr/bin:/sbin:/bin
|
||||
ENV PATH /opt/ghc/8.2.1/bin:/usr/sbin:/usr/bin:/sbin:/bin
|
||||
|
||||
ADD debian-bootstrap.sh /tmp/debian-bootstrap.sh
|
||||
RUN /tmp/debian-bootstrap.sh && rm /tmp/debian-bootstrap.sh
|
||||
|
||||
@ -16,7 +16,7 @@ To add your package, first fork this repository.
|
||||
In the [`build-constraints.yaml`](https://github.com/fpco/stackage/blob/master/build-constraints.yaml) file, there's a section called `packages`.
|
||||
To add a set of packages, you would add:
|
||||
|
||||
"My Name myemail@example.com @mygithubuser":
|
||||
"My Name <myemail@example.com> @mygithubuser":
|
||||
- package1
|
||||
- package2
|
||||
- package3
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
2
check
2
check
@ -3,4 +3,4 @@
|
||||
# Convenience script for checking constraints locally
|
||||
|
||||
cd `dirname $0`
|
||||
exec stack exec --resolver ghc-8.0.2 stackage-curator check
|
||||
exec stack exec --resolver ghc-8.2.1 stackage-curator check
|
||||
|
||||
@ -25,7 +25,7 @@ add-apt-repository -y --keyserver hkp://keyserver.ubuntu.com:80 'deb http://down
|
||||
add-apt-repository -y --keyserver hkp://keyserver.ubuntu.com:80 'deb http://download.mono-project.com/repo/debian wheezy-apache24-compat main'
|
||||
add-apt-repository -y --keyserver hkp://keyserver.ubuntu.com:80 'deb http://download.mono-project.com/repo/debian wheezy-libjpeg62-compat main'
|
||||
|
||||
GHCVER=8.0.2
|
||||
GHCVER=8.2.1
|
||||
|
||||
apt-get update
|
||||
apt-get install -y \
|
||||
@ -48,7 +48,7 @@ apt-get install -y \
|
||||
libblas-dev \
|
||||
libbz2-dev \
|
||||
libcairo2-dev \
|
||||
libclang-3.7-dev \
|
||||
libclang-3.9-dev \
|
||||
libcurl4-openssl-dev \
|
||||
libdevil-dev \
|
||||
libedit-dev \
|
||||
@ -70,8 +70,10 @@ apt-get install -y \
|
||||
libgtk2.0-dev \
|
||||
libgtksourceview-3.0-dev \
|
||||
libhidapi-dev \
|
||||
libi2c-dev \
|
||||
libicu-dev \
|
||||
libimlib2-dev \
|
||||
libjack-jackd2-dev \
|
||||
libjudy-dev \
|
||||
liblapack-dev \
|
||||
libleveldb-dev \
|
||||
@ -115,7 +117,7 @@ apt-get install -y \
|
||||
libyaml-dev \
|
||||
libzip-dev \
|
||||
libzmq3-dev \
|
||||
llvm-3.7 \
|
||||
llvm-3.9 \
|
||||
locales \
|
||||
m4 \
|
||||
minisat \
|
||||
@ -154,9 +156,9 @@ update-alternatives --install "/usr/bin/ld" "ld" "/usr/bin/ld.bfd" 10
|
||||
# This version is tracked here:
|
||||
# https://ghc.haskell.org/trac/ghc/wiki/Commentary/Compiler/Backends/LLVM/Installing
|
||||
#
|
||||
# GHC 8.0 requires LLVM 3.7 tools (specifically, llc-3.7 and opt-3.7).
|
||||
update-alternatives --install "/usr/bin/llc" "llc" "/usr/bin/llc-3.7" 50
|
||||
update-alternatives --install "/usr/bin/opt" "opt" "/usr/bin/opt-3.7" 50
|
||||
# GHC 8.2 requires LLVM 3.9 tools (specifically, llc-3.9 and opt-3.9).
|
||||
update-alternatives --install "/usr/bin/llc" "llc" "/usr/bin/llc-3.9" 50
|
||||
update-alternatives --install "/usr/bin/opt" "opt" "/usr/bin/opt-3.9" 50
|
||||
|
||||
# install ocilib dependencies then build and install ocilib
|
||||
cd /tmp \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user