Merge branch 'master' into nightly

This commit is contained in:
Dan Burton 2018-12-17 15:22:01 -05:00
commit a324da4e07
No known key found for this signature in database
GPG Key ID: 41F154F410EC12E0
6 changed files with 351 additions and 715 deletions

View File

@ -4,7 +4,7 @@ ENV HOME /home/stackage
ENV LANG en_US.UTF-8 ENV LANG en_US.UTF-8
# NOTE: also update debian-bootstrap.sh when cuda version changes # NOTE: also update debian-bootstrap.sh when cuda version changes
ENV PATH /usr/local/cuda-10.0/bin:/opt/ghc/8.6.2/bin:/usr/sbin:/usr/bin:/sbin:/bin ENV PATH /usr/local/cuda-10.0/bin:/opt/ghc/8.6.3/bin:/usr/sbin:/usr/bin:/sbin:/bin
ENV CUDA_PATH /usr/local/cuda-10.0 ENV CUDA_PATH /usr/local/cuda-10.0
ENV LD_LIBRARY_PATH=/usr/local/cuda-10.0/lib64:/usr/local/cuda-10.0/nvvm/lib64 ENV LD_LIBRARY_PATH=/usr/local/cuda-10.0/lib64:/usr/local/cuda-10.0/nvvm/lib64

View File

@ -21,6 +21,9 @@ To add your package you can edit [`build-constraints.yaml`](https://github.com/f
If your library depends on a C library, please add it to the `debian-bootstrap.sh` script. If your library depends on a C library, please add it to the `debian-bootstrap.sh` script.
Any dependencies of your packages that are not already part of stackage are added implictly, but it is prefered
to add all packages explicitly. It is planned to remove this behaviour in the future.
After doing that commit with a message like "add foo-bar" and send a pull request. After doing that commit with a message like "add foo-bar" and send a pull request.
The continuous integration job will do some checks to see if your package's dependencies are up-to-date. The continuous integration job will do some checks to see if your package's dependencies are up-to-date.
@ -201,7 +204,9 @@ purely on Stackage Curator discretion. The most common examples are:
considered a major version bump, and disallowed in an LTS minor considered a major version bump, and disallowed in an LTS minor
version bump. However, if a package is following SemVer, this version bump. However, if a package is following SemVer, this
would not be a breaking change, and curators may elect to include would not be a breaking change, and curators may elect to include
it. it. Note though that curators and their tooling will not know your
package is following SemVer, so in this case you would have to open
an issue on the [lts-haskell repo](https://github.com/fpco/lts-haskell/issues/new).
* If a package has overly restrictive version bounds on a * If a package has overly restrictive version bounds on a
dependency, in particular constraining a minor version dependency, in particular constraining a minor version

File diff suppressed because it is too large Load Diff

2
check
View File

@ -3,4 +3,4 @@
# Convenience script for checking constraints locally # Convenience script for checking constraints locally
cd `dirname $0` cd `dirname $0`
exec stack exec --resolver ghc-8.6.2 stackage-curator check exec stack exec --resolver ghc-8.6.3 stackage-curator check

View File

@ -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-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' add-apt-repository -y --keyserver hkp://keyserver.ubuntu.com:80 'deb http://download.mono-project.com/repo/debian wheezy-libjpeg62-compat main'
GHCVER=8.6.2 GHCVER=8.6.3
apt-get update apt-get update
apt-get install -y \ apt-get install -y \

View File

@ -2,7 +2,7 @@
set -euxo pipefail set -euxo pipefail
export GHCVER=8.6.2 export GHCVER=8.6.3
# Download and unpack the stack executable # Download and unpack the stack executable
mkdir -p ~/.local/bin mkdir -p ~/.local/bin