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

async_kernel: 112.24.00 -> 112.24.00/113.33.03

Browse Source 
PPX/P4 split
This commit is contained in:
Matthew Maurer 2016-09-14 15:52:58 -04:00
parent 284c2d8ef5
commit 6f998593a9
5 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{stdenv, buildOcaml, fetchurl, async_kernel, {stdenv, buildOcaml, fetchurl, async_kernel_p4,
async_unix, async_extra, pa_ounit}: async_unix, async_extra, pa_ounit}:
buildOcaml rec { buildOcaml rec {
@ -12,7 +12,7 @@ buildOcaml rec {
sha256 = "ecc4ca939ab098e689332921b110dbaacd06d9f8d8bf697023dfff3ca37dc1e9"; sha256 = "ecc4ca939ab098e689332921b110dbaacd06d9f8d8bf697023dfff3ca37dc1e9";
}; };
propagatedBuildInputs = [ async_kernel async_unix async_extra pa_ounit ]; propagatedBuildInputs = [ async_kernel_p4 async_unix async_extra pa_ounit ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://github.com/janestreet/async; homepage = https://github.com/janestreet/async;

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

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

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

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

16
pkgs/development/ocaml-modules/janestreet/async-kernel.nix Normal file
View File

@ -0,0 +1,16 @@
{stdenv, buildOcamlJane, fetchurl, core_kernel,
bin_prot, fieldslib,
sexplib, herelib, opam, js_build_tools, ocaml_oasis}:
buildOcamlJane rec {
name = "async_kernel";
hash = "1n6ifbrq6q6hq8bxh6b9vhg11mv9r6jgp1b7vfw7mh5s2nrd4b60";
propagatedBuildInputs = [ core_kernel bin_prot fieldslib herelib sexplib ];
meta = with stdenv.lib; {
homepage = https://github.com/janestreet/async_kernel;
description = "Jane Street Capital's asynchronous execution library (core) ";
license = licenses.asl20;
maintainers = [ maintainers.maurer maintainers.ericbmerritt ];
};
}

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

@ -5064,7 +5064,7 @@ in
async_find = callPackage ../development/ocaml-modules/async_find { }; async_find = callPackage ../development/ocaml-modules/async_find { };
async_kernel = callPackage ../development/ocaml-modules/async_kernel { }; async_kernel_p4 = callPackage ../development/ocaml-modules/async_kernel { };
async_shell = callPackage ../development/ocaml-modules/async_shell { }; async_shell = callPackage ../development/ocaml-modules/async_shell { };
@ -5609,6 +5609,11 @@ in
if lib.versionOlder "4.02" ocaml_version if lib.versionOlder "4.02" ocaml_version
then callPackage ../development/ocaml-modules/janestreet/core-extended.nix {} then callPackage ../development/ocaml-modules/janestreet/core-extended.nix {}
else core_extended_p4; else core_extended_p4;
async_kernel =
if lib.versionOlder "4.02" ocaml_version
then callPackage ../development/ocaml-modules/janestreet/async-kernel.nix {}
else async_kernel_p4;
}; };
ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0; ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0;