diff options
author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2018-07-05 19:40:30 +0000 |
---|---|---|
committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2018-07-05 19:40:31 +0000 |
commit | 3b0cd74f553e94afa6677358b196a7173dbae7a8 (patch) | |
tree | 8368b3d13f62f086e607713552091169b5943a72 /pkgs/top-level/ocaml-packages.nix | |
parent | 1bb95d8409aabcc9ee52045771b7c9109336fc2f (diff) | |
download | nixpkgs-3b0cd74f553e94afa6677358b196a7173dbae7a8.tar nixpkgs-3b0cd74f553e94afa6677358b196a7173dbae7a8.tar.gz nixpkgs-3b0cd74f553e94afa6677358b196a7173dbae7a8.tar.bz2 nixpkgs-3b0cd74f553e94afa6677358b196a7173dbae7a8.tar.lz nixpkgs-3b0cd74f553e94afa6677358b196a7173dbae7a8.tar.xz nixpkgs-3b0cd74f553e94afa6677358b196a7173dbae7a8.tar.zst nixpkgs-3b0cd74f553e94afa6677358b196a7173dbae7a8.zip |
ocamlPackages.janeStreet: 0.10 -> 0.11
Diffstat (limited to 'pkgs/top-level/ocaml-packages.nix')
-rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 87e1cf907f5..a0e91a8e093 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -56,6 +56,17 @@ let bap = callPackage ../development/ocaml-modules/bap { inherit (janeStreet_0_9_0) core_kernel ppx_jane parsexp; + ezjsonm = ezjsonm.override { + inherit (janeStreet_0_9_0) sexplib; + hex = hex.override { + cstruct = cstruct.override { + inherit (janeStreet_0_9_0) sexplib; + }; + }; + }; + uri = uri.override { + inherit (janeStreet_0_9_0) ppx_sexp_conv sexplib; + }; }; batteries = callPackage ../development/ocaml-modules/batteries { }; @@ -531,6 +542,8 @@ let piqi = callPackage ../development/ocaml-modules/piqi { }; piqi-ocaml = callPackage ../development/ocaml-modules/piqi-ocaml { }; + ppxlib = callPackage ../development/ocaml-modules/ppxlib { }; + psmt2-frontend = callPackage ../development/ocaml-modules/psmt2-frontend { }; psq = callPackage ../development/ocaml-modules/psq { }; @@ -735,7 +748,7 @@ let janeStreet = import ../development/ocaml-modules/janestreet { inherit lib janePackage ocaml ocamlbuild angstrom ctypes cryptokit; inherit magic-mime num ocaml-migrate-parsetree octavius ounit; - inherit ppx_deriving re zarith; + inherit ppx_deriving re zarith ppxlib; inherit (pkgs) stdenv openssl; }; |