From c724ced6a8dec770377ef42e922b38021dfe7250 Mon Sep 17 00:00:00 2001 From: Chris Dornan Date: Tue, 16 May 2017 19:06:26 +0100 Subject: [PATCH 01/10] Disable tensorflow pacakges as build failing to locate the C library --- build-constraints.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 83c19b1a..390945ee 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3021,10 +3021,10 @@ packages: - proto-lens-combinators - proto-lens-arbitrary - proto-lens-optparse - - tensorflow - - tensorflow-core-ops + # - tensorflow # blocked on C library + # - tensorflow-core-ops # blocked on C library - tensorflow-opgen - - tensorflow-ops + # - tensorflow-ops # blocked on C library - tensorflow-proto - tensorflow-test From 367c977c6d2919a7919a880fecf71e1ca92fa091 Mon Sep 17 00:00:00 2001 From: Chris Dornan Date: Tue, 16 May 2017 21:46:12 +0100 Subject: [PATCH 02/10] Remove upper bound on lens with active-0.2.0.13 (#2496) Also removed active-0.2.0.12 watchpoint. --- build-constraints.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 390945ee..824b620b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3148,9 +3148,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 @@ -4008,7 +4005,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: From 1efbd80e754784386503b8a392b5b7b35974be5c Mon Sep 17 00:00:00 2001 From: Chris Dornan Date: Wed, 17 May 2017 00:21:03 +0100 Subject: [PATCH 03/10] Disabling clr-inline (#2510) --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 824b620b..ff70045f 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -8,7 +8,7 @@ packages: - clr-marshal - clr-host - threepenny-editors - - clr-inline + # - clr-inline # see https://github.com/fpco/stackage/issues/2510 "Joshua Koike @jano017": - discord-hs From e88f0ca78adf6ba335f6cd3bdeeb3c4dfe0944b7 Mon Sep 17 00:00:00 2001 From: Daishi Nakajima Date: Wed, 17 May 2017 14:01:23 +0900 Subject: [PATCH 04/10] Add yesod-job-queue package --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index ff70045f..a3ee915c 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2589,7 +2589,7 @@ packages: "Daishi Nakajima @nakaji_dayo": - api-field-json-th - # - yesod-job-queue # compilation failure: nakaji-dayo/yesod-job-queue/issues/12 + - yesod-job-queue # "Braden Walters @meoblast001": # - hakyll-sass # compilation failure From dfa21f88e65053a3d02396cd88c0c53d2a5ba1f6 Mon Sep 17 00:00:00 2001 From: Chris Dornan Date: Wed, 17 May 2017 19:04:16 +0100 Subject: [PATCH 05/10] Disable tibetan-utils and release some bounds Bounds released: * matplotlib * base-orphans * semigroups * text-show * io-streams * concurrent-output * optparse-generic --- build-constraints.yaml | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index ff70045f..19162ee3 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -19,8 +19,8 @@ packages: "Richard Cook @rcook": - hidden-char - "Vanessa McHale @vmchale": - - tibetan-utils + "Vanessa McHale @vmchale": [] + # - tibetan-utils # bounds: text-show "Henning Thielemann @thielema": # - accelerate-arithmetic # via accelerate: bounds: base @@ -3112,9 +3112,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 +3124,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 @@ -3168,24 +3159,15 @@ 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 From 4f73bb75b747e2d6b29074dfa468e442c40f453b Mon Sep 17 00:00:00 2001 From: Judah Jacobson Date: Tue, 16 May 2017 13:23:52 -0700 Subject: [PATCH 06/10] Reenable and fix the tensorflow-* packages. Previously we installed libtensorflow into /usr/local/lib which wasn't in the search path. Moving it to /usr/lib fixed the problem. Also changed the script to manually install protoc v3.3.0. The default version of `protobuf-compiler` in Xenial is v2.6.1 which is too old to build `tensorflow-proto`. Verified by building the docker image locally and then running `stack install tensorflow tensorflow-ops ...` from within it. --- build-constraints.yaml | 6 +++--- debian-bootstrap.sh | 9 +++++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 390945ee..83c19b1a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3021,10 +3021,10 @@ packages: - proto-lens-combinators - proto-lens-arbitrary - proto-lens-optparse - # - tensorflow # blocked on C library - # - tensorflow-core-ops # blocked on C library + - tensorflow + - tensorflow-core-ops - tensorflow-opgen - # - tensorflow-ops # blocked on C library + - tensorflow-ops - tensorflow-proto - tensorflow-test diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh index 9e3bffd2..acb74922 100755 --- a/debian-bootstrap.sh +++ b/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 From 7fb612cb8365cf99dc6db9498975bbf64145d088 Mon Sep 17 00:00:00 2001 From: Chris Dornan Date: Thu, 18 May 2017 08:02:32 +0100 Subject: [PATCH 07/10] Disabling matplotlib again --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 19162ee3..422bd0c5 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3171,6 +3171,9 @@ packages: # 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 From 713b3c4625169ea1664f2c1ad123ea31f2e834f8 Mon Sep 17 00:00:00 2001 From: tittoassini Date: Thu, 18 May 2017 10:47:33 +0200 Subject: [PATCH 08/10] Added packages: zm, flat, model. --- build-constraints.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 422bd0c5..b6170ef7 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1,6 +1,11 @@ ghc-major-version: "8.0" # Constraints for brand new builds packages: + "Pasqualino Assini @tittoassini": + - zm + - flat + - model + "Timo Koepke @koepket": - hinterface From dbb13ee5a6cff23565ca21f2973b401b572cdd8f Mon Sep 17 00:00:00 2001 From: Chris Dornan Date: Thu, 18 May 2017 18:44:56 +0100 Subject: [PATCH 09/10] re-eable clr-inline (#2510) --- build-constraints.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 794bf89a..d6c9eff9 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5,7 +5,7 @@ packages: - zm - flat - model - + "Timo Koepke @koepket": - hinterface @@ -13,7 +13,7 @@ packages: - clr-marshal - clr-host - threepenny-editors - # - clr-inline # see https://github.com/fpco/stackage/issues/2510 + - clr-inline # see https://github.com/fpco/stackage/issues/2510 "Joshua Koike @jano017": - discord-hs From fce4ad9b88322ce9483943821e7643c66bbc9af7 Mon Sep 17 00:00:00 2001 From: Chris Dornan Date: Thu, 18 May 2017 19:26:01 +0100 Subject: [PATCH 10/10] Disable clr-inline and tensorflow again see https://github.com/fpco/stackage/issues/2527 and https://github.com/fpco/stackage/issues/2510 --- build-constraints.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index d6c9eff9..208ddd7d 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -13,7 +13,7 @@ packages: - clr-marshal - clr-host - threepenny-editors - - clr-inline # see https://github.com/fpco/stackage/issues/2510 + # - clr-inline # see https://github.com/fpco/stackage/issues/2510 "Joshua Koike @jano017": - discord-hs @@ -3026,10 +3026,10 @@ packages: - proto-lens-combinators - proto-lens-arbitrary - proto-lens-optparse - - tensorflow - - tensorflow-core-ops + # - tensorflow # https://github.com/fpco/stackage/issues/2527 + # - 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