From 8b795576001cb169d61f0cf4a87d5c54a88dfa90 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 17 Dec 2018 21:39:43 +0000 Subject: [PATCH] ocamlPackages.ppx_deriving_yojson: 3.1 -> 3.3 --- .../ppx_deriving_yojson/default.nix | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix index 26fa24d8dc0..53e8265c3a7 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix @@ -1,29 +1,30 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, topkg, cppo -, ppx_deriving, yojson, ounit +{ lib, buildDunePackage, fetchFromGitHub, ppxfind, ounit +, ppx_deriving, yojson }: -stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-ppx_deriving_yojson-${version}"; - version = "3.1"; +buildDunePackage rec { + pname = "ppx_deriving_yojson"; + version = "3.3"; + + minimumOCamlVersion = "4.04"; src = fetchFromGitHub { owner = "ocaml-ppx"; repo = "ppx_deriving_yojson"; rev = "v${version}"; - sha256 = "1pwfnq7z60nchba4gnf58918ll11w3gj5i88qhz1p2jm45hxqgnw"; + sha256 = "1gbfziw03r9azqlsmyn6izrgrf1xc30s88jgdany1kblpgq41rsz"; }; - buildInputs = [ ocaml findlib ocamlbuild cppo ounit ]; + buildInputs = [ ppxfind ounit ]; propagatedBuildInputs = [ ppx_deriving yojson ]; - inherit (topkg) installPhase; + doCheck = true; meta = { - description = "A Yojson codec generator for OCaml >= 4.02."; + description = "A Yojson codec generator for OCaml >= 4.04"; inherit (src.meta) homepage; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - inherit (ocaml.meta) platforms; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; }; }