[bug#33526] Utilities for emacs-irony-mode

[bug#33526] Utilities for emacs-irony-mode

[Tim Gesthuizen]

[-- Attachment #1.1.1: Type: text/plain, Size: 187 bytes --]

Hi,
I added some extra packages for using emacs-irony-mode and updated it
to fetch sources from git.
These packages should enhance integration of emacs-irony-mode into emacs.

Tim.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.1.2: 0001-gnu-Add-emacs-company-irony.patch --]
[-- Type: text/x-patch; name="0001-gnu-Add-emacs-company-irony.patch", Size: 1578 bytes --]

From be0733336aaf0047f92eaccb6cb360c86f941298 Mon Sep 17 00:00:00 2001
From: Tim Gesthuizen <tim.gesthuizen@yahoo.de>
Date: Tue, 27 Nov 2018 17:56:33 +0100
Subject: [PATCH 1/4] gnu: Add emacs-company-irony.

* gnu/packages/emacs.scm (emacs-company-irony): New variable.
---
 gnu/packages/emacs.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index e69121aef..20f747477 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -2848,6 +2848,27 @@ described on the homepage.")
     (build-system cmake-build-system)
     (synopsis "Server for the Emacs @dfn{irony mode}")))
 
+(define-public emacs-company-irony
+  (package
+   (name "emacs-company-irony")
+   (version "1.1.0")
+   (source (origin
+	    (method git-fetch)
+	    (uri (git-reference
+		  (url "https://github.com/Sarcasm/company-irony.git")
+		  (commit (string-append "v" version))))
+	    (sha256 (base32
+		     "1qgyam2vyjw90kpxns5cd6bq3qiqjhzpwrlvmi18vyb69qcgqd8a"))))
+   (build-system emacs-build-system)
+   (inputs
+    `(("emacs-irony-mode" ,emacs-irony-mode)
+      ("emacs-company" ,emacs-company)))
+   (synopsis "C++ completion backend for company using irony-mode")
+   (description "Backend for company-mode to complete C++ code with
+irony-mode using clang-tooling.")
+   (home-page "https://github.com/Sarcasm/company-irony")
+   (license license:gpl3+)))
+
 (define-public emacs-company-quickhelp
   (package
     (name "emacs-company-quickhelp")
-- 
2.19.2


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.1.3: 0002-gnu-Add-emacs-flycheck-irony.patch --]
[-- Type: text/x-patch; name="0002-gnu-Add-emacs-flycheck-irony.patch", Size: 1613 bytes --]

From bf04fa3e0892bd9461feb5bebb7454f478710282 Mon Sep 17 00:00:00 2001
From: Tim Gesthuizen <tim.gesthuizen@yahoo.de>
Date: Tue, 27 Nov 2018 17:57:14 +0100
Subject: [PATCH 2/4] gnu: Add emacs-flycheck-irony.

* gnu/packages/emacs.scm (emacs-flycheck-irony): New variable.
---
 gnu/packages/emacs.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 20f747477..236e394f6 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -2869,6 +2869,27 @@ irony-mode using clang-tooling.")
    (home-page "https://github.com/Sarcasm/company-irony")
    (license license:gpl3+)))
 
+(define-public emacs-flycheck-irony
+  (package
+    (name "emacs-flycheck-irony")
+    (version "0.1.0")
+    (source (origin
+	      (method git-fetch)
+	      (uri (git-reference
+		    (url "https://github.com/Sarcasm/flycheck-irony.git")
+		    (commit version)))
+	      (sha256 (base32 "1qgyam2vyjw90kpxns5cd6bq3qiqjhzpwrlvmi18vyb69qcgqd8a"))))
+    (build-system emacs-build-system)
+    (inputs
+     `(("irony-mode" ,emacs-irony-mode)
+       ("flycheck-mode" ,emacs-flycheck)
+       ("emacs-company" ,emacs-company)))
+    (synopsis "Live syntax checking frontend for flycheck using irony-mode")
+    (description "Provides a frontend for flycheck that lets irony-mode do
+the syntax checking.")
+    (home-page "https://github.com/Sarcasm/flycheck-irony")
+    (license license:gpl3+)))
+
 (define-public emacs-company-quickhelp
   (package
     (name "emacs-company-quickhelp")
-- 
2.19.2


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.1.4: 0003-gnu-Add-emacs-irony-eldoc.patch --]
[-- Type: text/x-patch; name="0003-gnu-Add-emacs-irony-eldoc.patch", Size: 1532 bytes --]

From fb1d8c037ba56cc9bbda87009ae0e0c03426eb31 Mon Sep 17 00:00:00 2001
From: Tim Gesthuizen <tim.gesthuizen@yahoo.de>
Date: Tue, 27 Nov 2018 17:57:28 +0100
Subject: [PATCH 3/4] gnu: Add emacs-irony-eldoc.

* gnu/packages/emacs.scm (emacs-irony-eldoc): New variable.
---
 gnu/packages/emacs.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 236e394f6..45f0e1060 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -2890,6 +2890,26 @@ the syntax checking.")
     (home-page "https://github.com/Sarcasm/flycheck-irony")
     (license license:gpl3+)))
 
+(define-public emacs-irony-eldoc
+  (package
+   (name "emacs-irony-eldoc")
+   (version (package-version emacs-irony-mode))
+   (source
+    (origin
+     (method git-fetch)
+     (uri (git-reference
+	   (url "https://github.com/ikirill/irony-eldoc.git")
+	   (commit "0df5831eaae264a25422b061eb2792aadde8b3f2")))
+     (sha256 (base32 "1l5qpr66v1l12fb50yh73grb2rr85xxmbj19mm33b5rdrq2bqmmd"))))
+   (build-system emacs-build-system)
+   (inputs
+    `(("irony-mode" ,emacs-irony-mode)))
+   (synopsis "Eldoc integration for irony-mode")
+   (description "Shows documentation for the current function or variable in the
+minibuffer using eldoc.")
+   (home-page "https://github.com/ikirill/irony-eldoc")
+   (license license:gpl3+)))
+
 (define-public emacs-company-quickhelp
   (package
     (name "emacs-company-quickhelp")
-- 
2.19.2


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.1.5: 0004-gnu-emacs-irony-mode-Fetch-source-using-git.patch --]
[-- Type: text/x-patch; name="0004-gnu-emacs-irony-mode-Fetch-source-using-git.patch", Size: 1424 bytes --]

From a1139fb9db8b1de48b6a6a4e3679a60a7e7e9bd5 Mon Sep 17 00:00:00 2001
From: Tim Gesthuizen <tim.gesthuizen@yahoo.de>
Date: Tue, 27 Nov 2018 18:09:25 +0100
Subject: [PATCH 4/4] gnu: emacs-irony-mode: Fetch source using git.

* gnu/packages/emacs.scm (emacs-irony-mode)[source]: Rewrite in terms of GIT-FETCH.
---
 gnu/packages/emacs.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 45f0e1060..e73766834 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -2811,11 +2811,13 @@ These are distributed in separate files and can be used individually.")
     (version "1.2.0")
     (home-page "https://github.com/Sarcasm/irony-mode")
     (source (origin
-              (method url-fetch)
-              (uri (string-append home-page "/archive/v" version ".tar.gz"))
+              (method git-fetch)
+              (uri (git-reference
+                    (url (string-append home-page ".git"))
+                    (commit (string-append "v" version))))
               (sha256
                (base32
-                "1f68zi0glkg2aly66s07rx3w0b0hdi1znxan02h6dbabaadylk99"))
+                "0nhjrnlmss535jbshjjd30vydbr8py21vkx4p294w6d8vg2rssf8"))
               (file-name (string-append name "-" version ".tar.gz"))))
     (build-system emacs-build-system)
     (arguments '())
-- 
2.19.2


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#33526] Utilities for emacs-irony-mode

[Ludovic Courtès]

Hello,

Tim Gesthuizen <tim.gesthuizen@yahoo.de> skribis:

> From be0733336aaf0047f92eaccb6cb360c86f941298 Mon Sep 17 00:00:00 2001
> From: Tim Gesthuizen <tim.gesthuizen@yahoo.de>
> Date: Tue, 27 Nov 2018 17:56:33 +0100
> Subject: [PATCH 1/4] gnu: Add emacs-company-irony.
>
> * gnu/packages/emacs.scm (emacs-company-irony): New variable.

I fixed the tiny issues reported by ‘guix lint’, made the description a
full sentence (info "(guix) Synopses and Descriptions"), and committed.

> From bf04fa3e0892bd9461feb5bebb7454f478710282 Mon Sep 17 00:00:00 2001
> From: Tim Gesthuizen <tim.gesthuizen@yahoo.de>
> Date: Tue, 27 Nov 2018 17:57:14 +0100
> Subject: [PATCH 2/4] gnu: Add emacs-flycheck-irony.
>
> * gnu/packages/emacs.scm (emacs-flycheck-irony): New variable.

[...]

> +	      (method git-fetch)
> +	      (uri (git-reference
> +		    (url "https://github.com/Sarcasm/flycheck-irony.git")
> +		    (commit version)))

The tag should be “v1.0.0”, not “1.0.0”, but then the hash is different
than the one here.

Also, ‘guix lint’ reports the same kind of issues as above.

Could you double-check and adjust the Git references and address the
issues that ‘guix lint’ reports in the remaining patches?

Thank you!

Ludo’.

[bug#33526] Utilities for emacs-irony-mode

[Tim Gesthuizen]

[-- Attachment #1.1.1: Type: text/plain, Size: 681 bytes --]

On 29.11.2018 09:48, Ludovic Courtès wrote:
> The tag should be “v1.0.0”, not “1.0.0”, but then the hash is different
> than the one here.
> 
> Also, ‘guix lint’ reports the same kind of issues as above.
> 
> Could you double-check and adjust the Git references and address the
> issues that ‘guix lint’ reports in the remaining patches?

Sorry for the bad patches.
I changed the following things:
- descriptions of the packages are now full sentences
- The source files now have proper names
- git references and hashs are updated so that the sources can be
  downloaded.

I hope that this resolves all issues.
The patches are attached.

Tim.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.1.2: 0001-gnu-Add-emacs-flycheck-irony.patch --]
[-- Type: text/x-patch; name="0001-gnu-Add-emacs-flycheck-irony.patch", Size: 1757 bytes --]

From d94c537e4d52579cee40cf6c0b88c5cc36be1108 Mon Sep 17 00:00:00 2001
From: Tim Gesthuizen <tim.gesthuizen@yahoo.de>
Date: Tue, 27 Nov 2018 17:57:14 +0100
Subject: [PATCH 1/2] gnu: Add emacs-flycheck-irony.

* gnu/packages/emacs.scm (emacs-flycheck-irony): New variable.
---
 gnu/packages/emacs.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 20f747477..647625d0e 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -2869,6 +2869,28 @@ irony-mode using clang-tooling.")
    (home-page "https://github.com/Sarcasm/company-irony")
    (license license:gpl3+)))
 
+(define-public emacs-flycheck-irony
+  (package
+    (name "emacs-flycheck-irony")
+    (version "0.1.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/Sarcasm/flycheck-irony.git")
+                    (commit (string-append "v" version))))
+              (sha256 (base32 "0qa5a8wzvzxwqql92ibc9s43k8sj3vwn7skz9hfr8av0skkhx996"))
+              (file-name (string-append name "-" version))))
+    (build-system emacs-build-system)
+    (inputs
+     `(("irony-mode" ,emacs-irony-mode)
+       ("flycheck-mode" ,emacs-flycheck)
+       ("emacs-company" ,emacs-company)))
+    (synopsis "Live syntax checking frontend for flycheck using irony-mode")
+    (description "This package provides a frontend for flycheck that lets irony-mode
+do the syntax checking.")
+    (home-page "https://github.com/Sarcasm/flycheck-irony")
+    (license license:gpl3+)))
+
 (define-public emacs-company-quickhelp
   (package
     (name "emacs-company-quickhelp")
-- 
2.19.2


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.1.3: 0002-gnu-Add-emacs-irony-eldoc.patch --]
[-- Type: text/x-patch; name="0002-gnu-Add-emacs-irony-eldoc.patch", Size: 1652 bytes --]

From 210363912b79310eebaa621bf17438a1882565e3 Mon Sep 17 00:00:00 2001
From: Tim Gesthuizen <tim.gesthuizen@yahoo.de>
Date: Tue, 27 Nov 2018 17:57:28 +0100
Subject: [PATCH 2/2] gnu: Add emacs-irony-eldoc.

* gnu/packages/emacs.scm (emacs-irony-eldoc): New variable.
---
 gnu/packages/emacs.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 647625d0e..073f19b95 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -2891,6 +2891,27 @@ do the syntax checking.")
     (home-page "https://github.com/Sarcasm/flycheck-irony")
     (license license:gpl3+)))
 
+(define-public emacs-irony-eldoc
+  (package
+    (name "emacs-irony-eldoc")
+    (version (package-version emacs-irony-mode))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/ikirill/irony-eldoc.git")
+             (commit "0df5831eaae264a25422b061eb2792aadde8b3f2")))
+       (sha256 (base32 "1l5qpr66v1l12fb50yh73grb2rr85xxmbj19mm33b5rdrq2bqmmd"))
+       (file-name (string-append name "-" version))))
+    (build-system emacs-build-system)
+    (inputs
+     `(("irony-mode" ,emacs-irony-mode)))
+    (synopsis "Eldoc integration for irony-mode")
+    (description "Irony-eldoc is an eldoc extension that shows documentation
+for the current function or variable in the minibuffer.")
+    (home-page "https://github.com/ikirill/irony-eldoc")
+    (license license:gpl3+)))
+
 (define-public emacs-company-quickhelp
   (package
     (name "emacs-company-quickhelp")
-- 
2.19.2


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

bug#33526: Utilities for emacs-irony-mode

[Ludovic Courtès]

Hi Tim,

Tim Gesthuizen <tim.gesthuizen@yahoo.de> skribis:

> Sorry for the bad patches.
> I changed the following things:
> - descriptions of the packages are now full sentences
> - The source files now have proper names
> - git references and hashs are updated so that the sources can be
>   downloaded.
>
> I hope that this resolves all issues.

It does.  I applied both patches, thank you!

Ludo’.