From 7bc87d81ff14e27f91ff5a7a3d807436fa04ca5b Mon Sep 17 00:00:00 2001 From: Josef Eisl Date: Wed, 20 Sep 2017 14:17:12 +0200 Subject: [PATCH 1/2] Revert "R: install tidyjson from github" This reverts commit 0f03592d1dedcecca1c5c9ce18ecbc977f4a3387. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 01a262c..209270e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -42,7 +42,7 @@ ENV PATH=/home/docker/usr/local/texlive/current/bin/x86_64-linux:$PATH \ # install R packages COPY ./R.packages /tmp/ -RUN Rscript -e 'p <- readLines("/tmp/R.packages"); install.packages(p, repos="http://cran.rstudio.com/", clean=TRUE); for(x in p) { if (!require(x,character.only = TRUE)) {quit(1)}};devtools::install_github("jeremystan/tidyjson")' +RUN Rscript -e 'p <- readLines("/tmp/R.packages"); install.packages(p, repos="http://cran.rstudio.com/", clean=TRUE); for(x in p) { if (!require(x,character.only = TRUE)) {quit(1)}}' # install texlive packages COPY ./texlive.packages /tmp/ From 1398205f49017d92ab72241813576c18989e1f82 Mon Sep 17 00:00:00 2001 From: Josef Eisl Date: Wed, 20 Sep 2017 14:17:14 +0200 Subject: [PATCH 2/2] Revert "R: remove tidyjson from CRAN download list" This reverts commit 5e49fea8e6f066bf26876e48752c055bb2a1ad5b. --- R.packages | 1 + 1 file changed, 1 insertion(+) diff --git a/R.packages b/R.packages index ee2da5f..9a3ced7 100644 --- a/R.packages +++ b/R.packages @@ -1,6 +1,7 @@ devtools knitr RColorBrewer +tidyjson tidyverse tikzDevice pdftools