diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-05 00:56:58 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-05 00:56:58 +0000 |
commit | 0e4e47512d709e93c35fa575dd82e3e6ce4f884d (patch) | |
tree | 937091db4b8e386f917648baf773d2dd51ab2973 /pkgs/development/ocaml-modules | |
parent | e1ed9b3b0851b95d3e82fb1085a121531c32a42a (diff) | |
parent | a43963db12774a01af9159981d877bb8326463ca (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/ocaml-modules')
-rw-r--r-- | pkgs/development/ocaml-modules/ppx_import/default.nix | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/development/ocaml-modules/ppx_import/default.nix b/pkgs/development/ocaml-modules/ppx_import/default.nix index f4977992759d..b5651a8cec2a 100644 --- a/pkgs/development/ocaml-modules/ppx_import/default.nix +++ b/pkgs/development/ocaml-modules/ppx_import/default.nix @@ -1,24 +1,27 @@ { lib, fetchurl, buildDunePackage, ocaml , ounit, ppx_deriving, ppx_tools_versioned +, ppxlib, ocaml-migrate-parsetree }: -if !lib.versionAtLeast ocaml.version "4.04" -then throw "ppx_import is not available for OCaml ${ocaml.version}" -else - buildDunePackage rec { pname = "ppx_import"; version = "1.7.1"; + useDune2 = true; + + minimumOCamlVersion = "4.04"; + src = fetchurl { url = "https://github.com/ocaml-ppx/ppx_import/releases/download/v${version}/ppx_import-v${version}.tbz"; sha256 = "16dyxfb7syz659rqa7yq36ny5vzl7gkqd7f4m6qm2zkjc1gc8j4v"; }; - buildInputs = [ ounit ppx_deriving ]; - propagatedBuildInputs = [ ppx_tools_versioned ]; + propagatedBuildInputs = [ + ppxlib ppx_tools_versioned ocaml-migrate-parsetree + ]; doCheck = true; + checkInputs = [ ounit ppx_deriving ]; meta = { description = "A syntax extension that allows to pull in types or signatures from other compiled interface files"; |