From 0f4fcbe60d9642d9c90ecc4bfa7fb6652235e7c9 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 22 Aug 2023 06:59:15 +0200 Subject: [PATCH] ocamlPackages.ppxlib: do not (always) depend on OMP --- pkgs/development/ocaml-modules/ppxlib/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ocaml-modules/ppxlib/default.nix b/pkgs/development/ocaml-modules/ppxlib/default.nix index 8ec18c2eab37..75a779100a8d 100644 --- a/pkgs/development/ocaml-modules/ppxlib/default.nix +++ b/pkgs/development/ocaml-modules/ppxlib/default.nix @@ -13,34 +13,37 @@ let param = { sha256 = "sha256-pct57oO7qAMEtlvEfymFOCvviWaLG0b5/7NzTC8vdSE="; max_version = "4.10"; useDune2 = false; - useOMP2 = false; + OMP = [ ocaml-migrate-parsetree ]; }; "0.13.0" = { sha256 = "sha256-geHz0whQDg5/YQjVsN2iuHlkClwh7z3Eqb2QOBzuOdk="; max_version = "4.11"; useDune2 = false; - useOMP2 = false; + OMP = [ ocaml-migrate-parsetree ]; }; "0.15.0" = { sha256 = "sha256-C2MNf410qJmlXMJxiLXOA+c1qT8H6gwt5WUy2P2TszA="; min_version = "4.07"; max_version = "4.12"; - useOMP2 = false; + OMP = [ ocaml-migrate-parsetree ]; }; "0.18.0" = { sha256 = "sha256-nUg8NkZ64GHHDfcWbtFGXq3MNEKu+nYPtcVDm/gEfcM="; min_version = "4.07"; max_version = "4.12"; + OMP = [ ocaml-migrate-parsetree-2 ]; }; "0.22.0" = { sha256 = "sha256-PuuR4DlmZiKEoyIuYS3uf0+it2N8U9lXLSp0E0u5bXo="; min_version = "4.07"; max_version = "4.13"; + OMP = [ ocaml-migrate-parsetree-2 ]; }; "0.22.2" = { sha256 = "sha256-0Oih69xiILFXTXqSbwCEYMURjM73m/mgzgJC80z/Ilo="; min_version = "4.07"; max_version = "4.14"; + OMP = [ ocaml-migrate-parsetree-2 ]; }; "0.23.0" = { sha256 = "sha256-G1g2wYa51aFqz0falPOWj08ItRm3cpzYao/TmXH+EuU="; @@ -50,10 +53,12 @@ let param = { "0.24.0" = { sha256 = "sha256-d2YCfC7ND1s7Rg6SEqcHCcZ0QngRPrkfMXxWxB56kMg="; min_version = "4.07"; + max_version = "5.1"; }; "0.28.0" = { sha256 = "sha256-2Hrl+aCBIGMIypZICbUKZq646D0lSAHouWdUSLYM83c="; min_version = "4.07"; + max_version = "5.1"; }; }."${version}"; in @@ -75,9 +80,7 @@ buildDunePackage rec { propagatedBuildInputs = [ ocaml-compiler-libs - (if param.useOMP2 or true - then ocaml-migrate-parsetree-2 - else ocaml-migrate-parsetree) + ] ++ (param.OMP or []) ++ [ ppx_derivers stdio stdlib-shims