diff --git a/pkgs/development/ocaml-modules/ocaml-protoc/default.nix b/pkgs/development/ocaml-modules/ocaml-protoc/default.nix index 5abb026032be..301a0f2c9a61 100644 --- a/pkgs/development/ocaml-modules/ocaml-protoc/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-protoc/default.nix @@ -1,30 +1,19 @@ { lib, fetchFromGitHub, buildDunePackage +, pbrt , stdlib-shims }: buildDunePackage rec { pname = "ocaml-protoc"; - version = "2.0.2"; - useDune2 = true; - - minimumOCamlVersion = "4.02"; - - src = fetchFromGitHub { - owner = "mransan"; - repo = "ocaml-protoc"; - rev = version; - sha256 = "1vlnjqqpypmjhlyrxfzla79y4ilmc9ggz311giy6vmh4cyzl29h3"; - }; + inherit (pbrt) version src; buildInputs = [ stdlib-shims ]; + propagatedBuildInputs = [ pbrt ]; doCheck = true; - meta = with lib; { - homepage = "https://github.com/mransan/ocaml-protoc"; + meta = pbrt.meta // { description = "A Protobuf Compiler for OCaml"; - license = licenses.mit; - maintainers = [ maintainers.vyorkin ]; }; } diff --git a/pkgs/development/ocaml-modules/pbrt/default.nix b/pkgs/development/ocaml-modules/pbrt/default.nix new file mode 100644 index 000000000000..ec5e5df7ab49 --- /dev/null +++ b/pkgs/development/ocaml-modules/pbrt/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchFromGitHub, buildDunePackage }: + +buildDunePackage rec { + pname = "pbrt"; + version = "2.4"; + + minimalOCamlVersion = "4.03"; + + src = fetchFromGitHub { + owner = "mransan"; + repo = "ocaml-protoc"; + rev = "${version}.0"; + hash = "sha256-EXugdcjALukSjB31zAVG9WiN6GMGXi2jlhHWaZ+p+uM="; + }; + + meta = with lib; { + homepage = "https://github.com/mransan/ocaml-protoc"; + description = "Runtime library for Protobuf tooling"; + license = licenses.mit; + maintainers = [ maintainers.vyorkin ]; + }; +} + diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index e66c1fbc9fb0..4bd589ec7826 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1396,6 +1396,8 @@ let pbkdf = callPackage ../development/ocaml-modules/pbkdf { }; + pbrt = callPackage ../development/ocaml-modules/pbrt { }; + pcap-format = callPackage ../development/ocaml-modules/pcap-format { }; pecu = callPackage ../development/ocaml-modules/pecu { };