From e69931170d2b460c30be1f54bb94043c0c001272 Mon Sep 17 00:00:00 2001
From: Vincent Laporte
Date: Wed, 15 Jan 2020 10:00:30 +0100
Subject: [Nix] Update reference to nixpkgs

This brings dune at version 2.1.2
---
 default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'default.nix')

diff --git a/default.nix b/default.nix
index cfadca54d2..3f9d0d56e9 100644
--- a/default.nix
+++ b/default.nix
@@ -42,7 +42,6 @@ stdenv.mkDerivation rec {
   buildInputs = [
     hostname
     python3 time # coq-makefile timing tools
-    dune
   ]
   ++ (with ocamlPackages; [ ocaml findlib num ])
   ++ optionals buildIde [
@@ -67,6 +66,7 @@ stdenv.mkDerivation rec {
     [ jq curl gitFull gnupg ] # Dependencies of the merging script
     ++ (with ocamlPackages; [ merlin ocp-indent ocp-index utop ocamlformat ]) # Dev tools
     ++ [ graphviz ] # Useful for STM debugging
+    ++ [ dune_2 ] # Maybe the next build system
   );
 
   src =
-- 
cgit v1.2.3


From c8d2da3db29ada93ed46a68dd789ccf16f22401c Mon Sep 17 00:00:00 2001
From: Vincent Laporte
Date: Wed, 15 Jan 2020 10:48:47 +0100
Subject: [Nix] Fix setup hook when COQPATH is not bound

---
 default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'default.nix')

diff --git a/default.nix b/default.nix
index 3f9d0d56e9..174e199014 100644
--- a/default.nix
+++ b/default.nix
@@ -111,7 +111,7 @@ stdenv.mkDerivation rec {
   setupHook = writeText "setupHook.sh" "
     addCoqPath () {
       if test -d \"$1/lib/coq/${coq-version}/user-contrib\"; then
-        export COQPATH=\"$COQPATH\${COQPATH:+:}$1/lib/coq/${coq-version}/user-contrib/\"
+        export COQPATH=\"\${COQPATH-}\${COQPATH:+:}$1/lib/coq/${coq-version}/user-contrib/\"
       fi
     }
 
-- 
cgit v1.2.3