ocamlPackages.opium: 0.18.0 → 0.20.0

pkgs/development/ocaml-modules/opium/default.nix

@@ -1,32 +1,62 @@
 { buildDunePackage
-
-, ppx_sexp_conv
-, ppx_fields_conv
-
+, lib
+, fetchurl
+, astring
+, base64
 , cmdliner
-, cohttp-lwt-unix
+, fmt
+, httpaf
+, httpaf-lwt-unix
 , logs
 , magic-mime
-, opium_kernel
-, stringext
-
-, alcotest
+, mirage-crypto
+, mtime
+, multipart-form-data
+, ptime
+, re
+, rock
+, tyxml
+, uri
+, yojson
+, alcotest-lwt
 }:
 
-buildDunePackage {
+buildDunePackage rec {
   pname = "opium";
-  inherit (opium_kernel) version src meta minimumOCamlVersion;
+  minimalOCamlVersion = "4.08";
+  duneVersion = "3";
 
-  useDune2 = true;
-
-  doCheck = true;
-
-  buildInputs = [
-    ppx_sexp_conv ppx_fields_conv
-    alcotest
-  ];
+  inherit (rock) src version;
 
   propagatedBuildInputs = [
-    opium_kernel cmdliner cohttp-lwt-unix magic-mime logs stringext
+    astring
+    base64
+    cmdliner
+    fmt
+    httpaf
+    httpaf-lwt-unix
+    logs
+    magic-mime
+    mirage-crypto
+    mtime
+    multipart-form-data
+    ptime
+    re
+    rock
+    tyxml
+    uri
+    yojson
   ];
+
+  doCheck = true;
+  checkInputs = [
+    alcotest-lwt
+  ];
+
+  meta = {
+    description = "OCaml web framework";
+    homepage = "https://github.com/rgrinberg/opium";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.pmahoney ];
+  };
 }

pkgs/development/ocaml-modules/opium_kernel/default.nix

@@ -1,44 +0,0 @@
-{ lib
-, buildDunePackage
-, fetchurl
-
-, ppx_fields_conv
-, ppx_sexp_conv
-
-, cohttp-lwt
-, ezjsonm
-, hmap
-, sexplib
-, fieldslib
-}:
-
-buildDunePackage rec {
-  pname = "opium_kernel";
-  version = "0.18.0";
-
-  useDune2 = true;
-
-  minimumOCamlVersion = "4.04.1";
-
-  src = fetchurl {
-    url = "https://github.com/rgrinberg/opium/releases/download/${version}/opium-${version}.tbz";
-    sha256 = "0a2y9gw55psqhqli3a5ps9mfdab8r46fnbj882r2sp366sfcy37q";
-  };
-
-  doCheck = true;
-
-  buildInputs = [
-    ppx_sexp_conv ppx_fields_conv
-  ];
-
-  propagatedBuildInputs = [
-    hmap cohttp-lwt ezjsonm sexplib fieldslib
-  ];
-
-  meta = {
-    description = "Sinatra like web toolkit for OCaml based on cohttp & lwt";
-    homepage = "https://github.com/rgrinberg/opium";
-    license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.pmahoney ];
-  };
-}

pkgs/top-level/ocaml-packages.nix

@@ -1108,8 +1108,6 @@ let
 
     opium = callPackage ../development/ocaml-modules/opium { };
 
-    opium_kernel = callPackage ../development/ocaml-modules/opium_kernel { };
-
     opti = callPackage ../development/ocaml-modules/opti { };
 
     optint = callPackage ../development/ocaml-modules/optint { };