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

core_extended: 112.24.00 -> 112.24.00/113.33.03

Browse Source 
PPX/P4 split
This commit is contained in:
Matthew Maurer 2016-09-13 21:51:24 -04:00
parent eafda42dc6
commit 2acf031b81
3 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/ocaml-modules/async_shell/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, buildOcaml, fetchurl, async, core_p4, core_extended}: {stdenv, buildOcaml, fetchurl, async, core_p4, core_extended_p4}:
buildOcaml rec { buildOcaml rec {
name = "async_shell"; name = "async_shell";
@ -11,7 +11,7 @@ buildOcaml rec {
sha256 = "0b4497bea9124c5a665ee58fb0a73c5cbf2f757479df902e6870627196e6c105"; sha256 = "0b4497bea9124c5a665ee58fb0a73c5cbf2f757479df902e6870627196e6c105";
}; };
propagatedBuildInputs = [ async core_p4 core_extended ]; propagatedBuildInputs = [ async core_p4 core_extended_p4 ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://github.com/janestreet/async_shell; homepage = https://github.com/janestreet/async_shell;

22
pkgs/development/ocaml-modules/janestreet/core-extended.nix Normal file
View File

@ -0,0 +1,22 @@
{stdenv, buildOcamlJane, fetchurl,
core,
bin_prot, fieldslib, sexplib, typerep, variantslib,
ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane,
re2, textutils,
ocaml_oasis, opam, js_build_tools}:
buildOcamlJane rec {
name = "core_extended";
hash = "1j4ipcn741j8w3h4gpv5sygjzg6b5g6gc2jcrr4n0jyn5dq8b0p5";
propagatedBuildInputs =
[ core bin_prot fieldslib sexplib typerep variantslib
ppx_assert ppx_bench ppx_driver ppx_expect ppx_inline_test ppx_jane
re2 textutils ];
meta = with stdenv.lib; {
homepage = https://github.com/janestreet/core_extended;
description = "Jane Street Capital's standard library overlay";
license = licenses.asl20;
maintainers = [ maintainers.maurer maintainers.ericbmerritt ];
};
}

11
pkgs/top-level/all-packages.nix
View File

@ -5301,7 +5301,7 @@ in
comparelib = callPackage ../development/ocaml-modules/comparelib { }; comparelib = callPackage ../development/ocaml-modules/comparelib { };
core_extended = callPackage ../development/ocaml-modules/core_extended { }; core_extended_p4 = callPackage ../development/ocaml-modules/core_extended { };
core_kernel_p4 = callPackage ../development/ocaml-modules/core_kernel { }; core_kernel_p4 = callPackage ../development/ocaml-modules/core_kernel { };
@ -5577,6 +5577,8 @@ in
re2 = callPackage ../development/ocaml-modules/janestreet/re2.nix {}; re2 = callPackage ../development/ocaml-modules/janestreet/re2.nix {};
textutils = callPackage ../development/ocaml-modules/janestreet/textutils.nix {}; textutils = callPackage ../development/ocaml-modules/janestreet/textutils.nix {};
core_extended = callPackage ../development/ocaml-modules/janestreet/core-extended.nix {};
}; };
ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0; ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0;
@ -5704,9 +5706,12 @@ in
tinycc = callPackage ../development/compilers/tinycc { }; tinycc = callPackage ../development/compilers/tinycc { };
trv = callPackage ../development/tools/misc/trv { trv = callPackage ../development/tools/misc/trv {
inherit (ocamlPackages_4_02) findlib camlp4 core async async_unix inherit (ocamlPackages_4_02) findlib camlp4 async async_unix
async_extra sexplib async_shell core_extended async_find cohttp uri; async_extra async_shell async_find cohttp uri;
ocaml = ocaml_4_02; ocaml = ocaml_4_02;
core_extended = ocamlPackages_4_02.core_extended_p4;
sexplib = ocamlPackages_4_02.sexplib_p4;
core = ocamlPackages_4_02.core_p4;
}; };
bupc = callPackage ../development/compilers/bupc { }; bupc = callPackage ../development/compilers/bupc { };