From 18370bce2f70681111462eed5479a659c031cb9f Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 20 Nov 2020 06:40:50 +0100 Subject: [PATCH] =?UTF-8?q?ocamlPackages.ocaml-protoc:=201.2.0=20=E2=86=92?= =?UTF-8?q?=202.0.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/ocaml-protoc/default.nix | 32 +++++++------------ 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocaml-protoc/default.nix b/pkgs/development/ocaml-modules/ocaml-protoc/default.nix index 1ef7b6c2d40..5abb026032b 100644 --- a/pkgs/development/ocaml-modules/ocaml-protoc/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-protoc/default.nix @@ -1,35 +1,27 @@ -{ stdenv, ocaml, fetchFromGitHub, ocamlbuild, findlib, ppx_deriving_protobuf }: +{ lib, fetchFromGitHub, buildDunePackage +, stdlib-shims +}: -stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-ocaml-protoc-${version}"; - version = "1.2.0"; +buildDunePackage rec { + pname = "ocaml-protoc"; + version = "2.0.2"; + + useDune2 = true; minimumOCamlVersion = "4.02"; src = fetchFromGitHub { owner = "mransan"; repo = "ocaml-protoc"; - rev = "60d2d4dd55f73830e1bed603cc44d3420430632c"; - sha256 = "1d1p8ch723z2qa9azmmnhbcpwxbpzk3imh1cgkjjq4p5jwzj8amj"; + rev = version; + sha256 = "1vlnjqqpypmjhlyrxfzla79y4ilmc9ggz311giy6vmh4cyzl29h3"; }; - installPhase = '' - mkdir -p tmp/bin - export PREFIX=`pwd`/tmp - make all.install.build - make check_install - make lib.install - make bin.install - ''; - - buildInputs = [ ocaml findlib ocamlbuild ]; - propagatedBuildInputs = [ ppx_deriving_protobuf ]; - - createFindlibDestdir = true; + buildInputs = [ stdlib-shims ]; doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mransan/ocaml-protoc"; description = "A Protobuf Compiler for OCaml"; license = licenses.mit;