gnu: ocaml-batteries: Update to 3.3.0.

* gnu/packages/ocaml.scm (ocaml-batteries): Update to 3.3.0.
(ocaml4.07-batteries): New variable.

gnu/packages/ocaml.scm

@@ -3208,21 +3208,57 @@ is used to determine whether the results truly differ.")
 (define-public ocaml-batteries
   (package
     (name "ocaml-batteries")
-    (version "2.10.0")
+    (version "3.3.0")
     (source (origin
-              (method url-fetch)
+              (method git-fetch)
-              (uri (string-append "https://github.com/ocaml-batteries-team/"
+              (uri (git-reference
-                                  "batteries-included/releases/download/v"
+                     (url "https://github.com/ocaml-batteries-team/batteries-included")
-                                  version "/batteries-" version ".tar.gz"))
+                     (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
               (sha256
                (base32
-                "08ghw87d56h1a6y1nnh3x2wy9xj25jqfk5sp6ma9nsyd37babb0h"))))
+                "1h03nkc3vajaijqhj1dy5hw85j2hwwxdkg8rvs2fc00qaf44ad1d"))))
     (build-system ocaml-build-system)
+    (propagated-inputs `(("ocaml-num" ,ocaml-num)))
     (native-inputs
      `(("ocamlbuild" ,ocamlbuild)
-       ("qtest" ,ocaml-qtest)))
+       ("ocaml-benchmark" ,ocaml-benchmark)
-    (propagated-inputs
+       ("ocaml-qcheck" ,ocaml-qcheck)
-     `(("ocaml-num" ,ocaml-num)))
+       ("ocaml-qtest" ,ocaml-qtest)))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'make-writable
+           (lambda _
+             (for-each make-file-writable (find-files "." "."))))
+         (add-before 'build 'fix-nondeterminism
+           (lambda _
+             (substitute* "setup.ml"
+               (("Sys.readdir dirname")
+                "let a = Sys.readdir dirname in Array.sort String.compare a; a"))
+             #t)))))
+    (properties `((ocaml4.07-variant . ,(delay ocaml4.07-batteries))))
+    (home-page "http://batteries.forge.ocamlcore.org/")
+    (synopsis "Development platform for the OCaml programming language")
+    (description "Define a standard set of libraries which may be expected on
+every compliant installation of OCaml and organize these libraries into a
+hierarchy of modules.")
+    (license license:lgpl2.1+)))
+
+(define-public ocaml4.07-batteries
+  (package-with-ocaml4.07
+    (package
+      (inherit ocaml-batteries)
+      (version "2.10.0")
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                       (url "https://github.com/ocaml-batteries-team/batteries-included")
+                       (commit (string-append "v" version))))
+                (file-name (git-file-name "ocaml-batteries" version))
+                (sha256
+                 (base32
+                  "02fxa1nkp7rpiwfp04n0sagdp9lad4dh9bvljp95xfshm1cx7y4q"))))
       (arguments
        `(#:phases
          (modify-phases %standard-phases
@@ -3252,12 +3288,10 @@ is used to determine whether the results truly differ.")
                (copy-file "_build/build/mkconf.byte" "build/mkconf.byte")
                (invoke "make" "all")
                #t)))))
-    (home-page "http://batteries.forge.ocamlcore.org/")
+      (native-inputs
-    (synopsis "Development platform for the OCaml programming language")
+       `(("ocamlbuild" ,ocamlbuild)
-    (description "Define a standard set of libraries which may be expected on
+         ("qtest" ,ocaml-qtest)))
-every compliant installation of OCaml and organize these libraries into a
+      (properties '()))))
-hierarchy of modules.")
-    (license license:lgpl2.1+)))
 
 (define-public ocaml-pcre
   (package