From df6758ff32d0772338328f2fa8c23ec6ae5fbfbc Mon Sep 17 00:00:00 2001
From: Joachim Breitner <mail@joachim-breitner.de>
Date: Mon, 25 Mar 2019 23:06:51 +0100
Subject: [PATCH 1/2] Switch `dev` to master (PR got merged)

---
 default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/default.nix b/default.nix
index b06b074fa86..60691f3ee33 100644
--- a/default.nix
+++ b/default.nix
@@ -35,8 +35,8 @@ let real-dvm =
     then
       let dev = builtins.fetchGit {
         url = "ssh://git@github.com/dfinity-lab/dev";
-        ref = "joachim/more-logging";
-        rev = "70d3b158611c96fe5e82b66d4a62c9d02bcd5345";
+        ref = "master";
+        rev = "55724569782676b1e08fdce265b7daddaeaec860";
       }; in
       (import dev {}).dvm
     else null

From 31e7ab67145b223766d5ae0d8bc017b37be76046 Mon Sep 17 00:00:00 2001
From: Joachim Breitner <mail@joachim-breitner.de>
Date: Mon, 25 Mar 2019 23:18:32 +0100
Subject: [PATCH 2/2] nix: Tighten file-includes whitelist

---
 default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/default.nix b/default.nix
index 60691f3ee33..ac2abd61328 100644
--- a/default.nix
+++ b/default.nix
@@ -95,9 +95,10 @@ rec {
       "test/"
       "test/.*Makefile.*"
       "test/quick.mk"
-      "test/(run.*|fail)/"
-      "test/(run.*|fail)/.*.as"
-      "test/(run.*|fail)/ok/.*"
+      "test/(fail|run|run-dfinity)/"
+      "test/(fail|run|run-dfinity)/.*.as"
+      "test/(fail|run|run-dfinity)/ok/"
+      "test/(fail|run|run-dfinity)/ok/.*.ok"
       "test/.*.sh"
       "samples/"
       "samples/.*"
@@ -154,9 +155,10 @@ rec {
       "test/"
       "test/.*Makefile.*"
       "test/quick.mk"
-      "test/(run.*|fail)/"
-      "test/(run.*|fail)/.*.as"
-      "test/(run.*|fail)/ok/.*"
+      "test/(fail|run|run-dfinity)/"
+      "test/(fail|run|run-dfinity)/.*.as"
+      "test/(fail|run|run-dfinity)/ok/"
+      "test/(fail|run|run-dfinity)/ok/.*.ok"
       "test/.*.sh"
       "samples/"
       "samples/.*"