From 784dc4e741babc5d766b04cbc3b869afb7cd8cf2 Mon Sep 17 00:00:00 2001
From: Théo Zimmermann
Date: Mon, 2 Jul 2018 10:42:31 +0200
Subject: Fix default.nix following a package renaming.

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

diff --git a/default.nix b/default.nix
index 91d9636041..af6714e9e8 100644
--- a/default.nix
+++ b/default.nix
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
 
   ] else []) ++ (if lib.inNixShell then [
     ocamlPackages.merlin
-    ocamlPackages.ocpIndent
+    ocamlPackages.ocp-indent
 
     # Dependencies of the merging script
     jq
-- 
cgit v1.2.3


From 3c269d6a79d602fee440b61431b6fba8a8479113 Mon Sep 17 00:00:00 2001
From: Théo Zimmermann
Date: Mon, 2 Jul 2018 11:32:01 +0200
Subject: Adding back ocp-index to default.nix.

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

diff --git a/default.nix b/default.nix
index af6714e9e8..a2645f4fc8 100644
--- a/default.nix
+++ b/default.nix
@@ -72,6 +72,7 @@ stdenv.mkDerivation rec {
   ] else []) ++ (if lib.inNixShell then [
     ocamlPackages.merlin
     ocamlPackages.ocp-indent
+    ocamlPackages.ocp-index
 
     # Dependencies of the merging script
     jq
-- 
cgit v1.2.3