diff options
| author | Masayuki Takeda <mtakeda.enigsol@gmail.com> | 2018-03-06 23:26:12 +0900 |
|---|---|---|
| committer | Masayuki Takeda <mtakeda.enigsol@gmail.com> | 2018-03-06 23:26:12 +0900 |
| commit | 39cb0d8dd4c3e8670a8f793bc4bd88f637a62e1f (patch) | |
| tree | d44cbeef8d50233cd5c9c70990b23846b4588271 /pkgs/top-level | |
| parent | bef07b86edadc8611bbc5805b723979cf86ff8ff (diff) | |
| download | nixlib-39cb0d8dd4c3e8670a8f793bc4bd88f637a62e1f.tar nixlib-39cb0d8dd4c3e8670a8f793bc4bd88f637a62e1f.tar.gz nixlib-39cb0d8dd4c3e8670a8f793bc4bd88f637a62e1f.tar.bz2 nixlib-39cb0d8dd4c3e8670a8f793bc4bd88f637a62e1f.tar.lz nixlib-39cb0d8dd4c3e8670a8f793bc4bd88f637a62e1f.tar.xz nixlib-39cb0d8dd4c3e8670a8f793bc4bd88f637a62e1f.tar.zst nixlib-39cb0d8dd4c3e8670a8f793bc4bd88f637a62e1f.zip | |
fix bap regression
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index efce8c412d94..82467fcd78ca 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -54,7 +54,9 @@ let base64 = callPackage ../development/ocaml-modules/base64 { }; - bap = callPackage ../development/ocaml-modules/bap { }; + bap = callPackage ../development/ocaml-modules/bap { + inherit (janeStreet_0_9_0) core_kernel ppx_jane parsexp; + }; batteries = callPackage ../development/ocaml-modules/batteries { }; @@ -712,13 +714,21 @@ let # Jane Street janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage.nix {}; - + 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 (pkgs) stdenv openssl; }; + + janeStreet_0_9_0 = import ../development/ocaml-modules/janestreet/old.nix { + janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage.nix { defaultVersion = "0.9.0"; }; + inherit lib ocaml ocamlbuild ctypes cryptokit; + inherit magic-mime num ocaml-migrate-parsetree octavius ounit; + inherit ppx_deriving re zarith; + inherit (pkgs) stdenv openssl; + }; js_build_tools = callPackage ../development/ocaml-modules/janestreet/js-build-tools.nix {}; |