diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2021-05-28 11:59:34 +0200 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2021-06-04 02:55:39 +0000 |
| commit | d4e3a5ad20bb5b0331bf5b2cb9b216521e156238 (patch) | |
| tree | ea056f8bd6847841a32ba78346f88dba956fd715 | |
| parent | Merge pull request #125582 from NixOS/backport-125576-to-release-21.05 (diff) | |
| download | nixpkgs-origin/backport-124741-to-release-21.05.tar.gz | |
ocamlPackages.ppx_import: disable checksorigin/backport-124741-to-release-21.05
(cherry picked from commit ecf820740a0b576361dac53778a4e6e2e6338287)
| -rw-r--r-- | pkgs/development/ocaml-modules/ppx_import/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 10 |
2 files changed, 1 insertions, 13 deletions
diff --git a/pkgs/development/ocaml-modules/ppx_import/default.nix b/pkgs/development/ocaml-modules/ppx_import/default.nix index 4ad26ff0862b..6588d6db7f45 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 b58fe1f4294e..618cde4220d1 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1081,15 +1081,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 { }; |