ocamlPackages.rpclib: 7.0.0 → 8.0.0

authored by Vincent Laporte and committed by Vincent Laporte d6dfd173 abfbb842

+20 -17
+7 -4
pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix
··· 1 - { lib, buildDunePackage, rpclib, ppxlib, ppx_deriving }: 1 + { lib, buildDunePackage, rpclib, alcotest, ppxlib, ppx_deriving, yojson }: 2 2 3 3 buildDunePackage rec { 4 4 pname = "ppx_deriving_rpc"; 5 5 6 - inherit (rpclib) version src; 6 + inherit (rpclib) version useDune2 src; 7 + 8 + minimumOCamlVersion = "4.08"; 7 9 8 - buildInputs = [ ppxlib ]; 10 + propagatedBuildInputs = [ ppxlib rpclib ppx_deriving ]; 9 11 10 - propagatedBuildInputs = [ rpclib ppx_deriving ]; 12 + checkInputs = [ alcotest yojson ]; 13 + doCheck = true; 11 14 12 15 meta = with lib; { 13 16 homepage = "https://github.com/mirage/ocaml-rpc";
+12 -10
pkgs/development/ocaml-modules/rpclib/default.nix
··· 1 - { lib, fetchFromGitHub, buildDunePackage, alcotest, cmdliner, rresult, result, xmlm, yojson }: 1 + { lib, fetchurl, buildDunePackage 2 + , alcotest 3 + , base64, cmdliner, rresult, xmlm, yojson 4 + }: 2 5 3 6 buildDunePackage rec { 4 7 pname = "rpclib"; 5 - version = "7.0.0"; 8 + version = "8.0.0"; 6 9 7 - minimumOCamlVersion = "4.04"; 10 + useDune2 = true; 8 11 9 - src = fetchFromGitHub { 10 - owner = "mirage"; 11 - repo = "ocaml-rpc"; 12 - rev = "v${version}"; 13 - sha256 = "0d8nb272mjxkq5ddn65cy9gjpa8yvd0v3jv3wp5xfh9gj29wd2jj"; 12 + src = fetchurl { 13 + url = "https://github.com/mirage/ocaml-rpc/releases/download/v${version}/rpclib-v${version}.tbz"; 14 + sha256 = "1kqbixk4d9y15ns566fiyzid5jszkamm1kv7iks71invv33v7krz"; 14 15 }; 15 16 16 - buildInputs = [ alcotest cmdliner yojson ]; 17 - propagatedBuildInputs = [ rresult result xmlm ]; 17 + buildInputs = [ cmdliner yojson ]; 18 + propagatedBuildInputs = [ base64 rresult xmlm ]; 19 + checkInputs = [ alcotest ]; 18 20 19 21 doCheck = true; 20 22
+1 -3
pkgs/top-level/ocaml-packages.nix
··· 878 878 879 879 ppx_deriving_protobuf = callPackage ../development/ocaml-modules/ppx_deriving_protobuf {}; 880 880 881 - ppx_deriving_rpc = callPackage ../development/ocaml-modules/ppx_deriving_rpc { 882 - ppxlib = ppxlib.override { legacy = true; }; 883 - }; 881 + ppx_deriving_rpc = callPackage ../development/ocaml-modules/ppx_deriving_rpc { }; 884 882 885 883 ppx_deriving_yojson = callPackage ../development/ocaml-modules/ppx_deriving_yojson {}; 886 884