summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorMatthew Maurer <matthew.r.maurer@gmail.com>2016-09-13 20:47:31 -0400
committerMatthew Maurer <matthew.r.maurer@gmail.com>2016-09-14 02:36:06 -0400
commita6f8b1f9ff0b22e7cfe1d0eaf31b172b9fca36e8 (patch)
tree34b968ba0ef5845ba1a83ab46b442c9522cc0534 /pkgs/development
parent5ce22cb05e4db1674e8a00e65beaa9ea1069e3fe (diff)
downloadnixlib-a6f8b1f9ff0b22e7cfe1d0eaf31b172b9fca36e8.tar
nixlib-a6f8b1f9ff0b22e7cfe1d0eaf31b172b9fca36e8.tar.gz
nixlib-a6f8b1f9ff0b22e7cfe1d0eaf31b172b9fca36e8.tar.bz2
nixlib-a6f8b1f9ff0b22e7cfe1d0eaf31b172b9fca36e8.tar.lz
nixlib-a6f8b1f9ff0b22e7cfe1d0eaf31b172b9fca36e8.tar.xz
nixlib-a6f8b1f9ff0b22e7cfe1d0eaf31b172b9fca36e8.tar.zst
nixlib-a6f8b1f9ff0b22e7cfe1d0eaf31b172b9fca36e8.zip
core_kernel: 112.24.00 -> 112.24.00/113.33.03
PPX/P4 split
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/ocaml-modules/async_kernel/default.nix4
-rw-r--r--pkgs/development/ocaml-modules/core/default.nix4
-rw-r--r--pkgs/development/ocaml-modules/janestreet/core_kernel.nix19
3 files changed, 23 insertions, 4 deletions
diff --git a/pkgs/development/ocaml-modules/async_kernel/default.nix b/pkgs/development/ocaml-modules/async_kernel/default.nix
index 98089c837b67..43fde1631ac7 100644
--- a/pkgs/development/ocaml-modules/async_kernel/default.nix
+++ b/pkgs/development/ocaml-modules/async_kernel/default.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcaml, fetchurl, core_kernel,
+{stdenv, buildOcaml, fetchurl, core_kernel_p4,
  bin_prot_p4, fieldslib_p4, pa_ounit, pa_test,
  sexplib_p4, herelib}:
 
@@ -14,7 +14,7 @@ buildOcaml rec {
   };
 
   buildInputs = [ pa_test pa_ounit ];
-  propagatedBuildInputs = [ core_kernel bin_prot_p4 fieldslib_p4 herelib sexplib_p4 ];
+  propagatedBuildInputs = [ core_kernel_p4 bin_prot_p4 fieldslib_p4 herelib sexplib_p4 ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/janestreet/async_kernel;
diff --git a/pkgs/development/ocaml-modules/core/default.nix b/pkgs/development/ocaml-modules/core/default.nix
index dc50ae24894d..4da4d16df7dd 100644
--- a/pkgs/development/ocaml-modules/core/default.nix
+++ b/pkgs/development/ocaml-modules/core/default.nix
@@ -1,5 +1,5 @@
 {stdenv, buildOcaml, fetchurl, type_conv,
- core_kernel, bin_prot_p4, comparelib, custom_printf, enumerate,
+ core_kernel_p4, bin_prot_p4, comparelib, custom_printf, enumerate,
  fieldslib_p4, herelib, pa_bench, pa_test, pa_ounit,
  pipebang, sexplib_p4, typerep_p4, variantslib_p4}:
 
@@ -17,7 +17,7 @@ buildOcaml rec {
   hasSharedObjects = true;
 
   buildInputs = [ pa_bench pa_test pa_ounit ];
-  propagatedBuildInputs = [ type_conv core_kernel bin_prot_p4 comparelib
+  propagatedBuildInputs = [ type_conv core_kernel_p4 bin_prot_p4 comparelib
                             custom_printf enumerate fieldslib_p4 herelib
                             pipebang sexplib_p4 typerep_p4 variantslib_p4 ];
 
diff --git a/pkgs/development/ocaml-modules/janestreet/core_kernel.nix b/pkgs/development/ocaml-modules/janestreet/core_kernel.nix
new file mode 100644
index 000000000000..93fcdde5bb38
--- /dev/null
+++ b/pkgs/development/ocaml-modules/janestreet/core_kernel.nix
@@ -0,0 +1,19 @@
+{stdenv, buildOcamlJane, fetchurl,
+ bin_prot, fieldslib, sexplib, typerep, variantslib,
+ ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane,
+ ocaml_oasis, opam, js_build_tools}:
+
+buildOcamlJane rec {
+  name = "core_kernel";
+  hash = "13gamj056nlib04l7yh80lqpdx0pnswzlb52fkqa01awwp5nf3z6";
+  propagatedBuildInputs =
+    [ bin_prot fieldslib sexplib typerep variantslib
+      ppx_assert ppx_bench ppx_driver ppx_expect ppx_inline_test ppx_jane ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/janestreet/core_kernel;
+    description = "Jane Street Capital's standard library overlay (kernel)";
+    license = licenses.asl20;
+    maintainers = [ maintainers.maurer maintainers.ericbmerritt ];
+  };
+}