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

ocamlPackages.sexplib: 0.9.2 -> 0.9.3

Browse Source
This commit is contained in:
Vincent Laporte 2017-11-03 23:53:25 +00:00
parent a9f13a4614
commit 8923737cd5
No known key found for this signature in database
GPG Key ID: EBD582ADDDB1F81F
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/ocaml-modules/janestreet/default.nix
View File

@ -1,17 +1,24 @@
{ stdenv, lib, janePackage, ocaml, ocamlbuild, cryptokit, ctypes, magic-mime,
ocaml-migrate-parsetree, octavius, ounit, ppx_deriving, re, zarith,
ocaml-migrate-parsetree, octavius, ounit, ppx_deriving, re, zarith, num,
openssl }:
rec {
# Jane Street packages, up to ppx_core
sexplib = janePackage {
sexplib = janePackage ({
name = "sexplib";
version = "0.9.2";
hash = "0szj7gi5ksy7kif5g71rkr6xhxc41xl8hq6s5zz610cjyngzyzjl";
meta.description = "Automated S-expression conversion";
};
} // (if lib.versionAtLeast ocaml.version "4.05"
then {
version = "0.9.3";
hash = "0a2sqh235ja3qwy7b2k3qym2616dz7369a195qwi6ljy3cnh7s53";
buildInputs = [ num ];
} else {
version = "0.9.2";
hash = "0szj7gi5ksy7kif5g71rkr6xhxc41xl8hq6s5zz610cjyngzyzjl";
}
));
base = janePackage {
name = "base";

2
pkgs/top-level/ocaml-packages.nix
View File

@ -682,7 +682,7 @@ let
janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage.nix {};
janeStreet = import ../development/ocaml-modules/janestreet {
inherit lib janePackage ocaml ocamlbuild ctypes cryptokit magic-mime;
inherit lib janePackage ocaml ocamlbuild ctypes cryptokit magic-mime num;
inherit ocaml-migrate-parsetree octavius ounit ppx_deriving re zarith;
inherit (pkgs) stdenv openssl;
};