From a070b3c46b348e3c68e33ea233c18dd5582f3e29 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 1 Oct 2022 08:10:42 +0200 Subject: [PATCH] =?UTF-8?q?ocamlPackages.ppx=5Ftools:=206.5=20=E2=86=92=20?= =?UTF-8?q?6.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/ppx_tools/default.nix | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/pkgs/development/ocaml-modules/ppx_tools/default.nix b/pkgs/development/ocaml-modules/ppx_tools/default.nix index 9ec1c24dbe3e..cc525d1d1e95 100644 --- a/pkgs/development/ocaml-modules/ppx_tools/default.nix +++ b/pkgs/development/ocaml-modules/ppx_tools/default.nix @@ -1,10 +1,9 @@ { lib, stdenv, fetchFromGitHub, buildDunePackage, ocaml, findlib, cppo }: let param = - let v6_5 = { - version = "6.5"; - sha256 = "sha256:0fwibah2hgllrnbdrmfqil5gr5raf6pb5h2zx6zs1h3d4ykvy8k8"; - useDune2 = true; + let v6_6 = { + version = "6.6"; + sha256 = "sha256-QhuaQ9346a3neoRM4GrOVzjR8fg9ysMZR1VzNgyIQtc="; nativeBuildInputs = [cppo]; buildInputs = [cppo]; }; in @@ -28,13 +27,13 @@ let param = "4.07" = { version = "5.1+4.06.0"; sha256 = "1ww4cspdpgjjsgiv71s0im5yjkr3544x96wsq1vpdacq7dr7zwiw"; }; - "4.08" = v6_5; - "4.09" = v6_5; - "4.10" = v6_5; - "4.11" = v6_5; - "4.12" = v6_5; - "4.13" = v6_5; - "4.14" = v6_5; + "4.08" = v6_6; + "4.09" = v6_6; + "4.10" = v6_6; + "4.11" = v6_6; + "4.12" = v6_6; + "4.13" = v6_6; + "4.14" = v6_6; }.${ocaml.meta.branch}; in @@ -56,7 +55,7 @@ if lib.versionAtLeast param.version "6.0" then buildDunePackage { inherit pname src meta; - inherit (param) version useDune2 buildInputs nativeBuildInputs; + inherit (param) version buildInputs nativeBuildInputs; strictDeps = true; }