From 8706ed24e579c19bcf8281b60d1ac2f638b73bf1 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 20 Feb 2020 06:13:47 +0100 Subject: [PATCH] ocamlPackages.dum: cleaning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Propagate the `easy-format` dependency. Fix build with OCaml ≥ 4.09. --- pkgs/development/ocaml-modules/dum/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/ocaml-modules/dum/default.nix b/pkgs/development/ocaml-modules/dum/default.nix index 37c00f6b31e9..5e5199c26905 100644 --- a/pkgs/development/ocaml-modules/dum/default.nix +++ b/pkgs/development/ocaml-modules/dum/default.nix @@ -1,25 +1,24 @@ -{ lib, fetchFromGitHub, buildOcaml, ocaml +{ stdenv, fetchFromGitHub, ocaml, findlib , easy-format }: -buildOcaml rec { - name = "dum"; +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-dum-${version}"; version = "1.0.1"; - minimumOCamlVersion = "4.06"; - src = fetchFromGitHub { owner = "mjambon"; - repo = name; + repo = "dum"; rev = "v${version}"; sha256 = "0yrxl97szjc0s2ghngs346x3y0xszx2chidgzxk93frjjpsr1mlr"; }; - buildInputs = [ easy-format ]; + buildInputs = [ ocaml findlib ]; + propagatedBuildInputs = [ easy-format ]; - doCheck = true; + createFindlibDestdir = true; - meta = with lib; { + meta = with stdenv.lib; { homepage = https://github.com/mjambon/dum; description = "Inspect the runtime representation of arbitrary OCaml values"; license = licenses.lgpl21Plus;