Updated version 8.9.0 from 'upstream/8.9.0'

with Debian dir 81a4f85bc45e59aa1eadb4797f0eb0b8039efb63

1 files changed, 6 insertions, 4 deletions

diff --git a/default.nix b/default.nix
index a64d8120..12ab470d 100644
--- a/default.nix
+++ b/default.nix
@@ -61,8 +61,9 @@ stdenv.mkDerivation rec {
     optional (!versionAtLeast ocaml.version "4.07") ncurses
     ++ [ ocamlPackages.ounit rsync which ]
   )
-  ++ optionals shell (with ocamlPackages;
-    [ merlin ocp-indent ocp-index ] # Dev tools
+  ++ optionals shell (
+    [ jq curl git gnupg ] # Dependencies of the merging script
+    ++ (with ocamlPackages; [ merlin ocp-indent ocp-index ]) # Dev tools
   );
 
   src =
@@ -74,14 +75,15 @@ stdenv.mkDerivation rec {
 
   prefixKey = "-prefix ";
 
-  buildFlags = [ "world" "byte" ] ++ optional buildDoc "sphinx";
+  buildFlags = [ "world" "byte" ] ++ optional buildDoc "doc-html";
 
   installTargets =
-    [ "install" "install-byte" ] ++ optional buildDoc "install-doc-sphinx";
+    [ "install" "install-byte" ] ++ optional buildDoc "install-doc-html";
 
   inherit doInstallCheck;
 
   preInstallCheck = ''
+    patchShebangs dev/tools/
     patchShebangs tools/
     patchShebangs test-suite/
   '';