mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 13:10:33 +00:00
Code Issues Wiki Activity

core: 112.24.01 -> 112.24.01/113.33.03

Browse source 
PPX/P4 split
This commit is contained in:
Matthew Maurer 2016-09-13 20:59:22 -04:00
parent a6f8b1f9ff
commit 0561329ae5
10 changed files with 39 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/ocaml-modules/async_extra/default.nix
View file

@ -1,5 +1,5 @@
{stdenv, buildOcaml, fetchurl, async_kernel, async_unix,
bin_prot_p4, core, custom_printf, fieldslib_p4, herelib, pa_ounit,
bin_prot_p4, core_p4, custom_printf, fieldslib_p4, herelib, pa_ounit,
pipebang, pa_test, sexplib_p4}:
buildOcaml rec {
@ -14,7 +14,7 @@ buildOcaml rec {
};
buildInputs = [ pa_test pa_ounit ];
propagatedBuildInputs = [ async_kernel async_unix core bin_prot_p4 custom_printf
propagatedBuildInputs = [ async_kernel async_unix core_p4 bin_prot_p4 custom_printf
fieldslib_p4 herelib pipebang sexplib_p4 ];
meta = with stdenv.lib; {

4
pkgs/development/ocaml-modules/async_find/default.nix
View file

@ -1,4 +1,4 @@
{stdenv, buildOcaml, fetchurl, async, core, sexplib_p4}:
{stdenv, buildOcaml, fetchurl, async, core_p4, sexplib_p4}:
buildOcaml rec {
name = "async_find";
@ -11,7 +11,7 @@ buildOcaml rec {
sha256 = "4e3fda72f50174f05d96a5a09323f236c041b1a685890c155822956f3deb8803";
};
propagatedBuildInputs = [ async core sexplib_p4 ];
propagatedBuildInputs = [ async core_p4 sexplib_p4 ];
meta = with stdenv.lib; {
homepage = https://github.com/janestreet/async_find;

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

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

4
pkgs/development/ocaml-modules/async_ssl/default.nix
View file

@ -1,4 +1,4 @@
{stdenv, buildOcaml, fetchurl, async, comparelib, core, ctypes, openssl,
{stdenv, buildOcaml, fetchurl, async, comparelib, core_p4, ctypes, openssl,
fieldslib_p4, herelib, pa_bench, pa_ounit, pipebang, pa_test, sexplib_p4}:
buildOcaml rec {
@ -13,7 +13,7 @@ buildOcaml rec {
};
buildInputs = [ pa_bench pa_test ];
propagatedBuildInputs = [ ctypes async comparelib core fieldslib_p4 pa_ounit
propagatedBuildInputs = [ ctypes async comparelib core_p4 fieldslib_p4 pa_ounit
herelib pipebang sexplib_p4 openssl ];
meta = with stdenv.lib; {

4
pkgs/development/ocaml-modules/async_unix/default.nix
View file

@ -1,5 +1,5 @@
{stdenv, buildOcaml, fetchurl, async_kernel,
bin_prot_p4, comparelib, core, fieldslib_p4, herelib, pa_ounit,
bin_prot_p4, comparelib, core_p4, fieldslib_p4, herelib, pa_ounit,
pipebang, pa_test, sexplib_p4}:
buildOcaml rec {
@ -15,7 +15,7 @@ buildOcaml rec {
hasSharedObjects = true;
buildInputs = [ pa_ounit ];
propagatedBuildInputs = [ async_kernel core bin_prot_p4 comparelib
propagatedBuildInputs = [ async_kernel core_p4 bin_prot_p4 comparelib
fieldslib_p4 herelib pipebang pa_test sexplib_p4 ];
meta = with stdenv.lib; {

4
pkgs/development/ocaml-modules/core_extended/default.nix
View file

@ -1,4 +1,4 @@
{stdenv, buildOcaml, fetchurl, bin_prot_p4, comparelib, core, custom_printf,
{stdenv, buildOcaml, fetchurl, bin_prot_p4, comparelib, core_p4, custom_printf,
fieldslib_p4, pa_bench, pa_ounit, pipebang, pa_test, textutils, re2, sexplib_p4}:
buildOcaml rec {
@ -14,7 +14,7 @@ buildOcaml rec {
hasSharedObjects = true;
buildInputs = [ pa_bench pa_test pa_ounit ];
propagatedBuildInputs = [bin_prot_p4 comparelib core custom_printf fieldslib_p4
propagatedBuildInputs = [bin_prot_p4 comparelib core_p4 custom_printf fieldslib_p4
pipebang textutils re2 sexplib_p4 ];
meta = with stdenv.lib; {

20
pkgs/development/ocaml-modules/janestreet/core.nix Normal file
View file

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

4
pkgs/development/ocaml-modules/re2/default.nix
View file

@ -1,4 +1,4 @@
{stdenv, buildOcaml, fetchurl, ocaml, core, pa_ounit, pa_test,
{stdenv, buildOcaml, fetchurl, ocaml, core_p4, pa_ounit, pa_test,
bin_prot_p4, comparelib, sexplib_p4, rsync}:
buildOcaml rec {
@ -16,7 +16,7 @@ buildOcaml rec {
else null;
buildInputs = [ pa_ounit pa_test rsync ];
propagatedBuildInputs = [ core bin_prot_p4 comparelib sexplib_p4 ];
propagatedBuildInputs = [ core_p4 bin_prot_p4 comparelib sexplib_p4 ];
hasSharedObjects = true;

4
pkgs/development/ocaml-modules/textutils/default.nix
View file

@ -1,4 +1,4 @@
{stdenv, buildOcaml, fetchurl, core, pa_ounit, pa_test, sexplib_p4}:
{stdenv, buildOcaml, fetchurl, core_p4, pa_ounit, pa_test, sexplib_p4}:
buildOcaml rec {
name = "textutils";
@ -12,7 +12,7 @@ buildOcaml rec {
};
buildInputs = [ pa_test ];
propagatedBuildInputs = [ core pa_ounit sexplib_p4 ];
propagatedBuildInputs = [ core_p4 pa_ounit sexplib_p4 ];
meta = with stdenv.lib; {
homepage = https://github.com/janestreet/textutils;

4
pkgs/top-level/all-packages.nix
View file

@ -5305,7 +5305,7 @@ in
core_kernel_p4 = callPackage ../development/ocaml-modules/core_kernel { };
core = callPackage ../development/ocaml-modules/core { };
core_p4 = callPackage ../development/ocaml-modules/core { };
ocaml_cryptgps = callPackage ../development/ocaml-modules/cryptgps { };
@ -5571,6 +5571,8 @@ in
bin_prot = callPackage ../development/ocaml-modules/janestreet/bin_prot.nix {};
core_kernel = callPackage ../development/ocaml-modules/janestreet/core_kernel.nix {};
core = callPackage ../development/ocaml-modules/janestreet/core.nix {};
};
ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0;