Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ocamlPackages.rpclib: 8.1.0 → 9.0.0 #215261

Merged
merged 2 commits into from
Feb 9, 2023
Merged

ocamlPackages.rpclib: 8.1.0 → 9.0.0 #215261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c287d4
ocamlPackages.rresult: disable for OCaml < 4.07
vbgl Feb 8, 2023
95d4472
ocamlPackages.rpclib: 8.1.0 → 9.0.0
vbgl Feb 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
buildDunePackage rec {
pname = "ppx_deriving_rpc";

inherit (rpclib) version useDune2 src;
inherit (rpclib) version src;

minimumOCamlVersion = "4.08";
minimalOCamlVersion = "4.08";
duneVersion = "3";

propagatedBuildInputs = [ ppxlib rpclib ppx_deriving ];

Expand Down
13 changes: 7 additions & 6 deletions pkgs/development/ocaml-modules/rpclib/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
{ lib, fetchurl, buildDunePackage, ocaml
{ lib, fetchurl, buildDunePackage
, alcotest
, base64, cmdliner, rresult, xmlm, yojson
}:

buildDunePackage rec {
pname = "rpclib";
version = "8.1.0";
version = "9.0.0";

useDune2 = true;
minimalOCamlVersion = "4.08";
duneVersion = "3";

src = fetchurl {
url = "https://github.com/mirage/ocaml-rpc/releases/download/v${version}/rpclib-v${version}.tbz";
sha256 = "0fbajg8wq8hjhkvvfnq68br0m0pa8zf2qzadhfgi2nnr9713rada";
url = "https://github.com/mirage/ocaml-rpc/releases/download/${version}/rpclib-${version}.tbz";
hash = "sha256-ziPrdWwCjZN0vRmCMpa923wjfT8FVFLTDRz30VIW6WM=";
};

buildInputs = [ cmdliner yojson ];
propagatedBuildInputs = [ base64 rresult xmlm ];
checkInputs = [ alcotest ];

doCheck = lib.versionAtLeast ocaml.version "4.08";
doCheck = true;

meta = with lib; {
homepage = "https://github.com/mirage/ocaml-rpc";
Expand Down
3 changes: 2 additions & 1 deletion pkgs/development/ocaml-modules/rpclib/lwt.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@

buildDunePackage {
pname = "rpclib-lwt";
inherit (rpclib) version useDune2 src;
inherit (rpclib) version src;
duneVersion = "3";

propagatedBuildInputs = [ lwt rpclib ];

Expand Down
3 changes: 3 additions & 0 deletions pkgs/development/ocaml-modules/rresult/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, result }:

lib.throwIfNot (lib.versionAtLeast ocaml.version "4.07")
"rresult is not available for OCaml ${ocaml.version}"

stdenv.mkDerivation rec {
pname = "ocaml${ocaml.version}-rresult";
version = "0.7.0";
Expand Down