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

[Julien Lepiller <julien@lepiller.eu>]

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

On Mon, 30 Jan 2017 23:23:27 +0100
ludo@gnu.org (Ludovic Courtès) wrote:

> Julien Lepiller <julien@lepiller.eu> skribis:
> 
> > On Mon, 30 Jan 2017 10:22:13 +0100
> > ludo@gnu.org (Ludovic Courtès) wrote:
> >  
> >> Julien Lepiller <julien@lepiller.eu> skribis:
> >>   
> >> > +++ b/gnu/packages/patches/ocaml-janestreet-fix-libdir.patch
> >> > @@ -0,0 +1,39 @@
> >> > +This patch adds a --libdir option to opam-installer so it
> >> > installs the plugin +in the specified directory rather than in
> >> > the default one (ocaml's directory in +the store, which is
> >> > forbidden). +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    
> >> 
> >> On second thought, I think it’d be simpler and more maintainable
> >> to do this as a substitution in the snippet.
> >> 
> >> WDYT?
> >> 
> >> (It will also avoid ‘guix lint’ complaints about the patch file
> >> name not matching the package name.  :-))
> >> 
> >> Ludo’.  
> >
> > Sure, here it is :)
> >
> > From 8cd3ba3a3f9702a89f8f52c75c33d3d02f20f60b Mon Sep 17 00:00:00
> > 2001 From: Julien Lepiller <julien@lepiller.eu>
> > Date: Fri, 30 Dec 2016 16:27:27 +0100
> > Subject: [PATCH 2/2] gnu: Add ocaml-bin-prot.
> >
> > * gnu/packages/ocaml.scm (ocaml-bin-prot): New variable.  
> 
> Wait, I was commenting on ocaml-js-build-tools, not on ocaml-bin-prot:
> 
>   https://lists.gnu.org/archive/html/guix-devel/2017-01/threads.html#02134
> 
> Could it be that you’re replying to the wrong message?  :-)
> 
> Ludo’.

I was replying to the correct message, but not with the correct patch.


[-- Attachment #2: 0001-gnu-Add-ocaml-js-build-tools.patch --]
[-- Type: text/x-patch, Size: 4049 bytes --]

From 96a8ec5f4ad68c14f49335bf58d27ef21c2419f7 Mon Sep 17 00:00:00 2001
From: Julien Lepiller <julien@lepiller.eu>
Date: Fri, 27 Jan 2017 22:58:50 +0100
Subject: [PATCH 1/2] gnu: Add ocaml-js-build-tools.

* 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): Add it.
---
 gnu/packages/ocaml.scm | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index ba0f5cd4c..6e1e745fe 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -66,6 +66,46 @@
                  (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))
+          (modules '((guix build utils)))
+          (snippet
+           `(let ((pattern (string-append "lib/" ,name)))
+              ;; install.ml contains an invalid reference to the ppx file and
+              ;; propagates this error to the generated META file.  It
+              ;; looks for it in the "lib" directory, but it is installed in
+              ;; "lib/ocaml/site-lib/package".  This substitute does not change
+              ;; this file for non ppx packages.
+              (substitute* "install.ml"
+                           ((pattern)
+                            (string-append "lib/ocaml/site-lib/" ,name)))
+              ;; The standard Makefile would try to install janestreet modules
+              ;; in OCaml's directory in the store, which is read-only.
+              (substitute* "Makefile"
+                           (("--prefix")
+                            "--libdir $(LIBDIR) --prefix"))))))
+
+;; 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")
@@ -1942,3 +1982,25 @@ 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 ocaml static compilation 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 package contains tools to help building Jane Street
+packages, but can be used for other purposes.  It contains:
+@enumerate
+@item an @command{oasis2opam-install} tool to produce a @file{.install} file
+from the oasis build log
+@item a @code{js_build_tools} ocamlbuild plugin with various goodies.
+@end enumerate")
+    (license license:asl2.0)))
-- 
2.11.0