From 9ebf44d84754adc5b64fcf612c6816c02c80462d Mon Sep 17 00:00:00 2001 From: Benjamin Barenblat Date: Sat, 2 Feb 2019 19:29:23 -0500 Subject: Imported Upstream version 8.9.0 --- default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'default.nix') 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/ ''; -- cgit v1.2.3