Merge branch 'master' into nightly

build-constraints.yaml

@@ -1,6 +1,11 @@
 ghc-major-version: "8.0"
 # Constraints for brand new builds
 packages:
+    "Pasqualino Assini <tittoassini@gmail.com> @tittoassini":
+        - zm
+        - flat
+        - model
+
     "Timo Koepke <timo.koepke@gmail.com> @koepket":
         - hinterface
 
@@ -8,7 +13,7 @@ packages:
         - clr-marshal
         - clr-host
         - threepenny-editors
-        - clr-inline
+      # - clr-inline  # see https://github.com/fpco/stackage/issues/2510
 
     "Joshua Koike <jkoike2013@gmail.com> @jano017":
         - discord-hs
@@ -19,8 +24,8 @@ packages:
     "Richard Cook <rcook@rcook.org> @rcook":
         - hidden-char
 
-    "Vanessa McHale <tmchale@wisc.edu> @vmchale":
+    "Vanessa McHale <tmchale@wisc.edu> @vmchale": []
-        - tibetan-utils
+        # - tibetan-utils # bounds: text-show
 
     "Henning Thielemann <stackage@henning-thielemann.de> @thielema":
         # - accelerate-arithmetic # via accelerate: bounds: base
@@ -2589,7 +2594,7 @@ packages:
 
     "Daishi Nakajima <nakaji.dayo@gmail.com> @nakaji_dayo":
         - api-field-json-th
-        # - yesod-job-queue # compilation failure: nakaji-dayo/yesod-job-queue/issues/12
+        - yesod-job-queue
 
     # "Braden Walters <vc@braden-walters.info> @meoblast001":
         # - hakyll-sass # compilation failure
@@ -3021,10 +3026,10 @@ packages:
         - proto-lens-combinators
         - proto-lens-arbitrary
         - proto-lens-optparse
-        - tensorflow
+        # - tensorflow          # https://github.com/fpco/stackage/issues/2527
-        - tensorflow-core-ops
+        # - tensorflow-core-ops # https://github.com/fpco/stackage/issues/2527
         - tensorflow-opgen
-        - tensorflow-ops
+        # - tensorflow-ops      # https://github.com/fpco/stackage/issues/2527
         - tensorflow-proto
         - tensorflow-test
 
@@ -3112,9 +3117,6 @@ packages:
         # https://github.com/fpco/stackage/issues/2345
         - syb < 0.7
 
-        # https://github.com/fpco/stackage/issues/2365
-        - matplotlib < 0.4.1 # still an issue with 0.4.3
-
         # https://github.com/fpco/stackage/issues/2378
         - errors < 2.2.0
 
@@ -3127,12 +3129,6 @@ packages:
         # https://github.com/fpco/stackage/issues/2433
         - hlint < 2
 
-        # https://github.com/fpco/stackage/issues/2436
-        - base-orphans < 0.6
-        - semigroups < 0.18.3
-        # https://github.com/fpco/stackage/issues/2463
-        - text-show < 3.6
-
         # https://github.com/fpco/stackage/issues/2439
         - persistent < 2.7.0
 
@@ -3148,9 +3144,6 @@ packages:
         # https://github.com/fpco/stackage/issues/2464
         - traverse-with-class < 1.0.0.0
 
-        # https://github.com/diagrams/active/issues/20
-        - lens < 4.15.2
-
         # https://github.com/fpco/stackage/issues/2477
         - intervals < 0.8
 
@@ -3171,27 +3164,21 @@ packages:
         - websockets-simple < 0.0.2.1
         - websockets-rpc < 0.4.1
 
-        # https://github.com/fpco/stackage/issues/2499
-        - io-streams < 1.4.0.0
-
         # https://github.com/fpco/stackage/issues/2504
         - statistics < 0.14
 
         # https://github.com/fpco/stackage/issues/2505
         - one-liner < 0.9
 
-        # https://github.com/fpco/stackage/issues/2507
-        - concurrent-output < 1.8
-
         # https://github.com/fpco/stackage/issues/2513
         - hsyslog < 5
 
-        # https://github.com/fpco/stackage/issues/2514
-        - optparse-generic < 1.2
-
         # https://github.com/fpco/stackage/issues/2516
         - ghc-typelits-knownnat <0.3
 
+        # https://github.com/fpco/stackage/issues/2365
+        - matplotlib < 0.4.1 # still an issue with 0.4.5
+
 # end of packages
 
 # Package flags are applied to individual packages, and override the values of
@@ -4008,7 +3995,6 @@ tell-me-when-its-released:
 - req-0.2.0 # Remove from expected-test-failures https://github.com/mrkkrp/req/issues/14#issuecomment-287562784
 - vivid-0.2.0.5 # Re-enable package (disabed per MonadRandom < 0.5) https://github.com/fpco/stackage/issues/2180
 - lens-4.15.2 # Test failures in lens-4.15.1 https://github.com/fpco/stackage/issues/2496
-- active-0.2.0.12 # Will likely contain fix for the lens-4.15.2 https://github.com/fpco/stackage/issues/2496
 
 # Packages which should be hidden after registering, to avoid module name
 # conflicts. This is intended for at least two use cases:

debian-bootstrap.sh

@@ -123,7 +123,6 @@ apt-get install -y \
     nodejs \
     npm \
     openjdk-8-jdk \
-    protobuf-compiler \
     python-mpltoolkits.basemap \
     python3-matplotlib \
     python3-numpy \
@@ -191,9 +190,15 @@ wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
     && apt-get update \
     && apt-get install -y llvm-4.0
 
+# Install version 3 of the protobuf compiler.  (The `protobuf-compiler` package only
+# supports version 2.)
+curl -OL https://github.com/google/protobuf/releases/download/v3.3.0/protoc-3.3.0-linux-x86_64.zip \
+  && sudo unzip -o protoc-3.3.0-linux-x86_64.zip -d /usr bin/protoc \
+  && rm -f protoc-3.3.0-linux-x84_64.zip
+
 # 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 \
+    && sudo tar zxf libtensorflow.tar.gz -C /usr \
     && rm libtensorflow.tar.gz \
     && ldconfig