GNU bug report logs - #34627
[PATCH] gnu: ocaml-menhir: Update to 20181113.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 34627 in the body.
You can then email your comments to 34627 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Gabriel Hondet <gabrielhondet <at> gmail.com>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: ocaml-menhir: Update to 20181113.
Date: Sat, 23 Feb 2019 09:50:38 +0100

[Message part 1 (text/plain, inline)]

* gnu/packages/ocaml.scm (ocaml-menhir): Update to 20181113.
---
 gnu/packages/ocaml.scm | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 9a807a4cb6..31e9a697a2 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -639,37 +639,43 @@ Emacs.")
 (define-public ocaml-menhir
   (package
     (name "ocaml-menhir")
-    (version "20161115")
+    (version "20181113")
     (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "http://gallium.inria.fr/~fpottier/menhir/"
-                    "menhir-" version ".tar.gz"))
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://gitlab.inria.fr/fpottier/menhir.git")
+                    (commit version)))
+              (file-name (git-file-name name version))
               (sha256
                (base32
-                "1j8nmcj2gq6hyyi16z27amiahplgrnk4ppchpm0v4qy80kwkf47k"))))
-    (build-system gnu-build-system)
-    (inputs
-     `(("ocaml" ,ocaml)))
+                "1iqdf64ayq4s3d9jkwhs3s8wqc2s48b292hp0kcjsskfhcvwg0kr"))))
+    (build-system ocaml-build-system)
     (native-inputs
      `(("ocamlbuild" ,ocamlbuild)))
     (arguments
-     `(#:parallel-build? #f ; Parallel build causes failure
-       #:tests? #f ; No check target
+     `(#:tests? #f ; No check target
        #:phases
        (modify-phases %standard-phases
          (replace 'configure
            (lambda* (#:key outputs #:allow-other-keys)
              (let ((out (assoc-ref outputs "out")))
                (setenv "PREFIX" out))
+             #t))
+         (replace 'build
+           (lambda _
+             (invoke "make" "-f" "Makefile" "USE_OCAMLFIND=true" "all")
+             #t))
+         (replace 'install
+           (lambda _
+             (invoke "make" "-f" "Makefile" "install")
              #t)))))
     (properties
      `((ocaml4.02-variant . ,(delay ocaml4.02-menhir))))
-    (home-page "http://gallium.inria.fr/~fpottier/menhir")
+    (home-page "http://gallium.inria.fr/~fpottier/menhir/")
     (synopsis "Parser generator")
     (description "Menhir is a parser generator.  It turns high-level grammar
 specifications, decorated with semantic actions expressed in the OCaml
-programming language into parsers, again expressed in OCaml. It is based on
+programming language into parsers, again expressed in OCaml.  It is based on
 Knuth’s LR(1) parser construction technique.")
     ;; The file src/standard.mly and all files listed in src/mnehirLib.mlpack
     ;; that have an *.ml or *.mli extension are GPL licensed. All other files
-- 
2.20.1

[signature.asc (application/pgp-signature, inline)]

Message #8 received at 34627 <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: Gabriel Hondet <gabrielhondet <at> gmail.com>
Cc: 34627 <at> debbugs.gnu.org
Subject: Re: [bug#34627] [PATCH] gnu: ocaml-menhir: Update to 20181113.
Date: Mon, 25 Feb 2019 22:58:51 -0500

[Message part 1 (text/plain, inline)]

On Sat, Feb 23, 2019 at 09:50:38AM +0100, Gabriel Hondet wrote:
> * gnu/packages/ocaml.scm (ocaml-menhir): Update to 20181113.

Thanks!

> +         (replace 'build
> +           (lambda _
> +             (invoke "make" "-f" "Makefile" "USE_OCAMLFIND=true" "all")
> +             #t))
> +         (replace 'install
> +           (lambda _
> +             (invoke "make" "-f" "Makefile" "install")
>               #t)))))

Can you add comments explaining why these phases are replaced?

[signature.asc (application/pgp-signature, inline)]

Message #11 received at 34627 <at> debbugs.gnu.org (full text, mbox):

From: Gabriel Hondet <gabrielhondet <at> gmail.com>
To: Leo Famulari <leo <at> famulari.name>
Cc: 34627 <at> debbugs.gnu.org
Subject: Re: [bug#34627] [PATCH] gnu: ocaml-menhir: Update to 20181113.
Date: Sat, 06 Apr 2019 10:27:17 +0200

[Message part 1 (text/plain, inline)]

Hi Leo,

> Can you add comments explaining why these phases are replaced?

[0001-gnu-ocaml-menhir-Update-to-20181113.patch (text/x-diff, inline)]

From dde2129019d0490909e764181b1f332c3faefa5f Mon Sep 17 00:00:00 2001
From: gabrielhdt <gabrielhondet <at> gmail.com>
Date: Sat, 23 Feb 2019 09:50:38 +0100
Subject: [PATCH] gnu: ocaml-menhir: Update to 20181113.

* gnu/packages/ocaml.scm (ocaml-menhir): Update to 20181113.
---
 gnu/packages/ocaml.scm | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 9a807a4cb6..0ad33f6b25 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -639,37 +639,45 @@ Emacs.")
 (define-public ocaml-menhir
   (package
     (name "ocaml-menhir")
-    (version "20161115")
+    (version "20181113")
     (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "http://gallium.inria.fr/~fpottier/menhir/"
-                    "menhir-" version ".tar.gz"))
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://gitlab.inria.fr/fpottier/menhir.git")
+                    (commit version)))
+              (file-name (git-file-name name version))
               (sha256
                (base32
-                "1j8nmcj2gq6hyyi16z27amiahplgrnk4ppchpm0v4qy80kwkf47k"))))
-    (build-system gnu-build-system)
-    (inputs
-     `(("ocaml" ,ocaml)))
+                "1iqdf64ayq4s3d9jkwhs3s8wqc2s48b292hp0kcjsskfhcvwg0kr"))))
+    (build-system ocaml-build-system)
     (native-inputs
      `(("ocamlbuild" ,ocamlbuild)))
     (arguments
-     `(#:parallel-build? #f ; Parallel build causes failure
-       #:tests? #f ; No check target
+     `(#:tests? #f ; No check target
        #:phases
        (modify-phases %standard-phases
          (replace 'configure
            (lambda* (#:key outputs #:allow-other-keys)
              (let ((out (assoc-ref outputs "out")))
                (setenv "PREFIX" out))
+             #t))
+         (replace 'build
+           (lambda _
+             ;; invoke the right makefile
+             (invoke "make" "-f" "Makefile" "USE_OCAMLFIND=true" "all")
+             #t))
+         (replace 'install
+           (lambda _
+             ;; invoke the right makefile
+             (invoke "make" "-f" "Makefile" "install")
              #t)))))
     (properties
      `((ocaml4.02-variant . ,(delay ocaml4.02-menhir))))
-    (home-page "http://gallium.inria.fr/~fpottier/menhir")
+    (home-page "http://gallium.inria.fr/~fpottier/menhir/")
     (synopsis "Parser generator")
     (description "Menhir is a parser generator.  It turns high-level grammar
 specifications, decorated with semantic actions expressed in the OCaml
-programming language into parsers, again expressed in OCaml. It is based on
+programming language into parsers, again expressed in OCaml.  It is based on
 Knuth’s LR(1) parser construction technique.")
     ;; The file src/standard.mly and all files listed in src/mnehirLib.mlpack
     ;; that have an *.ml or *.mli extension are GPL licensed. All other files
-- 
2.21.0

[Message part 3 (text/plain, inline)]

Sorry for taking so long!

Gabriel

[signature.asc (application/pgp-signature, inline)]

Message #14 received at 34627 <at> debbugs.gnu.org (full text, mbox):

From: Ricardo Wurmus <rekado <at> elephly.net>
To: Gabriel Hondet <gabrielhondet <at> gmail.com>
Cc: 34627 <at> debbugs.gnu.org, Leo Famulari <leo <at> famulari.name>
Subject: Re: [bug#34627] [PATCH] gnu: ocaml-menhir: Update to 20181113.
Date: Mon, 08 Apr 2019 15:30:04 +0200

Hi Gabriel,

>> Can you add comments explaining why these phases are replaced?
> From dde2129019d0490909e764181b1f332c3faefa5f Mon Sep 17 00:00:00 2001
> From: gabrielhdt <gabrielhondet <at> gmail.com>
> Date: Sat, 23 Feb 2019 09:50:38 +0100
> Subject: [PATCH] gnu: ocaml-menhir: Update to 20181113.
>
> * gnu/packages/ocaml.scm (ocaml-menhir): Update to 20181113.
> ---
>  gnu/packages/ocaml.scm | 34 +++++++++++++++++++++-------------
>  1 file changed, 21 insertions(+), 13 deletions(-)
>
> diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
> index 9a807a4cb6..0ad33f6b25 100644
> --- a/gnu/packages/ocaml.scm
> +++ b/gnu/packages/ocaml.scm
> @@ -639,37 +639,45 @@ Emacs.")
>  (define-public ocaml-menhir
>    (package
>      (name "ocaml-menhir")
> -    (version "20161115")
> +    (version "20181113")
>      (source (origin
> -              (method url-fetch)
> -              (uri (string-append
> -                    "http://gallium.inria.fr/~fpottier/menhir/"
> -                    "menhir-" version ".tar.gz"))
> +              (method git-fetch)
> +              (uri (git-reference
> +                    (url "https://gitlab.inria.fr/fpottier/menhir.git")
> +                    (commit version)))
> +              (file-name (git-file-name name version))
>                (sha256
>                 (base32
> -                "1j8nmcj2gq6hyyi16z27amiahplgrnk4ppchpm0v4qy80kwkf47k"))))
> -    (build-system gnu-build-system)
> -    (inputs
> -     `(("ocaml" ,ocaml)))
> +                "1iqdf64ayq4s3d9jkwhs3s8wqc2s48b292hp0kcjsskfhcvwg0kr"))))
> +    (build-system ocaml-build-system)
>      (native-inputs
>       `(("ocamlbuild" ,ocamlbuild)))
>      (arguments
> -     `(#:parallel-build? #f ; Parallel build causes failure
> -       #:tests? #f ; No check target
> +     `(#:tests? #f ; No check target
>         #:phases
>         (modify-phases %standard-phases
>           (replace 'configure
>             (lambda* (#:key outputs #:allow-other-keys)
>               (let ((out (assoc-ref outputs "out")))
>                 (setenv "PREFIX" out))
> +             #t))
> +         (replace 'build
> +           (lambda _
> +             ;; invoke the right makefile
> +             (invoke "make" "-f" "Makefile" "USE_OCAMLFIND=true" "all")
> +             #t))
> +         (replace 'install
> +           (lambda _
> +             ;; invoke the right makefile
> +             (invoke "make" "-f" "Makefile" "install")

Is the problem here that GNUmakefile exists?  Could we simply remove
that file instead of replacing the phases?  When replacing the phases
you should also pass the default make-flags and ensure that parallel
building is enabled.

Removing the other makefile seems to be the better option.

--
Ricardo

Message #17 received at 34627 <at> debbugs.gnu.org (full text, mbox):

From: Gabriel Hondet <gabrielhondet <at> gmail.com>
To: Ricardo Wurmus <rekado <at> elephly.net>
Cc: 34627 <at> debbugs.gnu.org, Leo Famulari <leo <at> famulari.name>
Subject: Re: [bug#34627] [PATCH] gnu: ocaml-menhir: Update to 20181113.
Date: Wed, 10 Apr 2019 19:11:57 +0200

[Message part 1 (text/plain, inline)]

Hi Ricardo,

On Mon 08 Apr 2019 at 15:30 Ricardo Wurmus wrote:

> Hi Gabriel,
>
>
> Is the problem here that GNUmakefile exists?  Could we simply remove
> that file instead of replacing the phases?  When replacing the phases
> you should also pass the default make-flags and ensure that parallel
> building is enabled.
>
> Removing the other makefile seems to be the better option.

Yes it was, but after inspecting downloaded sources, I realised that
there was no GNUmakefile, so I removed all the -f business, and it
works.

[0001-gnu-ocaml-menhir-Update-to-20181113.patch (text/x-diff, inline)]

From f6d25b84679aeb0705e930abad79397d739bf39c Mon Sep 17 00:00:00 2001
From: gabrielhdt <gabrielhondet <at> gmail.com>
Date: Sat, 23 Feb 2019 09:50:38 +0100
Subject: [PATCH] gnu: ocaml-menhir: Update to 20181113.

* gnu/packages/ocaml.scm (ocaml-menhir): Update to 20181113.
---
 gnu/packages/ocaml.scm | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 9a807a4cb6..79dbe68066 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -639,23 +639,23 @@ Emacs.")
 (define-public ocaml-menhir
   (package
     (name "ocaml-menhir")
-    (version "20161115")
+    (version "20181113")
     (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "http://gallium.inria.fr/~fpottier/menhir/"
-                    "menhir-" version ".tar.gz"))
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://gitlab.inria.fr/fpottier/menhir.git")
+                    (commit version)))
+              (file-name (git-file-name name version))
               (sha256
                (base32
-                "1j8nmcj2gq6hyyi16z27amiahplgrnk4ppchpm0v4qy80kwkf47k"))))
-    (build-system gnu-build-system)
-    (inputs
-     `(("ocaml" ,ocaml)))
+                "1iqdf64ayq4s3d9jkwhs3s8wqc2s48b292hp0kcjsskfhcvwg0kr"))))
+    (build-system ocaml-build-system)
     (native-inputs
-     `(("ocamlbuild" ,ocamlbuild)))
+     `(("ocamlbuild" ,ocamlbuild)
+       ("ocaml-findlib" ,ocaml-findlib)))
     (arguments
-     `(#:parallel-build? #f ; Parallel build causes failure
-       #:tests? #f ; No check target
+     `(#:tests? #f ; No check target
+       #:make-flags (list "USE_OCAMLFIND=true")
        #:phases
        (modify-phases %standard-phases
          (replace 'configure
@@ -665,11 +665,11 @@ Emacs.")
              #t)))))
     (properties
      `((ocaml4.02-variant . ,(delay ocaml4.02-menhir))))
-    (home-page "http://gallium.inria.fr/~fpottier/menhir")
+    (home-page "http://gallium.inria.fr/~fpottier/menhir/")
     (synopsis "Parser generator")
     (description "Menhir is a parser generator.  It turns high-level grammar
 specifications, decorated with semantic actions expressed in the OCaml
-programming language into parsers, again expressed in OCaml. It is based on
+programming language into parsers, again expressed in OCaml.  It is based on
 Knuth’s LR(1) parser construction technique.")
     ;; The file src/standard.mly and all files listed in src/mnehirLib.mlpack
     ;; that have an *.ml or *.mli extension are GPL licensed. All other files
-- 
2.21.0

[Message part 3 (text/plain, inline)]

Gabriel

[signature.asc (application/pgp-signature, inline)]

Message #20 received at 34627 <at> debbugs.gnu.org (full text, mbox):

From: Gabriel Hondet <gabrielhondet <at> gmail.com>
To: 34627 <at> debbugs.gnu.org
Subject: [PATCH] gnu: ocaml-menhir: Update to 20181113.
Date: Fri, 03 May 2019 20:30:18 +0200

[Message part 1 (text/plain, inline)]

Hi everyone,

I submit back a patch which seems to have been forgotten.  It has
been revised.

Cheers,

Gabriel

[0001-gnu-ocaml-menhir-Update-to-20181113.patch (text/x-diff, inline)]

From 00f2ab14431a9e95cea9ae9e6e8dca974fbd53b7 Mon Sep 17 00:00:00 2001
From: gabrielhdt <gabrielhondet <at> gmail.com>
Date: Fri, 3 May 2019 20:25:04 +0200
Subject: [PATCH] gnu: ocaml-menhir: Update to 20181113.

* gnu/packages/ocaml.scm (ocaml-menhir): Update to 20181113.
---
 gnu/packages/ocaml.scm | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 33acbbec4e..6e69be3f19 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -756,35 +756,33 @@ Emacs.")
 (define-public ocaml-menhir
   (package
     (name "ocaml-menhir")
-    (version "20161115")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "http://gallium.inria.fr/~fpottier/menhir/"
-                    "menhir-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1j8nmcj2gq6hyyi16z27amiahplgrnk4ppchpm0v4qy80kwkf47k"))))
-    (build-system gnu-build-system)
+    (version "20181113")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.inria.fr/fpottier/menhir.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1iqdf64ayq4s3d9jkwhs3s8wqc2s48b292hp0kcjsskfhcvwg0kr"))))
+    (build-system ocaml-build-system)
     (inputs
      `(("ocaml" ,ocaml)))
     (native-inputs
      `(("ocamlbuild" ,ocamlbuild)))
     (arguments
-     `(#:parallel-build? #f ; Parallel build causes failure
+     `(#:make-flags `("USE_OCAMLFIND=true"
+                      ,(string-append "PREFIX=" (assoc-ref %outputs "out")))
        #:tests? #f ; No check target
        #:phases
        (modify-phases %standard-phases
-         (replace 'configure
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let ((out (assoc-ref outputs "out")))
-               (setenv "PREFIX" out))
-             #t)))))
-    (home-page "http://gallium.inria.fr/~fpottier/menhir")
+         (delete 'configure))))
+    (home-page "http://gallium.inria.fr/~fpottier/menhir/")
     (synopsis "Parser generator")
     (description "Menhir is a parser generator.  It turns high-level grammar
 specifications, decorated with semantic actions expressed in the OCaml
-programming language into parsers, again expressed in OCaml. It is based on
+programming language into parsers, again expressed in OCaml.  It is based on
 Knuth’s LR(1) parser construction technique.")
     ;; The file src/standard.mly and all files listed in src/mnehirLib.mlpack
     ;; that have an *.ml or *.mli extension are GPL licensed. All other files
-- 
2.21.0

[signature.asc (application/pgp-signature, inline)]

Message #25 received at 34627-done <at> debbugs.gnu.org (full text, mbox):

From: Julien Lepiller <julien <at> lepiller.eu>
To: Gabriel Hondet <gabrielhondet <at> gmail.com>
Cc: 34627-done <at> debbugs.gnu.org
Subject: Re: [bug#34627] [PATCH] gnu: ocaml-menhir: Update to 20181113.
Date: Fri, 3 May 2019 20:48:59 +0200

Le Fri, 03 May 2019 20:30:18 +0200,
Gabriel Hondet <gabrielhondet <at> gmail.com> a écrit :

> Hi everyone,
> 
> I submit back a patch which seems to have been forgotten.  It has
> been revised.
> 
> Cheers,
> 
> Gabriel

Hi, sorry for the delay! it's finally pushed as
187f9636f176d62bf869b787ad410e3a528aa1a0. Thank you!

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.