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

async_unix: 112.24.00 -> 112.24.00/113.33.03

Browse Source 
PPX/P4 split
This commit is contained in:
Matthew Maurer 2016-09-14 16:08:02 -04:00
parent 6f998593a9
commit 4e159d7064
4 changed files with 30 additions and 6 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,5 +1,5 @@
{stdenv, buildOcaml, fetchurl, async_kernel_p4, {stdenv, buildOcaml, fetchurl, async_kernel_p4,
async_unix, async_extra, pa_ounit}: async_unix_p4, async_extra, pa_ounit}:
buildOcaml rec { buildOcaml rec {
name = "async"; name = "async";
@ -12,7 +12,7 @@ buildOcaml rec {
sha256 = "ecc4ca939ab098e689332921b110dbaacd06d9f8d8bf697023dfff3ca37dc1e9"; sha256 = "ecc4ca939ab098e689332921b110dbaacd06d9f8d8bf697023dfff3ca37dc1e9";
}; };
propagatedBuildInputs = [ async_kernel_p4 async_unix async_extra pa_ounit ]; propagatedBuildInputs = [ async_kernel_p4 async_unix_p4 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_p4, async_unix, {stdenv, buildOcaml, fetchurl, async_kernel_p4, async_unix_p4,
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_p4 async_unix core_p4 bin_prot_p4 custom_printf propagatedBuildInputs = [ async_kernel_p4 async_unix_p4 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; {

17
pkgs/development/ocaml-modules/janestreet/async-unix.nix Normal file
View File

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

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

@ -5070,7 +5070,7 @@ in
async_ssl = callPackage ../development/ocaml-modules/async_ssl { }; async_ssl = callPackage ../development/ocaml-modules/async_ssl { };
async_unix = callPackage ../development/ocaml-modules/async_unix { }; async_unix_p4 = callPackage ../development/ocaml-modules/async_unix { };
async = async =
if lib.versionOlder "4.02" ocaml_version if lib.versionOlder "4.02" ocaml_version
@ -5614,6 +5614,12 @@ in
if lib.versionOlder "4.02" ocaml_version if lib.versionOlder "4.02" ocaml_version
then callPackage ../development/ocaml-modules/janestreet/async-kernel.nix {} then callPackage ../development/ocaml-modules/janestreet/async-kernel.nix {}
else async_kernel_p4; else async_kernel_p4;
async_unix =
if lib.versionOlder "4.02" ocaml_version
then callPackage ../development/ocaml-modules/janestreet/async-unix.nix {}
else async_unix_p4;
}; };
ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0; ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0;
@ -5741,9 +5747,10 @@ 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 async async_unix inherit (ocamlPackages_4_02) findlib camlp4 async
async_extra async_shell async_find cohttp uri; async_extra async_shell async_find cohttp uri;
ocaml = ocaml_4_02; ocaml = ocaml_4_02;
async_unix = ocamlPackages_4_02.async_unix_p4;
core_extended = ocamlPackages_4_02.core_extended_p4; core_extended = ocamlPackages_4_02.core_extended_p4;
sexplib = ocamlPackages_4_02.sexplib_p4; sexplib = ocamlPackages_4_02.sexplib_p4;
core = ocamlPackages_4_02.core_p4; core = ocamlPackages_4_02.core_p4;