public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #35439 from mt-caret/janestreet-0.10.0

Browse Source 
janeStreet: 0.9.0 -> 0.10.0
This commit is contained in:
Vincent Laporte
2018-03-07 09:06:32 +01:00
committed by GitHub
parent fb6177722d 391b4d7388
commit 0e23b529cc
5 changed files with 741 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/ocaml-packages.nix
+15 -4
View File
@@ -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,10 +714,19 @@ let
# Jane Street
janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage.nix {};
janeStreet = import ../development/ocaml-modules/janestreet {
inherit lib janePackage ocaml ocamlbuild ctypes cryptokit magic-mime num;
inherit ocaml-migrate-parsetree octavius ounit ppx_deriving re zarith;
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;
};