diff options
| author | xeji <36407913+xeji@users.noreply.github.com> | 2018-07-14 00:25:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-14 00:25:55 +0200 |
| commit | ebdb6edad7e862739218c953478b72afdc40762f (patch) | |
| tree | c24706f11cdfad47cc7310414a7bfd6d523640aa /pkgs/top-level | |
| parent | d6899cf8b9ea17ac71b3ea27d3f8f42306c66209 (diff) | |
| parent | ca12adfeafb334d3e966a26e01064ba616e0224f (diff) | |
| download | nixlib-ebdb6edad7e862739218c953478b72afdc40762f.tar nixlib-ebdb6edad7e862739218c953478b72afdc40762f.tar.gz nixlib-ebdb6edad7e862739218c953478b72afdc40762f.tar.bz2 nixlib-ebdb6edad7e862739218c953478b72afdc40762f.tar.lz nixlib-ebdb6edad7e862739218c953478b72afdc40762f.tar.xz nixlib-ebdb6edad7e862739218c953478b72afdc40762f.tar.zst nixlib-ebdb6edad7e862739218c953478b72afdc40762f.zip | |
Merge pull request #43440 from vbgl/ocaml-lwt_log-1.0.0
ocamlPackages.lwt_log: init at 1.0.0
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f9d10d6f2be1..cf9703545437 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8100,8 +8100,6 @@ with pkgs; flow = callPackage ../development/tools/analysis/flow { inherit (darwin.apple_sdk.frameworks) CoreServices; inherit (darwin) cf-private; - inherit (ocamlPackages) ocaml findlib camlp4 sedlex ocamlbuild lwt_ppx - wtf8 dtoa; }; foreman = callPackage ../tools/system/foreman { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index da7be689a41c..a49d638dc47e 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -392,6 +392,10 @@ let ocaml_lwt = if lib.versionOlder "4.02" ocaml.version then lwt3 else lwt2; + lwt_log = callPackage ../development/ocaml-modules/lwt_log { + lwt = lwt3; + }; + lwt_ppx = callPackage ../development/ocaml-modules/lwt/ppx.nix { lwt = lwt3; }; |