diff options
| author | Joachim F <joachifm@users.noreply.github.com> | 2016-09-26 23:17:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-26 23:17:53 +0200 |
| commit | a5580c99519411bb77dea4835516645514dad18b (patch) | |
| tree | 6a3ce34228c6b16c59210e62debe24093f930973 /pkgs/development/tools/misc | |
| parent | 67baa48161b697b4e09eef1c3cb43b7ba6f68298 (diff) | |
| parent | 43d6264f61e9456f0514b93ff81d0a03808829b8 (diff) | |
| download | nixlib-a5580c99519411bb77dea4835516645514dad18b.tar nixlib-a5580c99519411bb77dea4835516645514dad18b.tar.gz nixlib-a5580c99519411bb77dea4835516645514dad18b.tar.bz2 nixlib-a5580c99519411bb77dea4835516645514dad18b.tar.lz nixlib-a5580c99519411bb77dea4835516645514dad18b.tar.xz nixlib-a5580c99519411bb77dea4835516645514dad18b.tar.zst nixlib-a5580c99519411bb77dea4835516645514dad18b.zip | |
Merge pull request #18765 from aske/ocaml-move
Reorganize ocaml packages
Diffstat (limited to 'pkgs/development/tools/misc')
| -rw-r--r-- | pkgs/development/tools/misc/trv/default.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/development/tools/misc/trv/default.nix b/pkgs/development/tools/misc/trv/default.nix index 606cc5146470..c14a41cc5599 100644 --- a/pkgs/development/tools/misc/trv/default.nix +++ b/pkgs/development/tools/misc/trv/default.nix @@ -1,5 +1,6 @@ -{stdenv, fetchFromGitHub, ocaml, findlib, camlp4, core, async, async_unix, re2, - async_extra, sexplib, async_shell, core_extended, async_find, cohttp, uri, tzdata}: +{stdenv, fetchFromGitHub, ocaml, findlib, camlp4, core_p4, async_p4, async_unix_p4 +, re2_p4, async_extra_p4, sexplib_p4, async_shell, core_extended_p4, async_find +, cohttp, uri, tzdata}: let ocaml_version = (builtins.parseDrvName ocaml.name).version; @@ -20,9 +21,9 @@ stdenv.mkDerivation { buildInputs = [ ocaml findlib camlp4 ]; - propagatedBuildInputs = [ core async async_unix - async_extra sexplib async_shell core_extended - async_find cohttp uri re2 ]; + propagatedBuildInputs = [ core_p4 async_p4 async_unix_p4 + async_extra_p4 sexplib_p4 async_shell core_extended_p4 + async_find cohttp uri re2_p4 ]; createFindlibDestdir = true; dontStrip = true; |