From fdeeb2630b55d762f95e2d018908ce4c88d02169 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 28 May 2021 11:59:34 +0200 Subject: [PATCH] ocamlPackages.ppx_import: disable checks --- pkgs/development/ocaml-modules/ppx_import/default.nix | 4 ---- pkgs/top-level/ocaml-packages.nix | 10 +--------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/pkgs/development/ocaml-modules/ppx_import/default.nix b/pkgs/development/ocaml-modules/ppx_import/default.nix index 4ad26ff0862..6588d6db7f4 100644 --- a/pkgs/development/ocaml-modules/ppx_import/default.nix +++ b/pkgs/development/ocaml-modules/ppx_import/default.nix @@ -1,7 +1,6 @@ { lib, fetchurl, buildDunePackage , ppx_tools_versioned , ocaml-migrate-parsetree -, ounit, ppx_deriving, ppxlib }: buildDunePackage rec { @@ -21,9 +20,6 @@ buildDunePackage rec { ppx_tools_versioned ocaml-migrate-parsetree ]; - doCheck = true; - checkInputs = [ ounit ppx_deriving ppxlib ]; - meta = { description = "A syntax extension that allows to pull in types or signatures from other compiled interface files"; license = lib.licenses.mit; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 11d511c9c94..fe8eee65d0c 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1085,15 +1085,7 @@ let ppx_gen_rec = callPackage ../development/ocaml-modules/ppx_gen_rec {}; - ppx_import = callPackage ../development/ocaml-modules/ppx_import ( - let ppxlib_0_15 = if lib.versionAtLeast ppxlib.version "0.15" - then ppxlib.override { version = "0.15.0"; } - else ppxlib; in - { - ppx_deriving = ppx_deriving.override { ppxlib = ppxlib_0_15; }; - ppxlib = ppxlib_0_15; - } - ); + ppx_import = callPackage ../development/ocaml-modules/ppx_import {}; ppx_irmin = callPackage ../development/ocaml-modules/irmin/ppx.nix { };