From b4e057c88d3a97d2c11a0ba61775d222dbc459a9 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 13 Jun 2023 06:25:34 +0200 Subject: [PATCH] ocamlPackages.dose3: cleanup --- .../ocaml-modules/dose3/default.nix | 20 +++++-------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/pkgs/development/ocaml-modules/dose3/default.nix b/pkgs/development/ocaml-modules/dose3/default.nix index 1146da5d3067..4210dde025c0 100644 --- a/pkgs/development/ocaml-modules/dose3/default.nix +++ b/pkgs/development/ocaml-modules/dose3/default.nix @@ -1,7 +1,7 @@ { lib, buildDunePackage, fetchFromGitLab -, camlzip, ocamlgraph, parmap, re, stdlib-shims -, base64, bz2, extlib, cudf -, dpkg, git, ocaml, ounit, python39, python39Packages +, ocamlgraph, parmap, re, stdlib-shims +, base64, extlib, cudf +, ocaml, ounit }: buildDunePackage rec { @@ -15,8 +15,7 @@ buildDunePackage rec { sha256 = "sha256-K0fYSAWV48Rers/foDrEIqieyJ0PvpXkuYrFrZGBkkE="; }; - minimalOCamlVersion = "4.03"; - useDune2 = true; + minimalOCamlVersion = "4.07"; buildInputs = [ parmap @@ -24,8 +23,6 @@ buildDunePackage rec { propagatedBuildInputs = [ base64 - bz2 - camlzip cudf extlib ocamlgraph @@ -33,17 +30,10 @@ buildDunePackage rec { stdlib-shims ]; - nativeCheckInputs = [ - python39 # Replaces: conf-python-3 - python39Packages.pyyaml # Replaces: conf-python3-yaml - git - ]; checkInputs = [ - dpkg # Replaces: conf-dpkg ounit ]; - doCheck = false; # Tests are failing. - # To enable tests use: lib.versionAtLeast ocaml.version "4.04"; + doCheck = lib.versionAtLeast ocaml.version "4.08"; meta = with lib; { description = "Dose library (part of Mancoosi tools)";