From a3b117a70aeae149eca3a69b7767b8163ef63f0b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 14 Apr 2023 21:55:05 +0200 Subject: [PATCH] =?UTF-8?q?ocamlPackages.bisect=5Fppx:=202.8.1=20=E2=86=92?= =?UTF-8?q?=202.8.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/bisect_ppx/default.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/development/ocaml-modules/bisect_ppx/default.nix b/pkgs/development/ocaml-modules/bisect_ppx/default.nix index 4ecfea79e15..3e581b4b866 100644 --- a/pkgs/development/ocaml-modules/bisect_ppx/default.nix +++ b/pkgs/development/ocaml-modules/bisect_ppx/default.nix @@ -2,23 +2,18 @@ buildDunePackage rec { pname = "bisect_ppx"; - version = "2.8.1"; + version = "2.8.2"; src = fetchFromGitHub { owner = "aantron"; repo = "bisect_ppx"; rev = version; - sha256 = "sha256-pOeeSxzUF1jXQjA71atSZALdgQ2NB9qpKo5iaDnPwhQ="; + hash = "sha256-Uc5ZYL6tORcCCvCe9UmOnBF68FqWpQ4bc48fTQwnfis="; }; - patches = lib.optionals (lib.versionAtLeast ppxlib.version "0.26.0") [ - # Ppxlib >= 0.26.0 compatibility + patches = [ + # Ppxlib >= 0.28.0 compatibility # remove when a new version is released - (fetchpatch { - name = "${pname}-${version}-ppxlib-0.26-compatibility.patch"; - url = "https://patch-diff.githubusercontent.com/raw/aantron/bisect_ppx/pull/400.patch"; - sha256 = "sha256-WAn6+d6pMUr79LVugOENuh9s0gbVEcTg0rxXMz1P3ak="; - }) (fetchpatch { name = "${pname}-${version}-ppxlib-0.28-compatibility.patch"; url = "https://github.com/anmonteiro/bisect_ppx/commit/cc442a08e3a2e0e18deb48f3a696076ac0986728.patch"; @@ -26,7 +21,8 @@ buildDunePackage rec { }) ]; - minimalOCamlVersion = "4.08"; + minimalOCamlVersion = "4.11"; + duneVersion = "3"; buildInputs = [ cmdliner