diff options
author | Matthew Maurer <matthew.r.maurer@gmail.com> | 2016-09-13 20:21:56 -0400 |
---|---|---|
committer | Matthew Maurer <matthew.r.maurer@gmail.com> | 2016-09-14 02:35:48 -0400 |
commit | fc4b5786cd185ca255ac41d27dc4bcf292ba6aa7 (patch) | |
tree | be40a0a44a619e395ccf193367f0d0100a187eb9 /pkgs | |
parent | 3eb02d9f386576790ba6d8544779aa3b980e972f (diff) |
sexplib: 112.24.01 -> 112.24.01/113.33.03
PPX/P4 split
Diffstat (limited to 'pkgs')
20 files changed, 57 insertions, 37 deletions
diff --git a/pkgs/development/ocaml-modules/async_extra/default.nix b/pkgs/development/ocaml-modules/async_extra/default.nix index 8689c0291c3f..960504f2a51a 100644 --- a/pkgs/development/ocaml-modules/async_extra/default.nix +++ b/pkgs/development/ocaml-modules/async_extra/default.nix @@ -1,6 +1,6 @@ {stdenv, buildOcaml, fetchurl, async_kernel, async_unix, bin_prot, core, custom_printf, fieldslib_p4, herelib, pa_ounit, - pipebang, pa_test, sexplib}: + pipebang, pa_test, sexplib_p4}: buildOcaml rec { name = "async_extra"; @@ -15,7 +15,7 @@ buildOcaml rec { buildInputs = [ pa_test pa_ounit ]; propagatedBuildInputs = [ async_kernel async_unix core bin_prot custom_printf - fieldslib_p4 herelib pipebang sexplib ]; + fieldslib_p4 herelib pipebang sexplib_p4 ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/async_extra; diff --git a/pkgs/development/ocaml-modules/async_find/default.nix b/pkgs/development/ocaml-modules/async_find/default.nix index ae10e931ce25..ed07a03753e7 100644 --- a/pkgs/development/ocaml-modules/async_find/default.nix +++ b/pkgs/development/ocaml-modules/async_find/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, async, core, sexplib}: +{stdenv, buildOcaml, fetchurl, async, core, sexplib_p4}: buildOcaml rec { name = "async_find"; @@ -11,7 +11,7 @@ buildOcaml rec { sha256 = "4e3fda72f50174f05d96a5a09323f236c041b1a685890c155822956f3deb8803"; }; - propagatedBuildInputs = [ async core sexplib ]; + propagatedBuildInputs = [ async core sexplib_p4 ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/async_find; diff --git a/pkgs/development/ocaml-modules/async_kernel/default.nix b/pkgs/development/ocaml-modules/async_kernel/default.nix index f850e4612960..4bd698b59d98 100644 --- a/pkgs/development/ocaml-modules/async_kernel/default.nix +++ b/pkgs/development/ocaml-modules/async_kernel/default.nix @@ -1,6 +1,6 @@ {stdenv, buildOcaml, fetchurl, core_kernel, bin_prot, fieldslib_p4, pa_ounit, pa_test, - sexplib, herelib}: + sexplib_p4, herelib}: buildOcaml rec { name = "async_kernel"; @@ -14,7 +14,7 @@ buildOcaml rec { }; buildInputs = [ pa_test pa_ounit ]; - propagatedBuildInputs = [ core_kernel bin_prot fieldslib_p4 herelib sexplib ]; + propagatedBuildInputs = [ core_kernel bin_prot fieldslib_p4 herelib sexplib_p4 ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/async_kernel; diff --git a/pkgs/development/ocaml-modules/async_ssl/default.nix b/pkgs/development/ocaml-modules/async_ssl/default.nix index cc4f5ba32c9f..52148c9d707d 100644 --- a/pkgs/development/ocaml-modules/async_ssl/default.nix +++ b/pkgs/development/ocaml-modules/async_ssl/default.nix @@ -1,5 +1,5 @@ {stdenv, buildOcaml, fetchurl, async, comparelib, core, ctypes, openssl, - fieldslib_p4, herelib, pa_bench, pa_ounit, pipebang, pa_test, sexplib}: + fieldslib_p4, herelib, pa_bench, pa_ounit, pipebang, pa_test, sexplib_p4}: buildOcaml rec { name = "async_ssl"; @@ -14,7 +14,7 @@ buildOcaml rec { buildInputs = [ pa_bench pa_test ]; propagatedBuildInputs = [ ctypes async comparelib core fieldslib_p4 pa_ounit - herelib pipebang sexplib openssl ]; + herelib pipebang sexplib_p4 openssl ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/async_ssl; diff --git a/pkgs/development/ocaml-modules/async_unix/default.nix b/pkgs/development/ocaml-modules/async_unix/default.nix index 11965f3f35ff..e796870e54c8 100644 --- a/pkgs/development/ocaml-modules/async_unix/default.nix +++ b/pkgs/development/ocaml-modules/async_unix/default.nix @@ -1,6 +1,6 @@ {stdenv, buildOcaml, fetchurl, async_kernel, bin_prot, comparelib, core, fieldslib_p4, herelib, pa_ounit, - pipebang, pa_test, sexplib}: + pipebang, pa_test, sexplib_p4}: buildOcaml rec { name = "async_unix"; @@ -16,7 +16,7 @@ buildOcaml rec { hasSharedObjects = true; buildInputs = [ pa_ounit ]; propagatedBuildInputs = [ async_kernel core bin_prot comparelib - fieldslib_p4 herelib pipebang pa_test sexplib ]; + fieldslib_p4 herelib pipebang pa_test sexplib_p4 ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/async_unix; diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix index 0fa44a2cd7fb..dcf3c8c13d79 100644 --- a/pkgs/development/ocaml-modules/cohttp/default.nix +++ b/pkgs/development/ocaml-modules/cohttp/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, cmdliner, re, uri, fieldslib_p4, sexplib, conduit, +{stdenv, buildOcaml, fetchurl, cmdliner, re, uri, fieldslib_p4, sexplib_p4, conduit, stringext, base64, magic-mime, ounit, alcotest, lwt ? null, async ? null, async_ssl ? null}: @@ -14,7 +14,7 @@ buildOcaml rec { }; buildInputs = [ alcotest ]; - propagatedBuildInputs = [ cmdliner re uri fieldslib_p4 sexplib sexplib + propagatedBuildInputs = [ cmdliner re uri fieldslib_p4 sexplib_p4 sexplib_p4 conduit stringext base64 magic-mime ounit async async_ssl lwt ]; diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix index dbb83f4c8cf0..26accd99db67 100644 --- a/pkgs/development/ocaml-modules/conduit/default.nix +++ b/pkgs/development/ocaml-modules/conduit/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, sexplib, stringext, uri, cstruct, ipaddr, +{stdenv, buildOcaml, fetchurl, sexplib_p4, stringext, uri, cstruct, ipaddr, async ? null, async_ssl ? null, lwt ? null}: buildOcaml rec { @@ -10,7 +10,7 @@ buildOcaml rec { sha256 = "5cf1a46aa0254345e5143feebe6b54bdef96314e9987f44e69f24618d620faa1"; }; - propagatedBuildInputs = ([ sexplib stringext uri cstruct ipaddr ] + propagatedBuildInputs = ([ sexplib_p4 stringext uri cstruct ipaddr ] ++ stdenv.lib.optional (lwt != null) lwt ++ stdenv.lib.optional (async != null) async ++ stdenv.lib.optional (async_ssl != null) async_ssl); diff --git a/pkgs/development/ocaml-modules/core/default.nix b/pkgs/development/ocaml-modules/core/default.nix index e52b41526acd..90b62985d110 100644 --- a/pkgs/development/ocaml-modules/core/default.nix +++ b/pkgs/development/ocaml-modules/core/default.nix @@ -1,7 +1,7 @@ {stdenv, buildOcaml, fetchurl, type_conv, core_kernel, bin_prot, comparelib, custom_printf, enumerate, fieldslib_p4, herelib, pa_bench, pa_test, pa_ounit, - pipebang, sexplib, typerep_p4, variantslib}: + pipebang, sexplib_p4, typerep_p4, variantslib}: buildOcaml rec { name = "core"; @@ -19,7 +19,7 @@ buildOcaml rec { buildInputs = [ pa_bench pa_test pa_ounit ]; propagatedBuildInputs = [ type_conv core_kernel bin_prot comparelib custom_printf enumerate fieldslib_p4 herelib - pipebang sexplib typerep_p4 variantslib ]; + pipebang sexplib_p4 typerep_p4 variantslib ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/core; diff --git a/pkgs/development/ocaml-modules/core_extended/default.nix b/pkgs/development/ocaml-modules/core_extended/default.nix index e263d8d2c1b5..555c59246615 100644 --- a/pkgs/development/ocaml-modules/core_extended/default.nix +++ b/pkgs/development/ocaml-modules/core_extended/default.nix @@ -1,5 +1,5 @@ {stdenv, buildOcaml, fetchurl, bin_prot, comparelib, core, custom_printf, - fieldslib_p4, pa_bench, pa_ounit, pipebang, pa_test, textutils, re2, sexplib}: + fieldslib_p4, pa_bench, pa_ounit, pipebang, pa_test, textutils, re2, sexplib_p4}: buildOcaml rec { name = "core_extended"; @@ -15,7 +15,7 @@ buildOcaml rec { hasSharedObjects = true; buildInputs = [ pa_bench pa_test pa_ounit ]; propagatedBuildInputs = [bin_prot comparelib core custom_printf fieldslib_p4 - pipebang textutils re2 sexplib ]; + pipebang textutils re2 sexplib_p4 ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/core_extended; diff --git a/pkgs/development/ocaml-modules/core_kernel/default.nix b/pkgs/development/ocaml-modules/core_kernel/default.nix index 9be9f578026c..5e36a97aeb6b 100644 --- a/pkgs/development/ocaml-modules/core_kernel/default.nix +++ b/pkgs/development/ocaml-modules/core_kernel/default.nix @@ -1,7 +1,7 @@ {stdenv, buildOcaml, fetchurl, type_conv, bin_prot, comparelib, custom_printf, enumerate, fieldslib_p4, herelib, pa_bench, pa_test, pa_ounit, - pipebang, sexplib, typerep_p4, variantslib}: + pipebang, sexplib_p4, typerep_p4, variantslib}: buildOcaml rec { name = "core_kernel"; @@ -18,7 +18,7 @@ buildOcaml rec { buildInputs = [ pa_test pa_ounit ]; propagatedBuildInputs = [ type_conv pa_bench bin_prot comparelib custom_printf - enumerate fieldslib_p4 herelib pipebang sexplib + enumerate fieldslib_p4 herelib pipebang sexplib_p4 typerep_p4 variantslib ]; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/cstruct/default.nix b/pkgs/development/ocaml-modules/cstruct/default.nix index 57a057e0eaa9..68b202f9ade6 100644 --- a/pkgs/development/ocaml-modules/cstruct/default.nix +++ b/pkgs/development/ocaml-modules/cstruct/default.nix @@ -1,4 +1,4 @@ -{stdenv, writeText, fetchurl, ocaml, ocplib-endian, sexplib, findlib, +{stdenv, writeText, fetchurl, ocaml, ocplib-endian, sexplib_p4, findlib, async ? null, lwt ? null, camlp4}: assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { configureFlags = stdenv.lib.strings.concatStringsSep " " ((if lwt != null then ["--enable-lwt"] else []) ++ (if async != null then ["--enable-async"] else [])); buildInputs = [ocaml findlib camlp4]; - propagatedBuildInputs = [ocplib-endian sexplib lwt async]; + propagatedBuildInputs = [ocplib-endian sexplib_p4 lwt async]; createFindlibDestdir = true; dontStrip = true; diff --git a/pkgs/development/ocaml-modules/custom_printf/default.nix b/pkgs/development/ocaml-modules/custom_printf/default.nix index 05a8ecfe616b..16c31fc3861a 100644 --- a/pkgs/development/ocaml-modules/custom_printf/default.nix +++ b/pkgs/development/ocaml-modules/custom_printf/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, type_conv, sexplib, pa_ounit}: +{stdenv, buildOcaml, fetchurl, type_conv, sexplib_p4, pa_ounit}: buildOcaml rec { name = "custom_printf"; @@ -12,7 +12,7 @@ buildOcaml rec { }; buildInputs = [ pa_ounit ]; - propagatedBuildInputs = [ type_conv sexplib ]; + propagatedBuildInputs = [ type_conv sexplib_p4 ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/custom_printf; diff --git a/pkgs/development/ocaml-modules/ezjsonm/default.nix b/pkgs/development/ocaml-modules/ezjsonm/default.nix index fd8ce1c33898..4d63b0c3f95f 100644 --- a/pkgs/development/ocaml-modules/ezjsonm/default.nix +++ b/pkgs/development/ocaml-modules/ezjsonm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, jsonm, hex, sexplib, lwt }: +{ stdenv, fetchzip, ocaml, findlib, jsonm, hex, sexplib_p4, lwt }: let version = "0.4.1"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; buildInputs = [ ocaml findlib ]; - propagatedBuildInputs = [ jsonm hex sexplib lwt ]; + propagatedBuildInputs = [ jsonm hex sexplib_p4 lwt ]; createFindlibDestdir = true; configureFlags = "--enable-lwt"; diff --git a/pkgs/development/ocaml-modules/ipaddr/default.nix b/pkgs/development/ocaml-modules/ipaddr/default.nix index 749b6a1d94e3..cdc273d6ecfd 100644 --- a/pkgs/development/ocaml-modules/ipaddr/default.nix +++ b/pkgs/development/ocaml-modules/ipaddr/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, sexplib}: +{stdenv, buildOcaml, fetchurl, sexplib_p4}: buildOcaml rec { name = "ipaddr"; @@ -9,7 +9,7 @@ buildOcaml rec { sha256 = "7051013d8f58abff433187d70cd7ddd7a6b49a6fbe6cad1893f571f65b8ed3d0"; }; - propagatedBuildInputs = [ sexplib ]; + propagatedBuildInputs = [ sexplib_p4 ]; configurePhase = '' ocaml setup.ml -configure --prefix $out diff --git a/pkgs/development/ocaml-modules/janestreet/sexplib.nix b/pkgs/development/ocaml-modules/janestreet/sexplib.nix new file mode 100644 index 000000000000..4a785d199c8c --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/sexplib.nix @@ -0,0 +1,18 @@ +{stdenv, buildOcamlJane, type_conv}: + +buildOcamlJane rec { + minimumSupportedOcamlVersion = "4.02"; + name = "sexplib"; + version = "113.33.03"; + + hash = "1klar4qw4s7bj47ig7kxz2m4j1q3c60pfppis4vxrxv15r0kfh22"; + + propagatedBuildInputs = [ type_conv ]; + + meta = with stdenv.lib; { + homepage = https://ocaml.janestreet.com/; + description = "Library for serializing OCaml values to and from S-expressions"; + license = licenses.asl20; + maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/pa_test/default.nix b/pkgs/development/ocaml-modules/pa_test/default.nix index faf17e20dc1e..5acf931b2eac 100644 --- a/pkgs/development/ocaml-modules/pa_test/default.nix +++ b/pkgs/development/ocaml-modules/pa_test/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, type_conv, pa_ounit, sexplib, herelib}: +{stdenv, buildOcaml, fetchurl, type_conv, pa_ounit, sexplib_p4, herelib}: buildOcaml rec { name = "pa_test"; @@ -12,7 +12,7 @@ buildOcaml rec { }; buildInputs = [ pa_ounit ]; - propagatedBuildInputs = [ type_conv sexplib herelib ]; + propagatedBuildInputs = [ type_conv sexplib_p4 herelib ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/pa_test; diff --git a/pkgs/development/ocaml-modules/re2/default.nix b/pkgs/development/ocaml-modules/re2/default.nix index e89e28fe1e55..5a1d382afb1a 100644 --- a/pkgs/development/ocaml-modules/re2/default.nix +++ b/pkgs/development/ocaml-modules/re2/default.nix @@ -1,5 +1,5 @@ {stdenv, buildOcaml, fetchurl, ocaml, core, pa_ounit, pa_test, - bin_prot, comparelib, sexplib, rsync}: + bin_prot, comparelib, sexplib_p4, rsync}: buildOcaml rec { name = "re2"; @@ -16,7 +16,7 @@ buildOcaml rec { else null; buildInputs = [ pa_ounit pa_test rsync ]; - propagatedBuildInputs = [ core bin_prot comparelib sexplib ]; + propagatedBuildInputs = [ core bin_prot comparelib sexplib_p4 ]; hasSharedObjects = true; diff --git a/pkgs/development/ocaml-modules/textutils/default.nix b/pkgs/development/ocaml-modules/textutils/default.nix index 377b94eff8b8..d3bb995769e9 100644 --- a/pkgs/development/ocaml-modules/textutils/default.nix +++ b/pkgs/development/ocaml-modules/textutils/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, core, pa_ounit, pa_test, sexplib}: +{stdenv, buildOcaml, fetchurl, core, pa_ounit, pa_test, sexplib_p4}: buildOcaml rec { name = "textutils"; @@ -12,7 +12,7 @@ buildOcaml rec { }; buildInputs = [ pa_test ]; - propagatedBuildInputs = [ core pa_ounit sexplib ]; + propagatedBuildInputs = [ core pa_ounit sexplib_p4 ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/textutils; diff --git a/pkgs/development/ocaml-modules/uri/default.nix b/pkgs/development/ocaml-modules/uri/default.nix index dca989c88efd..a6335274f737 100644 --- a/pkgs/development/ocaml-modules/uri/default.nix +++ b/pkgs/development/ocaml-modules/uri/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, re, sexplib, stringext, ounit }: +{ stdenv, fetchzip, ocaml, findlib, re, sexplib_p4, stringext, ounit }: assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; buildInputs = [ ocaml findlib ounit ]; - propagatedBuildInputs = [ re sexplib stringext ]; + propagatedBuildInputs = [ re sexplib_p4 stringext ]; configurePhase = "ocaml setup.ml -configure --prefix $out --enable-tests"; buildPhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 87ebf949bd36..84479b743184 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5405,7 +5405,7 @@ in sexplib_111_25_00 = callPackage ../development/ocaml-modules/sexplib/111.25.00.nix { }; sexplib_112_24_01 = callPackage ../development/ocaml-modules/sexplib/112.24.01.nix { }; - sexplib = + sexplib_p4 = if lib.versionOlder "4.02" ocaml_version then sexplib_112_24_01 else if lib.versionOlder "4.00" ocaml_version @@ -5563,6 +5563,8 @@ in typerep = callPackage ../development/ocaml-modules/janestreet/typerep.nix {}; fieldslib = callPackage ../development/ocaml-modules/janestreet/fieldslib.nix {}; + + sexplib = callPackage ../development/ocaml-modules/janestreet/sexplib.nix {}; }; ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0; |