diff --git a/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix index 92d73e540f4..b7d1986c30d 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix @@ -1,13 +1,16 @@ -{ lib, buildDunePackage, rpclib, ppxlib, ppx_deriving }: +{ lib, buildDunePackage, rpclib, alcotest, ppxlib, ppx_deriving, yojson }: buildDunePackage rec { pname = "ppx_deriving_rpc"; - inherit (rpclib) version src; + inherit (rpclib) version useDune2 src; - buildInputs = [ ppxlib ]; + minimumOCamlVersion = "4.08"; - propagatedBuildInputs = [ rpclib ppx_deriving ]; + propagatedBuildInputs = [ ppxlib rpclib ppx_deriving ]; + + checkInputs = [ alcotest yojson ]; + doCheck = true; meta = with lib; { homepage = "https://github.com/mirage/ocaml-rpc"; diff --git a/pkgs/development/ocaml-modules/rpclib/default.nix b/pkgs/development/ocaml-modules/rpclib/default.nix index 9216a489248..53b559257be 100644 --- a/pkgs/development/ocaml-modules/rpclib/default.nix +++ b/pkgs/development/ocaml-modules/rpclib/default.nix @@ -1,20 +1,22 @@ -{ lib, fetchFromGitHub, buildDunePackage, alcotest, cmdliner, rresult, result, xmlm, yojson }: +{ lib, fetchurl, buildDunePackage +, alcotest +, base64, cmdliner, rresult, xmlm, yojson +}: buildDunePackage rec { pname = "rpclib"; - version = "7.0.0"; + version = "8.0.0"; - minimumOCamlVersion = "4.04"; + useDune2 = true; - src = fetchFromGitHub { - owner = "mirage"; - repo = "ocaml-rpc"; - rev = "v${version}"; - sha256 = "0d8nb272mjxkq5ddn65cy9gjpa8yvd0v3jv3wp5xfh9gj29wd2jj"; + src = fetchurl { + url = "https://github.com/mirage/ocaml-rpc/releases/download/v${version}/rpclib-v${version}.tbz"; + sha256 = "1kqbixk4d9y15ns566fiyzid5jszkamm1kv7iks71invv33v7krz"; }; - buildInputs = [ alcotest cmdliner yojson ]; - propagatedBuildInputs = [ rresult result xmlm ]; + buildInputs = [ cmdliner yojson ]; + propagatedBuildInputs = [ base64 rresult xmlm ]; + checkInputs = [ alcotest ]; doCheck = true; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 5e4f350099a..316666ca6d8 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -878,9 +878,7 @@ let ppx_deriving_protobuf = callPackage ../development/ocaml-modules/ppx_deriving_protobuf {}; - ppx_deriving_rpc = callPackage ../development/ocaml-modules/ppx_deriving_rpc { - ppxlib = ppxlib.override { legacy = true; }; - }; + ppx_deriving_rpc = callPackage ../development/ocaml-modules/ppx_deriving_rpc { }; ppx_deriving_yojson = callPackage ../development/ocaml-modules/ppx_deriving_yojson {};