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

async_extra: 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:18:43 -04:00
parent 1de9488674
commit 32367919c4
3 changed files with 26 additions and 5 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_p4, async_extra, pa_ounit}: async_unix_p4, async_extra_p4, 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_p4 async_extra pa_ounit ]; propagatedBuildInputs = [ async_kernel_p4 async_unix_p4 async_extra_p4 pa_ounit ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://github.com/janestreet/async; homepage = https://github.com/janestreet/async;

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

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

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

@ -5060,7 +5060,7 @@ in
asn1-combinators = callPackage ../development/ocaml-modules/asn1-combinators { }; asn1-combinators = callPackage ../development/ocaml-modules/asn1-combinators { };
async_extra = callPackage ../development/ocaml-modules/async_extra { }; async_extra_p4 = callPackage ../development/ocaml-modules/async_extra { };
async_find = callPackage ../development/ocaml-modules/async_find { }; async_find = callPackage ../development/ocaml-modules/async_find { };
@ -5610,18 +5610,22 @@ in
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 = async_kernel =
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_rpc_kernel = callPackage ../development/ocaml-modules/janestreet/async-rpc-kernel.nix {}; async_rpc_kernel = callPackage ../development/ocaml-modules/janestreet/async-rpc-kernel.nix {};
async_unix = async_unix =
if lib.versionOlder "4.02" ocaml_version if lib.versionOlder "4.02" ocaml_version
then callPackage ../development/ocaml-modules/janestreet/async-unix.nix {} then callPackage ../development/ocaml-modules/janestreet/async-unix.nix {}
else async_unix_p4; else async_unix_p4;
async_extra =
if lib.versionOlder "4.02" ocaml_version
then callPackage ../development/ocaml-modules/janestreet/async-extra.nix {}
else async_extra_p4;
}; };
ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0; ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0;