From 9cd9eb77320650f3c15962cbaafc5c579b417131 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
Date: Fri, 11 Sep 2020 15:03:24 +0200
Subject: [PATCH] Update shells

---
 shells/dodona-docs.nix | 12 ++++++++++++
 shells/dodona.nix      |  2 +-
 shells/r.nix           | 30 +++++++++++++++---------------
 3 files changed, 28 insertions(+), 16 deletions(-)
 create mode 100644 shells/dodona-docs.nix

diff --git a/shells/dodona-docs.nix b/shells/dodona-docs.nix
new file mode 100644
index 00000000..2099dc92
--- /dev/null
+++ b/shells/dodona-docs.nix
@@ -0,0 +1,12 @@
+let
+  pkgs = import <nixpkgs> { };
+in
+pkgs.mkShell {
+  buildInputs = with pkgs; [
+    nodejs-12_x
+    yarn
+  ];
+  shellHook = ''
+    export PUPPETEER_EXECUTABLE_PATH="${pkgs.ungoogled-chromium}/bin/chromium"
+  '';
+}
diff --git a/shells/dodona.nix b/shells/dodona.nix
index 5c065df4..f7562372 100644
--- a/shells/dodona.nix
+++ b/shells/dodona.nix
@@ -6,7 +6,7 @@ pkgs.mkShell {
     chromedriver
     libmysqlclient
     nodejs-12_x
-    ruby_2_7
+    ruby
     yarn
     zlib
     (
diff --git a/shells/r.nix b/shells/r.nix
index 13259193..51a1c316 100644
--- a/shells/r.nix
+++ b/shells/r.nix
@@ -1,18 +1,18 @@
 let
   pkgs = import <nixpkgs> { };
 in
-  pkgs.mkShell {
-    buildInputs = [
-      (pkgs.rWrapper.override {
-        packages = with pkgs.rPackages; [
-          base64enc
-          dplyr
-          dslabs
-          jsonlite
-          knitr
-          R6
-          rlang
-        ];
-      })
-    ];
-  }
+pkgs.mkShell {
+  buildInputs = [
+    (pkgs.rWrapper.override {
+      packages = with pkgs.rPackages; [
+        base64enc
+        dplyr
+        dslabs
+        jsonlite
+        knitr
+        R6
+        rlang
+      ];
+    })
+  ];
+}