diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2023-05-10 20:06:08 +0200 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2023-05-10 20:06:09 +0200 |
| commit | ffcb033f38b6c7b0c8aef8e10a46c93275e53fd5 (patch) | |
| tree | 8eebacb4d34e6b242f7131f1f488d77535b0afe3 /pkgs/development/tools/ocaml | |
| parent | 011e1aa38339a24e4ecbd80411f72c0254dce7ec (diff) | |
| download | nixpkgs-ffcb033f38b6c7b0c8aef8e10a46c93275e53fd5.tar nixpkgs-ffcb033f38b6c7b0c8aef8e10a46c93275e53fd5.tar.gz nixpkgs-ffcb033f38b6c7b0c8aef8e10a46c93275e53fd5.tar.bz2 nixpkgs-ffcb033f38b6c7b0c8aef8e10a46c93275e53fd5.tar.lz nixpkgs-ffcb033f38b6c7b0c8aef8e10a46c93275e53fd5.tar.xz nixpkgs-ffcb033f38b6c7b0c8aef8e10a46c93275e53fd5.tar.zst nixpkgs-ffcb033f38b6c7b0c8aef8e10a46c93275e53fd5.zip | |
ocamlPackages.dot-merlin-reader: use Dune 3
Diffstat (limited to 'pkgs/development/tools/ocaml')
| -rw-r--r-- | pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix | 9 |
1 files 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 90c0aee0ff3..c4b69eb5530 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"; |