on master help sign in
Merge branch 'master' into nightly
307541fChris Dornan
build-constraints.yaml+15−29
@@ -1,6 +1,11 @@
1ghc-major-version: "8.0"
1ghc-major-version: "8.0"
2# Constraints for brand new builds
2# Constraints for brand new builds
3packages:
3packages:
4+ "Pasqualino Assini <tittoassini@gmail.com> @tittoassini":
5+ - zm
6+ - flat
7+ - model
8+
4 "Timo Koepke <timo.koepke@gmail.com> @koepket":
9 "Timo Koepke <timo.koepke@gmail.com> @koepket":
5 - hinterface
10 - hinterface
6
11
@@ -8,7 +13,7 @@ packages:
8 - clr-marshal
13 - clr-marshal
9 - clr-host
14 - clr-host
10 - threepenny-editors
15 - threepenny-editors
11− - clr-inline
16+ # - clr-inline # see https://github.com/fpco/stackage/issues/2510
12
17
13 "Joshua Koike <jkoike2013@gmail.com> @jano017":
18 "Joshua Koike <jkoike2013@gmail.com> @jano017":
14 - discord-hs
19 - discord-hs
@@ -19,8 +24,8 @@ packages:
19 "Richard Cook <rcook@rcook.org> @rcook":
24 "Richard Cook <rcook@rcook.org> @rcook":
20 - hidden-char
25 - hidden-char
21
26
22− "Vanessa McHale <tmchale@wisc.edu> @vmchale":
27+ "Vanessa McHale <tmchale@wisc.edu> @vmchale": []
23− - tibetan-utils
28+ # - tibetan-utils # bounds: text-show
24
29
25 "Henning Thielemann <stackage@henning-thielemann.de> @thielema":
30 "Henning Thielemann <stackage@henning-thielemann.de> @thielema":
26 # - accelerate-arithmetic # via accelerate: bounds: base
31 # - accelerate-arithmetic # via accelerate: bounds: base
@@ -2589,7 +2594,7 @@ packages:
2589
2594
2590 "Daishi Nakajima <nakaji.dayo@gmail.com> @nakaji_dayo":
2595 "Daishi Nakajima <nakaji.dayo@gmail.com> @nakaji_dayo":
2591 - api-field-json-th
2596 - api-field-json-th
2592− # - yesod-job-queue # compilation failure: nakaji-dayo/yesod-job-queue/issues/12
2597+ - yesod-job-queue
2593
2598
2594 # "Braden Walters <vc@braden-walters.info> @meoblast001":
2599 # "Braden Walters <vc@braden-walters.info> @meoblast001":
2595 # - hakyll-sass # compilation failure
2600 # - hakyll-sass # compilation failure
@@ -3021,10 +3026,10 @@ packages:
3021 - proto-lens-combinators
3026 - proto-lens-combinators
3022 - proto-lens-arbitrary
3027 - proto-lens-arbitrary
3023 - proto-lens-optparse
3028 - proto-lens-optparse
3024− - tensorflow
3029+ # - tensorflow # https://github.com/fpco/stackage/issues/2527
3025− - tensorflow-core-ops
3030+ # - tensorflow-core-ops # https://github.com/fpco/stackage/issues/2527
3026 - tensorflow-opgen
3031 - tensorflow-opgen
3027− - tensorflow-ops
3032+ # - tensorflow-ops # https://github.com/fpco/stackage/issues/2527
3028 - tensorflow-proto
3033 - tensorflow-proto
3029 - tensorflow-test
3034 - tensorflow-test
3030
3035
@@ -3112,9 +3117,6 @@ packages:
3112 # https://github.com/fpco/stackage/issues/2345
3117 # https://github.com/fpco/stackage/issues/2345
3113 - syb < 0.7
3118 - syb < 0.7
3114
3119
3115− # https://github.com/fpco/stackage/issues/2365
3116− - matplotlib < 0.4.1 # still an issue with 0.4.3
3117−
3118 # https://github.com/fpco/stackage/issues/2378
3120 # https://github.com/fpco/stackage/issues/2378
3119 - errors < 2.2.0
3121 - errors < 2.2.0
3120
3122
@@ -3127,12 +3129,6 @@ packages:
3127 # https://github.com/fpco/stackage/issues/2433
3129 # https://github.com/fpco/stackage/issues/2433
3128 - hlint < 2
3130 - hlint < 2
3129
3131
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−
3136 # https://github.com/fpco/stackage/issues/2439
3132 # https://github.com/fpco/stackage/issues/2439
3137 - persistent < 2.7.0
3133 - persistent < 2.7.0
3138
3134
@@ -3148,9 +3144,6 @@ packages:
3148 # https://github.com/fpco/stackage/issues/2464
3144 # https://github.com/fpco/stackage/issues/2464
3149 - traverse-with-class < 1.0.0.0
3145 - traverse-with-class < 1.0.0.0
3150
3146
3151− # https://github.com/diagrams/active/issues/20
3152− - lens < 4.15.2
3153−
3154 # https://github.com/fpco/stackage/issues/2477
3147 # https://github.com/fpco/stackage/issues/2477
3155 - intervals < 0.8
3148 - intervals < 0.8
3156
3149
@@ -3171,27 +3164,21 @@ packages:
3171 - websockets-simple < 0.0.2.1
3164 - websockets-simple < 0.0.2.1
3172 - websockets-rpc < 0.4.1
3165 - websockets-rpc < 0.4.1
3173
3166
3174− # https://github.com/fpco/stackage/issues/2499
3175− - io-streams < 1.4.0.0
3176−
3177 # https://github.com/fpco/stackage/issues/2504
3167 # https://github.com/fpco/stackage/issues/2504
3178 - statistics < 0.14
3168 - statistics < 0.14
3179
3169
3180 # https://github.com/fpco/stackage/issues/2505
3170 # https://github.com/fpco/stackage/issues/2505
3181 - one-liner < 0.9
3171 - one-liner < 0.9
3182
3172
3183− # https://github.com/fpco/stackage/issues/2507
3184− - concurrent-output < 1.8
3185−
3186 # https://github.com/fpco/stackage/issues/2513
3173 # https://github.com/fpco/stackage/issues/2513
3187 - hsyslog < 5
3174 - hsyslog < 5
3188
3175
3189− # https://github.com/fpco/stackage/issues/2514
3190− - optparse-generic < 1.2
3191−
3192 # https://github.com/fpco/stackage/issues/2516
3176 # https://github.com/fpco/stackage/issues/2516
3193 - ghc-typelits-knownnat <0.3
3177 - ghc-typelits-knownnat <0.3
3194
3178
3179+ # https://github.com/fpco/stackage/issues/2365
3180+ - matplotlib < 0.4.1 # still an issue with 0.4.5
3181+
3195# end of packages
3182# end of packages
3196
3183
3197# Package flags are applied to individual packages, and override the values of
3184# Package flags are applied to individual packages, and override the values of
@@ -4008,7 +3995,6 @@ tell-me-when-its-released:
4008- req-0.2.0 # Remove from expected-test-failures https://github.com/mrkkrp/req/issues/14#issuecomment-287562784
3995- req-0.2.0 # Remove from expected-test-failures https://github.com/mrkkrp/req/issues/14#issuecomment-287562784
4009- vivid-0.2.0.5 # Re-enable package (disabed per MonadRandom < 0.5) https://github.com/fpco/stackage/issues/2180
3996- vivid-0.2.0.5 # Re-enable package (disabed per MonadRandom < 0.5) https://github.com/fpco/stackage/issues/2180
4010- lens-4.15.2 # Test failures in lens-4.15.1 https://github.com/fpco/stackage/issues/2496
3997- 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
4012
3998
4013# Packages which should be hidden after registering, to avoid module name
3999# Packages which should be hidden after registering, to avoid module name
4014# conflicts. This is intended for at least two use cases:
4000# conflicts. This is intended for at least two use cases:
debian-bootstrap.sh+7−2
@@ -123,7 +123,6 @@ apt-get install -y \
123 nodejs \
123 nodejs \
124 npm \
124 npm \
125 openjdk-8-jdk \
125 openjdk-8-jdk \
126− protobuf-compiler \
127 python-mpltoolkits.basemap \
126 python-mpltoolkits.basemap \
128 python3-matplotlib \
127 python3-matplotlib \
129 python3-numpy \
128 python3-numpy \
@@ -191,9 +190,15 @@ wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
191 && apt-get update \
190 && apt-get update \
192 && apt-get install -y llvm-4.0
191 && apt-get install -y llvm-4.0
193
192
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+
194# Install the TensorFlow C API.
199# Install the TensorFlow C API.
195curl https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-1.1.0.tar.gz > libtensorflow.tar.gz \
200curl 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 \
197 && rm libtensorflow.tar.gz \
202 && rm libtensorflow.tar.gz \
198 && ldconfig
203 && ldconfig
199
204