NixOS · May 30, 2017 · May 30, 2017 · May 30, 2017 · May 30, 2017 · May 30, 2017
diff --git a/pkgs/development/ocaml-modules/base/default.nix b/pkgs/development/ocaml-modules/base/default.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/async_kernel-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/async_kernel-113_33_00.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/async_unix-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/async_unix-113_33_00.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/core-113_33_02.nix b/pkgs/development/ocaml-modules/janestreet/core-113_33_02.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/core_kernel-113_33_01.nix b/pkgs/development/ocaml-modules/janestreet/core_kernel-113_33_01.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage.nix b/pkgs/development/ocaml-modules/janestreet/janePackage.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, ocaml, jbuilder, findlib }:
+
+{ name, version ? "0.9.0", buildInputs ? [], hash, meta, ...}@args:
+
+if !stdenv.lib.versionAtLeast ocaml.version "4.03"
+then throw "${name}-${version} is not available for OCaml ${ocaml.version}" else
+
+stdenv.mkDerivation (args // {
+  name = "ocaml${ocaml.version}-${name}-${version}";
+  inherit version;
+
+  src = fetchFromGitHub {
+    owner = "janestreet";
+    repo = name;
+    rev = "v${version}";
+    sha256 = hash;
+  };
+
+  buildInputs = [ ocaml jbuilder findlib ] ++ buildInputs;
+
+  inherit (jbuilder) installPhase;
+
+  meta = {
+    license = stdenv.lib.licenses.asl20;
+    inherit (ocaml.meta) platforms;
+    homepage = "https://github.com/janestreet/${name}";
+  } // meta;
+})
diff --git a/pkgs/development/ocaml-modules/janestreet/ocaml-compiler-libs.nix b/pkgs/development/ocaml-modules/janestreet/ocaml-compiler-libs.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_ast.nix b/pkgs/development/ocaml-modules/janestreet/ppx_ast.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_bench-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_bench-113_33_00.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_bin_prot-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_bin_prot-113_33_00.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_compare-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_compare-113_33_00.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_core-113_33_01.nix b/pkgs/development/ocaml-modules/janestreet/ppx_core-113_33_01.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_custom_printf-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_custom_printf-113_33_00.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_enumerate-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_enumerate-113_33_00.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_expect-113_33_01.nix b/pkgs/development/ocaml-modules/janestreet/ppx_expect-113_33_01.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_fail-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_fail-113_33_00.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_fields_conv-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_fields_conv-113_33_00.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_inline_test-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_inline_test-113_33_00.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_jane-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_jane-113_33_00.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_let-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_let-113_33_00.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_optcomp-113_33_01.nix b/pkgs/development/ocaml-modules/janestreet/ppx_optcomp-113_33_01.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_pipebang-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_pipebang-113_33_00.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_sexp_conv-113_33_01.nix b/pkgs/development/ocaml-modules/janestreet/ppx_sexp_conv-113_33_01.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_sexp_message-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_sexp_message-113_33_00.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_sexp_value-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_sexp_value-113_33_00.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_traverse_builtins.nix b/pkgs/development/ocaml-modules/janestreet/ppx_traverse_builtins.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_type_conv-113_33_02.nix b/pkgs/development/ocaml-modules/janestreet/ppx_type_conv-113_33_02.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_typerep_conv-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_typerep_conv-113_33_00.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_variants_conv-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_variants_conv-113_33_00.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/sexplib-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/sexplib-113_33_00.nix
diff --git a/pkgs/development/ocaml-modules/stdio/default.nix b/pkgs/development/ocaml-modules/stdio/default.nix
diff --git a/pkgs/tools/misc/patdiff/default.nix b/pkgs/tools/misc/patdiff/default.nix
@@ -0,0 +1,13 @@
+{ ocamlPackages }:
+
+with ocamlPackages;
+
+janePackage {
+  name = "patdiff";
+  hash = "15b6nkmd2z07j4nnmkb2g6qn3daw2xmmz3lgswkj03v29ffib014";
+  buildInputs = [ core_extended expect_test_helpers patience_diff ocaml_pcre ];
+  meta = {
+    description = "File Diff using the Patience Diff algorithm";
+    inherit (core_extended.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -1057,6 +1057,10 @@ with pkgs;
 
   nfdump = callPackage ../tools/networking/nfdump { };
 
+  patdiff = callPackage ../tools/misc/patdiff {
+    ocamlPackages = ocamlPackages_4_03;
+  };
+
   playerctl = callPackage ../tools/audio/playerctl { };
 
   socklog = callPackage ../tools/system/socklog { };

diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
@@ -5,6 +5,7 @@ let
     let
       packageSet = self:
         with self; let inherit (self) callPackage; in
+     let ocamlPackages =
   {
     callPackage = newScope self;
 
@@ -30,11 +31,17 @@ let
 
     async_extra_p4 = callPackage ../development/ocaml-modules/async_extra { };
 
-    async_find = callPackage ../development/ocaml-modules/async_find { };
+    async_find =
+      if lib.versionOlder "4.03" ocaml.version
+      then janeStreet.async_find
+      else callPackage ../development/ocaml-modules/async_find { };
 
     async_kernel_p4 = callPackage ../development/ocaml-modules/async_kernel { };
 
-    async_shell = callPackage ../development/ocaml-modules/async_shell { };
+    async_shell =
+      if lib.versionOlder "4.03" ocaml.version
+      then janeStreet.async_shell
+      else callPackage ../development/ocaml-modules/async_shell { };
 
     async_unix_p4 = callPackage ../development/ocaml-modules/async_unix { };
 
@@ -47,8 +54,6 @@ let
 
     atdgen = callPackage ../development/ocaml-modules/atdgen { };
 
-    base = callPackage ../development/ocaml-modules/base { };
-
     base64 = callPackage ../development/ocaml-modules/base64 { };
 
     bap = callPackage ../development/ocaml-modules/bap { };
@@ -525,8 +530,6 @@ let
 
     sqlite3EZ = callPackage ../development/ocaml-modules/sqlite3EZ { };
 
-    stdio = callPackage ../development/ocaml-modules/stdio { };
-
     stog = callPackage ../applications/misc/stog { };
 
     stringext = callPackage ../development/ocaml-modules/stringext { };
@@ -582,208 +585,243 @@ let
     };
 
     # Jane Street
-    js_build_tools = callPackage ../development/ocaml-modules/janestreet/js-build-tools.nix {};
 
-    buildOcamlJane = callPackage ../development/ocaml-modules/janestreet/buildOcamlJane.nix {};
+    janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage.nix {};
 
-    ocaml-compiler-libs = callPackage ../development/ocaml-modules/janestreet/ocaml-compiler-libs.nix {};
+    janeStreet = import ../development/ocaml-modules/janestreet {
+      inherit lib janePackage ocamlbuild ctypes cryptokit magic-mime;
+      inherit ocaml-migrate-parsetree octavius ounit ppx_deriving re zarith;
+      openssl = pkgs.openssl;
+    };
 
-    ppx_ast = callPackage ../development/ocaml-modules/janestreet/ppx_ast.nix {};
+    js_build_tools = callPackage ../development/ocaml-modules/janestreet/js-build-tools.nix {};
+
+    buildOcamlJane = callPackage ../development/ocaml-modules/janestreet/buildOcamlJane.nix {};
 
     ppx_core =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_core-113_33_01.nix {}
+      then janeStreet.ppx_core
       else callPackage ../development/ocaml-modules/janestreet/ppx-core.nix {};
 
     ppx_optcomp =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_optcomp-113_33_01.nix {
-        oasis = ocaml_oasis; }
+      then janeStreet.ppx_optcomp
       else callPackage ../development/ocaml-modules/janestreet/ppx-optcomp.nix {};
 
-    ppx_driver = callPackage ../development/ocaml-modules/janestreet/ppx-driver.nix {};
+    ppx_driver =
+      if lib.versionOlder "4.03" ocaml.version
+      then janeStreet.ppx_driver
+      else callPackage ../development/ocaml-modules/janestreet/ppx-driver.nix {};
 
     ppx_type_conv =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_type_conv-113_33_02.nix { }
+      then janeStreet.ppx_type_conv
       else callPackage ../development/ocaml-modules/janestreet/ppx-type-conv.nix {};
 
     ppx_compare =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_compare-113_33_00.nix {}
+      then janeStreet.ppx_compare
       else callPackage ../development/ocaml-modules/janestreet/ppx-compare.nix {};
 
-    ppx_here = callPackage ../development/ocaml-modules/janestreet/ppx-here.nix {};
+    ppx_here =
+      if lib.versionOlder "4.03" ocaml.version
+      then janeStreet.ppx_here
+      else callPackage ../development/ocaml-modules/janestreet/ppx-here.nix {};
 
     ppx_sexp_conv =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_sexp_conv-113_33_01.nix { }
+      then janeStreet.ppx_sexp_conv
       else callPackage ../development/ocaml-modules/janestreet/ppx-sexp-conv.nix {};
 
-    ppx_assert = callPackage ../development/ocaml-modules/janestreet/ppx-assert.nix {};
+    ppx_assert =
+      if lib.versionOlder "4.03" ocaml.version
+      then janeStreet.ppx_assert
+      else callPackage ../development/ocaml-modules/janestreet/ppx-assert.nix {};
 
     ppx_inline_test =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_inline_test-113_33_00.nix {}
+      then janeStreet.ppx_inline_test
       else callPackage ../development/ocaml-modules/janestreet/ppx-inline-test.nix {};
 
     ppx_bench =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_bench-113_33_00.nix {}
+      then janeStreet.ppx_bench
       else callPackage ../development/ocaml-modules/janestreet/ppx-bench.nix {};
 
     ppx_bin_prot =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_bin_prot-113_33_00.nix {}
+      then janeStreet.ppx_bin_prot
       else callPackage ../development/ocaml-modules/janestreet/ppx-bin-prot.nix {};
 
     ppx_custom_printf =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_custom_printf-113_33_00.nix {}
+      then janeStreet.ppx_custom_printf
       else callPackage ../development/ocaml-modules/janestreet/ppx-custom-printf.nix {};
 
     ppx_enumerate =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_enumerate-113_33_00.nix {}
+      then janeStreet.ppx_enumerate
       else callPackage ../development/ocaml-modules/janestreet/ppx-enumerate.nix {};
 
     ppx_fail =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_fail-113_33_00.nix {}
+      then janeStreet.ppx_fail
       else callPackage ../development/ocaml-modules/janestreet/ppx-fail.nix {};
 
     ppx_fields_conv =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_fields_conv-113_33_00.nix {}
+      then janeStreet.ppx_fields_conv
       else callPackage ../development/ocaml-modules/janestreet/ppx-fields-conv.nix {};
 
     ppx_let =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_let-113_33_00.nix {}
+      then janeStreet.ppx_let
       else callPackage ../development/ocaml-modules/janestreet/ppx-let.nix {};
 
     ppx_pipebang =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_pipebang-113_33_00.nix {}
+      then janeStreet.ppx_pipebang
       else callPackage ../development/ocaml-modules/janestreet/ppx-pipebang.nix {};
 
     ppx_sexp_message =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_sexp_message-113_33_00.nix {}
+      then janeStreet.ppx_sexp_message
       else callPackage ../development/ocaml-modules/janestreet/ppx-sexp-message.nix {};
 
     ppx_sexp_value =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_sexp_value-113_33_00.nix {}
+      then janeStreet.ppx_sexp_value
       else callPackage ../development/ocaml-modules/janestreet/ppx-sexp-value.nix {};
 
     ppx_typerep_conv =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_typerep_conv-113_33_00.nix {}
+      then janeStreet.ppx_typerep_conv
       else callPackage ../development/ocaml-modules/janestreet/ppx-typerep-conv.nix {};
 
     ppx_variants_conv =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_variants_conv-113_33_00.nix {}
+      then janeStreet.ppx_variants_conv
       else callPackage ../development/ocaml-modules/janestreet/ppx-variants-conv.nix {};
 
     ppx_expect =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_expect-113_33_01.nix {}
+      then janeStreet.ppx_expect
       else callPackage ../development/ocaml-modules/janestreet/ppx-expect.nix {};
 
     ppx_jane =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_jane-113_33_00.nix {}
+      then janeStreet.ppx_jane
       else callPackage ../development/ocaml-modules/janestreet/ppx-jane.nix {};
 
-    ppx_traverse_builtins = callPackage ../development/ocaml-modules/janestreet/ppx_traverse_builtins.nix {};
-
 
     # Core sublibs
     typerep =
-      if lib.versionOlder "4.02" ocaml.version
+      if lib.versionOlder "4.03" ocaml.version
+      then janeStreet.typerep
+      else if lib.versionOlder "4.02" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/typerep.nix {}
       else typerep_p4;
 
     fieldslib =
-      if lib.versionOlder "4.02" ocaml.version
+      if lib.versionOlder "4.03" ocaml.version
+      then janeStreet.fieldslib
+      else if lib.versionOlder "4.02" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/fieldslib.nix {}
       else fieldslib_p4;
 
     sexplib =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/sexplib-113_33_00.nix {}
+      then janeStreet.sexplib
       else if lib.versionOlder "4.02" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/sexplib.nix {}
       else sexplib_p4;
 
     variantslib =
-      if lib.versionOlder "4.02" ocaml.version
+      if lib.versionOlder "4.03" ocaml.version
+      then janeStreet.variantslib
+      else if lib.versionOlder "4.02" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/variantslib.nix {}
       else variantslib_p4;
 
     bin_prot =
-      if lib.versionOlder "4.02" ocaml.version
+      if lib.versionOlder "4.03" ocaml.version
+      then janeStreet.bin_prot
+      else if lib.versionOlder "4.02" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/bin_prot.nix {}
       else bin_prot_p4;
 
     core_kernel =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/core_kernel-113_33_01.nix {}
+      then janeStreet.core_kernel
       else if lib.versionOlder "4.02" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/core_kernel.nix {}
       else core_kernel_p4;
 
     core =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/core-113_33_02.nix {}
+      then janeStreet.core
       else if lib.versionOlder "4.02" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/core.nix {}
       else core_p4;
 
     re2 =
-      if lib.versionOlder "4.02" ocaml.version
+      if lib.versionOlder "4.03" ocaml.version
+      then janeStreet.re2
+      else if lib.versionOlder "4.02" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/re2.nix {}
       else re2_p4;
 
     textutils =
-      if lib.versionOlder "4.02" ocaml.version
+      if lib.versionOlder "4.03" ocaml.version
+      then janeStreet.textutils
+      else if lib.versionOlder "4.02" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/textutils.nix {}
       else textutils_p4;
 
     core_extended =
-      if lib.versionOlder "4.02" ocaml.version
+      if lib.versionOlder "4.03" ocaml.version
+      then janeStreet.core_extended
+      else if lib.versionOlder "4.02" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/core-extended.nix {}
       else core_extended_p4;
 
     async_kernel =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/async_kernel-113_33_00.nix {}
+      then janeStreet.async_kernel
       else if lib.versionOlder "4.02" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/async-kernel.nix {}
       else async_kernel_p4;
 
-    async_rpc_kernel = callPackage ../development/ocaml-modules/janestreet/async-rpc-kernel.nix {};
+    async_rpc_kernel =
+      if lib.versionOlder "4.03" ocaml.version
+      then janeStreet.async_rpc_kernel
+      else callPackage ../development/ocaml-modules/janestreet/async-rpc-kernel.nix {};
 
     async_unix =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/async_unix-113_33_00.nix {}
+      then janeStreet.async_unix
       else if lib.versionOlder "4.02" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/async-unix.nix {}
       else async_unix_p4;
 
     async_extra =
-      if lib.versionOlder "4.02" ocaml.version
+      if lib.versionOlder "4.03" ocaml.version
+      then janeStreet.async_extra
+      else if lib.versionOlder "4.02" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/async-extra.nix {}
       else async_extra_p4;
 
     async =
-      if lib.versionOlder "4.02" ocaml.version
+      if lib.versionOlder "4.03" ocaml.version
+      then janeStreet.async
+      else if lib.versionOlder "4.02" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/async.nix {}
       else async_p4;
 
-    async_ssl = callPackage ../development/ocaml-modules/janestreet/async_ssl.nix { };
+    async_ssl =
+      if lib.versionOlder "4.03" ocaml.version
+      then janeStreet.async_ssl
+      else callPackage ../development/ocaml-modules/janestreet/async_ssl.nix { };
 
     # Apps / from all-packages
 
@@ -835,6 +873,7 @@ let
     };
 
   };
+    in (ocamlPackages.janeStreet // ocamlPackages);
     in lib.fix' (lib.extends overrides packageSet);
 in rec
 {