Merge pull request #2519 from fpco/master

updating nightly from master
This commit is contained in:
Adam Bergmark 2017-05-16 09:47:51 +02:00 committed by GitHub
commit d08587bcfe
2 changed files with 17 additions and 1 deletions

View File

@ -2918,6 +2918,7 @@ packages:
- stack-type
"Mitsutoshi Aoe <maoe@foldr.in> @maoe":
- sensu-run
- viewprof
"Dylan Simon <dylan-stack@dylex.net> @dylex":
@ -3020,6 +3021,12 @@ packages:
- proto-lens-combinators
- proto-lens-arbitrary
- proto-lens-optparse
- tensorflow
- tensorflow-core-ops
- tensorflow-opgen
- tensorflow-ops
- tensorflow-proto
- tensorflow-test
"Christof Schramm <christof.schramm@campus.lmu.de>":
- mnist-idx
@ -3182,6 +3189,9 @@ packages:
# https://github.com/fpco/stackage/issues/2514
- optparse-generic < 1.2
# https://github.com/fpco/stackage/issues/2516
- ghc-typelits-knownnat <0.3
# end of packages
# Package flags are applied to individual packages, and override the values of
@ -3516,7 +3526,7 @@ expected-test-failures:
- webdriver-angular # webdriver server
- yahoo-finance-api # Requires being able to access Yahoo Finance API
- req-conduit # bad JSON response from service pinged https://github.com/mrkkrp/req-conduit/issues/1
# clr-inline # requires working Mono https://github.com/fpco/stackage/issues/2510
- clr-inline # requires working Mono https://github.com/fpco/stackage/issues/2510
# Test executable requires arguments
- hpqtypes

View File

@ -191,6 +191,12 @@ wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
&& apt-get update \
&& apt-get install -y llvm-4.0
# Install the TensorFlow C API.
curl https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-1.1.0.tar.gz > libtensorflow.tar.gz \
&& sudo tar zxf libtensorflow.tar.gz -C /usr/local \
&& rm libtensorflow.tar.gz \
&& ldconfig
## non-free repo for mediabus-fdk-aac
#apt-add-repository multiverse \
# && apt-get update \