From f4a95e846536026c56e5e06bd22c841c30f42ff1 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 15 Jul 2020 15:56:23 +0200 Subject: [PATCH] =?UTF-8?q?ocamlPackages.markup:=200.7.5=20=E2=86=92=200.8?= =?UTF-8?q?.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/markup/default.nix | 20 ++++++------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/pkgs/development/ocaml-modules/markup/default.nix b/pkgs/development/ocaml-modules/markup/default.nix index 92daea1a4b6..8b3525d2634 100644 --- a/pkgs/development/ocaml-modules/markup/default.nix +++ b/pkgs/development/ocaml-modules/markup/default.nix @@ -1,28 +1,20 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, uutf, lwt }: +{ lib, buildDunePackage, fetchzip, uutf }: -stdenv.mkDerivation rec { +buildDunePackage rec { pname = "markup"; - version = "0.7.5"; - name = "ocaml${ocaml.version}-${pname}-${version}"; + version = "0.8.2"; src = fetchzip { url = "https://github.com/aantron/markup.ml/archive/${version}.tar.gz"; - sha256 = "09qm73m6c6wjh51w61vnfsnis37m28cf1r6hnkr3bbg903ahwbp5"; + sha256 = "13zcrwzjmifniv3bvjbkd2ah8wwa3ld75bxh1d8hrzdvfxzh9szn"; }; - buildInputs = [ ocaml findlib ocamlbuild lwt ]; - - installPhase = "make ocamlfind-install"; - propagatedBuildInputs = [ uutf ]; - createFindlibDestdir = true; - - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/aantron/markup.ml/"; description = "A pair of best-effort parsers implementing the HTML5 and XML specifications"; - license = licenses.bsd2; - platforms = ocaml.meta.platforms or []; + license = licenses.mit; maintainers = with maintainers; [ gal_bolle ];