From 91fdfb4c29ab627dda3f139605027c55b4d3dc56 Mon Sep 17 00:00:00 2001
From: Min RK <benjaminrk@gmail.com>
Date: Wed, 23 May 2018 15:22:21 +0200
Subject: [PATCH 1/2] prefer R to conda

allows mixing conda and R because R inherits from Python (and thereby conda)
---
 repo2docker/app.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/repo2docker/app.py b/repo2docker/app.py
index 40d6fa83..7534f7c2 100644
--- a/repo2docker/app.py
+++ b/repo2docker/app.py
@@ -66,8 +66,8 @@ class Repo2Docker(Application):
             LegacyBinderDockerBuildPack,
             DockerBuildPack,
             JuliaBuildPack,
-            CondaBuildPack,
             RBuildPack,
+            CondaBuildPack,
             PythonBuildPack,
         ],
         config=True,

From 3092365890dfa751dfb11a3665baa7959a9e8c5e Mon Sep 17 00:00:00 2001
From: Min RK <benjaminrk@gmail.com>
Date: Wed, 23 May 2018 15:52:24 +0200
Subject: [PATCH 2/2] nbrsessionproxy to 0.7

for shiny support!
---
 repo2docker/buildpacks/r.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/repo2docker/buildpacks/r.py b/repo2docker/buildpacks/r.py
index a10a4b53..12650c0c 100644
--- a/repo2docker/buildpacks/r.py
+++ b/repo2docker/buildpacks/r.py
@@ -4,6 +4,7 @@ import datetime
 
 from .python import PythonBuildPack
 
+
 class RBuildPack(PythonBuildPack):
     """
     Setup R for use with a repository
@@ -169,7 +170,7 @@ class RBuildPack(PythonBuildPack):
                 "${NB_USER}",
                 # Install nbrsessionproxy
                 r"""
-                pip install --no-cache-dir nbrsessionproxy==0.6.1 && \
+                pip install --no-cache-dir nbrsessionproxy==0.7.0 && \
                 jupyter serverextension enable nbrsessionproxy --sys-prefix && \
                 jupyter nbextension install --py nbrsessionproxy --sys-prefix && \
                 jupyter nbextension enable --py nbrsessionproxy --sys-prefix