From ce8b6404a84ede830b6387c1b1b493331e900be9 Mon Sep 17 00:00:00 2001
From: James Brock <jamesbrock@gmail.com>
Date: Fri, 28 Feb 2020 01:14:15 +0900
Subject: [PATCH] Restore dependencies in docker/Dockerfile

I think I commented these out. Why did I do that? I don't remember.
They are necessary for building magic.
---
 README.md         | 12 ++++++------
 docker/Dockerfile | 14 +++++++-------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index db747043..ba2ad394 100644
--- a/README.md
+++ b/README.md
@@ -128,8 +128,8 @@ docker run --rm -it -p8888:8888 ihaskell:latest
 
 ## Stack and Docker
 
-IHaskell, being a Jupyter kernel, depends at runtime on a tall pile of software
-provided by, traditionally, `apt`, `pip`, and `npm`.
+IHaskell, being a Jupyter kernel, has a tall pile of compile-time and run-time
+dependencies provided by, traditionally, `apt`, `pip`, and `npm`.
 To develop IHaskell, we want to be able to isolate and control all of the
 dependencies. We can use
 [Stack's Docker integration](https://docs.haskellstack.org/en/stable/docker_integration/)
@@ -182,15 +182,15 @@ stack --docker exec pip3 -- install jupyterlab
 stack --docker exec bash -- -c 'cd ihaskell_labextension;npm install;npm run build;jupyter labextension link .'
 ```
 
-Run the Jupyter notebook, with security disabled for testing.
+Run the Jupyter notebook, with security disabled for testing, listening on all interfaces.
 
 ```bash
-stack --docker exec jupyter -- notebook --NotebookApp.token='' notebooks
+stack --docker exec jupyter -- notebook --NotebookApp.token='' --no-browser --LabApp.ip=0.0.0.0 notebooks
 ```
 
-Run JupyterLab (if you installed it), with security disabled for testing.
+Run JupyterLab (if you installed it), with security disabled for testing, listening on all interfaces.
 ```bash
-stack --docker exec jupyter -- lab --NotebookApp.token='' notebooks
+stack --docker exec jupyter -- lab --NotebookApp.token='' --no-browser --LabApp.ip=0.0.0.0 notebooks
 ```
 Everything in Stackage can be installed by `stack --docker install`.
 
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 1e3dc4ba..ab7c7556 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -30,13 +30,13 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     libtinfo-dev \
     libzmq3-dev \
     libpango1.0-dev \
-##
-## IHaskell.Display dependencies
-#    libmagic-dev \
-#    libcairo2-dev \
-#    libblas-dev \
-#    liblapack-dev \
-#    g++ \
+#
+# IHaskell.Display dependencies
+    libmagic-dev \
+    libcairo2-dev \
+    libblas-dev \
+    liblapack-dev \
+    g++ \
 #
 # Required for building ihaskell_labextension
     npm \