From fe16955be79c29a643773fe115c09c88d2924cfe Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 13 Sep 2023 06:50:15 +0200 Subject: [PATCH] =?UTF-8?q?ocamlPackages.dolmen:=200.6=20=E2=86=92=200.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/dolmen/default.nix | 12 +++++++----- pkgs/development/ocaml-modules/dolmen/loop.nix | 3 ++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ocaml-modules/dolmen/default.nix b/pkgs/development/ocaml-modules/dolmen/default.nix index b27efe501944..1586474f3910 100644 --- a/pkgs/development/ocaml-modules/dolmen/default.nix +++ b/pkgs/development/ocaml-modules/dolmen/default.nix @@ -1,24 +1,26 @@ { lib, fetchurl, buildDunePackage , menhir, menhirLib , fmt +, qcheck }: buildDunePackage rec { pname = "dolmen"; - version = "0.6"; + version = "0.9"; minimalOCamlVersion = "4.08"; src = fetchurl { - url = "https://github.com/Gbury/dolmen/releases/download/v${version}/dolmen-v${version}.tbz"; - sha256 = "133l23mwxa9xy340izvk4zp5jqjz2cwsm2innsgs2kg85pd39c41"; + url = "https://github.com/Gbury/dolmen/releases/download/v${version}/dolmen-${version}.tbz"; + hash = "sha256-AD21OFS6zDoz+lXtac95gXwQNppPfGvpRK8dzDZXigo="; }; nativeBuildInputs = [ menhir ]; propagatedBuildInputs = [ menhirLib fmt ]; - # Testr are not compatible with menhir 20211128 - doCheck = false; + doCheck = true; + + checkInputs = [ qcheck ]; meta = { description = "An OCaml library providing clean and flexible parsers for input languages"; diff --git a/pkgs/development/ocaml-modules/dolmen/loop.nix b/pkgs/development/ocaml-modules/dolmen/loop.nix index 9c09535c616d..11e49ad9ee8d 100644 --- a/pkgs/development/ocaml-modules/dolmen/loop.nix +++ b/pkgs/development/ocaml-modules/dolmen/loop.nix @@ -1,12 +1,13 @@ { buildDunePackage, dolmen, dolmen_type , gen +, pp_loc }: buildDunePackage { pname = "dolmen_loop"; inherit (dolmen) src version; - propagatedBuildInputs = [ dolmen dolmen_type gen ]; + propagatedBuildInputs = [ dolmen dolmen_type gen pp_loc ]; meta = dolmen.meta // { description = "A tool library for automated deduction tools";