[bug#33079] [PATCH 01/34] gnu: ocaml: Update to 4.07.0.

[Julien Lepiller <julien@lepiller.eu>]

* gnu/packages/ocaml.scm (ocaml): Update to 4.07.0.
(ocaml-4.02): New variable.
---
 gnu/packages/ocaml.scm | 37 ++++++++++++++++++++++++++++++++-----
 1 file changed, 32 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 6b55e84fe..681b9652e 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -6,7 +6,7 @@
 ;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2016, 2018 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2016, 2017 Julien Lepiller <julien@lepiller.eu>
+;;; Copyright © 2016-2018 Julien Lepiller <julien@lepiller.eu>
 ;;; Copyright © 2017 Ben Woodcroft <donttrustben@gmail.com>
 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018 Peter Kreye <kreyepr@gmail.com>
@@ -120,7 +120,7 @@
                          "/lib/ocaml/site-lib"))
     #:phases (modify-phases %standard-phases (delete 'configure))))
 
-(define-public ocaml
+(define-public ocaml-4.02
   (package
     (name "ocaml")
     (version "4.02.3")
@@ -145,7 +145,8 @@
             (files (list "lib/ocaml" "lib/ocaml/site-lib")))
            (search-path-specification
             (variable "CAML_LD_LIBRARY_PATH")
-            (files (list "lib/ocaml/site-lib/stubslibs")))))
+            (files (list "lib/ocaml/site-lib/stubslibs"
+                         "lib/ocaml/site-lib/stublibs")))))
     (native-inputs
      `(("perl" ,perl)
        ("pkg-config" ,pkg-config)))
@@ -228,7 +229,7 @@ functional, imperative and object-oriented styles of programming.")
 
 (define-public ocaml-4.01
   (package
-    (inherit ocaml)
+    (inherit ocaml-4.02)
     (version "4.01.0")
     (source (origin
               (method url-fetch)
@@ -240,7 +241,7 @@ functional, imperative and object-oriented styles of programming.")
                (base32
                 "03d7ida94s1gpr3gadf4jyhmh5rrszd5s4m4z59daaib25rvfyv7"))))
     (arguments
-     (substitute-keyword-arguments (package-arguments ocaml)
+     (substitute-keyword-arguments (package-arguments ocaml-4.02)
        ((#:phases phases)
         `(modify-phases ,phases
            (replace 'build
@@ -256,6 +257,32 @@ functional, imperative and object-oriented styles of programming.")
                          (string-append
                           "TOPDIR=" (getcwd) "/.."))))))))))))
 
+(define-public ocaml-4.07
+  (package
+    (inherit ocaml-4.02)
+    (version "4.07.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "http://caml.inria.fr/pub/distrib/ocaml-"
+                    (version-major+minor version)
+                    "/ocaml-" version ".tar.xz"))
+              (sha256
+               (base32
+                "03wzkzv6w4rdiiva20g5amz0n4x75swpjl8d80468p6zm8hgfnzl"))))
+    (arguments
+     (substitute-keyword-arguments (package-arguments ocaml-4.02)
+       ((#:phases phases)
+        `(modify-phases ,phases
+           (delete 'prepare-socket-test)
+           (replace 'check
+             (lambda _
+               (with-directory-excursion "testsuite"
+                 (invoke "make" "all"))
+               #t))))))))
+
+(define-public ocaml ocaml-4.07)
+
 (define-public opam
   (package
     (name "opam")
-- 
2.18.0