on master help sign in
Merge branch 'master' into nightly
commit307541f2ec0215ac33ee33066d03da1eba097e90 authorChris Dornan <chris@chrisdornan.com> dateSat 20 May 2017, 12:16 (9 years ago) parentd08587bfce4ad9
2 files changed+22−31
build-constraints.yaml+15−29 debian-bootstrap.sh+7−2
build-constraints.yaml+15−29
@@ -1,6 +1,11 @@
11ghc-major-version: "8.0"
22# Constraints for brand new builds
33packages:
4+ "Pasqualino Assini <tittoassini@gmail.com> @tittoassini":
5+ - zm
6+ - flat
7+ - model
8+
49 "Timo Koepke <timo.koepke@gmail.com> @koepket":
510 - hinterface
611
@@ -8,7 +13,7 @@ packages:
813 - clr-marshal
914 - clr-host
1015 - threepenny-editors
11− - clr-inline
16+ # - clr-inline # see https://github.com/fpco/stackage/issues/2510
1217
1318 "Joshua Koike <jkoike2013@gmail.com> @jano017":
1419 - discord-hs
@@ -19,8 +24,8 @@ packages:
1924 "Richard Cook <rcook@rcook.org> @rcook":
2025 - hidden-char
2126
22− "Vanessa McHale <tmchale@wisc.edu> @vmchale":
23− - tibetan-utils
27+ "Vanessa McHale <tmchale@wisc.edu> @vmchale": []
28+ # - tibetan-utils # bounds: text-show
2429
2530 "Henning Thielemann <stackage@henning-thielemann.de> @thielema":
2631 # - accelerate-arithmetic # via accelerate: bounds: base
@@ -2589,7 +2594,7 @@ packages:
25892594
25902595 "Daishi Nakajima <nakaji.dayo@gmail.com> @nakaji_dayo":
25912596 - api-field-json-th
2592− # - yesod-job-queue # compilation failure: nakaji-dayo/yesod-job-queue/issues/12
2597+ - yesod-job-queue
25932598
25942599 # "Braden Walters <vc@braden-walters.info> @meoblast001":
25952600 # - hakyll-sass # compilation failure
@@ -3021,10 +3026,10 @@ packages:
30213026 - proto-lens-combinators
30223027 - proto-lens-arbitrary
30233028 - proto-lens-optparse
3024− - tensorflow
3025− - tensorflow-core-ops
3029+ # - tensorflow # https://github.com/fpco/stackage/issues/2527
3030+ # - tensorflow-core-ops # https://github.com/fpco/stackage/issues/2527
30263031 - tensorflow-opgen
3027− - tensorflow-ops
3032+ # - tensorflow-ops # https://github.com/fpco/stackage/issues/2527
30283033 - tensorflow-proto
30293034 - tensorflow-test
30303035
@@ -3112,9 +3117,6 @@ packages:
31123117 # https://github.com/fpco/stackage/issues/2345
31133118 - syb < 0.7
31143119
3115− # https://github.com/fpco/stackage/issues/2365
3116− - matplotlib < 0.4.1 # still an issue with 0.4.3
3117−
31183120 # https://github.com/fpco/stackage/issues/2378
31193121 - errors < 2.2.0
31203122
@@ -3127,12 +3129,6 @@ packages:
31273129 # https://github.com/fpco/stackage/issues/2433
31283130 - hlint < 2
31293131
3130− # https://github.com/fpco/stackage/issues/2436
3131− - base-orphans < 0.6
3132− - semigroups < 0.18.3
3133− # https://github.com/fpco/stackage/issues/2463
3134− - text-show < 3.6
3135−
31363132 # https://github.com/fpco/stackage/issues/2439
31373133 - persistent < 2.7.0
31383134
@@ -3148,9 +3144,6 @@ packages:
31483144 # https://github.com/fpco/stackage/issues/2464
31493145 - traverse-with-class < 1.0.0.0
31503146
3151− # https://github.com/diagrams/active/issues/20
3152− - lens < 4.15.2
3153−
31543147 # https://github.com/fpco/stackage/issues/2477
31553148 - intervals < 0.8
31563149
@@ -3171,27 +3164,21 @@ packages:
31713164 - websockets-simple < 0.0.2.1
31723165 - websockets-rpc < 0.4.1
31733166
3174− # https://github.com/fpco/stackage/issues/2499
3175− - io-streams < 1.4.0.0
3176−
31773167 # https://github.com/fpco/stackage/issues/2504
31783168 - statistics < 0.14
31793169
31803170 # https://github.com/fpco/stackage/issues/2505
31813171 - one-liner < 0.9
31823172
3183− # https://github.com/fpco/stackage/issues/2507
3184− - concurrent-output < 1.8
3185−
31863173 # https://github.com/fpco/stackage/issues/2513
31873174 - hsyslog < 5
31883175
3189− # https://github.com/fpco/stackage/issues/2514
3190− - optparse-generic < 1.2
3191−
31923176 # https://github.com/fpco/stackage/issues/2516
31933177 - ghc-typelits-knownnat <0.3
31943178
3179+ # https://github.com/fpco/stackage/issues/2365
3180+ - matplotlib < 0.4.1 # still an issue with 0.4.5
3181+
31953182# end of packages
31963183
31973184# Package flags are applied to individual packages, and override the values of
@@ -4008,7 +3995,6 @@ tell-me-when-its-released:
40083995- req-0.2.0 # Remove from expected-test-failures https://github.com/mrkkrp/req/issues/14#issuecomment-287562784
40093996- vivid-0.2.0.5 # Re-enable package (disabed per MonadRandom < 0.5) https://github.com/fpco/stackage/issues/2180
40103997- lens-4.15.2 # Test failures in lens-4.15.1 https://github.com/fpco/stackage/issues/2496
4011−- active-0.2.0.12 # Will likely contain fix for the lens-4.15.2 https://github.com/fpco/stackage/issues/2496
40123998
40133999# Packages which should be hidden after registering, to avoid module name
40144000# conflicts. This is intended for at least two use cases:
debian-bootstrap.sh+7−2
@@ -123,7 +123,6 @@ apt-get install -y \
123123 nodejs \
124124 npm \
125125 openjdk-8-jdk \
126− protobuf-compiler \
127126 python-mpltoolkits.basemap \
128127 python3-matplotlib \
129128 python3-numpy \
@@ -191,9 +190,15 @@ wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
191190 && apt-get update \
192191 && apt-get install -y llvm-4.0
193192
193+# Install version 3 of the protobuf compiler. (The `protobuf-compiler` package only
194+# supports version 2.)
195+curl -OL https://github.com/google/protobuf/releases/download/v3.3.0/protoc-3.3.0-linux-x86_64.zip \
196+ && sudo unzip -o protoc-3.3.0-linux-x86_64.zip -d /usr bin/protoc \
197+ && rm -f protoc-3.3.0-linux-x84_64.zip
198+
194199# Install the TensorFlow C API.
195200curl https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-1.1.0.tar.gz > libtensorflow.tar.gz \
196− && sudo tar zxf libtensorflow.tar.gz -C /usr/local \
201+ && sudo tar zxf libtensorflow.tar.gz -C /usr \
197202 && rm libtensorflow.tar.gz \
198203 && ldconfig
199204