Merge pull request #42630 from vbgl/ocaml-ocp-index-1.1.6

ocamlPackages.ocp-index: 1.1.5 -> 1.1.6

7 files changed, 22 insertions, 119 deletions

diff --git a/pkgs/development/ocaml-modules/cmdliner/0.9.nix b/pkgs/development/ocaml-modules/cmdliner/0.9.nix
deleted file mode 100644
index 345d56d21707..000000000000
--- a/pkgs/development/ocaml-modules/cmdliner/0.9.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opaline }:
-
-let
-  pname = "cmdliner";
-in
-
-assert stdenv.lib.versionAtLeast ocaml.version "3.12";
-
-stdenv.mkDerivation rec {
-
-  name = "ocaml-${pname}-${version}";
-  version = "0.9.8";
-
-  src = fetchurl {
-    url = "http://erratique.ch/software/${pname}/releases/${pname}-${version}.tbz";
-    sha256 = "0hdxlkgiwjml9dpaa80282a8350if7mc1m6yz2mrd7gci3fszykx";
-  };
-
-  unpackCmd = "tar xjf $src";
-  nativeBuildInputs = [ ocamlbuild opaline ];
-  buildInputs = [ ocaml findlib ];
-
-  configurePhase = "ocaml pkg/git.ml";
-  buildPhase     = "ocaml pkg/build.ml native=true native-dynlink=true";
-  installPhase   = "opaline -libdir $OCAMLFIND_DESTDIR";
-
-  meta = with stdenv.lib; {
-    homepage = http://erratique.ch/software/cmdliner;
-    description = "An OCaml module for the declarative definition of command line interfaces";
-    license = licenses.bsd3;
-    platforms = ocaml.meta.platforms or [];
-    maintainers = [ maintainers.vbgl ];
-  };
-}
diff --git a/pkgs/development/tools/ocaml/ocaml-top/default.nix b/pkgs/development/tools/ocaml/ocaml-top/default.nix
index 3cf70d66ddbd..e7d8b163420c 100644
--- a/pkgs/development/tools/ocaml/ocaml-top/default.nix
+++ b/pkgs/development/tools/ocaml/ocaml-top/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ ncurses jbuilder ]
-  ++ (with ocamlPackages; [ ocaml ocpBuild findlib lablgtk ocp-index ]);
+  ++ (with ocamlPackages; [ ocaml ocp-build findlib lablgtk ocp-index ]);
 
   configurePhase = ''
     export TERM=xterm
diff --git a/pkgs/development/tools/ocaml/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix
index 8da0f781a8b2..0ed7312660a1 100644
--- a/pkgs/development/tools/ocaml/ocp-build/default.nix
+++ b/pkgs/development/tools/ocaml/ocp-build/default.nix
@@ -1,11 +1,10 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, ncurses, buildOcaml }:
+{ stdenv, fetchFromGitHub, ocaml, findlib, ncurses }:
 let
   version = "1.99.19-beta";
 in
-buildOcaml {
+stdenv.mkDerivation rec {
 
-  name = "ocp-build";
-  inherit version;
+  name = "ocaml${ocaml.version}-ocp-build-${version}";
 
   src = fetchFromGitHub {
     owner = "OCamlPro";
@@ -14,7 +13,7 @@ buildOcaml {
     sha256 = "162k5l0cxyqanxlml5v8mqapdq5qbqc9m4b8wdjq7mf523b3h2zj";
   };
 
-  buildInputs = [ ocaml ];
+  buildInputs = [ ocaml findlib ];
   propagatedBuildInputs = [ ncurses ];
   preInstall = "mkdir -p $out/bin";
   preConfigure = ''
diff --git a/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix b/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix
deleted file mode 100644
index bdc75766bbf7..000000000000
--- a/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, fetchzip, ocaml, findlib, ocpBuild, opam, cmdliner }:
-
-let inherit (stdenv.lib) getVersion versionAtLeast; in
-
-assert versionAtLeast (getVersion ocaml) "3.12.1";
-assert versionAtLeast (getVersion ocpBuild) "1.99.6-beta";
-assert versionAtLeast "0.9.8" (getVersion cmdliner);
-
-stdenv.mkDerivation {
-
-  name = "ocp-indent-1.5.2";
-
-  src = fetchzip {
-    url = "https://github.com/OCamlPro/ocp-indent/archive/1.5.2.tar.gz";
-    sha256 = "0ynv2yhm7akpvqp72pdabhddwr352s1k85q8m1khsvspgg1mkiqz";
-  };
-
-  nativeBuildInputs = [ ocpBuild opam ];
-
-  buildInputs = [ ocaml findlib cmdliner ];
-
-  createFindlibDestdir = true;
-
-  preConfigure = "patchShebangs ./install.sh";
-
-  postInstall = ''
-    mv $out/lib/{ocp-indent,ocaml/${getVersion ocaml}/site-lib/}
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = http://typerex.ocamlpro.com/ocp-indent.html;
-    description = "A customizable tool to indent OCaml code";
-    license = licenses.gpl3;
-    platforms = ocaml.meta.platforms or [];
-    maintainers = [ maintainers.jirkamarsik ];
-  };
-}
diff --git a/pkgs/development/tools/ocaml/ocp-indent/default.nix b/pkgs/development/tools/ocaml/ocp-indent/default.nix
index d11278f4d29c..43898d250d91 100644
--- a/pkgs/development/tools/ocaml/ocp-indent/default.nix
+++ b/pkgs/development/tools/ocaml/ocp-indent/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchzip, ocaml, findlib, ocpBuild, opam, cmdliner }:
+{ stdenv, fetchzip, ocaml, findlib, jbuilder, ocp-build, cmdliner }:
 
 let inherit (stdenv.lib) getVersion versionAtLeast; in
 
 assert versionAtLeast (getVersion ocaml) "3.12.1";
 assert versionAtLeast (getVersion cmdliner) "1.0.0";
-assert versionAtLeast (getVersion ocpBuild) "1.99.6-beta";
+assert versionAtLeast (getVersion ocp-build) "1.99.6-beta";
 
 stdenv.mkDerivation rec {
 
-  name = "ocp-indent-${version}";
+  name = "ocaml${ocaml.version}-ocp-indent-${version}";
   version = "1.6.1";
 
   src = fetchzip {
@@ -16,16 +16,10 @@ stdenv.mkDerivation rec {
     sha256 = "0rcaa11mjqka032g94wgw9llqpflyk3ywr3lr6jyxbh1rjvnipnw";
   };
 
-  nativeBuildInputs = [ ocpBuild opam ];
+  nativeBuildInputs = [ ocp-build ];
   buildInputs = [ ocaml findlib cmdliner ];
 
-  createFindlibDestdir = true;
-
-  preConfigure = "patchShebangs ./install.sh";
-
-  postInstall = ''
-    mv $out/lib/{ocp-indent,ocaml/${getVersion ocaml}/site-lib/}
-  '';
+  inherit (jbuilder) installPhase;
 
   meta = with stdenv.lib; {
     homepage = http://typerex.ocamlpro.com/ocp-indent.html;
diff --git a/pkgs/development/tools/ocaml/ocp-index/default.nix b/pkgs/development/tools/ocaml/ocp-index/default.nix
index 6b865e9709a6..0a63ae805342 100644
--- a/pkgs/development/tools/ocaml/ocp-index/default.nix
+++ b/pkgs/development/tools/ocaml/ocp-index/default.nix
@@ -1,39 +1,23 @@
-{ stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, ocpBuild, ocpIndent, opam, cmdliner, ncurses, re, lambdaTerm, libev }:
+{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, ocp-build, ocp-indent, cmdliner, re }:
 
-let inherit (stdenv.lib) getVersion versionAtLeast optional; in
+stdenv.mkDerivation rec {
 
-assert versionAtLeast (getVersion ocaml) "4";
-assert versionAtLeast (getVersion ocpBuild) "1.99.13-beta";
-assert versionAtLeast (getVersion ocpIndent) "1.4.2";
-
-let
-  version = "1.1.5";
-in
-
-stdenv.mkDerivation {
-
-  name = "ocp-index-${version}";
+  version = "1.1.6";
+  name = "ocaml${ocaml.version}-ocp-index-${version}";
 
   src = fetchFromGitHub {
     owner = "OCamlPro";
     repo = "ocp-index";
     rev = version;
-    sha256 = "0gir0fm8mq609371kmwpsqfvpfx2b26ax3f9rg5fjf5r0bjk9pqd";
+    sha256 = "0p367aphz9w71qbm3y47qwhgqmyai28l96i1ifb6kg7awph5qmj3";
   };
 
-  patches = [ (fetchpatch {
-    url = https://github.com/OCamlPro/ocp-index/commit/618872a0980d077857a63d502eadbbf0d1b05c0f.diff;
-    sha256 = "07snnydczkzapradh1c22ggv9vaff67nc36pi3218azb87mb1p7z";
-  }) ];
-
-  buildInputs = [ ocaml findlib ocpBuild opam cmdliner ncurses re libev ]
-  ++ optional (versionAtLeast (getVersion lambdaTerm) "1.7") lambdaTerm;
-  propagatedBuildInputs = [ ocpIndent ];
+  buildInputs = [ ocaml findlib jbuilder ocp-build cmdliner re ];
+  propagatedBuildInputs = [ ocp-indent ];
 
-  createFindlibDestdir = true;
+  buildPhase = "jbuilder build -p ocp-index";
 
-  preBuild = "export TERM=xterm";
-  postInstall = "mv $out/lib/{ocp-index,ocaml/${getVersion ocaml}/site-lib/}";
+  inherit (jbuilder) installPhase;
 
   meta = {
     homepage = http://typerex.ocamlpro.com/ocp-index.html;
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 6ca593f349fb..87e1cf907f52 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -139,8 +139,6 @@ let
 
     cil = callPackage ../development/ocaml-modules/cil { };
 
-    cmdliner_0_9 = callPackage ../development/ocaml-modules/cmdliner/0.9.nix { };
-
     cmdliner = callPackage ../development/ocaml-modules/cmdliner { };
 
     cohttp_p4 = callPackage ../development/ocaml-modules/cohttp/0.19.3.nix {
@@ -494,12 +492,11 @@ let
 
     ocf = callPackage ../development/ocaml-modules/ocf { };
 
-    ocpBuild = callPackage ../development/tools/ocaml/ocp-build { };
+    ocp-build = callPackage ../development/tools/ocaml/ocp-build { };
 
-    ocpIndent = callPackage ../development/tools/ocaml/ocp-indent { };
-    ocpIndent_1_5_2 = callPackage ../development/tools/ocaml/ocp-indent/1.5.2.nix { cmdliner = cmdliner_0_9; };
+    ocp-indent = callPackage ../development/tools/ocaml/ocp-indent { };
 
-    ocp-index = callPackage ../development/tools/ocaml/ocp-index { ocpIndent = ocpIndent_1_5_2; };
+    ocp-index = callPackage ../development/tools/ocaml/ocp-index { };
 
     ocp-ocamlres = callPackage ../development/ocaml-modules/ocp-ocamlres { };