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

ocaml-typerep: 112.24.00 -> 112.24.00/113.33.03

Browse Source 
Split typerep into ppx supporting (modern) and p4 supporting (legacy)
This commit is contained in:
Matthew Maurer 2016-09-13 19:21:04 -04:00
parent 794b4fbfb9
commit d97392c39a
4 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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, herelib, pa_bench, pa_test, pa_ounit, fieldslib, herelib, pa_bench, pa_test, pa_ounit,
pipebang, sexplib, typerep, variantslib}: pipebang, sexplib, 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 herelib custom_printf enumerate fieldslib herelib
pipebang sexplib typerep variantslib ]; pipebang sexplib 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_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, herelib, pa_bench, pa_test, pa_ounit, fieldslib, herelib, pa_bench, pa_test, pa_ounit,
pipebang, sexplib, typerep, variantslib}: pipebang, sexplib, typerep_p4, variantslib}:
buildOcaml rec { buildOcaml rec {
name = "core_kernel"; name = "core_kernel";
@ -19,7 +19,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 herelib pipebang sexplib enumerate fieldslib herelib pipebang sexplib
typerep variantslib ]; typerep_p4 variantslib ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://github.com/janestreet/core_kernel; homepage = https://github.com/janestreet/core_kernel;

20
pkgs/development/ocaml-modules/janestreet/typerep.nix Normal file
View File

@ -0,0 +1,20 @@
{stdenv, buildOcamlJane, type_conv}:
buildOcamlJane rec {
name = "typerep";
version = "113.33.03";
minimumSupportedOcamlVersion = "4.00";
hash = "1ss34nq20vfgx8hwi5sswpmn3my9lvrpdy5dkng746xchwi33ar7";
propagatedBuildInputs = [ type_conv ];
meta = with stdenv.lib; {
homepage = https://github.com/janestreet/typerep;
description = "Runtime types for OCaml (beta version)";
license = licenses.asl20;
maintainers = [ maintainers.maurer maintainers.ericbmerritt ];
};
}

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

@ -5470,7 +5470,7 @@ in
twt = callPackage ../development/ocaml-modules/twt { }; twt = callPackage ../development/ocaml-modules/twt { };
typerep = callPackage ../development/ocaml-modules/typerep { }; typerep_p4 = callPackage ../development/ocaml-modules/typerep { };
utop = callPackage ../development/tools/ocaml/utop { }; utop = callPackage ../development/tools/ocaml/utop { };
@ -5555,6 +5555,8 @@ in
ppx_variants_conv = callPackage ../development/ocaml-modules/janestreet/ppx-variants-conv.nix {}; ppx_variants_conv = callPackage ../development/ocaml-modules/janestreet/ppx-variants-conv.nix {};
ppx_expect = callPackage ../development/ocaml-modules/janestreet/ppx-expect.nix {}; ppx_expect = callPackage ../development/ocaml-modules/janestreet/ppx-expect.nix {};
typerep = callPackage ../development/ocaml-modules/janestreet/typerep.nix {};
}; };
ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0; ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0;