diff options
author | Matthew Maurer <matthew.r.maurer@gmail.com> | 2016-09-14 16:08:02 -0400 |
---|---|---|
committer | Matthew Maurer <matthew.r.maurer@gmail.com> | 2016-09-14 16:37:21 -0400 |
commit | 4e159d70643287c318b10f78b9f0b8cb0e64d903 (patch) | |
tree | 2344803818857e2557b7a5b2559d39b266baaed4 | |
parent | 6f998593a9937027eee317a80a091a46b80bb9b4 (diff) | |
download | nixlib-4e159d70643287c318b10f78b9f0b8cb0e64d903.tar nixlib-4e159d70643287c318b10f78b9f0b8cb0e64d903.tar.gz nixlib-4e159d70643287c318b10f78b9f0b8cb0e64d903.tar.bz2 nixlib-4e159d70643287c318b10f78b9f0b8cb0e64d903.tar.lz nixlib-4e159d70643287c318b10f78b9f0b8cb0e64d903.tar.xz nixlib-4e159d70643287c318b10f78b9f0b8cb0e64d903.tar.zst nixlib-4e159d70643287c318b10f78b9f0b8cb0e64d903.zip |
async_unix: 112.24.00 -> 112.24.00/113.33.03
PPX/P4 split
-rw-r--r-- | pkgs/development/ocaml-modules/async/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/async_extra/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/janestreet/async-unix.nix | 17 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 11 |
4 files changed, 30 insertions, 6 deletions
diff --git a/pkgs/development/ocaml-modules/async/default.nix b/pkgs/development/ocaml-modules/async/default.nix index 2ddfc40b8f86..f9d263c40cec 100644 --- a/pkgs/development/ocaml-modules/async/default.nix +++ b/pkgs/development/ocaml-modules/async/default.nix @@ -1,5 +1,5 @@ {stdenv, buildOcaml, fetchurl, async_kernel_p4, - async_unix, async_extra, pa_ounit}: + async_unix_p4, async_extra, pa_ounit}: buildOcaml rec { name = "async"; @@ -12,7 +12,7 @@ buildOcaml rec { 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; { homepage = https://github.com/janestreet/async; diff --git a/pkgs/development/ocaml-modules/async_extra/default.nix b/pkgs/development/ocaml-modules/async_extra/default.nix index fbb95a682f4d..80addcfc3bb4 100644 --- a/pkgs/development/ocaml-modules/async_extra/default.nix +++ b/pkgs/development/ocaml-modules/async_extra/default.nix @@ -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, pipebang, pa_test, sexplib_p4}: @@ -14,7 +14,7 @@ buildOcaml rec { }; 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 ]; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/janestreet/async-unix.nix b/pkgs/development/ocaml-modules/janestreet/async-unix.nix new file mode 100644 index 000000000000..5621d2ec704b --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/async-unix.nix @@ -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 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dac3e196b233..7e6a1b5a3a55 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5070,7 +5070,7 @@ in 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 = if lib.versionOlder "4.02" ocaml_version @@ -5614,6 +5614,12 @@ in if lib.versionOlder "4.02" ocaml_version then callPackage ../development/ocaml-modules/janestreet/async-kernel.nix {} 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; @@ -5741,9 +5747,10 @@ in tinycc = callPackage ../development/compilers/tinycc { }; 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; ocaml = ocaml_4_02; + async_unix = ocamlPackages_4_02.async_unix_p4; core_extended = ocamlPackages_4_02.core_extended_p4; sexplib = ocamlPackages_4_02.sexplib_p4; core = ocamlPackages_4_02.core_p4; |