[bug#43809] [PATCH 0/1] gnu: emacs-tuareg: Update to 2.2.0-0.ccde45b.

[bug#43809] [PATCH 0/1] gnu: emacs-tuareg: Update to 2.2.0-0.ccde45b.

[zimoun]

Dear,

This patch updates to the last revision.  The main argument is to fix the
annoying warning message about "Package cl deprecated".  It has been fixed
upstream by the commit f1fb36d2dbc34c989300662a4d94d7cdd8234f9e [1].
Moreover, this commit also fixes 'lexical-binding'.

Last, note that even nothing had been released, the last upstream commit is
from Sep. 16, 2018.

[1] <https://github.com/ocaml/tuareg/commit/f1fb36d2dbc34c989300662a4d94d7cdd8234f9e>.


All the best,
simon

zimoun (1):
  gnu: emacs-tuareg: Update to  2.2.0-0.ccde45b.

 gnu/packages/ocaml.scm | 84 +++++++++++++++++++++---------------------
 1 file changed, 43 insertions(+), 41 deletions(-)


base-commit: 435e5e27742eb71796be8a73be7a6549fd5e9582
-- 
2.28.0

[bug#43809] [PATCH 1/1] gnu: emacs-tuareg: Update to 2.2.0-0.ccde45b.

[zimoun]

* gnu/packages/ocaml.scm (emacs-tuareg): Update to 2.2.0-0.ccde45b.
---
 gnu/packages/ocaml.scm | 84 +++++++++++++++++++++---------------------
 1 file changed, 43 insertions(+), 41 deletions(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index d61948afc3..c16fcc5bd1 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -15,6 +15,7 @@
 ;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2020 Brett Gilio <brettg@gnu.org>
 ;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
+;;; Copyright © 2020 Simon Tournier <zimon.toutoune@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -672,49 +673,50 @@ the OCaml core distribution.")
     (license license:lgpl2.1+))); with linking exception
 
 (define-public emacs-tuareg
-  (package
-    (name "emacs-tuareg")
-    (version "2.2.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/ocaml/tuareg")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "06zxnn85fk5087iq0zxc5l5n9fz8r0367wylmynbfhc9711vccy6"))))
-    (build-system gnu-build-system)
-    (native-inputs `(("emacs" ,emacs-minimal)
-                     ("opam" ,opam)))
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'make-git-checkout-writable
-           (lambda _
-             (for-each make-file-writable (find-files "."))
-             #t))
-         (delete 'configure)
-         (add-before 'install 'fix-install-path
-           (lambda* (#:key outputs #:allow-other-keys)
-             (substitute* "Makefile"
-               (("/emacs/site-lisp")
-                (string-append (assoc-ref %outputs "out")
-                               "/share/emacs/site-lisp/")))
-             #t))
-         (add-after 'install 'post-install
-           (lambda* (#:key outputs #:allow-other-keys)
-             (symlink "tuareg.el"
-                      (string-append (assoc-ref outputs "out")
-                                     "/share/emacs/site-lisp/"
-                                     "tuareg-autoloads.el"))
-             #t)))))
-    (home-page "https://github.com/ocaml/tuareg")
-    (synopsis "OCaml programming mode, REPL, debugger for Emacs")
-    (description "Tuareg helps editing OCaml code, to highlight important
+  (let ((commit "ccde45bbc292123ec20617f1af7f7e19f7481545"))
+    (package
+      (name "emacs-tuareg")
+      (version (git-version "2.2.0" "0" commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/ocaml/tuareg")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "1yxv4bnqarilnpg5j7wywall8170hwvm0q4xx06yqjgcn8pq1lac"))))
+      (build-system gnu-build-system)
+      (native-inputs `(("emacs" ,emacs-minimal)
+                       ("opam" ,opam)))
+      (arguments
+       `(#:phases
+         (modify-phases %standard-phases
+           (add-after 'unpack 'make-git-checkout-writable
+             (lambda _
+               (for-each make-file-writable (find-files "."))
+               #t))
+           (delete 'configure)
+           (add-before 'install 'fix-install-path
+             (lambda* (#:key outputs #:allow-other-keys)
+               (substitute* "Makefile"
+                 (("/emacs/site-lisp")
+                  (string-append (assoc-ref %outputs "out")
+                                 "/share/emacs/site-lisp/")))
+               #t))
+           (add-after 'install 'post-install
+             (lambda* (#:key outputs #:allow-other-keys)
+               (symlink "tuareg.el"
+                        (string-append (assoc-ref outputs "out")
+                                       "/share/emacs/site-lisp/"
+                                       "tuareg-autoloads.el"))
+               #t)))))
+      (home-page "https://github.com/ocaml/tuareg")
+      (synopsis "OCaml programming mode, REPL, debugger for Emacs")
+      (description "Tuareg helps editing OCaml code, to highlight important
 parts of the code, to run an OCaml REPL, and to run the OCaml debugger within
 Emacs.")
-    (license license:gpl2+)))
+      (license license:gpl2+))))
 
 (define-public ocaml-menhir
   (package
-- 
2.28.0

[bug#43809] [PATCH 1/1] gnu: emacs-tuareg: Update to 2.2.0-0.ccde45b.

[Nicolas Goaziou]

Hello,

zimoun <zimon.toutoune@gmail.com> writes:

> * gnu/packages/ocaml.scm (emacs-tuareg): Update to 2.2.0-0.ccde45b.

Thank you. Some minor comments follow.

> +  (let ((commit "ccde45bbc292123ec20617f1af7f7e19f7481545"))

I suggest to add a comment explaining why we do not use regular release.

> +    (package
> +      (name "emacs-tuareg")
> +      (version (git-version "2.2.0" "0" commit))
> +      (source
> +       (origin
> +         (method git-fetch)
> +         (uri (git-reference
> +               (url "https://github.com/ocaml/tuareg")
> +               (commit commit)))
> +         (file-name (git-file-name name version))
> +         (sha256
> +          (base32 "1yxv4bnqarilnpg5j7wywall8170hwvm0q4xx06yqjgcn8pq1lac"))))
> +      (build-system gnu-build-system)
> +      (native-inputs `(("emacs" ,emacs-minimal)
> +                       ("opam" ,opam)))

Nitpick: Please move these inputs below `native-inputs'.

Otherwise, LGTM.

Regards,
-- 
Nicolas Goaziou

[bug#43809] [PATCH 1/1] gnu: emacs-tuareg: Update to 2.2.0-0.ccde45b.

[zimoun]

Hi Nicolas,

Thank you for the review.  The v2 is sent.

   <http://issues.guix.gnu.org/43809#3>

On Wed, 7 Oct 2020 at 21:43, Nicolas Goaziou <mail@nicolasgoaziou.fr> wrote:

> > +  (let ((commit "ccde45bbc292123ec20617f1af7f7e19f7481545"))
>
> I suggest to add a comment explaining why we do not use regular release.

Done but I was not very inspired. :-)


> > +      (native-inputs `(("emacs" ,emacs-minimal)
> > +                       ("opam" ,opam)))
>
> Nitpick: Please move these inputs below `native-inputs'.

Thank you for the nitpick.  Done.  To be honest, I am not tweaked this line. :-)

Cheers,
simon

[bug#43809] [PATCH v2] gnu: emacs-tuareg: Update to 2.2.0-0.ccde45b.

[zimoun]

* gnu/packages/ocaml.scm (emacs-tuareg): Update to 2.2.0-0.ccde45b.
---
 gnu/packages/ocaml.scm | 87 ++++++++++++++++++++++--------------------
 1 file changed, 46 insertions(+), 41 deletions(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index d61948afc3..9ad17ec49c 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -15,6 +15,7 @@
 ;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2020 Brett Gilio <brettg@gnu.org>
 ;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
+;;; Copyright © 2020 Simon Tournier <zimon.toutoune@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -672,49 +673,53 @@ the OCaml core distribution.")
     (license license:lgpl2.1+))); with linking exception
 
 (define-public emacs-tuareg
-  (package
-    (name "emacs-tuareg")
-    (version "2.2.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/ocaml/tuareg")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "06zxnn85fk5087iq0zxc5l5n9fz8r0367wylmynbfhc9711vccy6"))))
-    (build-system gnu-build-system)
-    (native-inputs `(("emacs" ,emacs-minimal)
-                     ("opam" ,opam)))
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'make-git-checkout-writable
-           (lambda _
-             (for-each make-file-writable (find-files "."))
-             #t))
-         (delete 'configure)
-         (add-before 'install 'fix-install-path
-           (lambda* (#:key outputs #:allow-other-keys)
-             (substitute* "Makefile"
-               (("/emacs/site-lisp")
-                (string-append (assoc-ref %outputs "out")
-                               "/share/emacs/site-lisp/")))
-             #t))
-         (add-after 'install 'post-install
-           (lambda* (#:key outputs #:allow-other-keys)
-             (symlink "tuareg.el"
-                      (string-append (assoc-ref outputs "out")
-                                     "/share/emacs/site-lisp/"
-                                     "tuareg-autoloads.el"))
-             #t)))))
-    (home-page "https://github.com/ocaml/tuareg")
-    (synopsis "OCaml programming mode, REPL, debugger for Emacs")
-    (description "Tuareg helps editing OCaml code, to highlight important
+  ;; Last upstream release on Sept., 14th, 2018, since then "Package cl
+  ;; deprecated" or 'lexical-binding' and others had been fixed.
+  (let ((commit "ccde45bbc292123ec20617f1af7f7e19f7481545"))
+    (package
+      (name "emacs-tuareg")
+      (version (git-version "2.2.0" "0" commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/ocaml/tuareg")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "1yxv4bnqarilnpg5j7wywall8170hwvm0q4xx06yqjgcn8pq1lac"))))
+      (build-system gnu-build-system)
+      (native-inputs
+       `(("emacs" ,emacs-minimal)
+         ("opam" ,opam)))
+      (arguments
+       `(#:phases
+         (modify-phases %standard-phases
+           (add-after 'unpack 'make-git-checkout-writable
+             (lambda _
+               (for-each make-file-writable (find-files "."))
+               #t))
+           (delete 'configure)
+           (add-before 'install 'fix-install-path
+             (lambda* (#:key outputs #:allow-other-keys)
+               (substitute* "Makefile"
+                 (("/emacs/site-lisp")
+                  (string-append (assoc-ref %outputs "out")
+                                 "/share/emacs/site-lisp/")))
+               #t))
+           (add-after 'install 'post-install
+             (lambda* (#:key outputs #:allow-other-keys)
+               (symlink "tuareg.el"
+                        (string-append (assoc-ref outputs "out")
+                                       "/share/emacs/site-lisp/"
+                                       "tuareg-autoloads.el"))
+               #t)))))
+      (home-page "https://github.com/ocaml/tuareg")
+      (synopsis "OCaml programming mode, REPL, debugger for Emacs")
+      (description "Tuareg helps editing OCaml code, to highlight important
 parts of the code, to run an OCaml REPL, and to run the OCaml debugger within
 Emacs.")
-    (license license:gpl2+)))
+      (license license:gpl2+))))
 
 (define-public ocaml-menhir
   (package

base-commit: 7e917283d71fee1a29363e113f29c8c21f7c4739
-- 
2.28.0

[bug#43809] [PATCH v2] gnu: emacs-tuareg: Update to 2.2.0-0.ccde45b.

[Nicolas Goaziou]

Hello,

zimoun <zimon.toutoune@gmail.com> writes:

> * gnu/packages/ocaml.scm (emacs-tuareg): Update to 2.2.0-0.ccde45b.

Thank you.

> +  ;; Last upstream release on Sept., 14th, 2018, since then "Package cl
> +  ;; deprecated" or 'lexical-binding' and others had been fixed.
> +  (let ((commit "ccde45bbc292123ec20617f1af7f7e19f7481545"))
> +    (package
> +      (name "emacs-tuareg")
> +      (version (git-version "2.2.0" "0" commit))

I suggest to bind "0" to `revision' instead of hard-coding it here.
Otherwise, LGTM.

> +      (source
> +       (origin
> +         (method git-fetch)
> +         (uri (git-reference
> +               (url "https://github.com/ocaml/tuareg")
> +               (commit commit)))
> +         (file-name (git-file-name name version))
> +         (sha256
> +          (base32 "1yxv4bnqarilnpg5j7wywall8170hwvm0q4xx06yqjgcn8pq1lac"))))
> +      (build-system gnu-build-system)

I assume emacs-build-system is not an option, right?

Regards,
-- 
Nicolas Goaziou

[bug#43809] [PATCH v2] gnu: emacs-tuareg: Update to 2.2.0-0.ccde45b.

[zimoun]

Hi,

On Tue, 13 Oct 2020 at 09:30, Nicolas Goaziou <mail@nicolasgoaziou.fr> wrote:

> > +      (source
> > +       (origin
> > +         (method git-fetch)
> > +         (uri (git-reference
> > +               (url "https://github.com/ocaml/tuareg")
> > +               (commit commit)))
> > +         (file-name (git-file-name name version))
> > +         (sha256
> > +          (base32 "1yxv4bnqarilnpg5j7wywall8170hwvm0q4xx06yqjgcn8pq1lac"))))
> > +      (build-system gnu-build-system)
>
> I assume emacs-build-system is not an option, right?

I do not know.  I have just tried to fix an annoying message with my
Emacs config, not really tried to check the Tuareg package itsefl. :-)
What do you mean?  Use the OCaml build system instead?

Thanks for the review.

All the best,
simon

[bug#43809] [PATCH v2] gnu: emacs-tuareg: Update to 2.2.0-0.ccde45b.

[Nicolas Goaziou]

zimoun <zimon.toutoune@gmail.com> writes:

> Hi,
>
> On Tue, 13 Oct 2020 at 09:30, Nicolas Goaziou <mail@nicolasgoaziou.fr> wrote:
>
>> > +      (source
>> > +       (origin
>> > +         (method git-fetch)
>> > +         (uri (git-reference
>> > +               (url "https://github.com/ocaml/tuareg")
>> > +               (commit commit)))
>> > +         (file-name (git-file-name name version))
>> > +         (sha256
>> > +          (base32 "1yxv4bnqarilnpg5j7wywall8170hwvm0q4xx06yqjgcn8pq1lac"))))
>> > +      (build-system gnu-build-system)
>>
>> I assume emacs-build-system is not an option, right?
>
> I do not know.  I have just tried to fix an annoying message with my
> Emacs config, not really tried to check the Tuareg package itsefl. :-)
> What do you mean?  Use the OCaml build system instead?

AFAICT, I see mostly elisp files in the repository, and all the
additional phases in the package are already handled by Emacs build
system. So, I thought using emacs-build-system would be enough. I didn't
try it, tho.

But this is indeed orthogonal to your patch, so I think you can push it
as-is.

Regards,

[bug#43809] [PATCH v2] gnu: emacs-tuareg: Update to 2.2.0-0.ccde45b.

[zimoun]

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

Hi Nicolas,

Please find attached the v3 tweaking the ’revision’ “0”.


On Tue, 13 Oct 2020 at 11:36, Nicolas Goaziou <mail@nicolasgoaziou.fr> wrote:

>>> I assume emacs-build-system is not an option, right?

[...]

> AFAICT, I see mostly elisp files in the repository, and all the
> additional phases in the package are already handled by Emacs build
> system. So, I thought using emacs-build-system would be enough. I didn't
> try it, tho.

I tried and I do not know… It seems building successfully.  Even if I
have not checked if the result is functional.  However, the ’check’
phase needs revamp, I guess.

Well, the replacement needs more care than a simple drop-in. :-)


All the best,
simon

-- >8 --

[-- Attachment #2: v3.patch --]
[-- Type: text/x-diff, Size: 4894 bytes --]

From 8c7d3838648e5f5b1d6dc6292550e35cf9413f82 Mon Sep 17 00:00:00 2001
From: zimoun <zimon.toutoune@gmail.com>
Date: Mon, 5 Oct 2020 09:14:54 +0200
Subject: [PATCH v3] gnu: emacs-tuareg: Update to  2.2.0-0.ccde45b.

* gnu/packages/ocaml.scm (emacs-tuareg): Update to 2.2.0-0.ccde45b.
---
 gnu/packages/ocaml.scm | 88 ++++++++++++++++++++++--------------------
 1 file changed, 47 insertions(+), 41 deletions(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index d61948afc3..2abe63238e 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -15,6 +15,7 @@
 ;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2020 Brett Gilio <brettg@gnu.org>
 ;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
+;;; Copyright © 2020 Simon Tournier <zimon.toutoune@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -672,49 +673,54 @@ the OCaml core distribution.")
     (license license:lgpl2.1+))); with linking exception
 
 (define-public emacs-tuareg
-  (package
-    (name "emacs-tuareg")
-    (version "2.2.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/ocaml/tuareg")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "06zxnn85fk5087iq0zxc5l5n9fz8r0367wylmynbfhc9711vccy6"))))
-    (build-system gnu-build-system)
-    (native-inputs `(("emacs" ,emacs-minimal)
-                     ("opam" ,opam)))
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'make-git-checkout-writable
-           (lambda _
-             (for-each make-file-writable (find-files "."))
-             #t))
-         (delete 'configure)
-         (add-before 'install 'fix-install-path
-           (lambda* (#:key outputs #:allow-other-keys)
-             (substitute* "Makefile"
-               (("/emacs/site-lisp")
-                (string-append (assoc-ref %outputs "out")
-                               "/share/emacs/site-lisp/")))
-             #t))
-         (add-after 'install 'post-install
-           (lambda* (#:key outputs #:allow-other-keys)
-             (symlink "tuareg.el"
-                      (string-append (assoc-ref outputs "out")
-                                     "/share/emacs/site-lisp/"
-                                     "tuareg-autoloads.el"))
-             #t)))))
-    (home-page "https://github.com/ocaml/tuareg")
-    (synopsis "OCaml programming mode, REPL, debugger for Emacs")
-    (description "Tuareg helps editing OCaml code, to highlight important
+  ;; Last upstream release on Sept., 14th, 2018, since then "Package cl
+  ;; deprecated" or 'lexical-binding' and others had been fixed.
+  (let ((commit "ccde45bbc292123ec20617f1af7f7e19f7481545")
+        (revision "0"))
+    (package
+      (name "emacs-tuareg")
+      (version (git-version "2.2.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/ocaml/tuareg")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "1yxv4bnqarilnpg5j7wywall8170hwvm0q4xx06yqjgcn8pq1lac"))))
+      (build-system gnu-build-system)
+      (native-inputs
+       `(("emacs" ,emacs-minimal)
+         ("opam" ,opam)))
+      (arguments
+       `(#:phases
+         (modify-phases %standard-phases
+           (add-after 'unpack 'make-git-checkout-writable
+             (lambda _
+               (for-each make-file-writable (find-files "."))
+               #t))
+           (delete 'configure)
+           (add-before 'install 'fix-install-path
+             (lambda* (#:key outputs #:allow-other-keys)
+               (substitute* "Makefile"
+                 (("/emacs/site-lisp")
+                  (string-append (assoc-ref %outputs "out")
+                                 "/share/emacs/site-lisp/")))
+               #t))
+           (add-after 'install 'post-install
+             (lambda* (#:key outputs #:allow-other-keys)
+               (symlink "tuareg.el"
+                        (string-append (assoc-ref outputs "out")
+                                       "/share/emacs/site-lisp/"
+                                       "tuareg-autoloads.el"))
+               #t)))))
+      (home-page "https://github.com/ocaml/tuareg")
+      (synopsis "OCaml programming mode, REPL, debugger for Emacs")
+      (description "Tuareg helps editing OCaml code, to highlight important
 parts of the code, to run an OCaml REPL, and to run the OCaml debugger within
 Emacs.")
-    (license license:gpl2+)))
+      (license license:gpl2+))))
 
 (define-public ocaml-menhir
   (package
-- 
2.28.0

[bug#43809] [PATCH v2] gnu: emacs-tuareg: Update to 2.2.0-0.ccde45b.

[zimoun]

Hi Nicolas,

Friendly ping.  The patch is attached to:

      <http://issues.guix.gnu.org/43809#8>

Tell me if something does not like correct.


All the best,
simon

[bug#43809] [PATCH v2] gnu: emacs-tuareg: Update to 2.2.0-0.ccde45b.

[Nicolas Goaziou]

Hello,

LGTM, as I wrote already :)

Le 19 octobre 2020 09:58:58 GMT+02:00, zimoun <zimon.toutoune@gmail.com> a écrit :
>Hi Nicolas,
>
>Friendly ping.  The patch is attached to:
>
>      <http://issues.guix.gnu.org/43809#8>
>
>Tell me if something does not like correct.
>
>
>All the best,
>simon

-- 
Nicolas Goaziou

[bug#43809] [PATCH v2] gnu: emacs-tuareg: Update to 2.2.0-0.ccde45b.

[zimoun]

Hi Nicolas,

On Mon, 19 Oct 2020 at 19:20, Nicolas Goaziou <mail@nicolasgoaziou.fr> wrote:

> LGTM, as I wrote already :)

Ah sorry to bother you again, that's just because I do not have the
super power; not granted to commit access :-).

Cheers,
simon

bug#43809: [PATCH v2] gnu: emacs-tuareg: Update to 2.2.0-0.ccde45b.

[Nicolas Goaziou]

Hello,

zimoun <zimon.toutoune@gmail.com> writes:

> Ah sorry to bother you again, that's just because I do not have the
> super power; not granted to commit access :-).

Oh, sorry! I could have sworn you had commit access.

Patch applied. Thank you.

Regards,
-- 
Nicolas Goaziou