From 73182c1442f26386aff968b07f0a2ec7d3dd14b3 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 5 Dec 2020 17:27:37 +0100 Subject: [PATCH] ocamlPackages.gmap: use Dune 2 --- pkgs/development/ocaml-modules/gmap/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/gmap/default.nix b/pkgs/development/ocaml-modules/gmap/default.nix index 2585dfcaa96..407919f91bc 100644 --- a/pkgs/development/ocaml-modules/gmap/default.nix +++ b/pkgs/development/ocaml-modules/gmap/default.nix @@ -1,9 +1,11 @@ -{ lib, buildDunePackage, fetchurl, alcotest }: +{ lib, buildDunePackage, ocaml, fetchurl, alcotest }: buildDunePackage rec { pname = "gmap"; version = "0.3.0"; + useDune2 = true; + src = fetchurl { url = "https://github.com/hannesm/gmap/releases/download/${version}/gmap-${version}.tbz"; sha256 = "073wa0lrb0jj706j87cwzf1a8d1ff14100mnrjs8z3xc4ri9xp84"; @@ -11,9 +13,9 @@ buildDunePackage rec { minimumOCamlVersion = "4.03"; - buildInputs = [ alcotest ]; + checkInputs = [ alcotest ]; - doCheck = true; + doCheck = lib.versionAtLeast ocaml.version "4.05"; meta = { description = "Heterogenous maps over a GADT";