[bug#28289] [PATCH] gnu: Add emacs-ocaml-tuareg.

[bug#28289] [PATCH] gnu: Add emacs-ocaml-tuareg.

[Oleg Pykhalov]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: [PATCH] gnu: Add emacs-ocaml-tuareg. --]
[-- Type: text/x-patch, Size: 2730 bytes --]

From 99c16b82de639864d9cfc5d144d8e0739f3c586c Mon Sep 17 00:00:00 2001
From: Oleg Pykhalov <go.wigust@gmail.com>
Date: Wed, 30 Aug 2017 09:29:44 +0300
Subject: [PATCH] gnu: Add emacs-ocaml-tuareg.

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

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 43bbdcd6e..be2907e84 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -57,6 +57,7 @@
   #:use-module (gnu packages xml)
   #:use-module (gnu packages xorg)
   #:use-module (guix build-system gnu)
+  #:use-module (guix build-system emacs)
   #:use-module (guix build-system ocaml)
   #:use-module (guix download)
   #:use-module ((guix licenses) #:prefix license:)
@@ -575,6 +576,46 @@ assistant to write formal mathematical proofs using a variety of theorem
 provers.")
     (license license:gpl2+)))
 
+(define-public emacs-ocaml-tuareg
+  (package
+    (name "emacs-ocaml-tuareg")
+    (version "2.0.10")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://github.com/ocaml/tuareg/archive/"
+                                  version ".tar.gz"))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1r2smclcs63n74lcyckbp90j09wyjdngn816cqzfkw54iwh3hd7q"))))
+    (build-system gnu-build-system)
+    (native-inputs `(("emacs" ,emacs-minimal)
+                     ("opam" ,opam)))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (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+)))
+
 (define-public ocaml-menhir
   (package
     (name "ocaml-menhir")
-- 
2.14.1

bug#28289: [PATCH] gnu: Add emacs-ocaml-tuareg.

[Ludovic Courtès]

Hi Oleg,

Oleg Pykhalov <go.wigust@gmail.com> skribis:

>>From 99c16b82de639864d9cfc5d144d8e0739f3c586c Mon Sep 17 00:00:00 2001
> From: Oleg Pykhalov <go.wigust@gmail.com>
> Date: Wed, 30 Aug 2017 09:29:44 +0300
> Subject: [PATCH] gnu: Add emacs-ocaml-tuareg.
>
> * gnu/packages/ocaml.scm (emacs-ocaml-tuareg): New variable.

[...]

> --- a/gnu/packages/ocaml.scm
> +++ b/gnu/packages/ocaml.scm
> @@ -57,6 +57,7 @@
>    #:use-module (gnu packages xml)
>    #:use-module (gnu packages xorg)
>    #:use-module (guix build-system gnu)
> +  #:use-module (guix build-system emacs)

I removed this line…

>    #:use-module (guix build-system ocaml)
>    #:use-module (guix download)
>    #:use-module ((guix licenses) #:prefix license:)
> @@ -575,6 +576,46 @@ assistant to write formal mathematical proofs using a variety of theorem
>  provers.")
>      (license license:gpl2+)))
>  
> +(define-public emacs-ocaml-tuareg
> +  (package
> +    (name "emacs-ocaml-tuareg")

… and renamed the package to “emacs-tuareg”, since the upstream name is
just “Tuareg”.

I hope that’s fine you, otherwise please let me know!

Thank you,
Ludo’.