From 3131757b9ff3a3f113304ff44abc168b969bf8af Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 22 Jul 2022 17:59:51 +0200 Subject: [PATCH] =?UTF-8?q?ocamlPackages.omd:=201.3.1=20=E2=86=92=201.3.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../development/ocaml-modules/omd/default.nix | 27 ++++++------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/pkgs/development/ocaml-modules/omd/default.nix b/pkgs/development/ocaml-modules/omd/default.nix index cfb743cc982..0512e4a9e6e 100644 --- a/pkgs/development/ocaml-modules/omd/default.nix +++ b/pkgs/development/ocaml-modules/omd/default.nix @@ -1,32 +1,21 @@ -{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild }: +{ lib, buildDunePackage, fetchurl }: -stdenv.mkDerivation rec { - pname = "ocaml${ocaml.version}-omd"; - version = "1.3.1"; +buildDunePackage rec { + pname = "omd"; + version = "1.3.2"; + + minimalOCamlVersion = "4.03"; src = fetchurl { - url = "https://github.com/Chris00/omd/releases/download/${version}/omd-${version}.tar.gz"; - sha256 = "1sgdgzpx96br7npj8mh91cli5mqmzsjpngwm7x4212n3k1d0ivwa"; + url = "https://github.com/ocaml/omd/releases/download/${version}/omd-${version}.tbz"; + sha256 = "sha256-YCPhZCYx8I9njrVyWCCHnte7Wj/+53fN7evCjB+F+ts="; }; - nativeBuildInputs = [ ocaml findlib ocamlbuild ]; - - strictDeps = true; - - createFindlibDestdir = true; - - configurePhase = '' - runHook preConfigure - ocaml setup.ml -configure --prefix $out - runHook postConfigure - ''; - meta = { description = "Extensible Markdown library and tool in OCaml"; homepage = "https://github.com/ocaml/omd"; license = lib.licenses.isc; maintainers = [ lib.maintainers.vbgl ]; mainProgram = "omd"; - inherit (ocaml.meta) platforms; }; }