From 0feb4e8729e2117200ce30e63981e4de078a8e86 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 7 Oct 2019 06:48:15 +0000 Subject: [PATCH] =?UTF-8?q?ocamlPackages.digestif:=200.5=20=E2=86=92=200.8?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/digestif/default.nix | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/pkgs/development/ocaml-modules/digestif/default.nix b/pkgs/development/ocaml-modules/digestif/default.nix index d8089bb533f..f0a98249d6d 100644 --- a/pkgs/development/ocaml-modules/digestif/default.nix +++ b/pkgs/development/ocaml-modules/digestif/default.nix @@ -1,27 +1,26 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg }: +{ lib, fetchurl, buildDunePackage +, bigarray-compat, eqaf, stdlib-shims +, alcotest +}: -if !stdenv.lib.versionAtLeast ocaml.version "4.3" -then throw "digestif is not available for OCaml ${ocaml.version}" -else - -stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-digestif-${version}"; - version = "0.5"; +buildDunePackage rec { + pname = "digestif"; + version = "0.8.0"; src = fetchurl { - url = "https://github.com/mirage/digestif/releases/download/v${version}/digestif-${version}.tbz"; - sha256 = "0fsyfi5ps17j3wjav5176gf6z3a5xcw9aqhcr1gml9n9ayfbkhrd"; + url = "https://github.com/mirage/digestif/releases/download/v${version}/digestif-v${version}.tbz"; + sha256 = "09g4zngqiw97cljv8ds4m063wcxz3y7c7vzaprsbpjzi0ja5jdcy"; }; - buildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = lib.optional doCheck alcotest; + propagatedBuildInputs = [ bigarray-compat eqaf stdlib-shims ]; - inherit (topkg) buildPhase installPhase; + doCheck = true; meta = { description = "Simple hash algorithms in OCaml"; homepage = "https://github.com/mirage/digestif"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - inherit (ocaml.meta) platforms; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; }; }