[Backport release-26.05] ocamlPackages.ocsigen-toolkit: 4.2.0 → 4.3.0 (#542498)

pkgs/development/ocaml-modules/ocsigen-start/default.nix

@@ -12,6 +12,7 @@
   eliom,
   resource-pooling,
   ocsigen-ppx-rpc,
+  js_of_ocaml-ppx_deriving_json,
 }:
 
 stdenv.mkDerivation {
@@ -23,7 +24,10 @@ stdenv.mkDerivation {
     findlib
     eliom
   ];
-  buildInputs = [ ocsigen-ppx-rpc ];
+  buildInputs = [
+    ocsigen-ppx-rpc
+    js_of_ocaml-ppx_deriving_json
+  ];
   propagatedBuildInputs = [
     pgocaml_ppx
     safepass

pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix

@@ -1,57 +1,41 @@
 {
-  stdenv,
   lib,
+  buildDunePackage,
   fetchFromGitHub,
-  ocaml,
-  findlib,
-  opaline,
   calendar,
+  cmdliner,
   eliom,
   js_of_ocaml-ppx_deriving_json,
+  ocsigen-ppx-rpc,
 }:
 
-stdenv.mkDerivation rec {
+buildDunePackage (finalAttrs: {
   pname = "ocsigen-toolkit";
-  name = "ocaml${ocaml.version}-${pname}-${version}";
-  version = "4.2.0";
-
-  propagatedBuildInputs = [
-    calendar
-    js_of_ocaml-ppx_deriving_json
-    eliom
-  ];
-  nativeBuildInputs = [
-    ocaml
-    findlib
-    opaline
-    eliom
-  ];
-
-  strictDeps = true;
-
-  installPhase = ''
-    runHook preInstall
-    mkdir -p $OCAMLFIND_DESTDIR
-    export OCAMLPATH=$out/lib/ocaml/${ocaml.version}/site-lib/:$OCAMLPATH
-    make install
-    opaline -prefix $out
-    runHook postInstall
-  '';
+  version = "4.3.0";
 
   src = fetchFromGitHub {
     owner = "ocsigen";
     repo = "ocsigen-toolkit";
-    tag = version;
-    hash = "sha256-wken+5hUewE0Nktl2PY1xMmVveSs8X0ihWD+MK4pzRQ=";
+    tag = finalAttrs.version;
+    hash = "sha256-q6e8pacQ/F2vJeI4IqgyWI68J8qKq1vk3yRpI09BjLU=";
   };
 
+  buildInputs = [
+    cmdliner
+    js_of_ocaml-ppx_deriving_json
+    ocsigen-ppx-rpc
+  ];
+
+  propagatedBuildInputs = [
+    calendar
+    eliom
+  ];
+
   meta = {
     homepage = "http://ocsigen.org/ocsigen-toolkit/";
     description = "User interface widgets for Ocsigen applications";
     license = lib.licenses.lgpl21;
     maintainers = [ lib.maintainers.gal_bolle ];
-    inherit (ocaml.meta) platforms;
-    broken = true;
   };
 
-}
+})