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

sexplib: 112.24.01 -> 112.24.01/113.33.03

Browse Source 
PPX/P4 split
This commit is contained in:
Matthew Maurer 2016-09-13 20:21:56 -04:00
parent 3eb02d9f38
commit fc4b5786cd
20 changed files with 57 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
{stdenv, buildOcaml, fetchurl, async_kernel, async_unix, {stdenv, buildOcaml, fetchurl, async_kernel, async_unix,
bin_prot, core, custom_printf, fieldslib_p4, herelib, pa_ounit, bin_prot, core, custom_printf, fieldslib_p4, herelib, pa_ounit,
pipebang, pa_test, sexplib}: pipebang, pa_test, sexplib_p4}:
buildOcaml rec { buildOcaml rec {
name = "async_extra"; name = "async_extra";
@ -15,7 +15,7 @@ buildOcaml rec {
buildInputs = [ pa_test pa_ounit ]; buildInputs = [ pa_test pa_ounit ];
propagatedBuildInputs = [ async_kernel async_unix core bin_prot custom_printf 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; { meta = with stdenv.lib; {
homepage = https://github.com/janestreet/async_extra; homepage = https://github.com/janestreet/async_extra;

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

@ -1,4 +1,4 @@
{stdenv, buildOcaml, fetchurl, async, core, sexplib}: {stdenv, buildOcaml, fetchurl, async, core, sexplib_p4}:
buildOcaml rec { buildOcaml rec {
name = "async_find"; name = "async_find";
@ -11,7 +11,7 @@ buildOcaml rec {
sha256 = "4e3fda72f50174f05d96a5a09323f236c041b1a685890c155822956f3deb8803"; sha256 = "4e3fda72f50174f05d96a5a09323f236c041b1a685890c155822956f3deb8803";
}; };
propagatedBuildInputs = [ async core sexplib ]; propagatedBuildInputs = [ async core sexplib_p4 ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://github.com/janestreet/async_find; homepage = https://github.com/janestreet/async_find;

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

@ -1,6 +1,6 @@
{stdenv, buildOcaml, fetchurl, core_kernel, {stdenv, buildOcaml, fetchurl, core_kernel,
bin_prot, fieldslib_p4, pa_ounit, pa_test, bin_prot, fieldslib_p4, pa_ounit, pa_test,
sexplib, herelib}: sexplib_p4, herelib}:
buildOcaml rec { buildOcaml rec {
name = "async_kernel"; name = "async_kernel";
@ -14,7 +14,7 @@ buildOcaml rec {
}; };
buildInputs = [ pa_test pa_ounit ]; 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; { meta = with stdenv.lib; {
homepage = https://github.com/janestreet/async_kernel; homepage = https://github.com/janestreet/async_kernel;

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

@ -1,5 +1,5 @@
{stdenv, buildOcaml, fetchurl, async, comparelib, core, ctypes, openssl, {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 { buildOcaml rec {
name = "async_ssl"; name = "async_ssl";
@ -14,7 +14,7 @@ buildOcaml rec {
buildInputs = [ pa_bench pa_test ]; buildInputs = [ pa_bench pa_test ];
propagatedBuildInputs = [ ctypes async comparelib core fieldslib_p4 pa_ounit propagatedBuildInputs = [ ctypes async comparelib core fieldslib_p4 pa_ounit
herelib pipebang sexplib openssl ]; herelib pipebang sexplib_p4 openssl ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://github.com/janestreet/async_ssl; homepage = https://github.com/janestreet/async_ssl;

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

@ -1,6 +1,6 @@
{stdenv, buildOcaml, fetchurl, async_kernel, {stdenv, buildOcaml, fetchurl, async_kernel,
bin_prot, comparelib, core, fieldslib_p4, herelib, pa_ounit, bin_prot, comparelib, core, fieldslib_p4, herelib, pa_ounit,
pipebang, pa_test, sexplib}: pipebang, pa_test, sexplib_p4}:
buildOcaml rec { buildOcaml rec {
name = "async_unix"; name = "async_unix";
@ -16,7 +16,7 @@ buildOcaml rec {
hasSharedObjects = true; hasSharedObjects = true;
buildInputs = [ pa_ounit ]; buildInputs = [ pa_ounit ];
propagatedBuildInputs = [ async_kernel core bin_prot comparelib 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; { meta = with stdenv.lib; {
homepage = https://github.com/janestreet/async_unix; homepage = https://github.com/janestreet/async_unix;

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

@ -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, stringext, base64, magic-mime, ounit, alcotest, lwt ? null,
async ? null, async_ssl ? null}: async ? null, async_ssl ? null}:
@ -14,7 +14,7 @@ buildOcaml rec {
}; };
buildInputs = [ alcotest ]; 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 conduit stringext base64 magic-mime ounit async
async_ssl lwt ]; async_ssl lwt ];

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

@ -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}: async ? null, async_ssl ? null, lwt ? null}:
buildOcaml rec { buildOcaml rec {
@ -10,7 +10,7 @@ buildOcaml rec {
sha256 = "5cf1a46aa0254345e5143feebe6b54bdef96314e9987f44e69f24618d620faa1"; sha256 = "5cf1a46aa0254345e5143feebe6b54bdef96314e9987f44e69f24618d620faa1";
}; };
propagatedBuildInputs = ([ sexplib stringext uri cstruct ipaddr ] propagatedBuildInputs = ([ sexplib_p4 stringext uri cstruct ipaddr ]
++ stdenv.lib.optional (lwt != null) lwt ++ stdenv.lib.optional (lwt != null) lwt
++ stdenv.lib.optional (async != null) async ++ stdenv.lib.optional (async != null) async
++ stdenv.lib.optional (async_ssl != null) async_ssl); ++ stdenv.lib.optional (async_ssl != null) async_ssl);

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

@ -1,7 +1,7 @@
{stdenv, buildOcaml, fetchurl, type_conv, {stdenv, buildOcaml, fetchurl, type_conv,
core_kernel, bin_prot, comparelib, custom_printf, enumerate, core_kernel, bin_prot, comparelib, custom_printf, enumerate,
fieldslib_p4, herelib, pa_bench, pa_test, pa_ounit, fieldslib_p4, herelib, pa_bench, pa_test, pa_ounit,
pipebang, sexplib, typerep_p4, variantslib}: pipebang, sexplib_p4, typerep_p4, variantslib}:
buildOcaml rec { buildOcaml rec {
name = "core"; name = "core";
@ -19,7 +19,7 @@ buildOcaml rec {
buildInputs = [ pa_bench pa_test pa_ounit ]; buildInputs = [ pa_bench pa_test pa_ounit ];
propagatedBuildInputs = [ type_conv core_kernel bin_prot comparelib propagatedBuildInputs = [ type_conv core_kernel bin_prot comparelib
custom_printf enumerate fieldslib_p4 herelib custom_printf enumerate fieldslib_p4 herelib
pipebang sexplib typerep_p4 variantslib ]; pipebang sexplib_p4 typerep_p4 variantslib ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://github.com/janestreet/core; homepage = https://github.com/janestreet/core;

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

@ -1,5 +1,5 @@
{stdenv, buildOcaml, fetchurl, bin_prot, comparelib, core, custom_printf, {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 { buildOcaml rec {
name = "core_extended"; name = "core_extended";
@ -15,7 +15,7 @@ buildOcaml rec {
hasSharedObjects = true; hasSharedObjects = true;
buildInputs = [ pa_bench pa_test pa_ounit ]; buildInputs = [ pa_bench pa_test pa_ounit ];
propagatedBuildInputs = [bin_prot comparelib core custom_printf fieldslib_p4 propagatedBuildInputs = [bin_prot comparelib core custom_printf fieldslib_p4
pipebang textutils re2 sexplib ]; pipebang textutils re2 sexplib_p4 ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://github.com/janestreet/core_extended; homepage = https://github.com/janestreet/core_extended;

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

@ -1,7 +1,7 @@
{stdenv, buildOcaml, fetchurl, type_conv, {stdenv, buildOcaml, fetchurl, type_conv,
bin_prot, comparelib, custom_printf, enumerate, bin_prot, comparelib, custom_printf, enumerate,
fieldslib_p4, herelib, pa_bench, pa_test, pa_ounit, fieldslib_p4, herelib, pa_bench, pa_test, pa_ounit,
pipebang, sexplib, typerep_p4, variantslib}: pipebang, sexplib_p4, typerep_p4, variantslib}:
buildOcaml rec { buildOcaml rec {
name = "core_kernel"; name = "core_kernel";
@ -18,7 +18,7 @@ buildOcaml rec {
buildInputs = [ pa_test pa_ounit ]; buildInputs = [ pa_test pa_ounit ];
propagatedBuildInputs = [ type_conv pa_bench bin_prot comparelib custom_printf 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 ]; typerep_p4 variantslib ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

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

@ -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}: async ? null, lwt ? null, camlp4}:
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01"; 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 []) ++ configureFlags = stdenv.lib.strings.concatStringsSep " " ((if lwt != null then ["--enable-lwt"] else []) ++
(if async != null then ["--enable-async"] else [])); (if async != null then ["--enable-async"] else []));
buildInputs = [ocaml findlib camlp4]; buildInputs = [ocaml findlib camlp4];
propagatedBuildInputs = [ocplib-endian sexplib lwt async]; propagatedBuildInputs = [ocplib-endian sexplib_p4 lwt async];
createFindlibDestdir = true; createFindlibDestdir = true;
dontStrip = true; dontStrip = true;

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

@ -1,4 +1,4 @@
{stdenv, buildOcaml, fetchurl, type_conv, sexplib, pa_ounit}: {stdenv, buildOcaml, fetchurl, type_conv, sexplib_p4, pa_ounit}:
buildOcaml rec { buildOcaml rec {
name = "custom_printf"; name = "custom_printf";
@ -12,7 +12,7 @@ buildOcaml rec {
}; };
buildInputs = [ pa_ounit ]; buildInputs = [ pa_ounit ];
propagatedBuildInputs = [ type_conv sexplib ]; propagatedBuildInputs = [ type_conv sexplib_p4 ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://github.com/janestreet/custom_printf; homepage = https://github.com/janestreet/custom_printf;

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

@ -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 let version = "0.4.1"; in
@ -11,7 +11,7 @@ stdenv.mkDerivation {
}; };
buildInputs = [ ocaml findlib ]; buildInputs = [ ocaml findlib ];
propagatedBuildInputs = [ jsonm hex sexplib lwt ]; propagatedBuildInputs = [ jsonm hex sexplib_p4 lwt ];
createFindlibDestdir = true; createFindlibDestdir = true;
configureFlags = "--enable-lwt"; configureFlags = "--enable-lwt";

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

@ -1,4 +1,4 @@
{stdenv, buildOcaml, fetchurl, sexplib}: {stdenv, buildOcaml, fetchurl, sexplib_p4}:
buildOcaml rec { buildOcaml rec {
name = "ipaddr"; name = "ipaddr";
@ -9,7 +9,7 @@ buildOcaml rec {
sha256 = "7051013d8f58abff433187d70cd7ddd7a6b49a6fbe6cad1893f571f65b8ed3d0"; sha256 = "7051013d8f58abff433187d70cd7ddd7a6b49a6fbe6cad1893f571f65b8ed3d0";
}; };
propagatedBuildInputs = [ sexplib ]; propagatedBuildInputs = [ sexplib_p4 ];
configurePhase = '' configurePhase = ''
ocaml setup.ml -configure --prefix $out ocaml setup.ml -configure --prefix $out

18
pkgs/development/ocaml-modules/janestreet/sexplib.nix Normal file
View File

@ -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 ];
};
}

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

@ -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 { buildOcaml rec {
name = "pa_test"; name = "pa_test";
@ -12,7 +12,7 @@ buildOcaml rec {
}; };
buildInputs = [ pa_ounit ]; buildInputs = [ pa_ounit ];
propagatedBuildInputs = [ type_conv sexplib herelib ]; propagatedBuildInputs = [ type_conv sexplib_p4 herelib ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://github.com/janestreet/pa_test; homepage = https://github.com/janestreet/pa_test;

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

@ -1,5 +1,5 @@
{stdenv, buildOcaml, fetchurl, ocaml, core, pa_ounit, pa_test, {stdenv, buildOcaml, fetchurl, ocaml, core, pa_ounit, pa_test,
bin_prot, comparelib, sexplib, rsync}: bin_prot, comparelib, sexplib_p4, rsync}:
buildOcaml rec { buildOcaml rec {
name = "re2"; name = "re2";
@ -16,7 +16,7 @@ buildOcaml rec {
else null; else null;
buildInputs = [ pa_ounit pa_test rsync ]; buildInputs = [ pa_ounit pa_test rsync ];
propagatedBuildInputs = [ core bin_prot comparelib sexplib ]; propagatedBuildInputs = [ core bin_prot comparelib sexplib_p4 ];
hasSharedObjects = true; hasSharedObjects = true;

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

@ -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 { buildOcaml rec {
name = "textutils"; name = "textutils";
@ -12,7 +12,7 @@ buildOcaml rec {
}; };
buildInputs = [ pa_test ]; buildInputs = [ pa_test ];
propagatedBuildInputs = [ core pa_ounit sexplib ]; propagatedBuildInputs = [ core pa_ounit sexplib_p4 ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://github.com/janestreet/textutils; homepage = https://github.com/janestreet/textutils;

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

@ -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"; assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4";
@ -13,7 +13,7 @@ stdenv.mkDerivation {
}; };
buildInputs = [ ocaml findlib ounit ]; buildInputs = [ ocaml findlib ounit ];
propagatedBuildInputs = [ re sexplib stringext ]; propagatedBuildInputs = [ re sexplib_p4 stringext ];
configurePhase = "ocaml setup.ml -configure --prefix $out --enable-tests"; configurePhase = "ocaml setup.ml -configure --prefix $out --enable-tests";
buildPhase = '' buildPhase = ''

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

@ -5405,7 +5405,7 @@ in
sexplib_111_25_00 = callPackage ../development/ocaml-modules/sexplib/111.25.00.nix { }; 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_112_24_01 = callPackage ../development/ocaml-modules/sexplib/112.24.01.nix { };
sexplib = sexplib_p4 =
if lib.versionOlder "4.02" ocaml_version if lib.versionOlder "4.02" ocaml_version
then sexplib_112_24_01 then sexplib_112_24_01
else if lib.versionOlder "4.00" ocaml_version else if lib.versionOlder "4.00" ocaml_version
@ -5563,6 +5563,8 @@ in
typerep = callPackage ../development/ocaml-modules/janestreet/typerep.nix {}; typerep = callPackage ../development/ocaml-modules/janestreet/typerep.nix {};
fieldslib = callPackage ../development/ocaml-modules/janestreet/fieldslib.nix {}; fieldslib = callPackage ../development/ocaml-modules/janestreet/fieldslib.nix {};
sexplib = callPackage ../development/ocaml-modules/janestreet/sexplib.nix {};
}; };
ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0; ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0;