From 62a2b30b0951e6739d661e8870aea553a82f904b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 23 Aug 2023 06:43:43 +0200 Subject: [PATCH] ocamlPackages.ppx_deriving: do not (always) depend on OMP --- .../ocaml-modules/ppx_deriving/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/ocaml-modules/ppx_deriving/default.nix b/pkgs/development/ocaml-modules/ppx_deriving/default.nix index 031c8335186b..314f52f40fc0 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving/default.nix @@ -10,22 +10,18 @@ , ounit , ounit2 , ocaml-migrate-parsetree -, ocaml-migrate-parsetree-2 }: let params = if lib.versionAtLeast ppxlib.version "0.20" then { version = "5.2.1"; sha256 = "11h75dsbv3rs03pl67hdd3lbim7wjzh257ij9c75fcknbfr5ysz9"; - useOMP2 = true; } else if lib.versionAtLeast ppxlib.version "0.15" then { version = "5.1"; sha256 = "1i64fd7qrfzbam5hfbl01r0sx4iihsahcwqj13smmrjlnwi3nkxh"; - useOMP2 = false; } else { version = "5.0"; sha256 = "0fkzrn4pdyvf1kl0nwvhqidq01pnq3ql8zk1jd56hb0cxaw851w3"; - useOMP2 = false; } ; in @@ -33,8 +29,6 @@ buildDunePackage rec { pname = "ppx_deriving"; inherit (params) version; - duneVersion = "3"; - src = fetchurl { url = "https://github.com/ocaml-ppx/ppx_deriving/releases/download/v${version}/ppx_deriving-v${version}.tbz"; inherit (params) sha256; @@ -44,10 +38,8 @@ buildDunePackage rec { nativeBuildInputs = [ cppo ]; buildInputs = [ findlib ppxlib ]; - propagatedBuildInputs = [ - (if params.useOMP2 - then ocaml-migrate-parsetree-2 - else ocaml-migrate-parsetree) + propagatedBuildInputs = + lib.optional (lib.versionOlder version "5.2") ocaml-migrate-parsetree ++ [ ppx_derivers result ];