From e251feab80d0adaa455547ae8b71c07889c4b4f8 Mon Sep 17 00:00:00 2001
From: robinlovelace <rob00x@gmail.com>
Date: Tue, 1 Oct 2024 12:01:43 +0100
Subject: [PATCH] Install deps for https://github.com/acteng/netgen/issues/24

---
 binder/Dockerfile |  2 +-
 rust/Dockerfile   | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/binder/Dockerfile b/binder/Dockerfile
index 2ee4fbe..a420a1a 100644
--- a/binder/Dockerfile
+++ b/binder/Dockerfile
@@ -1,2 +1,2 @@
 FROM rocker/binder:4.3.1
-RUN R -e "options(repos = c(geocompr = 'https://geocompr.r-universe.dev', CRAN = 'https://cloud.r-project.org')); install.packages('geocompkg')"
+RUN R -e "remotes::install_github('geocompx/geocompkg', upgrade = TRUE)"
diff --git a/rust/Dockerfile b/rust/Dockerfile
index 42a9408..feddab0 100644
--- a/rust/Dockerfile
+++ b/rust/Dockerfile
@@ -1,7 +1,10 @@
 FROM ghcr.io/geocompx/docker:suggests
-# RUN --mount=type=secret,id=GITHUB_PAT \
-#   echo "GITHUB_PAT=$(cat /run/secrets/GITHUB_PAT)" > ~/.Renviron
-# RUN R -e "remotes::install_github('geocompr/geocompkg', upgrade = TRUE, dependencies = TRUE, force = TRUE)"
+# od2net R package: https://urban-analytics-technology-platform.github.io/od2net/r/
+RUN R -e "remotes::install_github('Urban-Analytics-Technology-Platform/od2net', subdir = 'r', upgrade = TRUE, dependencies = TRUE)"
+# acteng/netgen:
+RUN R -e "remotes::install_github('acteng/netgen', upgrade = TRUE, dependencies = TRUE)"
+# robinlovelace/simodels:
+RUN R -e "remotes::install_github('robinlovelace/simodels', upgrade = TRUE, dependencies = TRUE)"
 
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y \
   && export PATH="$HOME/.cargo/bin:$PATH" \
@@ -19,8 +22,5 @@ RUN curl https://sh.rustup.rs -sSf | sh -s -- -y \
 
 # RUN R -e "remotes::install_github('geocompx/geocompkg', upgrade = TRUE, dependencies = TRUE)"
 RUN chown -Rv rstudio /home/rstudio/geocompr
-# Set RStudio preferences
-# No inline code:
-RUN echo '{' >> /etc/rstudio/rstudio-prefs.json
-RUN echo '    "rmd_chunk_output_inline": false' >> /etc/rstudio/rstudio-prefs.json
-RUN echo '}' >> /etc/rstudio/rstudio-prefs.json
+
+