diff mbox series

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

Message ID 86pn5mmm7f.fsf@gmail.com
State Accepted
Headers show
Series [bug#43809,v2] gnu: emacs-tuareg: Update to 2.2.0-0.ccde45b. | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch fail View Laminar job

Commit Message

zimoun Oct. 13, 2020, 10:53 a.m. UTC
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 --

Comments

zimoun Oct. 19, 2020, 7:58 a.m. UTC | #1
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 Oct. 19, 2020, 3:20 p.m. UTC | #2
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
zimoun Oct. 19, 2020, 6:34 p.m. UTC | #3
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
Nicolas Goaziou Oct. 19, 2020, 8:48 p.m. UTC | #4
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,
diff mbox series

Patch

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