From 5e31efee6b634dbe79787cc55cd152dbb474fe61 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 9 May 2025 07:13:39 +0200 Subject: [PATCH] =?UTF-8?q?ocamlPackages.junit:=202.0.2=20=E2=86=92=202.3.?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/junit/alcotest.nix | 9 +++++---- pkgs/development/ocaml-modules/junit/default.nix | 4 ++-- pkgs/development/ocaml-modules/junit/ounit.nix | 5 ++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/ocaml-modules/junit/alcotest.nix b/pkgs/development/ocaml-modules/junit/alcotest.nix index edec978cbe8e..eb750b4372a7 100644 --- a/pkgs/development/ocaml-modules/junit/alcotest.nix +++ b/pkgs/development/ocaml-modules/junit/alcotest.nix @@ -1,19 +1,20 @@ { buildDunePackage, + lib, + ocaml, junit, alcotest, }: -buildDunePackage ({ +buildDunePackage { pname = "junit_alcotest"; inherit (junit) src version meta; - duneVersion = "3"; propagatedBuildInputs = [ junit alcotest ]; - doCheck = false; # 2 tests fail: 1) "Test with unexpected exception"; 2) "with wrong result"; -}) + doCheck = lib.versionAtLeast ocaml.version "4.12"; +} diff --git a/pkgs/development/ocaml-modules/junit/default.nix b/pkgs/development/ocaml-modules/junit/default.nix index e615c40d9a58..9604ec31e75a 100644 --- a/pkgs/development/ocaml-modules/junit/default.nix +++ b/pkgs/development/ocaml-modules/junit/default.nix @@ -8,11 +8,11 @@ buildDunePackage (rec { pname = "junit"; - version = "2.0.2"; + version = "2.3.0"; src = fetchurl { url = "https://github.com/Khady/ocaml-junit/releases/download/${version}/junit-${version}.tbz"; - sha256 = "00bbx5j8vsy9fqbc04xa3lsalaxicirmbczr65bllfk1afv43agx"; + hash = "sha256-j+4lfuQEWq8z8ik/zfA5phWqv8km+tGEzqG/63cbhTM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/junit/ounit.nix b/pkgs/development/ocaml-modules/junit/ounit.nix index 2a0c47d01a51..6e4b79eea272 100644 --- a/pkgs/development/ocaml-modules/junit/ounit.nix +++ b/pkgs/development/ocaml-modules/junit/ounit.nix @@ -1,18 +1,17 @@ { buildDunePackage, junit, - ounit, + ounit2, }: buildDunePackage ({ pname = "junit_ounit"; inherit (junit) src version meta; - duneVersion = "3"; propagatedBuildInputs = [ junit - ounit + ounit2 ]; doCheck = true;