[PATCH 00/10] ocaml patches

[PATCH 00/10] ocaml patches

[Julien Lepiller]

Here are the next 10 ocaml-related patches I would like to push. What do you
think?

I'm pretty sure number 9 and 10 can be improved, any idea?

Julien Lepiller (10):
  gnu: Add ocaml-base64.
  gnu: Add ocamlify.
  gnu: Add omake.
  gnu: Add ocaml-batteries.
  gnu: Add ocaml-pcre.
  gnu: Add ocaml-expect.
  gnu: Add ocaml-fileutils.
  gnu: Add ocaml-oasis.
  gnu: Add ocaml-js-build-tools.
  gnu: Add ocaml-bin-prot.

 gnu/local.mk                                       |   2 +
 gnu/packages/ocaml.scm                             | 301 +++++++++++++++++++++
 .../patches/ocaml-janestreet-fix-libdir.patch      |  36 +++
 .../patches/ocaml-omake-fix-non-determinism.patch  |  41 +++
 4 files changed, 380 insertions(+)
 create mode 100644 gnu/packages/patches/ocaml-janestreet-fix-libdir.patch
 create mode 100644 gnu/packages/patches/ocaml-omake-fix-non-determinism.patch

-- 
2.11.0

[PATCH 01/10] gnu: Add ocaml-base64.

[Julien Lepiller]

* gnu/packages/ocaml.scm (ocaml-base64): New variable.
---
 gnu/packages/ocaml.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 28c6ab34f..012833766 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -1696,3 +1696,35 @@ without a complete in-memory representation of the data.")
     (description "Client-side URL transfer library, supporting HTTP and a
 multitude of other network protocols (FTP/SMTP/RTSP/etc).")
     (license license:isc)))
+
+(define-public ocaml-base64
+  (package
+    (name "ocaml-base64")
+    (version "2.1.2")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://github.com/mirage/ocaml-base64/"
+                                  "releases/download/v" version "/base64-"
+                                   version ".tbz"))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                 "1p45sawchmrkr22gkmydjc4ary23pisp58zsnb7iq7d82nxs1lfq"))))
+    (build-system ocaml-build-system)
+    (arguments
+     `(#:build-flags (list "build" "--tests" "true")
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'configure))))
+    (native-inputs
+     `(("topkg" ,ocaml-topkg)
+       ("opam" ,opam)
+       ("rresult" ,ocaml-rresult)
+       ("bos" ,ocaml-bos)
+       ("alcotest" ,ocaml-alcotest)))
+    (home-page "https://github.com/mirage/ocaml-base64")
+    (synopsis "Base64 encoding for OCaml")
+    (description "Base64 is a group of similar binary-to-text encoding schemes
+that represent binary data in an ASCII string format by translating it into a
+radix-64 representation.  It is specified in RFC 4648.")
+    (license license:isc)))
-- 
2.11.0

[PATCH 02/10] gnu: Add ocamlify.

[Julien Lepiller]

* gnu/packages/ocaml.scm (ocamlify): New variable.
---
 gnu/packages/ocaml.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 012833766..a2297d1ab 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -1728,3 +1728,27 @@ multitude of other network protocols (FTP/SMTP/RTSP/etc).")
 that represent binary data in an ASCII string format by translating it into a
 radix-64 representation.  It is specified in RFC 4648.")
     (license license:isc)))
+
+(define-public ocamlify
+  (package
+    (name "ocamlify")
+    (version "0.0.2")
+    (source (origin
+              (method url-fetch)
+              (uri (ocaml-forge-uri name version 1209))
+              (sha256
+               (base32
+                "1f0fghvlbfryf5h3j4as7vcqrgfjb4c8abl5y0y5h069vs4kp5ii"))))
+    (build-system ocaml-build-system)
+    ; tests are done during build
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (delete 'check))))
+    (home-page "https://forge.ocamlcore.org/projects/ocamlify")
+    (synopsis "Include files in OCaml code")
+    (description "OCamlify allows to create OCaml source code by including
+whole files into OCaml string or string list.  The code generated can be
+compiled as a standard OCaml file.  It allows embedding external resources as
+OCaml code.")
+    (license license:lgpl2.1))); with an exception
-- 
2.11.0

[PATCH 03/10] gnu: Add omake.

[Julien Lepiller]

* gnu/packages/ocaml.scm (omake): New variable.
* gnu/packages/patches/ocaml-omake-fix-non-determinism.patch: New file.
* gnu/local.mk (dist_patch_DATA): New patch.
---
 gnu/local.mk                                       |  1 +
 gnu/packages/ocaml.scm                             | 41 ++++++++++++++++++++++
 .../patches/ocaml-omake-fix-non-determinism.patch  | 41 ++++++++++++++++++++++
 3 files changed, 83 insertions(+)
 create mode 100644 gnu/packages/patches/ocaml-omake-fix-non-determinism.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 24dcd03fd..5b919dd86 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -778,6 +778,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/ocaml-CVE-2015-8869.patch		\
   %D%/packages/patches/ocaml-Add-a-.file-directive.patch	\
   %D%/packages/patches/ocaml-findlib-make-install.patch	\
+  %D%/packages/patches/ocaml-omake-fix-non-determinism.patch	\
   %D%/packages/patches/ola-readdir-r.patch			\
   %D%/packages/patches/openexr-missing-samples.patch		\
   %D%/packages/patches/openjpeg-CVE-2016-5157.patch		\
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index a2297d1ab..f69f77a7b 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -1752,3 +1752,44 @@ whole files into OCaml string or string list.  The code generated can be
 compiled as a standard OCaml file.  It allows embedding external resources as
 OCaml code.")
     (license license:lgpl2.1))); with an exception
+
+(define-public omake
+  (package
+    (name "omake")
+    (version "0.10.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://download.camlcity.org/download/"
+                                  "omake-" version ".tar.gz"))
+              (sha256
+               (base32
+                "093ansbppms90hiqvzar2a46fj8gm9iwnf8gn38s6piyp70lrbsj"))
+              (patches (search-patches "ocaml-omake-fix-non-determinism.patch"))))
+    (build-system ocaml-build-system)
+    (arguments
+     `(#:make-flags
+       (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
+       #:tests? #f; no test target
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'fix-makefile
+           (lambda* (#:key outputs #:allow-other-keys)
+             (substitute* "mk/osconfig_unix.mk"
+                (("CC = cc") "CC = gcc")))))))
+    (native-inputs `(("hevea" ,hevea)))
+    (home-page "http://projects.camlcity.org/projects/omake.html")
+    (synopsis "Build system designed for scalability and portability")
+    (description "Similar to make utilities you may have used, but it features
+many additional enhancements, including:
+
+- Support for projects spanning several directories or directory hierarchies.
+- Fast, reliable, automated, scriptable dependency analysis using MD5 digests,
+with full support for incremental builds.
+- Dependency analysis takes the command lines into account — whenever the
+command line used to build a target changes, the target is considered
+out-of-date.
+-  Fully scriptable, includes a library that providing support for standard
+tasks in C, C++, OCaml, and LaTeX projects, or a mixture thereof.")
+    (license (list license:lgpl2.1; libmojave
+                   license:expat; OMake scripts
+                   license:gpl2)))); OMake itself, with an exception
diff --git a/gnu/packages/patches/ocaml-omake-fix-non-determinism.patch b/gnu/packages/patches/ocaml-omake-fix-non-determinism.patch
new file mode 100644
index 000000000..813ce3cd7
--- /dev/null
+++ b/gnu/packages/patches/ocaml-omake-fix-non-determinism.patch
@@ -0,0 +1,41 @@
+From 2e7e254160506dc00f1beabf170512a8e932934b Mon Sep 17 00:00:00 2001
+From: Julien Lepiller <julien@lepiller.eu>
+Date: Sat, 31 Dec 2016 15:43:38 +0100
+Subject: [PATCH] fix build date in binary
+
+---
+ src/magic/omake_gen_magic.ml | 12 ++----------
+ 1 file changed, 2 insertions(+), 10 deletions(-)
+
+diff --git a/src/magic/omake_gen_magic.ml b/src/magic/omake_gen_magic.ml
+index b2419ba..fad52f5 100644
+--- a/src/magic/omake_gen_magic.ml
++++ b/src/magic/omake_gen_magic.ml
+@@ -150,7 +150,7 @@ let ir_magic = "%s"
+ let obj_magic = "%s"
+ let lib_dir = "%s"
+ let version = "%s"
+-let version_message = "OMake %s:\\n\\tbuild [%s %s %d %02d:%02d:%02d %d]\\n\\ton %s"
++let version_message = "OMake %s"
+ |}
+        default_save_interval
+        digest_len
+@@ -160,15 +160,7 @@ let version_message = "OMake %s:\\n\\tbuild [%s %s %d %02d:%02d:%02d %d]\\n\\ton
+        (digest_files ".omo.magic" ".omo" omo_files)
+        (String.escaped libdir)
+        (String.escaped (shorten_version version))
+-       (String.escaped version)
+-       [|"Sun"; "Mon"; "Tue"; "Wed"; "Thu"; "Fri"; "Sat"|].(tm.tm_wday)
+-       [|"Jan"; "Feb"; "Mar"; "Apr"; "May"; "Jun"; "Jul"; "Aug"; "Sep"; "Oct"; "Nov"; "Dec"|].(tm.tm_mon)
+-       tm.tm_mday
+-       tm.tm_hour
+-       tm.tm_min
+-       tm.tm_sec
+-       (tm.tm_year + 1900)
+-       (String.escaped (Unix.gethostname ()));
++       (String.escaped version);
+   List.iter
+     (fun (name,value) ->
+        Printf.fprintf buf "let %s = %S\n" name value
+--
+2.11.0
-- 
2.11.0

Re: [PATCH 03/10] gnu: Add omake.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 5858 bytes --]

Julien Lepiller <julien@lepiller.eu> writes:

> * gnu/packages/ocaml.scm (omake): New variable.
> * gnu/packages/patches/ocaml-omake-fix-non-determinism.patch: New file.
> * gnu/local.mk (dist_patch_DATA): New patch.
> ---
>  gnu/local.mk                                       |  1 +
>  gnu/packages/ocaml.scm                             | 41 ++++++++++++++++++++++
>  .../patches/ocaml-omake-fix-non-determinism.patch  | 41 ++++++++++++++++++++++
>  3 files changed, 83 insertions(+)
>  create mode 100644 gnu/packages/patches/ocaml-omake-fix-non-determinism.patch
>
> diff --git a/gnu/local.mk b/gnu/local.mk
> index 24dcd03fd..5b919dd86 100644
> --- a/gnu/local.mk
> +++ b/gnu/local.mk
> @@ -778,6 +778,7 @@ dist_patch_DATA =						\
>    %D%/packages/patches/ocaml-CVE-2015-8869.patch		\
>    %D%/packages/patches/ocaml-Add-a-.file-directive.patch	\
>    %D%/packages/patches/ocaml-findlib-make-install.patch	\
> +  %D%/packages/patches/ocaml-omake-fix-non-determinism.patch	\
                          ^^^^^^^^^^^
                          This should start with the package name.
 
>    %D%/packages/patches/ola-readdir-r.patch			\
>    %D%/packages/patches/openexr-missing-samples.patch		\
>    %D%/packages/patches/openjpeg-CVE-2016-5157.patch		\
> diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
> index a2297d1ab..f69f77a7b 100644
> --- a/gnu/packages/ocaml.scm
> +++ b/gnu/packages/ocaml.scm
> @@ -1752,3 +1752,44 @@ whole files into OCaml string or string list.  The code generated can be
>  compiled as a standard OCaml file.  It allows embedding external resources as
>  OCaml code.")
>      (license license:lgpl2.1))); with an exception
> +
> +(define-public omake
> +  (package
> +    (name "omake")
> +    (version "0.10.1")
> +    (source (origin
> +              (method url-fetch)
> +              (uri (string-append "http://download.camlcity.org/download/"
> +                                  "omake-" version ".tar.gz"))
> +              (sha256
> +               (base32
> +                "093ansbppms90hiqvzar2a46fj8gm9iwnf8gn38s6piyp70lrbsj"))
> +              (patches (search-patches "ocaml-omake-fix-non-determinism.patch"))))
> +    (build-system ocaml-build-system)
> +    (arguments
> +     `(#:make-flags
> +       (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
> +       #:tests? #f; no test target
> +       #:phases
> +       (modify-phases %standard-phases
> +         (add-before 'configure 'fix-makefile
> +           (lambda* (#:key outputs #:allow-other-keys)
> +             (substitute* "mk/osconfig_unix.mk"
> +                (("CC = cc") "CC = gcc")))))))

Indentation seems off here :-)

> +    (native-inputs `(("hevea" ,hevea)))
> +    (home-page "http://projects.camlcity.org/projects/omake.html")
> +    (synopsis "Build system designed for scalability and portability")
> +    (description "Similar to make utilities you may have used, but it features
> +many additional enhancements, including:
> +
> +- Support for projects spanning several directories or directory hierarchies.
> +- Fast, reliable, automated, scriptable dependency analysis using MD5 digests,
> +with full support for incremental builds.
> +- Dependency analysis takes the command lines into account — whenever the
> +command line used to build a target changes, the target is considered
> +out-of-date.
> +-  Fully scriptable, includes a library that providing support for standard
> +tasks in C, C++, OCaml, and LaTeX projects, or a mixture thereof.")

Could you use @enumerate here instead?

> +    (license (list license:lgpl2.1; libmojave
> +                   license:expat; OMake scripts
> +                   license:gpl2)))); OMake itself, with an exception

Which exception? Also, is there no "or later" on these?

> diff --git a/gnu/packages/patches/ocaml-omake-fix-non-determinism.patch b/gnu/packages/patches/ocaml-omake-fix-non-determinism.patch
> new file mode 100644
> index 000000000..813ce3cd7
> --- /dev/null
> +++ b/gnu/packages/patches/ocaml-omake-fix-non-determinism.patch
> @@ -0,0 +1,41 @@
> +From 2e7e254160506dc00f1beabf170512a8e932934b Mon Sep 17 00:00:00 2001
> +From: Julien Lepiller <julien@lepiller.eu>
> +Date: Sat, 31 Dec 2016 15:43:38 +0100
> +Subject: [PATCH] fix build date in binary

Ooh, nice find! The rest LGTM.

> +
> +---
> + src/magic/omake_gen_magic.ml | 12 ++----------
> + 1 file changed, 2 insertions(+), 10 deletions(-)
> +
> +diff --git a/src/magic/omake_gen_magic.ml b/src/magic/omake_gen_magic.ml
> +index b2419ba..fad52f5 100644
> +--- a/src/magic/omake_gen_magic.ml
> ++++ b/src/magic/omake_gen_magic.ml
> +@@ -150,7 +150,7 @@ let ir_magic = "%s"
> + let obj_magic = "%s"
> + let lib_dir = "%s"
> + let version = "%s"
> +-let version_message = "OMake %s:\\n\\tbuild [%s %s %d %02d:%02d:%02d %d]\\n\\ton %s"
> ++let version_message = "OMake %s"
> + |}
> +        default_save_interval
> +        digest_len
> +@@ -160,15 +160,7 @@ let version_message = "OMake %s:\\n\\tbuild [%s %s %d %02d:%02d:%02d %d]\\n\\ton
> +        (digest_files ".omo.magic" ".omo" omo_files)
> +        (String.escaped libdir)
> +        (String.escaped (shorten_version version))
> +-       (String.escaped version)
> +-       [|"Sun"; "Mon"; "Tue"; "Wed"; "Thu"; "Fri"; "Sat"|].(tm.tm_wday)
> +-       [|"Jan"; "Feb"; "Mar"; "Apr"; "May"; "Jun"; "Jul"; "Aug"; "Sep"; "Oct"; "Nov"; "Dec"|].(tm.tm_mon)
> +-       tm.tm_mday
> +-       tm.tm_hour
> +-       tm.tm_min
> +-       tm.tm_sec
> +-       (tm.tm_year + 1900)
> +-       (String.escaped (Unix.gethostname ()));
> ++       (String.escaped version);
> +   List.iter
> +     (fun (name,value) ->
> +        Printf.fprintf buf "let %s = %S\n" name value
> +--
> +2.11.0
> -- 
> 2.11.0

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

[PATCH 04/10] gnu: Add ocaml-batteries.

[Julien Lepiller]

* gnu/packages/ocaml.scm (ocaml-batteries): New variable.
---
 gnu/packages/ocaml.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index f69f77a7b..bc4193ac6 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -1793,3 +1793,32 @@ tasks in C, C++, OCaml, and LaTeX projects, or a mixture thereof.")
     (license (list license:lgpl2.1; libmojave
                    license:expat; OMake scripts
                    license:gpl2)))); OMake itself, with an exception
+
+(define-public ocaml-batteries
+  (package
+    (name "ocaml-batteries")
+    (version "2.5.3")
+    (source (origin
+              (method url-fetch)
+              (uri (ocaml-forge-uri "batteries" version 1650))
+              (sha256
+               (base32
+                "1a97w3x2l1jr5x9kj5gqm1x6b0q9fjqdcsvls7arnl3bvzgsia0n"))))
+    (build-system ocaml-build-system)
+    (native-inputs
+     `(("qtest" ,ocaml-qtest)
+       ("bisect" ,ocaml-bisect)
+       ("ounit" ,ocaml-ounit)))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (delete 'check); tests are run by the build phase
+         (replace 'build
+           (lambda* (#:key outputs #:allow-other-keys)
+             (zero? (system* "ocaml" "setup.ml" "-build")))))))
+    (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+)))
-- 
2.11.0

[PATCH 05/10] gnu: Add ocaml-pcre.

[Julien Lepiller]

* gnu/packages/ocaml.scm (ocaml-pcre): New variable.
---
 gnu/packages/ocaml.scm | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index bc4193ac6..4fbb75c24 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -40,6 +40,7 @@
   #:use-module (gnu packages m4)
   #:use-module (gnu packages multiprecision)
   #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages pcre)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
@@ -1822,3 +1823,38 @@ tasks in C, C++, OCaml, and LaTeX projects, or a mixture thereof.")
 every compliant installation of OCaml and organize these libraries into a
 hierarchy of modules.")
     (license license:lgpl2.1+)))
+
+(define-public ocaml-pcre
+  (package
+    (name "ocaml-pcre")
+    (version "7.2.3")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://github.com/mmottl/pcre-ocaml/archive"
+                                  "/v" version ".tar.gz"))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0rj6dw79px4sj2kq0iss2nzq3rnsn9wivvc0f44wa1mppr6njfb3"))))
+    (build-system ocaml-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'install 'link-lib
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (stubs (string-append out "/lib/ocaml/site-lib/stubslibs"))
+                    (lib (string-append out "/lib/ocaml/site-lib/pcre")))
+               (mkdir-p stubs)
+               (symlink (string-append lib "/dllpcre_stubs.so")
+                        (string-append stubs "/dllpcre_stubs.so"))))))))
+    (native-inputs
+     `(("batteries" ,ocaml-batteries)
+       ("pcre:bin" ,pcre "bin")))
+    (propagated-inputs `(("pcre" ,pcre)))
+    (home-page "https://mmottl.github.io/pcre-ocaml")
+    (synopsis "Bindings to the Perl Compatibility Regular Expressions library")
+    (description "Pcre-ocaml offers library functions for string pattern
+matching and substitution, similar to the functionality offered by the Perl
+language.")
+    (license license:lgpl2.1))); with an exception
-- 
2.11.0

[PATCH 06/10] gnu: Add ocaml-expect.

[Julien Lepiller]

* gnu/packages/ocaml.scm (ocaml-expect): New variable.
---
 gnu/packages/ocaml.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 4fbb75c24..b70c10dea 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -1858,3 +1858,24 @@ hierarchy of modules.")
 matching and substitution, similar to the functionality offered by the Perl
 language.")
     (license license:lgpl2.1))); with an exception
+
+(define-public ocaml-expect
+  (package
+    (name "ocaml-expect")
+    (version "0.0.5")
+    (source (origin
+              (method url-fetch)
+              (uri (ocaml-forge-uri name version 1372))
+              (sha256
+               (base32
+                "07xq8w2x2vffc32z7vk6y14jwbfb1cw0m2lm1jzi60hnr1dvg8by"))))
+    (build-system ocaml-build-system)
+    (native-inputs
+     `(("ocaml-pcre" ,ocaml-pcre)
+       ("ounit" ,ocaml-ounit)))
+    (propagated-inputs `(("batteries" ,ocaml-batteries)))
+    (home-page "https://forge.ocamlcore.org/projects/ocaml-expect/")
+    (synopsis "Simple implementation of expect")
+    (description "Help building unitary testing of interactive program.  You
+can match the question using a regular expression or a timeout.")
+    (license license:lgpl2.0))) ; with an exception
-- 
2.11.0

[PATCH 07/10] gnu: Add ocaml-fileutils.

[Julien Lepiller]

* gnu/packages/ocaml.scm (ocaml-fileutils): New variable.
---
 gnu/packages/ocaml.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index b70c10dea..6d033ebfe 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -1879,3 +1879,21 @@ language.")
     (description "Help building unitary testing of interactive program.  You
 can match the question using a regular expression or a timeout.")
     (license license:lgpl2.0))) ; with an exception
+
+(define-public ocaml-fileutils
+  (package
+    (name "ocaml-fileutils")
+    (version "0.5.1")
+    (source (origin
+              (method url-fetch)
+              (uri (ocaml-forge-uri name version 1651))
+              (sha256
+               (base32
+                "0g6zx2rcvacklxyli19ixcf6ich9ipxsps4k3jz98f5zlaab0a7g"))))
+    (build-system ocaml-build-system)
+    (native-inputs `(("ounit" ,ocaml-ounit)))
+    (home-page "http://ocaml-fileutils.forge.ocamlcore.org")
+    (synopsis "Pure OCaml functions to manipulate real file and filename")
+    (description "Library to provide pure OCaml functions to manipulate real
+file (POSIX like) and filename.")
+    (license license:lgpl2.1)))
-- 
2.11.0

[PATCH 08/10] gnu: Add ocaml-oasis.

[Julien Lepiller]

* gnu/packages/ocaml.scm (ocaml-oasis): New variable.
---
 gnu/packages/ocaml.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 6d033ebfe..35e0d081e 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -1897,3 +1897,33 @@ can match the question using a regular expression or a timeout.")
     (description "Library to provide pure OCaml functions to manipulate real
 file (POSIX like) and filename.")
     (license license:lgpl2.1)))
+
+(define-public ocaml-oasis
+  (package
+    (name "ocaml-oasis")
+    (version "0.4.8")
+    (source (origin
+              (method url-fetch)
+              (uri (ocaml-forge-uri name version 1669))
+              (sha256
+               (base32
+                "1ln7vc7ip6s5xbi20mhnn087xi4a2m5vqawx0703qqnfkzhmslqy"))))
+    (build-system ocaml-build-system)
+    (native-inputs
+     `(("ocamlify" ,ocamlify)
+       ("ocamlmod" ,ocamlmod)
+       ("ounit" ,ocaml-ounit)
+       ("omake" ,omake)
+       ("ocaml-expect" ,ocaml-expect)
+       ("ocaml-pcre" ,ocaml-pcre)
+       ("ocaml-fileutils" ,ocaml-fileutils)
+       ("camlp4" ,camlp4)
+       ("texlive" ,texlive)
+       ("pkg-config" ,pkg-config)))
+    (arguments `(#:tests? #f)) ; 33.33% test failures... ld cannot find crti.o
+    (home-page "https://oasis.forge.ocamlcore.org")
+    (synopsis "Integrates a configure, build, install system in OCaml projects")
+    (description "OASIS is a tool to integrate a configure, build and install
+system in your OCaml projects.  It helps to create standard entry points in your
+build system and allows external tools to analyse your project easily.")
+    (license license:lgpl2.1))) ; with an exception
-- 
2.11.0

Re: [PATCH 08/10] gnu: Add ocaml-oasis.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 2314 bytes --]

Julien Lepiller <julien@lepiller.eu> writes:

> * gnu/packages/ocaml.scm (ocaml-oasis): New variable.
> ---
>  gnu/packages/ocaml.scm | 30 ++++++++++++++++++++++++++++++
>  1 file changed, 30 insertions(+)
>
> diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
> index 6d033ebfe..35e0d081e 100644
> --- a/gnu/packages/ocaml.scm
> +++ b/gnu/packages/ocaml.scm
> @@ -1897,3 +1897,33 @@ can match the question using a regular expression or a timeout.")
>      (description "Library to provide pure OCaml functions to manipulate real
>  file (POSIX like) and filename.")
>      (license license:lgpl2.1)))
> +
> +(define-public ocaml-oasis
> +  (package
> +    (name "ocaml-oasis")
> +    (version "0.4.8")
> +    (source (origin
> +              (method url-fetch)
> +              (uri (ocaml-forge-uri name version 1669))
> +              (sha256
> +               (base32
> +                "1ln7vc7ip6s5xbi20mhnn087xi4a2m5vqawx0703qqnfkzhmslqy"))))
> +    (build-system ocaml-build-system)
> +    (native-inputs
> +     `(("ocamlify" ,ocamlify)
> +       ("ocamlmod" ,ocamlmod)
> +       ("ounit" ,ocaml-ounit)
> +       ("omake" ,omake)
> +       ("ocaml-expect" ,ocaml-expect)
> +       ("ocaml-pcre" ,ocaml-pcre)
> +       ("ocaml-fileutils" ,ocaml-fileutils)
> +       ("camlp4" ,camlp4)
> +       ("texlive" ,texlive)
> +       ("pkg-config" ,pkg-config)))
> +    (arguments `(#:tests? #f)) ; 33.33% test failures... ld cannot find crti.o

This has been discussed a couple of times on the mailing list. IIRC
setting up LD_LIBRARY_PATH to point to $glibc/lib fixes it.

See e.g. https://lists.gnu.org/archive/html/help-guix/2017-01/msg00028.html

or https://lists.gnu.org/archive/html/guix-devel/2016-11/msg01104.html

for a patch with a (suboptimal) fix. I should brush up this package.. :P

> +    (home-page "https://oasis.forge.ocamlcore.org")
> +    (synopsis "Integrates a configure, build, install system in OCaml projects")
> +    (description "OASIS is a tool to integrate a configure, build and install
> +system in your OCaml projects.  It helps to create standard entry points in your
> +build system and allows external tools to analyse your project easily.")
> +    (license license:lgpl2.1))) ; with an exception

Please clarify what the exception is, or where to find the full text.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

[PATCH 09/10] gnu: Add ocaml-js-build-tools.

[Julien Lepiller]

* gnu/packages/ocaml.scm (ocaml-js-build-tools): New variable.
* gnu/packages/patches/ocaml-janestreet-fix-libdir.patch: New file.
* gnu/local.mk (dist_patch_DATA): New patch.
---
 gnu/local.mk                                       |  1 +
 gnu/packages/ocaml.scm                             | 49 ++++++++++++++++++++++
 .../patches/ocaml-janestreet-fix-libdir.patch      | 36 ++++++++++++++++
 3 files changed, 86 insertions(+)
 create mode 100644 gnu/packages/patches/ocaml-janestreet-fix-libdir.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 5b919dd86..7b210c7b3 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -778,6 +778,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/ocaml-CVE-2015-8869.patch		\
   %D%/packages/patches/ocaml-Add-a-.file-directive.patch	\
   %D%/packages/patches/ocaml-findlib-make-install.patch	\
+  %D%/packages/patches/ocaml-janestreet-fix-libdir.patch \
   %D%/packages/patches/ocaml-omake-fix-non-determinism.patch	\
   %D%/packages/patches/ola-readdir-r.patch			\
   %D%/packages/patches/openexr-missing-samples.patch		\
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 35e0d081e..120095118 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -66,6 +66,35 @@
                  (number->string file-number) "/" name "-" version
                  ".tar.gz"))
 
+;; Janestreet packages are found in a similar way and all need the same patch
+(define (janestreet-origin name version hash)
+  (origin (method url-fetch)
+          (uri (string-append "https://ocaml.janestreet.com/ocaml-core/"
+                              (version-major+minor version) "/files/"
+                              name "-" version ".tar.gz"))
+          (sha256 (base32 hash))
+          (patches (search-patches "ocaml-janestreet-fix-libdir.patch"))
+          (modules '((guix build utils)))
+          (snippet `(substitute* "install.ml"
+                                 (((string-append "lib/" ,name))
+                                  (string-append "lib/ocaml/site-lib/" ,name))))))
+
+;; They also require almost the same set of arguments
+(define janestreet-arguments
+ `(#:use-make? #t
+   #:make-flags
+   (list (string-append "CONFIGUREFLAGS=--prefix "
+                        (assoc-ref %outputs "out")
+                        " --enable-tests")
+         (string-append "LIBDIR="
+                        (assoc-ref %outputs "out")
+                        "/lib/ocaml/site-lib")
+         ;; for ocaml-bin-prot, otherwise ignored
+         (string-append "OCAML_TOPLEVEL_PATH="
+                        (assoc-ref %build-inputs "findlib")
+                        "/lib/ocaml/site-lib"))
+   #:phases (modify-phases %standard-phases (delete 'configure))))
+
 (define-public ocaml
   (package
     (name "ocaml")
@@ -1927,3 +1956,23 @@ file (POSIX like) and filename.")
 system in your OCaml projects.  It helps to create standard entry points in your
 build system and allows external tools to analyse your project easily.")
     (license license:lgpl2.1))) ; with an exception
+
+(define-public ocaml-js-build-tools
+  (package
+    (name "ocaml-js-build-tools")
+    (version "113.33.06")
+    (source (janestreet-origin "js-build-tools" version
+              "0r8z4fz8iy5y6hkdlkpwf6rk4qigcr3dzyv35585xgg2ahf12zy6"))
+    (native-inputs
+     `(("oasis" ,ocaml-oasis)
+       ("opam" ,opam)))
+    (build-system ocaml-build-system)
+    (arguments janestreet-arguments)
+    (home-page "https://github.com/janestreet/js-build-tools")
+    (synopsis "Collection of tools to help building Jane Street Packages")
+    (description "This packages contains tools to help building Jane Street
+Packages. However most of it is general purpose.  It contains:
+
+- an oasis2opam-install tool to produce a .install file from the oasis build log
+- an js_build_tools ocamlbuild plugin with various goodies")
+    (license license:asl2.0)))
diff --git a/gnu/packages/patches/ocaml-janestreet-fix-libdir.patch b/gnu/packages/patches/ocaml-janestreet-fix-libdir.patch
new file mode 100644
index 000000000..07cabe3c4
--- /dev/null
+++ b/gnu/packages/patches/ocaml-janestreet-fix-libdir.patch
@@ -0,0 +1,36 @@
+diff -aur package.pristine/Makefile package.new/Makefile
+--- package.pristine/Makefile	2016-02-06 01:55:14.650150309 +0100
++++ package.new/Makefile	2016-02-06 01:57:56.012174364 +0100
+@@ -29,26 +29,26 @@
+ 	ocaml -I js-utils js-utils/gen_install.ml
+
+ install: $(NAME).install
+-	opam-installer -i --prefix $(PREFIX) $(NAME).install
++	opam-installer -i --prefix $(PREFIX) --libdir $(LIBDIR) $(NAME).install
+
+ uninstall: $(NAME).install
+-	opam-installer -u --prefix $(PREFIX) $(NAME).install
++	opam-installer -u --prefix $(PREFIX) --libdir $(LIBDIR) $(NAME).install
+
+ reinstall: $(NAME).install
+-	opam-installer -u --prefix $(PREFIX) $(NAME).install &> /dev/null || true
+-	opam-installer -i --prefix $(PREFIX) $(NAME).install
++	opam-installer -u --prefix $(PREFIX) --libdir $(LIBDIR) $(NAME).install &> /dev/null || true
++	opam-installer -i --prefix $(PREFIX) --libdir $(LIBDIR) $(NAME).install
+
+ bin.tar.gz: $(NAME).install
+ 	rm -rf _install
+ 	mkdir _install
+-	opam-installer -i --prefix _install $(NAME).install
++	opam-installer -i --prefix _install --libdir $(LIBDIR) $(NAME).install
+ 	tar czf bin.tar.gz -C _install .
+ 	rm -rf _install
+
+ bin.lzo: $(NAME).install
+ 	rm -rf _install
+ 	mkdir _install
+-	opam-installer -i --prefix _install $(NAME).install
++	opam-installer -i --prefix _install --libdir $(LIBDIR) $(NAME).install
+ 	cd _install && lzop -1 -P -o ../bin.lzo `find . -type f`
+ 	rm -rf _install
+
-- 
2.11.0

Re: [PATCH 09/10] gnu: Add ocaml-js-build-tools.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 6304 bytes --]

Julien Lepiller <julien@lepiller.eu> writes:

> * gnu/packages/ocaml.scm (ocaml-js-build-tools): New variable.
> * gnu/packages/patches/ocaml-janestreet-fix-libdir.patch: New file.
> * gnu/local.mk (dist_patch_DATA): New patch.
> ---
>  gnu/local.mk                                       |  1 +
>  gnu/packages/ocaml.scm                             | 49 ++++++++++++++++++++++
>  .../patches/ocaml-janestreet-fix-libdir.patch      | 36 ++++++++++++++++
>  3 files changed, 86 insertions(+)
>  create mode 100644 gnu/packages/patches/ocaml-janestreet-fix-libdir.patch
>
> diff --git a/gnu/local.mk b/gnu/local.mk
> index 5b919dd86..7b210c7b3 100644
> --- a/gnu/local.mk
> +++ b/gnu/local.mk
> @@ -778,6 +778,7 @@ dist_patch_DATA =						\
>    %D%/packages/patches/ocaml-CVE-2015-8869.patch		\
>    %D%/packages/patches/ocaml-Add-a-.file-directive.patch	\
>    %D%/packages/patches/ocaml-findlib-make-install.patch	\
> +  %D%/packages/patches/ocaml-janestreet-fix-libdir.patch \
>    %D%/packages/patches/ocaml-omake-fix-non-determinism.patch	\
>    %D%/packages/patches/ola-readdir-r.patch			\
>    %D%/packages/patches/openexr-missing-samples.patch		\
> diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
> index 35e0d081e..120095118 100644
> --- a/gnu/packages/ocaml.scm
> +++ b/gnu/packages/ocaml.scm
> @@ -66,6 +66,35 @@
>                   (number->string file-number) "/" name "-" version
>                   ".tar.gz"))
>  
> +;; Janestreet packages are found in a similar way and all need the same patch
> +(define (janestreet-origin name version hash)
> +  (origin (method url-fetch)
> +          (uri (string-append "https://ocaml.janestreet.com/ocaml-core/"
> +                              (version-major+minor version) "/files/"
> +                              name "-" version ".tar.gz"))
> +          (sha256 (base32 hash))
> +          (patches (search-patches "ocaml-janestreet-fix-libdir.patch"))
> +          (modules '((guix build utils)))
> +          (snippet `(substitute* "install.ml"
> +                                 (((string-append "lib/" ,name))
> +                                  (string-append "lib/ocaml/site-lib/" ,name))))))
> +
> +;; They also require almost the same set of arguments
> +(define janestreet-arguments
> + `(#:use-make? #t
> +   #:make-flags
> +   (list (string-append "CONFIGUREFLAGS=--prefix "
> +                        (assoc-ref %outputs "out")
> +                        " --enable-tests")
> +         (string-append "LIBDIR="
> +                        (assoc-ref %outputs "out")
> +                        "/lib/ocaml/site-lib")
> +         ;; for ocaml-bin-prot, otherwise ignored
> +         (string-append "OCAML_TOPLEVEL_PATH="
> +                        (assoc-ref %build-inputs "findlib")
> +                        "/lib/ocaml/site-lib"))
> +   #:phases (modify-phases %standard-phases (delete 'configure))))
> +
>  (define-public ocaml
>    (package
>      (name "ocaml")
> @@ -1927,3 +1956,23 @@ file (POSIX like) and filename.")
>  system in your OCaml projects.  It helps to create standard entry points in your
>  build system and allows external tools to analyse your project easily.")
>      (license license:lgpl2.1))) ; with an exception
> +
> +(define-public ocaml-js-build-tools
> +  (package
> +    (name "ocaml-js-build-tools")
> +    (version "113.33.06")
> +    (source (janestreet-origin "js-build-tools" version
> +              "0r8z4fz8iy5y6hkdlkpwf6rk4qigcr3dzyv35585xgg2ahf12zy6"))
> +    (native-inputs
> +     `(("oasis" ,ocaml-oasis)
> +       ("opam" ,opam)))
> +    (build-system ocaml-build-system)
> +    (arguments janestreet-arguments)
> +    (home-page "https://github.com/janestreet/js-build-tools")
> +    (synopsis "Collection of tools to help building Jane Street Packages")
> +    (description "This packages contains tools to help building Jane Street
> +Packages. However most of it is general purpose.  It contains:

The second sentence is difficult to parse. Maybe ", but can also be used
for other purposes."

> +
> +- an oasis2opam-install tool to produce a .install file from the oasis build log
> +- an js_build_tools ocamlbuild plugin with various goodies")

Please use @enumerate here too.

Hopefully someone else can chime in on the helper functions above, if it
works I'd say they are fine. LGTM!

> +    (license license:asl2.0)))
> diff --git a/gnu/packages/patches/ocaml-janestreet-fix-libdir.patch b/gnu/packages/patches/ocaml-janestreet-fix-libdir.patch
> new file mode 100644
> index 000000000..07cabe3c4
> --- /dev/null
> +++ b/gnu/packages/patches/ocaml-janestreet-fix-libdir.patch
> @@ -0,0 +1,36 @@
> +diff -aur package.pristine/Makefile package.new/Makefile
> +--- package.pristine/Makefile	2016-02-06 01:55:14.650150309 +0100
> ++++ package.new/Makefile	2016-02-06 01:57:56.012174364 +0100
> +@@ -29,26 +29,26 @@
> + 	ocaml -I js-utils js-utils/gen_install.ml
> +
> + install: $(NAME).install
> +-	opam-installer -i --prefix $(PREFIX) $(NAME).install
> ++	opam-installer -i --prefix $(PREFIX) --libdir $(LIBDIR) $(NAME).install
> +
> + uninstall: $(NAME).install
> +-	opam-installer -u --prefix $(PREFIX) $(NAME).install
> ++	opam-installer -u --prefix $(PREFIX) --libdir $(LIBDIR) $(NAME).install
> +
> + reinstall: $(NAME).install
> +-	opam-installer -u --prefix $(PREFIX) $(NAME).install &> /dev/null || true
> +-	opam-installer -i --prefix $(PREFIX) $(NAME).install
> ++	opam-installer -u --prefix $(PREFIX) --libdir $(LIBDIR) $(NAME).install &> /dev/null || true
> ++	opam-installer -i --prefix $(PREFIX) --libdir $(LIBDIR) $(NAME).install
> +
> + bin.tar.gz: $(NAME).install
> + 	rm -rf _install
> + 	mkdir _install
> +-	opam-installer -i --prefix _install $(NAME).install
> ++	opam-installer -i --prefix _install --libdir $(LIBDIR) $(NAME).install
> + 	tar czf bin.tar.gz -C _install .
> + 	rm -rf _install
> +
> + bin.lzo: $(NAME).install
> + 	rm -rf _install
> + 	mkdir _install
> +-	opam-installer -i --prefix _install $(NAME).install
> ++	opam-installer -i --prefix _install --libdir $(LIBDIR) $(NAME).install
> + 	cd _install && lzop -1 -P -o ../bin.lzo `find . -type f`
> + 	rm -rf _install
> +
> -- 
> 2.11.0

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

Re: [PATCH 09/10] gnu: Add ocaml-js-build-tools.

[Ludovic Courtès]

Marius Bakke <mbakke@fastmail.com> skribis:

>> --- /dev/null
>> +++ b/gnu/packages/patches/ocaml-janestreet-fix-libdir.patch
>> @@ -0,0 +1,36 @@
>> +diff -aur package.pristine/Makefile package.new/Makefile
>> +--- package.pristine/Makefile	2016-02-06 01:55:14.650150309 +0100
>> ++++ package.new/Makefile	2016-02-06 01:57:56.012174364 +0100

Also, please add one or two lines here describing what the patch does
and what its upstream status is.

Thanks,
Ludo’.

[PATCH 10/10] gnu: Add ocaml-bin-prot.

[Julien Lepiller]

* gnu/packages/ocaml.scm (ocaml-bin-prot): New variable.
---
 gnu/packages/ocaml.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 120095118..71a5c1954 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -1976,3 +1976,24 @@ Packages. However most of it is general purpose.  It contains:
 - an oasis2opam-install tool to produce a .install file from the oasis build log
 - an js_build_tools ocamlbuild plugin with various goodies")
     (license license:asl2.0)))
+
+(define-public ocaml-bin-prot
+  (package
+    (name "ocaml-bin-prot")
+    (version "113.33.03")
+    (source (janestreet-origin "bin_prot" version
+               "1ws8c017z8nbj3vw92ndvjk9011f71rmp3llncbv8r5fc76wqv3l"))
+    (native-inputs
+     `(("js-build-tools" ,ocaml-js-build-tools)
+       ("opam" ,opam)))
+    (build-system ocaml-build-system)
+    (arguments janestreet-arguments)
+    (home-page "https://github.com/janestreet/bin_prot/")
+    (synopsis "A binary protocol generator")
+    (description "This library contains functionality for reading and writing
+OCaml-values in a type-safe binary protocol.  It is extremely efficient,
+typically supporting type-safe marshalling and unmarshalling of even highly
+structured values at speeds sufficient to saturate a gigabit connection.  The
+protocol is also heavily optimized for size, making it ideal for long-term
+storage of large amounts of data.")
+    (license license:asl2.0)))
-- 
2.11.0

Re: [PATCH 00/10] ocaml patches

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 705 bytes --]

Julien Lepiller <julien@lepiller.eu> writes:

> Here are the next 10 ocaml-related patches I would like to push. What do you
> think?

I don't know anything about ocaml, but the patches reads fine to me.

One thing that strikes me is the usage of native-inputs; I assume it's
because the packages are not referenced, but bear in mind that they are
built for the architecture of the build machine, and not for the target
system.

E.g. `guix build --system=i686-linux ocamlify` will add 64-bit
native-inputs even if the final product is supposed to be 32-bit. Not
sure if that will cause problems or not.

> I'm pretty sure number 9 and 10 can be improved, any idea?

Not from me, I'd say it looks fine :-)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

Re: [PATCH 00/10] ocaml patches

[Julien Lepiller]

On Wed, 18 Jan 2017 23:27:06 +0100
Marius Bakke <mbakke@fastmail.com> wrote:

> Julien Lepiller <julien@lepiller.eu> writes:
> 
> > Here are the next 10 ocaml-related patches I would like to push.
> > What do you think?  
> 
> I don't know anything about ocaml, but the patches reads fine to me.
> 
> One thing that strikes me is the usage of native-inputs; I assume it's
> because the packages are not referenced, but bear in mind that they
> are built for the architecture of the build machine, and not for the
> target system.
I use native-inputs because the build system needs binaries (not
libraries) from these packages.

> 
> E.g. `guix build --system=i686-linux ocamlify` will add 64-bit
> native-inputs even if the final product is supposed to be 32-bit. Not
> sure if that will cause problems or not.
Just to be sure, I'll cross-compile them. I'll send updated patches
soon.

> 
> > I'm pretty sure number 9 and 10 can be improved, any idea?  
> 
> Not from me, I'd say it looks fine :-)
Thanks for your review :)

[PATCH 00/10] ocaml patches v2

[Julien Lepiller]

I finally had some time to work on these patches, so here are the new versions of
them. I was unable to fix the failing tests in oasis, so I just disabled the
failing ones.

Julien Lepiller (10):
  gnu: Add ocaml-base64.
  gnu: Add ocamlify.
  gnu: Add omake.
  gnu: Add ocaml-batteries.
  gnu: Add ocaml-pcre.
  gnu: Add ocaml-expect.
  gnu: Add ocaml-fileutils.
  gnu: Add ocaml-oasis.
  gnu: Add ocaml-js-build-tools.
  gnu: Add ocaml-bin-prot.

 gnu/local.mk                                       |   2 +
 gnu/packages/ocaml.scm                             | 317 +++++++++++++++++++++
 .../patches/ocaml-janestreet-fix-libdir.patch      |  39 +++
 .../patches/omake-fix-non-determinism.patch        |  41 +++
 4 files changed, 399 insertions(+)
 create mode 100644 gnu/packages/patches/ocaml-janestreet-fix-libdir.patch
 create mode 100644 gnu/packages/patches/omake-fix-non-determinism.patch

-- 
2.11.0

[PATCH 03/10] gnu: Add omake.

[Julien Lepiller]

* gnu/packages/ocaml.scm (omake): New variable.
* gnu/packages/patches/ocaml-omake-fix-non-determinism.patch: New file.
* gnu/local.mk (dist_patch_DATA): New patch.
---
 gnu/local.mk                                       |  1 +
 gnu/packages/ocaml.scm                             | 44 ++++++++++++++++++++++
 .../patches/omake-fix-non-determinism.patch        | 41 ++++++++++++++++++++
 3 files changed, 86 insertions(+)
 create mode 100644 gnu/packages/patches/omake-fix-non-determinism.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 59fc1a82c..2e3548342 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -775,6 +775,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/ocaml-CVE-2015-8869.patch		\
   %D%/packages/patches/ocaml-Add-a-.file-directive.patch	\
   %D%/packages/patches/ocaml-findlib-make-install.patch	\
+  %D%/packages/patches/omake-fix-non-determinism.patch	\
   %D%/packages/patches/ola-readdir-r.patch			\
   %D%/packages/patches/openexr-missing-samples.patch		\
   %D%/packages/patches/openjpeg-CVE-2016-5157.patch		\
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index a2297d1ab..0235ca023 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -1752,3 +1752,47 @@ whole files into OCaml string or string list.  The code generated can be
 compiled as a standard OCaml file.  It allows embedding external resources as
 OCaml code.")
     (license license:lgpl2.1))); with an exception
+
+(define-public omake
+  (package
+    (name "omake")
+    (version "0.10.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://download.camlcity.org/download/"
+                                  "omake-" version ".tar.gz"))
+              (sha256
+               (base32
+                "093ansbppms90hiqvzar2a46fj8gm9iwnf8gn38s6piyp70lrbsj"))
+              (patches (search-patches "omake-fix-non-determinism.patch"))))
+    (build-system ocaml-build-system)
+    (arguments
+     `(#:make-flags
+       (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
+       #:tests? #f ; no test target
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'fix-makefile
+                     (lambda* (#:key outputs #:allow-other-keys)
+                       (substitute* "mk/osconfig_unix.mk"
+                                    (("CC = cc") "CC = gcc")))))))
+    (native-inputs `(("hevea" ,hevea)))
+    (home-page "http://projects.camlcity.org/projects/omake.html")
+    (synopsis "Build system designed for scalability and portability")
+    (description "Similar to make utilities you may have used, but it features
+many additional enhancements, including:
+
+@enumerate
+@item Support for projects spanning several directories or directory hierarchies.
+@item Fast, reliable, automated, scriptable dependency analysis using MD5 digests,
+      with full support for incremental builds.
+@item Dependency analysis takes the command lines into account — whenever the
+      command line used to build a target changes, the target is considered
+      out-of-date.
+@item Fully scriptable, includes a library that providing support for standard
+      tasks in C, C++, OCaml, and LaTeX projects, or a mixture thereof.
+@end enumerate")
+    (license (list license:lgpl2.1 ; libmojave
+                   license:expat ; OMake scripts
+                   license:gpl2)))) ; OMake itself, with ocaml linking exception
+                                    ; see LICENSE.OMake
diff --git a/gnu/packages/patches/omake-fix-non-determinism.patch b/gnu/packages/patches/omake-fix-non-determinism.patch
new file mode 100644
index 000000000..813ce3cd7
--- /dev/null
+++ b/gnu/packages/patches/omake-fix-non-determinism.patch
@@ -0,0 +1,41 @@
+From 2e7e254160506dc00f1beabf170512a8e932934b Mon Sep 17 00:00:00 2001
+From: Julien Lepiller <julien@lepiller.eu>
+Date: Sat, 31 Dec 2016 15:43:38 +0100
+Subject: [PATCH] fix build date in binary
+
+---
+ src/magic/omake_gen_magic.ml | 12 ++----------
+ 1 file changed, 2 insertions(+), 10 deletions(-)
+
+diff --git a/src/magic/omake_gen_magic.ml b/src/magic/omake_gen_magic.ml
+index b2419ba..fad52f5 100644
+--- a/src/magic/omake_gen_magic.ml
++++ b/src/magic/omake_gen_magic.ml
+@@ -150,7 +150,7 @@ let ir_magic = "%s"
+ let obj_magic = "%s"
+ let lib_dir = "%s"
+ let version = "%s"
+-let version_message = "OMake %s:\\n\\tbuild [%s %s %d %02d:%02d:%02d %d]\\n\\ton %s"
++let version_message = "OMake %s"
+ |}
+        default_save_interval
+        digest_len
+@@ -160,15 +160,7 @@ let version_message = "OMake %s:\\n\\tbuild [%s %s %d %02d:%02d:%02d %d]\\n\\ton
+        (digest_files ".omo.magic" ".omo" omo_files)
+        (String.escaped libdir)
+        (String.escaped (shorten_version version))
+-       (String.escaped version)
+-       [|"Sun"; "Mon"; "Tue"; "Wed"; "Thu"; "Fri"; "Sat"|].(tm.tm_wday)
+-       [|"Jan"; "Feb"; "Mar"; "Apr"; "May"; "Jun"; "Jul"; "Aug"; "Sep"; "Oct"; "Nov"; "Dec"|].(tm.tm_mon)
+-       tm.tm_mday
+-       tm.tm_hour
+-       tm.tm_min
+-       tm.tm_sec
+-       (tm.tm_year + 1900)
+-       (String.escaped (Unix.gethostname ()));
++       (String.escaped version);
+   List.iter
+     (fun (name,value) ->
+        Printf.fprintf buf "let %s = %S\n" name value
+--
+2.11.0
-- 
2.11.0