From ffcb033f38b6c7b0c8aef8e10a46c93275e53fd5 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 10 May 2023 20:06:08 +0200 Subject: [PATCH] ocamlPackages.dot-merlin-reader: use Dune 3 --- .../development/tools/ocaml/merlin/dot-merlin-reader.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix b/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix index 90c0aee0ff3f..c4b69eb55309 100644 --- a/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix +++ b/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix @@ -1,15 +1,18 @@ -{ lib, fetchurl, yojson, csexp, buildDunePackage, merlin-lib, merlin }: +{ lib, fetchurl, yojson, csexp, findlib, buildDunePackage, merlin-lib, merlin }: buildDunePackage rec { pname = "dot-merlin-reader"; + duneVersion = "3"; + inherit (merlin) version src; minimalOCamlVersion = "4.06"; - buildInputs = if lib.versionAtLeast version "4.7-414" + buildInputs = [ findlib ] + ++ (if lib.versionAtLeast version "4.7-414" then [ merlin-lib ] - else [ yojson csexp ]; + else [ yojson csexp ]); meta = with lib; { description = "Reads config files for merlin";