From e16acb5c9b523a34a77c7fcddb986cd6840ba24c Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt <mail@ambrevar.xyz>
Date: Wed, 30 Oct 2019 14:33:18 +0100
Subject: gnu: Add emacs-eshell-prompt-extras.

* gnu/packages/emacs-xyz.scm (emacs-eshell-prompt-extras): New variable.
---
 gnu/packages/emacs-xyz.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

(limited to 'gnu/packages/emacs-xyz.scm')

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 1be819728f..6b586abfcc 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -19622,3 +19622,28 @@ minibuffer or an each area message).
 The contents and aspect is controlled by the @code{minibuffer-line-format}
 variable and the @code{minibuffer-line} face.")
     (license license:gpl3+)))
+
+(define-public emacs-eshell-prompt-extras
+  (let ((commit "5a328e1b9112c7f31ce2da7cde340f96626546b6")
+        (revision "1"))
+    (package
+      (name "emacs-eshell-prompt-extras")
+      (version (git-version "0.96" revision commit))
+      (home-page "https://github.com/zwild/eshell-prompt-extras")
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url home-page)
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "0fwlvrzjygs12dcp89wy3rb3wa03mrvbzpmpvmz4x6dfpr7csznk"))))
+      (build-system emacs-build-system)
+      (synopsis "Display extra information and color for your Eshell prompt")
+      (description "This library displays various customizable elements for
+@code{eshell} prompts: remote user, remote host, python virtual environment
+info, git branch, git dirty info and git unpushed number.  Multiple themes are
+available.")
+      (license license:gpl3+))))
-- 
cgit v1.2.3


From cd6a22d1ac2bc2043f2d20b28fc8de5ec739bff4 Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt <mail@ambrevar.xyz>
Date: Wed, 30 Oct 2019 14:39:37 +0100
Subject: gnu: Add emacs-eshell-did-you-mean.

* gnu/packages/emacs-xyz.scm (emacs-eshell-did-you-mean): New variable.
---
 gnu/packages/emacs-xyz.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'gnu/packages/emacs-xyz.scm')

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 6b586abfcc..6f584f72b7 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -19647,3 +19647,25 @@ variable and the @code{minibuffer-line} face.")
 info, git branch, git dirty info and git unpushed number.  Multiple themes are
 available.")
       (license license:gpl3+))))
+
+(define-public emacs-eshell-did-you-mean
+  (package
+    (name "emacs-eshell-did-you-mean")
+    (version "0.1")
+    (home-page "https://github.com/xuchunyang/eshell-did-you-mean")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url home-page)
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "0v0wshck5n4hspcv1zk1g2nm6xiigcjp16lx0dc8wzkl6ymljvbg"))))
+    (build-system emacs-build-system)
+    (synopsis "Display suggestions on 'command not found' in Eshell")
+    (description "This library adds a list of 'Did you mean...' suggestions
+when the command was not found in Eshell.  The suggestions are found after the
+commands that bear resemblance to the input command.")
+    (license license:gpl3+)))
-- 
cgit v1.2.3


From 44d1cce5573eca7d3fa7cca663f289072e65bcc1 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Fri, 1 Nov 2019 21:37:37 -0400
Subject: gnu: emacs-adoc-mode: Enable tests.

* gnu/packages/emacs-xyz.scm (emacs-adoc-mode)[source]: Fetch sources from
Git, as there are no tests in the MELPA release.
[arguments]: Enable tests and specify the test command.
{phases}: Add a 'disable-failing-tests phase.
---
 gnu/packages/emacs-xyz.scm | 36 ++++++++++++++++++++++++++++++++----
 1 file changed, 32 insertions(+), 4 deletions(-)

(limited to 'gnu/packages/emacs-xyz.scm')

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 6f584f72b7..d02c163e9f 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -15869,13 +15869,41 @@ and 'text viewing modes' respectively.")
     (version "0.6.6")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://stable.melpa.org/packages/adoc-mode-"
-                           version ".el"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/sensorflo/adoc-mode.git")
+             (commit (string-append "V" version))))
+       (file-name (git-file-name name version))
        (sha256
         (base32
-         "1c6hrgxxsnl2c19rgjykpm7r4xg9lp6bmk5z6bi7g8pqlrgwffcy"))))
+         "0kp2aafjhqxz3mjr9hkkss85r4n51chws5a2qj1xzb63dh36liwm"))))
     (build-system emacs-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         ;; See: https://github.com/sensorflo/adoc-mode/issues/39.
+         (add-after 'unpack 'disable-failing-tests
+           (lambda _
+             (let-syntax
+                 ((disable-tests
+                   (syntax-rules ()
+                     ((_ file ())
+                      (syntax-error "test names list must not be empty"))
+                     ((_ file (test-name ...))
+                      (substitute* file
+                        (((string-append "^\\(ert-deftest " test-name ".*") all)
+                         (string-append all "(skip-unless nil)\n")) ...)))))
+               (disable-tests "adoc-mode-test.el"
+                              ("adoctest-test-tempo-delimited-blocks"
+                               "adoctest-test-tempo-macros"
+                               "adoctest-test-tempo-paragraphs"
+                               "adoctest-test-tempo-passthroug-macros"
+                               "adoctest-test-tempo-quotes")))
+             #t)))
+       #:tests? #t
+       #:test-command '("emacs" "-Q" "-batch"
+                        "-l" "adoc-mode-test.el"
+                        "-f" "ert-run-tests-batch-and-exit")))
     (propagated-inputs
      `(("emacs-markup-faces" ,emacs-markup-faces)))
     (home-page "https://github.com/sensorflo/adoc-mode/wiki")
-- 
cgit v1.2.3


From daf29bf5a5d9e5819bc3904a64ea1dafd288274f Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt <mail@ambrevar.xyz>
Date: Sat, 2 Nov 2019 16:17:08 +0100
Subject: gnu: Add emacs-unfill.

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

(limited to 'gnu/packages/emacs-xyz.scm')

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index d02c163e9f..9604104d63 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -19697,3 +19697,24 @@ available.")
 when the command was not found in Eshell.  The suggestions are found after the
 commands that bear resemblance to the input command.")
     (license license:gpl3+)))
+
+(define-public emacs-unfill
+  (package
+    (name "emacs-unfill")
+    (version "0.2")
+    (home-page "https://github.com/purcell/unfill")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url home-page)
+             (commit "0.2")))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0wyradin5igp25nsd3n22i2ppxhmy49ac1iq1w2715v8pfmiydnc"))))
+    (build-system emacs-build-system)
+    (synopsis "Inverse of Emacs' @code{fill-paragraph} and @code{fill-region}")
+    (description
+     "The functions in this package provide the inverse of Emacs'
+@code{fill-paragraph} and @code{fill-region}.")
+    (license license:gpl3+)))
-- 
cgit v1.2.3


From edf2ac99bdc00a20bd9af16c6cc6cf22233b4c05 Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt <mail@ambrevar.xyz>
Date: Sat, 2 Nov 2019 16:18:56 +0100
Subject: gnu: emacs-evil-collection: Update to 20191102.

* gnu/packages/emacs-xyz.scm (emacs-evil-collection): Update to 20191102.
---
 gnu/packages/emacs-xyz.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'gnu/packages/emacs-xyz.scm')

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 9604104d63..037220ed9e 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -7439,8 +7439,8 @@ extensions.")
     (license license:gpl3+)))
 
 (define-public emacs-evil-collection
-  (let ((commit "38e916d5d56b391f1ad4c72ad3909491e86cda3c")
-        (revision "12"))
+  (let ((commit "eb36c82a84d313e961777dc78fd4ff1d718efdf6")
+        (revision "13"))
     (package
       (name "emacs-evil-collection")
       (version (git-version "0.0.3" revision commit))
@@ -7452,7 +7452,7 @@ extensions.")
                 (file-name (git-file-name name version))
                 (sha256
                  (base32
-                  "00a1ya3c92ymhfj4ai1ygljnxa147d4cgi6jmvccngicphn99782"))))
+                  "0wi84x9176y4xjl7zpn882achfamx3a2ixlj4nvflxfh6q1qg7bz"))))
       (build-system emacs-build-system)
       (propagated-inputs
        `(("emacs-evil" ,emacs-evil)
-- 
cgit v1.2.3


From 141bae73d62c166fde9b389322667a9e9961b4bc Mon Sep 17 00:00:00 2001
From: Oleg Pykhalov <go.wigust@gmail.com>
Date: Sat, 2 Nov 2019 18:18:16 +0300
Subject: gnu: Add emacs-tramp-auto-auth.

* gnu/packages/emacs-xyz.scm (emacs-tramp-auto-auth): New variable.
---
 gnu/packages/emacs-xyz.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'gnu/packages/emacs-xyz.scm')

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 037220ed9e..b819a7bb7e 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -18699,6 +18699,29 @@ well as an option for visually flashing evaluated s-expressions.")
 SSH servers.")
     (license license:gpl3+)))
 
+(define-public emacs-tramp-auto-auth
+  (let ((commit "f15a12dfab651aff60f4a9d70f868030a12344ac"))
+    (package
+      (name "emacs-tramp-auto-auth")
+      (version (git-version "20191027" "1" commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/oitofelix/tramp-auto-auth.git")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "09nkjgwppjfgv04q0gv468qihgx4y3p39lpwbd6vbh3wgbccas9k"))))
+      (build-system emacs-build-system)
+      (home-page "https://github.com/oitofelix/tramp-auto-auth")
+      (synopsis "TRAMP automatic authentication library")
+      (description "This package provides @code{tramp-auto-auth-mode} Emacs
+global minor mode whose purpose is to automatically feed TRAMP sub-processes
+with passwords for paths matching regexps.")
+      (license license:gpl3+))))
+
 (define-public emacs-eacl
   (package
     (name "emacs-eacl")
-- 
cgit v1.2.3


From 73282c75fef4eb03c1d6d009987be8ce988bdae3 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 3 Nov 2019 03:52:07 +0100
Subject: gnu: emacs-emms: Update to 5.3.

* gnu/packages/emacs-xyz.scm (emacs-emms): Update to 5.3.
---
 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/emacs-xyz.scm')

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index b819a7bb7e..81e6f066b4 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -1219,14 +1219,14 @@ or unexpected behavior inside an elisp configuration file (typically
 (define-public emacs-emms
   (package
     (name "emacs-emms")
-    (version "5.2")
+    (version "5.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnu/emms/emms-"
                                   version ".tar.gz"))
               (sha256
                (base32
-                "0cvpfdkagkpi8g02w8f7wzrpdk2ihas0mn5m9fr882xjdfshl21z"))
+                "00hnv7jjgb2simgrf7gf2y1cyg2syk7kj1hkbac146hlgxk8ngj1"))
               (modules '((guix build utils)))
               (snippet
                '(begin
-- 
cgit v1.2.3


From 0b3ec89eeb06b2d50e93fb2ddf089044b6b5a0d2 Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt <mail@ambrevar.xyz>
Date: Sun, 3 Nov 2019 13:15:10 +0100
Subject: gnu: emacs-fish-completion: Update to 1.2.

* gnu/packages/emacs-xyz.scm (emacs-fish-completion): Update to 1.2.
---
 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/emacs-xyz.scm')

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 81e6f066b4..cfd4b8702b 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -15087,7 +15087,7 @@ cohesion with the Emacs Way.")
 (define-public emacs-fish-completion
   (package
     (name "emacs-fish-completion")
-    (version "1.1")
+    (version "1.2")
     (source
      (origin
        (method git-fetch)
@@ -15097,7 +15097,7 @@ cohesion with the Emacs Way.")
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "1pjqnbyjmj64q5nwq1mrdxcls4fp5y0b6zqs785i0s6wdvrm4021"))))
+         "17lqip1i1rrsvxzz4bx9rqf1fvwd3hriwg3sj6qxmfc8pylnp37q"))))
     (build-system emacs-build-system)
     (inputs `(("fish" ,fish)))
     (arguments
-- 
cgit v1.2.3


From f02249b6bf7b0a42ab5bc198f8147d86c406b66f Mon Sep 17 00:00:00 2001
From: Leo Prikler <leo.prikler@student.tugraz.at>
Date: Fri, 1 Nov 2019 12:46:02 +0100
Subject: gnu: Add emacs-leaf

* gnu/packages/emacs-xyz: (emacs-leaf): New variable.

Signed-off-by: Mathieu Othacehe <m.othacehe@gmail.com>
---
 gnu/packages/emacs-xyz.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

(limited to 'gnu/packages/emacs-xyz.scm')

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index cfd4b8702b..d0d0fcf920 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -55,6 +55,7 @@
 ;;; Copyright © 2019 Jelle Licht <jlicht@fsfe.org>
 ;;; Copyright © 2019 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
 ;;; Copyright © 2019 Stephen Webber <montokapro@gmail.com>
+;;; Copyright © 2019 Leo Prikler <leo.prikler@student.tugraz.at>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -8959,6 +8960,36 @@ configuration in your @file{.emacs} file in a way that is both
 performance-oriented and tidy.")
     (license license:gpl2+)))
 
+(define-public emacs-leaf
+  (package
+    (name "emacs-leaf")
+    (version "3.5.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/conao3/leaf.el.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "1rgd59146wad92yc64las0qgx67k2ifgsw1vwhp40xvkd7kb0r6d"))))
+    (build-system emacs-build-system)
+    (home-page "https://github.com/conao3/leaf.el")
+    (arguments
+     `(#:tests? #t
+       #:test-command '("emacs" "--batch"
+                        "-l" "leaf-tests.el"
+                        "-f" "cort-test-run")))
+    (synopsis
+     "Simplify your init.el configuration, extended use-package")
+    (description
+     "This package provides macros that allows you to declaratively configure
+settings typical of an Elisp package with various keywords.  The syntax is
+similar, but not identical to use-package -- overall, leaf aims at a cleaner
+and more predictable implementation.")
+    (license license:agpl3+)))
+
 (define-public emacs-strace-mode
   (let* ((commit "6a69b4b06db6797af56f33eda5cb28af94e59f11")
          (revision "1"))
-- 
cgit v1.2.3


From ef189ab3b82a29991d9952b6c98b2f8c7acc7c88 Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt <mail@ambrevar.xyz>
Date: Mon, 4 Nov 2019 12:34:16 +0100
Subject: gnu: emacs-unfill: Use `version' instead of hard-coding
 git-reference.

* gnu/packages/emacs-xyz.scm (emacs-unfill)[source]: Use `version' in `commit'
  field.
---
 gnu/packages/emacs-xyz.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gnu/packages/emacs-xyz.scm')

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index d0d0fcf920..16d4d8f7ae 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -19762,7 +19762,7 @@ commands that bear resemblance to the input command.")
        (method git-fetch)
        (uri (git-reference
              (url home-page)
-             (commit "0.2")))
+             (commit version)))
        (file-name (git-file-name name version))
        (sha256
         (base32 "0wyradin5igp25nsd3n22i2ppxhmy49ac1iq1w2715v8pfmiydnc"))))
-- 
cgit v1.2.3


From 865e66daf3d672bb0acb8a4205f842667124faaf Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt <mail@ambrevar.xyz>
Date: Mon, 4 Nov 2019 12:37:55 +0100
Subject: gnu: Add emacs-windower.

* gnu/packages/emacs-xyz.scm (emacs-windower): New variable.
---
 gnu/packages/emacs-xyz.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

(limited to 'gnu/packages/emacs-xyz.scm')

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 16d4d8f7ae..7704a555ed 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -19772,3 +19772,32 @@ commands that bear resemblance to the input command.")
      "The functions in this package provide the inverse of Emacs'
 @code{fill-paragraph} and @code{fill-region}.")
     (license license:gpl3+)))
+
+(define-public emacs-windower
+  (package
+    (name "emacs-windower")
+    (version "0.0.1")
+    (home-page "https://gitlab.com/ambrevar/emacs-windower")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url home-page)
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0h24gb1ip0czfasxm8wwcc3v19g7mznzw2sxkmmfb5iis59p7dfy"))))
+    (build-system emacs-build-system)
+    (synopsis "Helper functions for window manipulation in Emacs")
+    (description
+     "This package provides helper functions for window manipulation in Emacs,
+such as:
+
+@itemize
+- switch to last buffer,
+- toggle single window display,
+- toggle between horizontal and vertical splits,
+- move borders more naturally,
+- swap windows à-la @code{windmove}.
+@end itemize\n")
+    (license license:gpl3+)))
-- 
cgit v1.2.3


From af3ec370b2f5df2061b76d16554f69569b94b320 Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt <mail@ambrevar.xyz>
Date: Mon, 4 Nov 2019 14:07:57 +0100
Subject: gnu: emacs-eshell-prompt-extras: Update to 1.0.

* gnu/packages/emacs-xyz.scm (emacs-eshell-prompt-extras): Update to 1.0.
---
 gnu/packages/emacs-xyz.scm | 38 ++++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 20 deletions(-)

(limited to 'gnu/packages/emacs-xyz.scm')

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 7704a555ed..4654a02491 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -19706,29 +19706,27 @@ variable and the @code{minibuffer-line} face.")
     (license license:gpl3+)))
 
 (define-public emacs-eshell-prompt-extras
-  (let ((commit "5a328e1b9112c7f31ce2da7cde340f96626546b6")
-        (revision "1"))
-    (package
-      (name "emacs-eshell-prompt-extras")
-      (version (git-version "0.96" revision commit))
-      (home-page "https://github.com/zwild/eshell-prompt-extras")
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url home-page)
-               (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32
-           "0fwlvrzjygs12dcp89wy3rb3wa03mrvbzpmpvmz4x6dfpr7csznk"))))
-      (build-system emacs-build-system)
-      (synopsis "Display extra information and color for your Eshell prompt")
-      (description "This library displays various customizable elements for
+  (package
+    (name "emacs-eshell-prompt-extras")
+    (version "1.0")
+    (home-page "https://github.com/zwild/eshell-prompt-extras")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url home-page)
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "0gb07mns23dgqqr6qfy7d6ndizy15sqgbgfaig6k5xbjnwi02v9g"))))
+    (build-system emacs-build-system)
+    (synopsis "Display extra information and color for your Eshell prompt")
+    (description "This library displays various customizable elements for
 @code{eshell} prompts: remote user, remote host, python virtual environment
 info, git branch, git dirty info and git unpushed number.  Multiple themes are
 available.")
-      (license license:gpl3+))))
+    (license license:gpl3+)))
 
 (define-public emacs-eshell-did-you-mean
   (package
-- 
cgit v1.2.3


From 14eac09841b34a4e4554c8015d49d4d7657a2a50 Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt <mail@ambrevar.xyz>
Date: Tue, 5 Nov 2019 10:45:09 +0100
Subject: gnu: emacs-engine-mode: Update to 2.1.1.

* gnu/packages/emacs-xyz.scm (emacs-engine-mode): Update to 2.1.1.
---
 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/emacs-xyz.scm')

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 4654a02491..f02da5460a 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -10399,7 +10399,7 @@ the nick color and the background color
 (define-public emacs-engine-mode
   (package
     (name "emacs-engine-mode")
-    (version "2.0.0")
+    (version "2.1.1")
     (source
      (origin
        (method git-fetch)
@@ -10408,7 +10408,7 @@ the nick color and the background color
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "02xas46nl28mascqsyr1zcd4hn15bh0fjv2xlxv1kmrj0pis94ml"))))
+        (base32 "1xka8i4cdvp5r2v2mkli1zz17x1sdsnmszbhqav2rf94v656d91i"))))
     (build-system emacs-build-system)
     (synopsis "Minor mode for defining and querying search engines")
     (description "@code{engine-mode} is a global minor mode for Emacs.  It
-- 
cgit v1.2.3


From f1d4d79fb3206fa26834b301fae7fc75c7f46ef8 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Sun, 10 Nov 2019 12:03:51 +0200
Subject: gnu: Add 'file-name' where appropriate.

* gnu/packages/admin.scm (detox, neofetch),
gnu/packages/algebra.scm (python-fpylll),
gnu/packages/bioinformatics.scm (tbsp, genrich),
gnu/packages/crypto.scm (hpenc),
gnu/packages/digest.scm (xxhash),
gnu/packages/emacs-xyz.scm (emacs-tiny, emacs-ergoemacs-mode,
emacs-make-it-so, emacs-poet-theme, emacs-deft, emacs-scribble-mode,
emacs-helm-mu, emacs-unidecode, emacs-diff-hl, emacs-helm-exwm,
emacs-gif-screencast, emacs-exec-path-from-shell),
gnu/packages/engineering.scm (gpx),
gnu/packages/freedesktop.scm (waylandpp),
gnu/packages/golang.scm (go-github-com-sirupsen-logrus,
go-github-com-shirou-gopsutil),
gnu/packages/guile-xyz.scm (guile-studio, guile-picture-language,
jupyter-guile-kernel),
gnu/packages/image-viewers.scm (qview),
gnu/packages/java-maths.scm (java-jblas),
gnu/packages/llvm.scm (libclc),
gnu/packages/logging.scm (spdlog),
gnu/packages/ocaml.scm (ocaml-cstruct, ocaml-zarith),
gnu/packages/terminals.scm (libtsm),
gnu/packages/tigervnc.scm (tigervnc-client),
gnu/packages/xdisorg.scm (xcalib, xbanish) [source]: Add file-name.
---
 gnu/packages/admin.scm          |  2 ++
 gnu/packages/algebra.scm        |  1 +
 gnu/packages/bioinformatics.scm |  2 ++
 gnu/packages/crypto.scm         |  1 +
 gnu/packages/digest.scm         |  1 +
 gnu/packages/emacs-xyz.scm      | 12 ++++++++++++
 gnu/packages/engineering.scm    |  1 +
 gnu/packages/freedesktop.scm    |  1 +
 gnu/packages/golang.scm         |  2 ++
 gnu/packages/guile-xyz.scm      |  3 +++
 gnu/packages/image-viewers.scm  |  1 +
 gnu/packages/java-maths.scm     |  1 +
 gnu/packages/llvm.scm           |  1 +
 gnu/packages/logging.scm        |  1 +
 gnu/packages/ocaml.scm          |  2 ++
 gnu/packages/terminals.scm      |  1 +
 gnu/packages/tigervnc.scm       |  1 +
 gnu/packages/xdisorg.scm        |  2 ++
 18 files changed, 36 insertions(+)

(limited to 'gnu/packages/emacs-xyz.scm')

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index c675db582f..c4723c5a9d 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -1599,6 +1599,7 @@ system is under heavy load.")
               (uri (git-reference
                     (url "https://github.com/dharple/detox.git")
                     (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
               (sha256
                (base32
                 "1dd608c7g65s5lj02cddvani3q9kzirddgkjqa22ap9d4f8b9xgr"))))
@@ -2834,6 +2835,7 @@ tool for remote execution and deployment.")
               (uri (git-reference
                     (url "https://github.com/dylanaraps/neofetch")
                     (commit version)))
+              (file-name (git-file-name name version))
               (sha256
                (base32
                 "022xzn9jk18k2f4b6011d8jk5nbl84i3mw3inlz4q52p2hvk8fch"))))
diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm
index e1680d4b91..f626c0de97 100644
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@ -201,6 +201,7 @@ the real span of the lattice.")
        (uri (git-reference
              (url "https://github.com/fplll/fpylll.git")
              (commit (string-append version "dev"))))
+       (file-name (git-file-name name version))
        (sha256
         (base32
          "01x2sqdv0sbjj4g4waj0hj4rcn4bq7h17442xaqwbznym9azmn9w"))))
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index e5d7081bc3..4a88e67191 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -12849,6 +12849,7 @@ HTML reports with interesting findings about your samples.")
               (uri (git-reference
                     (url "https://github.com/jsh58/Genrich.git")
                     (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
               (sha256
                (base32
                 "0x0q6z0208n3cxzqjla4rgjqpyqgwpmz27852lcvzkzaigymq4zp"))))
@@ -14798,6 +14799,7 @@ and reflect the fast5 file schema, and tools to convert between
          (uri (git-reference
                (url "https://github.com/phoenixding/tbsp.git")
                (commit commit)))
+         (file-name (git-file-name name version))
          (sha256
           (base32
            "025ym14x8gbd6hb55lsinqj6f5qzw36i10klgs7ldzxxd7s39ki1"))))
diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm
index 1f5bfc1631..2ae867f45b 100644
--- a/gnu/packages/crypto.scm
+++ b/gnu/packages/crypto.scm
@@ -952,6 +952,7 @@ utility/testing functions.")
               (uri (git-reference
                      (url "https://github.com/vstakhov/hpenc")
                      (commit version)))
+              (file-name (git-file-name name version))
               (sha256
                (base32
                 "1fb5yi3d2k8kd4zm7liiqagpz610y168xrr1cvn7cbq314jm2my1"))))
diff --git a/gnu/packages/digest.scm b/gnu/packages/digest.scm
index d5533bc474..7ec4ca1495 100644
--- a/gnu/packages/digest.scm
+++ b/gnu/packages/digest.scm
@@ -32,6 +32,7 @@
        (uri (git-reference
              (url "https://github.com/Cyan4973/xxHash")
              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
         (base32 "137hifc3f3cb4ib64rd6y83arc9hmbyncgrij2v8m94mx66g2aks"))))
     (build-system gnu-build-system)
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index f02da5460a..52a22ccca5 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -621,6 +621,7 @@ handful of functions that are not resource-specific.")
                 (uri (git-reference
                       (url "https://github.com/emacs-pe/scribble-mode.git")
                       (commit commit)))
+                (file-name (git-file-name name version))
                 (sha256
                  (base32
                   "1s5ccw1a5ack01wd94ywfcrar9j98agchwdh30q7iyxr0d2z4sii"))))
@@ -4818,6 +4819,7 @@ package provides a light and a dark variant.")
          (uri (git-reference
                (url "https://github.com/kunalb/poet.git")
                (commit commit)))
+         (file-name (git-file-name name version))
          (sha256
           (base32
            "0a84jdaj619mb59a46dmkk2sfs42rylqk9ryl1drgs8d3lia79mz"))))
@@ -8899,6 +8901,7 @@ actually changing the buffer's text.")
        (uri (git-reference
              (url "https://github.com/dgutov/diff-hl")
              (commit version)))
+       (file-name (git-file-name name version))
        (sha256
         (base32
          "1xlsg728mz3cwhrsqvisa0aidic67nymd9g7h4c1h3q63j39yb2s"))))
@@ -10519,6 +10522,7 @@ It supports dired buffers and opens them in tree mode at destination.")
          (uri (git-reference
                (url "https://github.com/abo-abo/tiny.git")
                (commit commit)))
+         (file-name (git-file-name name version))
          (sha256
           (base32
            "1498j392ap2mk4zmsm2id16pfgvj78r428da9vw7hdrzzibai2cx"))))
@@ -10574,6 +10578,7 @@ well as Github-style emojis like @code{:smile:}.  It provides a minor mode
          (uri (git-reference
                (url "https://github.com/abo-abo/make-it-so")
                (commit commit)))
+         (file-name (git-file-name name version))
          (sha256
           (base32
            "0p6xhyinzzkrwzbpxqfm8hlii0ikvmmylya240bwsa77w0g1k6xq"))))
@@ -10603,6 +10608,7 @@ included by default, and more can be readily added.")
          (uri (git-reference
                (url "https://github.com/sindikat/unidecode")
                (commit commit)))
+         (file-name (git-file-name name version))
          (sha256
           (base32
            "03x3nakbhmakwm977mwrf8jifvjnfwzpjv6wrwpizbqjnkgfchmn"))))
@@ -11449,6 +11455,7 @@ functionality is inherited from @code{hcl-mode}.")
        (uri (git-reference
              (url "https://github.com/purcell/exec-path-from-shell")
              (commit version)))
+       (file-name (git-file-name name version))
        (sha256
         (base32
          "1ga8bpxngd3ph2hdiik92c612ki71qxw818i6rgx6f6a5r0sbf3p"))))
@@ -11529,6 +11536,7 @@ to with quicklink-style selections.")
        (uri (git-reference
              (url "https://github.com/jrblevin/deft.git")
              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
         (base32
          "0z7cilgiz6krvl5h2z72hkch43qxmypb0k6p5vxn5lx1p6v0mrf2"))))
@@ -11618,6 +11626,7 @@ used with SGML-like languages: XML, HTML, XHTML, XSL, etc.")
          (uri (git-reference
                (url "https://github.com/ergoemacs/ergoemacs-mode.git")
                (commit commit)))
+         (file-name (git-file-name name version))
          (sha256
           (base32
            "1s3b9bridl78hh1mxmdk9nqlmqhibbaxk0a1cixmsf23s06w8w6l"))))
@@ -15177,6 +15186,7 @@ try completing.  See @code{fish-completion-fallback-on-bash-p}.")
          (uri (git-reference
                (url "https://gitlab.com/Ambrevar/emacs-gif-screencast.git")
                (commit commit)))
+         (file-name (git-file-name name version))
          (sha256
           (base32
            "19xqi5mgalnnhb4hw0fh7py2s2dllldx1xxbhwhknkdpifai8hl8"))))
@@ -15333,6 +15343,7 @@ from @code{emms-source-file-default-directory}.")
          (uri (git-reference
                (url "https://github.com/emacs-helm/helm-exwm.git")
                (commit commit)))
+         (file-name (git-file-name name version))
          (sha256
           (base32 "064ziinqa5sdv7rfjn0y278l12kld176fr88k4h78pgf2f2n7cd8"))))
       (build-system emacs-build-system)
@@ -15423,6 +15434,7 @@ projects unrelated to current-buffer.
          (uri (git-reference
                (url "https://github.com/emacs-helm/helm-mu.git")
                (commit commit)))
+         (file-name (git-file-name name version))
          (sha256
           (base32 "1lh0ahxdc5b2z18m9p30gwg8sbg33sjwkjr38p7h5xsm5fm7i0fz"))))
       (build-system emacs-build-system)
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 17d959b870..01b3163130 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -1986,6 +1986,7 @@ editors.")
               (uri (git-reference
                     (url "https://github.com/markwal/GPX.git")
                     (commit version)))
+              (file-name (git-file-name name version))
               (sha256
                (base32
                 "1yab269x8qyf7rd04vaxyqyjv4pzz9lp4sc4dwh927k23avr3rw5"))))
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 2574153cef..c7eed86418 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -617,6 +617,7 @@ applications, X servers (rootless or fullscreen) or other display servers.")
     (source (origin
               (method git-fetch)
               (uri (git-reference (url home-page) (commit version)))
+              (file-name (git-file-name name version))
               (sha256
                (base32
                 "16h57hzd688664qcyznzhjp3hxipdkzgv46x82yhkww24av8b55n"))))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index e3b22c13a2..7db6565cb5 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -1166,6 +1166,7 @@ GNU extensions} to the POSIX recommendations for command-line options.")
        (uri (git-reference
              (url "https://github.com/sirupsen/logrus.git")
              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
         (base32
          "0g5z7al7kky11ai2dhac6gkp3b5pxsvx72yj3xg4wg3265gbn7yz"))))
@@ -3022,6 +3023,7 @@ a cron spec parser and job runner.")
                 (uri (git-reference
                        (url "https://github.com/shirou/gopsutil")
                        (commit commit))) ; XXX
+                (file-name (git-file-name name version))
                 (sha256
                  (base32
                   "0x1g4r32q4201nr2b754xnrrndmwsrhfr7zg37spya86qrmijnws"))))
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index a3d2e8fad3..eef102432f 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -779,6 +779,7 @@ messaging library.")
          (uri (git-reference
                (url "https://github.com/jerry40/guile-kernel")
                (commit commit)))
+         (file-name (git-file-name name version))
          (sha256
           (base32
            "0aj04853bqm47ivfcmrgpb7w3wkis847kc7qrwsa5zcn9h38qh2f"))))
@@ -1975,6 +1976,7 @@ format is also supported.")
                 (uri (git-reference
                       (url "https://git.elephly.net/software/guile-picture-language.git")
                       (commit commit)))
+                (file-name (git-file-name name version))
                 (sha256
                  (base32
                   "1ydvw9dvssdvlvhh1dr8inyzy2x6m41qgp8hsivca1xysr4gc23a"))))
@@ -2005,6 +2007,7 @@ The picture values can directly be displayed in Geiser.")
                 (uri (git-reference
                       (url "https://git.elephly.net/software/guile-studio.git")
                       (commit commit)))
+                (file-name (git-file-name name version))
                 (sha256
                  (base32
                   "0rxl5gv2mavycwkl33lcwyb3z71j2f4zyzk60k7vl3hzszpr08iq"))))
diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm
index 51062df7a3..d237a27c4a 100644
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -460,6 +460,7 @@ including CBZ, CB7, CBT, LHA.")
               (uri (git-reference
                     (url "https://github.com/jurplel/qView.git")
                     (commit version)))
+              (file-name (git-file-name name version))
               (sha256
                (base32
                 "1s29hz44rb5dwzq8d4i4bfg77dr0v3ywpvidpa6xzg7hnnv3mhi5"))))
diff --git a/gnu/packages/java-maths.scm b/gnu/packages/java-maths.scm
index 6c22f2938d..748ae67b58 100644
--- a/gnu/packages/java-maths.scm
+++ b/gnu/packages/java-maths.scm
@@ -39,6 +39,7 @@
               (uri (git-reference
                     (url "https://github.com/mikiobraun/jblas.git")
                     (commit (string-append "jblas-" version))))
+              (file-name (git-file-name name version))
               (sha256
                (base32
                 "0afh48hq8i8li5z11x415c8slwsfrlib0w1xjfbg186mximqvv3g"))))
diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
index 9a42d4fe07..33a72cf640 100644
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@ -321,6 +321,7 @@ use with Clang, targeting C++11, C++14 and above.")
        (uri (git-reference
              (url "https://github.com/llvm/llvm-project.git")
              (commit (string-append "llvmorg-" version))))
+       (file-name (git-file-name name version))
        (sha256
         (base32
          "052h16wjcnqginzp7ki4il2xmm25v9nyk0wcz7cg03gbryhl7aqa"))))
diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm
index 1481f5b5ee..7bd29b80ba 100644
--- a/gnu/packages/logging.scm
+++ b/gnu/packages/logging.scm
@@ -187,6 +187,7 @@ windows in a terminal, colorize, filter and merge.")
        (uri (git-reference
              (url "https://github.com/gabime/spdlog.git")
              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
         (base32
          "1rd4zmrlkcdjx0m0wpmjm1g9srj7jak6ai08qkhbn2lsn0niifzd"))))
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 7984e40382..52896634ef 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -1115,6 +1115,7 @@ files in these formats.")
               (uri (git-reference
                      (url "https://github.com/ocaml/Zarith")
                      (commit (string-append "release-" version))))
+              (file-name (git-file-name name version))
               (sha256
                (base32
                 "0hv5ywz1q2cgn8apfz490clwk5hcynr937g2v8i13x2ax4bnv0lz"))))
@@ -2645,6 +2646,7 @@ big- and little-endian, with their unsafe counter-parts.")
               (uri (git-reference
                      (url "https://github.com/mirage/ocaml-cstruct")
                      (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
               (sha256
                (base32
                 "0m4bz0digcsc8l2msfikwcbi1y371kccx6xnkwrz212mf5mp98bv"))))
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index b934d0c142..75c0092064 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -219,6 +219,7 @@ text-based approach to terminal recording.")
                 (uri (git-reference
                       (url (string-append "https://github.com/Aetf/" name))
                       (commit commit)))
+                (file-name (git-file-name name version))
                 (sha256
                  (base32
                   "0mwn91i5h5d518i1s05y7hzv6bc13vzcvxszpfh77473iwg4wprx"))))
diff --git a/gnu/packages/tigervnc.scm b/gnu/packages/tigervnc.scm
index cb44d355c6..85ac730f3d 100644
--- a/gnu/packages/tigervnc.scm
+++ b/gnu/packages/tigervnc.scm
@@ -47,6 +47,7 @@
         (git-reference
          (url "https://github.com/TigerVNC/tigervnc.git")
          (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
         (base32
          "0b47fg3741qs3zdpl2zr0s6jz46dypp2j6gqrappbzm3ywnnmm1x"))))
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 772e09d5b2..8c24ff92ec 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -737,6 +737,7 @@ to find buttons, etc, on the screen to click on.")
               (method git-fetch)
               (uri (git-reference (url home-page)
                                   (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
               (sha256
                (base32
                 "0vp8ja68hpmqkl61zyjar3czhmny1hbm74m8f393incfz1ymr3i8"))))
@@ -1458,6 +1459,7 @@ XCB util-xrm module provides the following libraries:
               (uri (git-reference
                     (url home-page)
                     (commit version)))
+              (file-name (git-file-name name version))
               (sha256
                (base32
                 "05fzdjmhiafgi2jf0k41i3nm0837a78sb6yv59cwc23nla8g0bhr"))
-- 
cgit v1.2.3


From 43e0bd75c04fed9914dba4f7196c4600b6fe0306 Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt <mail@ambrevar.xyz>
Date: Mon, 11 Nov 2019 19:02:06 +0100
Subject: gnu: emacs-forge: Use right home-page URL.

* gnu/packages/emacs-xyz.scm (emacs-forge)[home-page]: Set home-page to
  https://github.com/magit/forge/.
---
 gnu/packages/emacs-xyz.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gnu/packages/emacs-xyz.scm')

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 52a22ccca5..7481b6c226 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -17823,7 +17823,7 @@ a suffix) we prefer to call it just a \"transient\".")
                    (invoke "makeinfo" "forge.texi")
                    (install-file "forge.info" info)
                    #t)))))))
-      (home-page "https://github.com/magit/ghub/")
+      (home-page "https://github.com/magit/forge/")
       (synopsis "Access Git forges from Magit")
       (description
        "Work with Git forges, such as Github and Gitlab, from the comfort of
-- 
cgit v1.2.3


From 87f2a7c86f385531ae333d2466e05b2a16717a83 Mon Sep 17 00:00:00 2001
From: Mathieu Othacehe <m.othacehe@gmail.com>
Date: Tue, 12 Nov 2019 15:43:20 +0100
Subject: gnu: Add emacs-flycheck-cpplint.

* gnu/packages/emacs-xyz.scm (emacs-flycheck-cpplint): New variable.
---
 gnu/packages/emacs-xyz.scm | 553 +++++++++++++++++++++++----------------------
 1 file changed, 289 insertions(+), 264 deletions(-)

(limited to 'gnu/packages/emacs-xyz.scm')

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 7481b6c226..52f9ab79fe 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -158,12 +158,12 @@
     (name "emacs-geiser")
     (version "0.10")
     (source (origin
-             (method url-fetch)
-             (uri (string-append "mirror://savannah/geiser/" version
-                                 "/geiser-" version ".tar.gz"))
-             (sha256
-              (base32
-               "0pj3l7p8d60c9b4vfprnv6g5l61d74pls4b5dvd84cn4ky9mzwjv"))))
+              (method url-fetch)
+              (uri (string-append "mirror://savannah/geiser/" version
+                                  "/geiser-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0pj3l7p8d60c9b4vfprnv6g5l61d74pls4b5dvd84cn4ky9mzwjv"))))
     (build-system gnu-build-system)
     (arguments
      '(#:phases
@@ -226,8 +226,8 @@ when typing parentheses directly or commenting out code line by line.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://github.com/magit/git-modes")
-                     (commit version)))
+                    (url "https://github.com/magit/git-modes")
+                    (commit version)))
               (file-name (git-file-name name version))
               (sha256
                (base32
@@ -544,33 +544,33 @@ clojure.walk and clojure.zip respectively.")
 
 (define-public emacs-graphql
   (package
-   (name "emacs-graphql")
-   (version "0.1.1")
-   (source (origin
-             (modules '((guix build utils)))
-             ;; Remove examples file with references to external packages as
-             ;; they do not exist at compilation time.
-             (snippet
-              '(begin (delete-file "examples.el")
-                 #t))
-             (method git-fetch)
-             (uri (git-reference
-                   (url "https://github.com/vermiculus/graphql.el.git")
-                   (commit version)))
+    (name "emacs-graphql")
+    (version "0.1.1")
+    (source (origin
+              (modules '((guix build utils)))
+              ;; Remove examples file with references to external packages as
+              ;; they do not exist at compilation time.
+              (snippet
+               '(begin (delete-file "examples.el")
+                       #t))
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/vermiculus/graphql.el.git")
+                    (commit version)))
               (file-name (git-file-name name version))
               (sha256
                (base32
                 "0sp0skc1rnhi39szfbq1i99pdgd3bhn4c15cff05iqhjy2d4hniw"))))
-   (build-system emacs-build-system)
-   (home-page
-    "https://github.com/vermiculus/graphql.el")
-   (synopsis "GraphQL utilities")
-   (description
-    "GraphQL.el provides a generally-applicable domain-specific language for
+    (build-system emacs-build-system)
+    (home-page
+     "https://github.com/vermiculus/graphql.el")
+    (synopsis "GraphQL utilities")
+    (description
+     "GraphQL.el provides a generally-applicable domain-specific language for
 creating and executing GraphQL queries against your favorite web services.
 GraphQL is a data query language and runtime designed and used to request and
 deliver data to mobile and web apps.")
-   (license license:gpl3+)))
+    (license license:gpl3+)))
 
 (define-public emacs-ghub
   ;; We need a newer commit to avoid problems in emacs-forge.
@@ -707,8 +707,8 @@ replacement.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://github.com/haskell/haskell-mode")
-                     (commit (string-append "v" version))))
+                    (url "https://github.com/haskell/haskell-mode")
+                    (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
                (base32 "1qk36y0v9fzass6785il65c6wb5cfj4ihhwkvgnzmbafpa8p4dvq"))
@@ -736,47 +736,47 @@ replacement.")
        (modify-phases %standard-phases
          (delete 'configure)
          (add-before
-          'build 'pre-build
-          (lambda* (#:key inputs #:allow-other-keys)
-            (define (el-dir store-dir)
-              (match (find-files store-dir "\\.el$")
-                ((f1 f2 ...) (dirname f1))
-                (_ "")))
-
-            (let ((sh (string-append (assoc-ref inputs "bash") "/bin/sh")))
-              (define emacs-prefix? (cut string-prefix? "emacs-" <>))
-
-              (setenv "SHELL" "sh")
-              (setenv "EMACSLOADPATH"
-                      (string-concatenate
-                       (map (match-lambda
-                              (((? emacs-prefix? name) . dir)
-                               (string-append (el-dir dir) ":"))
-                              (_ ""))
-                            inputs)))
-              (substitute* (find-files "." "\\.el") (("/bin/sh") sh))
-              ;; embed filename to fix test failure
-              (let ((file "tests/haskell-cabal-tests.el"))
-                (substitute* file
-                  (("\\(buffer-file-name\\)")
-                   (format #f "(or (buffer-file-name) ~s)" file))))
-              #t)))
+             'build 'pre-build
+           (lambda* (#:key inputs #:allow-other-keys)
+             (define (el-dir store-dir)
+               (match (find-files store-dir "\\.el$")
+                 ((f1 f2 ...) (dirname f1))
+                 (_ "")))
+
+             (let ((sh (string-append (assoc-ref inputs "bash") "/bin/sh")))
+               (define emacs-prefix? (cut string-prefix? "emacs-" <>))
+
+               (setenv "SHELL" "sh")
+               (setenv "EMACSLOADPATH"
+                       (string-concatenate
+                        (map (match-lambda
+                               (((? emacs-prefix? name) . dir)
+                                (string-append (el-dir dir) ":"))
+                               (_ ""))
+                             inputs)))
+               (substitute* (find-files "." "\\.el") (("/bin/sh") sh))
+               ;; embed filename to fix test failure
+               (let ((file "tests/haskell-cabal-tests.el"))
+                 (substitute* file
+                   (("\\(buffer-file-name\\)")
+                    (format #f "(or (buffer-file-name) ~s)" file))))
+               #t)))
          (replace
-          'install
-          (lambda* (#:key outputs #:allow-other-keys)
-            (let* ((out (assoc-ref outputs "out"))
-                   (el-dir (string-append out "/share/emacs/site-lisp"))
-                   (doc (string-append
-                         out "/share/doc/haskell-mode-" ,version))
-                   (info (string-append out "/share/info")))
-              (define (copy-to-dir dir files)
-                (for-each (lambda (f)
-                            (install-file f dir))
-                          files))
-
-              (with-directory-excursion "doc"
-                (invoke "makeinfo" "haskell-mode.texi")
-                (install-file "haskell-mode.info" info))
+             'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (el-dir (string-append out "/share/emacs/site-lisp"))
+                    (doc (string-append
+                          out "/share/doc/haskell-mode-" ,version))
+                    (info (string-append out "/share/info")))
+               (define (copy-to-dir dir files)
+                 (for-each (lambda (f)
+                             (install-file f dir))
+                           files))
+
+               (with-directory-excursion "doc"
+                 (invoke "makeinfo" "haskell-mode.texi")
+                 (install-file "haskell-mode.info" info))
                (copy-to-dir doc '("CONTRIBUTING.md" "NEWS" "README.md"))
                (copy-to-dir el-dir (find-files "." "\\.elc?"))
                ;; These are part of other packages.
@@ -1009,14 +1009,14 @@ and reused.")
     (version "0.4")
     (source
      (origin
-      (method git-fetch)
-      (uri (git-reference
-            (url "https://github.com/purcell/reformatter.el.git")
-            (commit version)))
-      (file-name (git-file-name name version))
-      (sha256
-       (base32
-        "0hhy6x1bkwlhdlarsgm06g3am4yh02yqv8qs34szpzgy53x84qah"))))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/purcell/reformatter.el.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "0hhy6x1bkwlhdlarsgm06g3am4yh02yqv8qs34szpzgy53x84qah"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/purcell/reformatter.el")
     (synopsis "Define commands which run reformatters on the current buffer")
@@ -1172,11 +1172,11 @@ or unexpected behavior inside an elisp configuration file (typically
     (name "emacs-wget")
     (version "0.5.0")
     (source (origin
-             (method url-fetch)
-             (uri (string-append "mirror://debian/pool/main/w/wget-el/wget-el_"
-                                 version ".orig.tar.gz"))
-             (sha256
-              (base32 "10byvyv9dk0ib55gfqm7bcpxmx2qbih1jd03gmihrppr2mn52nff"))))
+              (method url-fetch)
+              (uri (string-append "mirror://debian/pool/main/w/wget-el/wget-el_"
+                                  version ".orig.tar.gz"))
+              (sha256
+               (base32 "10byvyv9dk0ib55gfqm7bcpxmx2qbih1jd03gmihrppr2mn52nff"))))
     (build-system gnu-build-system)
     (inputs `(("wget" ,wget)))
     (native-inputs `(("emacs" ,emacs-minimal)))
@@ -1371,8 +1371,8 @@ light user interface.")
      (origin
        (method git-fetch)
        (uri (git-reference
-              (url "https://github.com/momomo5717/emms-mode-line-cycle")
-              (commit version)))
+             (url "https://github.com/momomo5717/emms-mode-line-cycle")
+             (commit version)))
        (file-name (git-file-name name version))
        (sha256
         (base32
@@ -1517,8 +1517,8 @@ links.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://github.com/Wilfred/ag.el.git")
-                     (commit version)))
+                    (url "https://github.com/Wilfred/ag.el.git")
+                    (commit version)))
               (file-name (git-file-name name version))
               (sha256
                (base32
@@ -1616,8 +1616,8 @@ or XEmacs.")
      (origin
        (method git-fetch)
        (uri (git-reference
-              (url "https://github.com/sebastiansturm/autothemer.git")
-              (commit version)))
+             (url "https://github.com/sebastiansturm/autothemer.git")
+             (commit version)))
        (file-name (git-file-name name version))
        (sha256
         (base32
@@ -1677,8 +1677,8 @@ searches.  Unlike code@{emacs-wiki.el}, it can be combined with any format.")
      (origin
        (method git-fetch)
        (uri (git-reference
-              (url "https://github.com/kiwanami/emacs-calfw.git")
-              (commit (string-append "v" version))))
+             (url "https://github.com/kiwanami/emacs-calfw.git")
+             (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
         (base32
@@ -1701,8 +1701,8 @@ Emacs buffer.")
      (origin
        (method git-fetch)
        (uri (git-reference
-              (url "https://github.com/wbolster/emacs-direnv.git")
-              (commit version)))
+             (url "https://github.com/wbolster/emacs-direnv.git")
+             (commit version)))
        (file-name (git-file-name name version))
        (sha256
         (base32
@@ -1816,8 +1816,8 @@ written in the Go programming language.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://github.com/jd/google-maps.el.git")
-                     (commit version)))
+                    (url "https://github.com/jd/google-maps.el.git")
+                    (commit version)))
               (file-name (git-file-name name version))
               (sha256
                (base32
@@ -1886,8 +1886,8 @@ diagrams.")
      (origin
        (method git-fetch)
        (uri (git-reference
-              (url "https://github.com/purcell/mmm-mode.git")
-              (commit version)))
+             (url "https://github.com/purcell/mmm-mode.git")
+             (commit version)))
        (file-name (git-file-name name version))
        (sha256
         (base32
@@ -1912,8 +1912,8 @@ single buffer.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://github.com/politza/tablist.git")
-                     (commit (string-append "v" version))))
+                    (url "https://github.com/politza/tablist.git")
+                    (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
                (base32
@@ -2201,13 +2201,13 @@ running Extempore process, and more.")
     (name "emacs-keyfreq")
     (version "20160516.716")
     (source
-      (origin
-        (method url-fetch)
-        (uri (string-append "http://melpa.org/packages/keyfreq-"
-               version ".el"))
-        (sha256
-          (base32
-            "008hd7d06qskc3mx0bbdgpgy2pwxr8185fzlyqf9qjg49y74p6g8"))))
+     (origin
+       (method url-fetch)
+       (uri (string-append "http://melpa.org/packages/keyfreq-"
+                           version ".el"))
+       (sha256
+        (base32
+         "008hd7d06qskc3mx0bbdgpgy2pwxr8185fzlyqf9qjg49y74p6g8"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/dacap/keyfreq")
     (synopsis "Track Emacs command frequencies")
@@ -3636,12 +3636,12 @@ These are distributed in separate files and can be used individually.")
     (arguments `(#:phases
                  (modify-phases %standard-phases
                    (add-after 'unpack 'configure
-                        (lambda* (#:key inputs #:allow-other-keys)
-                          (chmod "irony.el" #o644)
-                          (emacs-substitute-variables "irony.el"
-                            ("irony-server-install-prefix"
-                             (assoc-ref inputs "server")))
-                          #t)))))
+                     (lambda* (#:key inputs #:allow-other-keys)
+                       (chmod "irony.el" #o644)
+                       (emacs-substitute-variables "irony.el"
+                         ("irony-server-install-prefix"
+                          (assoc-ref inputs "server")))
+                       #t)))))
     (synopsis "C/C++/ObjC Code completion and syntax checks for Emacs")
     (description "Irony-mode provides Clang-assisted syntax checking and
 completion for C, C++, and ObjC in GNU Emacs.  Using @code{libclang} it can
@@ -3653,20 +3653,20 @@ described on the homepage.")
 
 (define-public emacs-irony-mode-server
   (package (inherit emacs-irony-mode)
-    (name "emacs-irony-mode-server")
-    (inputs
-     `(("clang" ,clang)))
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (replace 'configure
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let ((out (assoc-ref outputs "out")))
-               (invoke "cmake"
-                       "server"
-                       (string-append "-DCMAKE_INSTALL_PREFIX=" out)) #t))))))
-    (build-system cmake-build-system)
-    (synopsis "Server for the Emacs @dfn{irony mode}")))
+           (name "emacs-irony-mode-server")
+           (inputs
+            `(("clang" ,clang)))
+           (arguments
+            `(#:phases
+              (modify-phases %standard-phases
+                (replace 'configure
+                  (lambda* (#:key outputs #:allow-other-keys)
+                    (let ((out (assoc-ref outputs "out")))
+                      (invoke "cmake"
+                              "server"
+                              (string-append "-DCMAKE_INSTALL_PREFIX=" out)) #t))))))
+           (build-system cmake-build-system)
+           (synopsis "Server for the Emacs @dfn{irony mode}")))
 
 (define-public emacs-company-irony
   (package
@@ -4723,22 +4723,22 @@ to their corresponding tangled blocks.")
   (let ((commit "1f1185bf667a38d3d0d180ce85fd4c131818aae2")
         (revision "0"))
     (package
-     (name "emacs-atom-one-dark-theme")
-     (version (git-version "0.4.0" revision commit))
-     (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/jonathanchu/atom-one-dark-theme.git")
-                    (commit commit)))
-              (sha256
-               (base32
-                "1alma16hg3mfjly8a9s3mrswkjjx4lrpdnf43869hn2ibkn7zx9z"))
-              (file-name (git-file-name name version))))
-     (build-system emacs-build-system)
-     (home-page "https://github.com/jonathanchu/atom-one-dark-theme")
-     (synopsis "Atom One Dark color theme for Emacs")
-     (description "An Emacs port of the Atom One Dark theme from Atom.io.")
-     (license license:gpl3+))))
+      (name "emacs-atom-one-dark-theme")
+      (version (git-version "0.4.0" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/jonathanchu/atom-one-dark-theme.git")
+                      (commit commit)))
+                (sha256
+                 (base32
+                  "1alma16hg3mfjly8a9s3mrswkjjx4lrpdnf43869hn2ibkn7zx9z"))
+                (file-name (git-file-name name version))))
+      (build-system emacs-build-system)
+      (home-page "https://github.com/jonathanchu/atom-one-dark-theme")
+      (synopsis "Atom One Dark color theme for Emacs")
+      (description "An Emacs port of the Atom One Dark theme from Atom.io.")
+      (license license:gpl3+))))
 
 (define-public emacs-zenburn-theme
   (package
@@ -4900,7 +4900,7 @@ for the eyes.")
      "This program is an implementation of 2048 for Emacs.
 The goal of this game is to create a tile with value 2048.  The size of the
 board and goal value can be customized.")
-  (license license:gpl3+)))
+    (license license:gpl3+)))
 
 (define-public emacs-base16-theme
   (package
@@ -5292,8 +5292,8 @@ fully-functional one.")
      (origin
        (method git-fetch)
        (uri (git-reference
-              (url "https://github.com/abo-abo/hydra")
-              (commit version)))
+             (url "https://github.com/abo-abo/hydra")
+             (commit version)))
        (file-name (git-file-name name version))
        (sha256
         (base32
@@ -6555,7 +6555,7 @@ indentation guides in Emacs:
              ;; Move .info file at the root so that it can installed by the
              ;; 'move-doc phase.
              (rename-file "docs/_build/texinfo/Elpy.info" "Elpy.info")
-              #t))
+             #t))
          (add-after 'build-doc 'install-manpage
            (lambda* (#:key outputs #:allow-other-keys)
              (let* ((out  (assoc-ref outputs "out"))
@@ -6756,7 +6756,7 @@ Emacs completion function instead.")
     (description
      "Ido-ubiquitous enables ido-style completion for almost every function
 that uses the standard completion function completing-read.")
-  (license license:gpl3+)))
+    (license license:gpl3+)))
 
 (define-public emacs-yaml-mode
   (package
@@ -8381,7 +8381,7 @@ mode-line.")
       (home-page "https://gitlab.com/wavexx/mu4e-jump-to-list.el")
       (synopsis "Select and view mailing lists in mu4e")
       (description
-        "@code{mu4e-jump-to-list} allows you to select and view mailing lists
+       "@code{mu4e-jump-to-list} allows you to select and view mailing lists
 automatically using existing List-ID headers in your mu database.  Just press
 \"l\" in the headers view and any mailing list you've subscribed to will be
 automatically discovered and presented in recency order.")
@@ -8408,7 +8408,7 @@ automatically discovered and presented in recency order.")
       (home-page "https://github.com/seanfarley/mu4e-patch")
       (synopsis "Colorize patch-like emails in mu4e")
       (description
-        "Extension for mu4e to colorize patch-like emails with diff-mode.
+       "Extension for mu4e to colorize patch-like emails with diff-mode.
 This is based on Frank Terbeck's @code{gnus-article-treat-patch.el} but has
 been adapted to work with mu4e.")
       (license license:gpl3+))))
@@ -9807,7 +9807,7 @@ Emacs.")
              (lambda* (#:key inputs outputs #:allow-other-keys)
                (let ((out (assoc-ref outputs "out"))
                      (source-directory (string-append
-                                  (getenv "TMPDIR") "/source")))
+                                        (getenv "TMPDIR") "/source")))
                  (substitute* "bin/ert-runner"
                    (("ERT_RUNNER=\"\\$\\(dirname \\$\\(dirname \\$0\\)\\)")
                     (string-append "ERT_RUNNER=\"" out
@@ -10814,38 +10814,38 @@ messaging service.")
 
 (define-public emacs-bash-completion
   (package
-   (name "emacs-bash-completion")
-   (version "2.1.0")
-   (source
-    (origin
-      (method git-fetch)
-      (uri (git-reference
-            (url "https://github.com/szermatt/emacs-bash-completion.git")
-            (commit version)))
-      (file-name (git-file-name name version))
-      (sha256
-       (base32 "1a1wxcqzh0javjmxwi3lng5i99xiylm8lm04kv4q1lh9bli6vmv0"))))
-   (inputs `(("bash" ,bash)))
-   (build-system emacs-build-system)
-   (arguments
-    `(#:phases
-      (modify-phases %standard-phases
-        (add-after 'unpack 'make-git-checkout-writable
-          (λ _
-            (for-each make-file-writable (find-files "."))
-            #t))
-        (add-before 'install 'configure
-          (lambda* (#:key inputs #:allow-other-keys)
-            (let ((bash (assoc-ref inputs "bash")))
-              (emacs-substitute-variables "bash-completion.el"
-                ("bash-completion-prog" (string-append bash "/bin/bash"))))
-            #t)))))
-   (home-page "https://github.com/szermatt/emacs-bash-completion")
-   (synopsis "Bash completion for the shell buffer")
-   (description
-    "@code{bash-completion} defines dynamic completion hooks for shell-mode
+    (name "emacs-bash-completion")
+    (version "2.1.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/szermatt/emacs-bash-completion.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1a1wxcqzh0javjmxwi3lng5i99xiylm8lm04kv4q1lh9bli6vmv0"))))
+    (inputs `(("bash" ,bash)))
+    (build-system emacs-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'make-git-checkout-writable
+           (λ _
+             (for-each make-file-writable (find-files "."))
+             #t))
+         (add-before 'install 'configure
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((bash (assoc-ref inputs "bash")))
+               (emacs-substitute-variables "bash-completion.el"
+                 ("bash-completion-prog" (string-append bash "/bin/bash"))))
+             #t)))))
+    (home-page "https://github.com/szermatt/emacs-bash-completion")
+    (synopsis "Bash completion for the shell buffer")
+    (description
+     "@code{bash-completion} defines dynamic completion hooks for shell-mode
 and shell-command prompts that are based on Bash completion.")
-   (license license:gpl2+)))
+    (license license:gpl2+)))
 
 (define-public emacs-easy-kill
   (package
@@ -11794,28 +11794,28 @@ match and total match information in the mode-line in various search modes.")
 
 (define-public emacs-finalize
   (package
-  (name "emacs-finalize")
-  (version "2.0.0")
-  (source
-    (origin
-      (method git-fetch)
-      (uri (git-reference
-            (url "https://github.com/skeeto/elisp-finalize.git")
-            (commit version)))
-      (file-name (git-file-name name version))
-      (sha256
+    (name "emacs-finalize")
+    (version "2.0.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/skeeto/elisp-finalize.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
         (base32 "1gvlm4i62af5jscwz0jccc8ra0grprxpg2rlq91d5nn8dn5lpy79"))))
-  (build-system emacs-build-system)
-  (propagated-inputs
-    `(("emacs-cl-generic" ,emacs-cl-generic)))
-  (home-page "https://github.com/skeeto/elisp-finalize")
-  (synopsis "Finalizers for Emacs Lisp")
-  (description
-    "This package will allows to immediately run a callback (a finalizer)
+    (build-system emacs-build-system)
+    (propagated-inputs
+     `(("emacs-cl-generic" ,emacs-cl-generic)))
+    (home-page "https://github.com/skeeto/elisp-finalize")
+    (synopsis "Finalizers for Emacs Lisp")
+    (description
+     "This package will allows to immediately run a callback (a finalizer)
 after its registered lisp object has been garbage collected.  This allows for
 extra resources, such as buffers and processes, to be cleaned up after the
 object has been freed.")
-  (license license:unlicense)))
+    (license license:unlicense)))
 
 (define-public emacs-emacsql
   (package
@@ -15304,7 +15304,7 @@ type @code{C-h b}, or any incomplete key sequence plus @code{C-h}, to run
 @code{helm-descbinds}.  The bindings are presented in a similar way as
 @code{describe-bindings} does, but you can use completion to find the command
 you searched for and execute it, or view its documentation.")
-    (license license:gpl3+))))
+      (license license:gpl3+))))
 
 (define-public emacs-helm-emms
   (let ((commit "b785cb845a98a643eba9d5d53c9c0b4e6810a3cd"))
@@ -16961,27 +16961,27 @@ or a window into some windows according to a layout recipe.")
 
 (define-public emacs-e2wm
   (package
-      (name "emacs-e2wm")
-      (version "1.4")
-      (home-page "https://github.com/kiwanami/emacs-window-manager")
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url home-page)
-                      (commit (string-append "v" version))))
-                (sha256
-                 (base32
-                  "12midsrx07pdrsr1qbl2rpi7xyhxqx08bkz7n7gf8vsmqkpfp56s"))
-                (file-name (git-file-name name version))))
-      (build-system emacs-build-system)
-      (propagated-inputs
-       `(("emacs-window-layout" ,emacs-window-layout)))
-      (synopsis "Equilibrium Emacs Window Manager")
-      (description "E2WM is a window manager for Emacs.  It enables to
+    (name "emacs-e2wm")
+    (version "1.4")
+    (home-page "https://github.com/kiwanami/emacs-window-manager")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url home-page)
+                    (commit (string-append "v" version))))
+              (sha256
+               (base32
+                "12midsrx07pdrsr1qbl2rpi7xyhxqx08bkz7n7gf8vsmqkpfp56s"))
+              (file-name (git-file-name name version))))
+    (build-system emacs-build-system)
+    (propagated-inputs
+     `(("emacs-window-layout" ,emacs-window-layout)))
+    (synopsis "Equilibrium Emacs Window Manager")
+    (description "E2WM is a window manager for Emacs.  It enables to
 customize the place of pop-up window, how the windows are split, how the
 buffers are located in the windows, keybinds to manipulate windows and
 buffers, etc.  It also has plug-ins to help your Emacs life.")
-      (license license:gpl3+)))
+    (license license:gpl3+)))
 
 (define-public emacs-ctable
   (let ((commit "b8830d1ca95abb100a81bc32011bd17d5ecba000"))
@@ -18894,26 +18894,26 @@ and article extracts for Wikipedia.")
 
 (define-public emacs-webfeeder
   (package
-  (name "emacs-webfeeder")
-  (version "1.0.0")
-  (source
-    (origin
-      (method url-fetch)
-      (uri (string-append
+    (name "emacs-webfeeder")
+    (version "1.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
              "https://elpa.gnu.org/packages/webfeeder-"
              version
              ".tar"))
-      (sha256
+       (sha256
         (base32
-          "06y5vxw9m6pmbrzb8v2i3w9dnhgqxz06vyx1knmgi9cczlrj4a64"))))
-  (build-system emacs-build-system)
-  (home-page "https://gitlab.com/Ambrevar/emacs-webfeeder")
-  (synopsis "Build RSS and Atom webfeeds from HTML files")
-  (description
-    "Webfeeder is an Emacs library to generate RSS and Atom feeds from HTML
+         "06y5vxw9m6pmbrzb8v2i3w9dnhgqxz06vyx1knmgi9cczlrj4a64"))))
+    (build-system emacs-build-system)
+    (home-page "https://gitlab.com/Ambrevar/emacs-webfeeder")
+    (synopsis "Build RSS and Atom webfeeds from HTML files")
+    (description
+     "Webfeeder is an Emacs library to generate RSS and Atom feeds from HTML
 files.  The various elements of the HTML input are parsed with customizable
 functions (e.g. @code{webfeeder-title-function}).")
-  (license license:gpl3+)))
+    (license license:gpl3+)))
 
 (define-public emacs-evil-numbers
   (let ((commit "6ea1c8c3a9b37bed63d48f1128e9a4910e68187e"))
@@ -19075,15 +19075,15 @@ text-property translator.")
     (name "emacs-org-noter")
     (version "1.3.0")
     (source
-      (origin
-        (method url-fetch)
-        (uri (string-append
-               "https://stable.melpa.org/packages/org-noter-"
-               version
-               ".el"))
-        (sha256
-          (base32
-            "1hczwva73gsyanl1ldhdvql01gy0hy2g861yzkaklyb763sx58x4"))))
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://stable.melpa.org/packages/org-noter-"
+             version
+             ".el"))
+       (sha256
+        (base32
+         "1hczwva73gsyanl1ldhdvql01gy0hy2g861yzkaklyb763sx58x4"))))
     (build-system emacs-build-system)
     (propagated-inputs `(("emacs-org" ,emacs-org)))
     (home-page "https://github.com/weirdNox/org-noter")
@@ -19478,30 +19478,30 @@ contains a track position, playback will start at the specified position.")
 
 (define-public emacs-org-jira
   (package
-   (name "emacs-org-jira")
-   (version "4.3.1")
-   (source
-    (origin
-     (method git-fetch)
-     (uri (git-reference
-           (url "https://github.com/ahungry/org-jira.git")
-           (commit version)))
-     (file-name (git-file-name name version))
-     (sha256
-      (base32
-       "1l80r2a9zzbfk2c78i40h0ww79vm9v4j6xi2h5i4w9kqh10rs6h2"))))
-   (build-system emacs-build-system)
-   (propagated-inputs
-    `(("emacs-request" ,emacs-request)
-      ("emacs-s" ,emacs-s)
-      ("emacs-dash" ,emacs-dash)
-      ("emacs-org" ,emacs-org)))
-   (home-page "https://github.com/ahungry/org-jira")
-   (synopsis "Syncing between Jira and Org-mode")
-   (description
-    "This package provides an extension to org-mode for syncing issues with
+    (name "emacs-org-jira")
+    (version "4.3.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/ahungry/org-jira.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "1l80r2a9zzbfk2c78i40h0ww79vm9v4j6xi2h5i4w9kqh10rs6h2"))))
+    (build-system emacs-build-system)
+    (propagated-inputs
+     `(("emacs-request" ,emacs-request)
+       ("emacs-s" ,emacs-s)
+       ("emacs-dash" ,emacs-dash)
+       ("emacs-org" ,emacs-org)))
+    (home-page "https://github.com/ahungry/org-jira")
+    (synopsis "Syncing between Jira and Org-mode")
+    (description
+     "This package provides an extension to org-mode for syncing issues with
 JIRA issue servers.")
-   (license license:gpl3+)))
+    (license license:gpl3+)))
 
 (define-public emacs-systemd-mode
   (package
@@ -19811,3 +19811,28 @@ such as:
 - swap windows à-la @code{windmove}.
 @end itemize\n")
     (license license:gpl3+)))
+
+(define-public emacs-flycheck-cpplint
+  (let ((commit "1d8a090861572258ab704915263feeb3a436c3d2")
+        (revision "1"))
+    (package
+      (name "emacs-flycheck-cpplint")
+      (version (git-version "0.1" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/flycheck/flycheck-google-cpplint")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "0l6sg83f6z8x2alnblpv03rj442sbnkkkcbf8i0agjmx3713a5yx"))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       `(("flycheck-mode" ,emacs-flycheck)))
+      (synopsis "Google C++ checker for Flycheck")
+      (description "This package provides a interface for @code{cpplint} over
+Flycheck plugin.  @code{cpplint} is a static code checker for C++, following
+Google guidelines.")
+      (home-page "https://github.com/flycheck/flycheck-google-cpplint")
+      (license license:gpl3+))))
-- 
cgit v1.2.3


From 70b6286af63b5fbbf5c08d711c92469b04b4e7e5 Mon Sep 17 00:00:00 2001
From: Mathieu Othacehe <m.othacehe@gmail.com>
Date: Tue, 12 Nov 2019 16:10:32 +0100
Subject: Revert "gnu: Add emacs-flycheck-cpplint."

This reverts commit 87f2a7c86f385531ae333d2466e05b2a16717a83. It includes
undesired alignment fixes.
---
 gnu/packages/emacs-xyz.scm | 553 ++++++++++++++++++++++-----------------------
 1 file changed, 264 insertions(+), 289 deletions(-)

(limited to 'gnu/packages/emacs-xyz.scm')

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 52f9ab79fe..7481b6c226 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -158,12 +158,12 @@
     (name "emacs-geiser")
     (version "0.10")
     (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://savannah/geiser/" version
-                                  "/geiser-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0pj3l7p8d60c9b4vfprnv6g5l61d74pls4b5dvd84cn4ky9mzwjv"))))
+             (method url-fetch)
+             (uri (string-append "mirror://savannah/geiser/" version
+                                 "/geiser-" version ".tar.gz"))
+             (sha256
+              (base32
+               "0pj3l7p8d60c9b4vfprnv6g5l61d74pls4b5dvd84cn4ky9mzwjv"))))
     (build-system gnu-build-system)
     (arguments
      '(#:phases
@@ -226,8 +226,8 @@ when typing parentheses directly or commenting out code line by line.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/magit/git-modes")
-                    (commit version)))
+                     (url "https://github.com/magit/git-modes")
+                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
                (base32
@@ -544,33 +544,33 @@ clojure.walk and clojure.zip respectively.")
 
 (define-public emacs-graphql
   (package
-    (name "emacs-graphql")
-    (version "0.1.1")
-    (source (origin
-              (modules '((guix build utils)))
-              ;; Remove examples file with references to external packages as
-              ;; they do not exist at compilation time.
-              (snippet
-               '(begin (delete-file "examples.el")
-                       #t))
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/vermiculus/graphql.el.git")
-                    (commit version)))
+   (name "emacs-graphql")
+   (version "0.1.1")
+   (source (origin
+             (modules '((guix build utils)))
+             ;; Remove examples file with references to external packages as
+             ;; they do not exist at compilation time.
+             (snippet
+              '(begin (delete-file "examples.el")
+                 #t))
+             (method git-fetch)
+             (uri (git-reference
+                   (url "https://github.com/vermiculus/graphql.el.git")
+                   (commit version)))
               (file-name (git-file-name name version))
               (sha256
                (base32
                 "0sp0skc1rnhi39szfbq1i99pdgd3bhn4c15cff05iqhjy2d4hniw"))))
-    (build-system emacs-build-system)
-    (home-page
-     "https://github.com/vermiculus/graphql.el")
-    (synopsis "GraphQL utilities")
-    (description
-     "GraphQL.el provides a generally-applicable domain-specific language for
+   (build-system emacs-build-system)
+   (home-page
+    "https://github.com/vermiculus/graphql.el")
+   (synopsis "GraphQL utilities")
+   (description
+    "GraphQL.el provides a generally-applicable domain-specific language for
 creating and executing GraphQL queries against your favorite web services.
 GraphQL is a data query language and runtime designed and used to request and
 deliver data to mobile and web apps.")
-    (license license:gpl3+)))
+   (license license:gpl3+)))
 
 (define-public emacs-ghub
   ;; We need a newer commit to avoid problems in emacs-forge.
@@ -707,8 +707,8 @@ replacement.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/haskell/haskell-mode")
-                    (commit (string-append "v" version))))
+                     (url "https://github.com/haskell/haskell-mode")
+                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
                (base32 "1qk36y0v9fzass6785il65c6wb5cfj4ihhwkvgnzmbafpa8p4dvq"))
@@ -736,47 +736,47 @@ replacement.")
        (modify-phases %standard-phases
          (delete 'configure)
          (add-before
-             'build 'pre-build
-           (lambda* (#:key inputs #:allow-other-keys)
-             (define (el-dir store-dir)
-               (match (find-files store-dir "\\.el$")
-                 ((f1 f2 ...) (dirname f1))
-                 (_ "")))
-
-             (let ((sh (string-append (assoc-ref inputs "bash") "/bin/sh")))
-               (define emacs-prefix? (cut string-prefix? "emacs-" <>))
-
-               (setenv "SHELL" "sh")
-               (setenv "EMACSLOADPATH"
-                       (string-concatenate
-                        (map (match-lambda
-                               (((? emacs-prefix? name) . dir)
-                                (string-append (el-dir dir) ":"))
-                               (_ ""))
-                             inputs)))
-               (substitute* (find-files "." "\\.el") (("/bin/sh") sh))
-               ;; embed filename to fix test failure
-               (let ((file "tests/haskell-cabal-tests.el"))
-                 (substitute* file
-                   (("\\(buffer-file-name\\)")
-                    (format #f "(or (buffer-file-name) ~s)" file))))
-               #t)))
+          'build 'pre-build
+          (lambda* (#:key inputs #:allow-other-keys)
+            (define (el-dir store-dir)
+              (match (find-files store-dir "\\.el$")
+                ((f1 f2 ...) (dirname f1))
+                (_ "")))
+
+            (let ((sh (string-append (assoc-ref inputs "bash") "/bin/sh")))
+              (define emacs-prefix? (cut string-prefix? "emacs-" <>))
+
+              (setenv "SHELL" "sh")
+              (setenv "EMACSLOADPATH"
+                      (string-concatenate
+                       (map (match-lambda
+                              (((? emacs-prefix? name) . dir)
+                               (string-append (el-dir dir) ":"))
+                              (_ ""))
+                            inputs)))
+              (substitute* (find-files "." "\\.el") (("/bin/sh") sh))
+              ;; embed filename to fix test failure
+              (let ((file "tests/haskell-cabal-tests.el"))
+                (substitute* file
+                  (("\\(buffer-file-name\\)")
+                   (format #f "(or (buffer-file-name) ~s)" file))))
+              #t)))
          (replace
-             'install
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (el-dir (string-append out "/share/emacs/site-lisp"))
-                    (doc (string-append
-                          out "/share/doc/haskell-mode-" ,version))
-                    (info (string-append out "/share/info")))
-               (define (copy-to-dir dir files)
-                 (for-each (lambda (f)
-                             (install-file f dir))
-                           files))
-
-               (with-directory-excursion "doc"
-                 (invoke "makeinfo" "haskell-mode.texi")
-                 (install-file "haskell-mode.info" info))
+          'install
+          (lambda* (#:key outputs #:allow-other-keys)
+            (let* ((out (assoc-ref outputs "out"))
+                   (el-dir (string-append out "/share/emacs/site-lisp"))
+                   (doc (string-append
+                         out "/share/doc/haskell-mode-" ,version))
+                   (info (string-append out "/share/info")))
+              (define (copy-to-dir dir files)
+                (for-each (lambda (f)
+                            (install-file f dir))
+                          files))
+
+              (with-directory-excursion "doc"
+                (invoke "makeinfo" "haskell-mode.texi")
+                (install-file "haskell-mode.info" info))
                (copy-to-dir doc '("CONTRIBUTING.md" "NEWS" "README.md"))
                (copy-to-dir el-dir (find-files "." "\\.elc?"))
                ;; These are part of other packages.
@@ -1009,14 +1009,14 @@ and reused.")
     (version "0.4")
     (source
      (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/purcell/reformatter.el.git")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "0hhy6x1bkwlhdlarsgm06g3am4yh02yqv8qs34szpzgy53x84qah"))))
+      (method git-fetch)
+      (uri (git-reference
+            (url "https://github.com/purcell/reformatter.el.git")
+            (commit version)))
+      (file-name (git-file-name name version))
+      (sha256
+       (base32
+        "0hhy6x1bkwlhdlarsgm06g3am4yh02yqv8qs34szpzgy53x84qah"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/purcell/reformatter.el")
     (synopsis "Define commands which run reformatters on the current buffer")
@@ -1172,11 +1172,11 @@ or unexpected behavior inside an elisp configuration file (typically
     (name "emacs-wget")
     (version "0.5.0")
     (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://debian/pool/main/w/wget-el/wget-el_"
-                                  version ".orig.tar.gz"))
-              (sha256
-               (base32 "10byvyv9dk0ib55gfqm7bcpxmx2qbih1jd03gmihrppr2mn52nff"))))
+             (method url-fetch)
+             (uri (string-append "mirror://debian/pool/main/w/wget-el/wget-el_"
+                                 version ".orig.tar.gz"))
+             (sha256
+              (base32 "10byvyv9dk0ib55gfqm7bcpxmx2qbih1jd03gmihrppr2mn52nff"))))
     (build-system gnu-build-system)
     (inputs `(("wget" ,wget)))
     (native-inputs `(("emacs" ,emacs-minimal)))
@@ -1371,8 +1371,8 @@ light user interface.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/momomo5717/emms-mode-line-cycle")
-             (commit version)))
+              (url "https://github.com/momomo5717/emms-mode-line-cycle")
+              (commit version)))
        (file-name (git-file-name name version))
        (sha256
         (base32
@@ -1517,8 +1517,8 @@ links.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/Wilfred/ag.el.git")
-                    (commit version)))
+                     (url "https://github.com/Wilfred/ag.el.git")
+                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
                (base32
@@ -1616,8 +1616,8 @@ or XEmacs.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/sebastiansturm/autothemer.git")
-             (commit version)))
+              (url "https://github.com/sebastiansturm/autothemer.git")
+              (commit version)))
        (file-name (git-file-name name version))
        (sha256
         (base32
@@ -1677,8 +1677,8 @@ searches.  Unlike code@{emacs-wiki.el}, it can be combined with any format.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/kiwanami/emacs-calfw.git")
-             (commit (string-append "v" version))))
+              (url "https://github.com/kiwanami/emacs-calfw.git")
+              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
         (base32
@@ -1701,8 +1701,8 @@ Emacs buffer.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/wbolster/emacs-direnv.git")
-             (commit version)))
+              (url "https://github.com/wbolster/emacs-direnv.git")
+              (commit version)))
        (file-name (git-file-name name version))
        (sha256
         (base32
@@ -1816,8 +1816,8 @@ written in the Go programming language.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/jd/google-maps.el.git")
-                    (commit version)))
+                     (url "https://github.com/jd/google-maps.el.git")
+                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
                (base32
@@ -1886,8 +1886,8 @@ diagrams.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/purcell/mmm-mode.git")
-             (commit version)))
+              (url "https://github.com/purcell/mmm-mode.git")
+              (commit version)))
        (file-name (git-file-name name version))
        (sha256
         (base32
@@ -1912,8 +1912,8 @@ single buffer.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/politza/tablist.git")
-                    (commit (string-append "v" version))))
+                     (url "https://github.com/politza/tablist.git")
+                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
                (base32
@@ -2201,13 +2201,13 @@ running Extempore process, and more.")
     (name "emacs-keyfreq")
     (version "20160516.716")
     (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "http://melpa.org/packages/keyfreq-"
-                           version ".el"))
-       (sha256
-        (base32
-         "008hd7d06qskc3mx0bbdgpgy2pwxr8185fzlyqf9qjg49y74p6g8"))))
+      (origin
+        (method url-fetch)
+        (uri (string-append "http://melpa.org/packages/keyfreq-"
+               version ".el"))
+        (sha256
+          (base32
+            "008hd7d06qskc3mx0bbdgpgy2pwxr8185fzlyqf9qjg49y74p6g8"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/dacap/keyfreq")
     (synopsis "Track Emacs command frequencies")
@@ -3636,12 +3636,12 @@ These are distributed in separate files and can be used individually.")
     (arguments `(#:phases
                  (modify-phases %standard-phases
                    (add-after 'unpack 'configure
-                     (lambda* (#:key inputs #:allow-other-keys)
-                       (chmod "irony.el" #o644)
-                       (emacs-substitute-variables "irony.el"
-                         ("irony-server-install-prefix"
-                          (assoc-ref inputs "server")))
-                       #t)))))
+                        (lambda* (#:key inputs #:allow-other-keys)
+                          (chmod "irony.el" #o644)
+                          (emacs-substitute-variables "irony.el"
+                            ("irony-server-install-prefix"
+                             (assoc-ref inputs "server")))
+                          #t)))))
     (synopsis "C/C++/ObjC Code completion and syntax checks for Emacs")
     (description "Irony-mode provides Clang-assisted syntax checking and
 completion for C, C++, and ObjC in GNU Emacs.  Using @code{libclang} it can
@@ -3653,20 +3653,20 @@ described on the homepage.")
 
 (define-public emacs-irony-mode-server
   (package (inherit emacs-irony-mode)
-           (name "emacs-irony-mode-server")
-           (inputs
-            `(("clang" ,clang)))
-           (arguments
-            `(#:phases
-              (modify-phases %standard-phases
-                (replace 'configure
-                  (lambda* (#:key outputs #:allow-other-keys)
-                    (let ((out (assoc-ref outputs "out")))
-                      (invoke "cmake"
-                              "server"
-                              (string-append "-DCMAKE_INSTALL_PREFIX=" out)) #t))))))
-           (build-system cmake-build-system)
-           (synopsis "Server for the Emacs @dfn{irony mode}")))
+    (name "emacs-irony-mode-server")
+    (inputs
+     `(("clang" ,clang)))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (replace 'configure
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (invoke "cmake"
+                       "server"
+                       (string-append "-DCMAKE_INSTALL_PREFIX=" out)) #t))))))
+    (build-system cmake-build-system)
+    (synopsis "Server for the Emacs @dfn{irony mode}")))
 
 (define-public emacs-company-irony
   (package
@@ -4723,22 +4723,22 @@ to their corresponding tangled blocks.")
   (let ((commit "1f1185bf667a38d3d0d180ce85fd4c131818aae2")
         (revision "0"))
     (package
-      (name "emacs-atom-one-dark-theme")
-      (version (git-version "0.4.0" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://github.com/jonathanchu/atom-one-dark-theme.git")
-                      (commit commit)))
-                (sha256
-                 (base32
-                  "1alma16hg3mfjly8a9s3mrswkjjx4lrpdnf43869hn2ibkn7zx9z"))
-                (file-name (git-file-name name version))))
-      (build-system emacs-build-system)
-      (home-page "https://github.com/jonathanchu/atom-one-dark-theme")
-      (synopsis "Atom One Dark color theme for Emacs")
-      (description "An Emacs port of the Atom One Dark theme from Atom.io.")
-      (license license:gpl3+))))
+     (name "emacs-atom-one-dark-theme")
+     (version (git-version "0.4.0" revision commit))
+     (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/jonathanchu/atom-one-dark-theme.git")
+                    (commit commit)))
+              (sha256
+               (base32
+                "1alma16hg3mfjly8a9s3mrswkjjx4lrpdnf43869hn2ibkn7zx9z"))
+              (file-name (git-file-name name version))))
+     (build-system emacs-build-system)
+     (home-page "https://github.com/jonathanchu/atom-one-dark-theme")
+     (synopsis "Atom One Dark color theme for Emacs")
+     (description "An Emacs port of the Atom One Dark theme from Atom.io.")
+     (license license:gpl3+))))
 
 (define-public emacs-zenburn-theme
   (package
@@ -4900,7 +4900,7 @@ for the eyes.")
      "This program is an implementation of 2048 for Emacs.
 The goal of this game is to create a tile with value 2048.  The size of the
 board and goal value can be customized.")
-    (license license:gpl3+)))
+  (license license:gpl3+)))
 
 (define-public emacs-base16-theme
   (package
@@ -5292,8 +5292,8 @@ fully-functional one.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/abo-abo/hydra")
-             (commit version)))
+              (url "https://github.com/abo-abo/hydra")
+              (commit version)))
        (file-name (git-file-name name version))
        (sha256
         (base32
@@ -6555,7 +6555,7 @@ indentation guides in Emacs:
              ;; Move .info file at the root so that it can installed by the
              ;; 'move-doc phase.
              (rename-file "docs/_build/texinfo/Elpy.info" "Elpy.info")
-             #t))
+              #t))
          (add-after 'build-doc 'install-manpage
            (lambda* (#:key outputs #:allow-other-keys)
              (let* ((out  (assoc-ref outputs "out"))
@@ -6756,7 +6756,7 @@ Emacs completion function instead.")
     (description
      "Ido-ubiquitous enables ido-style completion for almost every function
 that uses the standard completion function completing-read.")
-    (license license:gpl3+)))
+  (license license:gpl3+)))
 
 (define-public emacs-yaml-mode
   (package
@@ -8381,7 +8381,7 @@ mode-line.")
       (home-page "https://gitlab.com/wavexx/mu4e-jump-to-list.el")
       (synopsis "Select and view mailing lists in mu4e")
       (description
-       "@code{mu4e-jump-to-list} allows you to select and view mailing lists
+        "@code{mu4e-jump-to-list} allows you to select and view mailing lists
 automatically using existing List-ID headers in your mu database.  Just press
 \"l\" in the headers view and any mailing list you've subscribed to will be
 automatically discovered and presented in recency order.")
@@ -8408,7 +8408,7 @@ automatically discovered and presented in recency order.")
       (home-page "https://github.com/seanfarley/mu4e-patch")
       (synopsis "Colorize patch-like emails in mu4e")
       (description
-       "Extension for mu4e to colorize patch-like emails with diff-mode.
+        "Extension for mu4e to colorize patch-like emails with diff-mode.
 This is based on Frank Terbeck's @code{gnus-article-treat-patch.el} but has
 been adapted to work with mu4e.")
       (license license:gpl3+))))
@@ -9807,7 +9807,7 @@ Emacs.")
              (lambda* (#:key inputs outputs #:allow-other-keys)
                (let ((out (assoc-ref outputs "out"))
                      (source-directory (string-append
-                                        (getenv "TMPDIR") "/source")))
+                                  (getenv "TMPDIR") "/source")))
                  (substitute* "bin/ert-runner"
                    (("ERT_RUNNER=\"\\$\\(dirname \\$\\(dirname \\$0\\)\\)")
                     (string-append "ERT_RUNNER=\"" out
@@ -10814,38 +10814,38 @@ messaging service.")
 
 (define-public emacs-bash-completion
   (package
-    (name "emacs-bash-completion")
-    (version "2.1.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/szermatt/emacs-bash-completion.git")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1a1wxcqzh0javjmxwi3lng5i99xiylm8lm04kv4q1lh9bli6vmv0"))))
-    (inputs `(("bash" ,bash)))
-    (build-system emacs-build-system)
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'make-git-checkout-writable
-           (λ _
-             (for-each make-file-writable (find-files "."))
-             #t))
-         (add-before 'install 'configure
-           (lambda* (#:key inputs #:allow-other-keys)
-             (let ((bash (assoc-ref inputs "bash")))
-               (emacs-substitute-variables "bash-completion.el"
-                 ("bash-completion-prog" (string-append bash "/bin/bash"))))
-             #t)))))
-    (home-page "https://github.com/szermatt/emacs-bash-completion")
-    (synopsis "Bash completion for the shell buffer")
-    (description
-     "@code{bash-completion} defines dynamic completion hooks for shell-mode
+   (name "emacs-bash-completion")
+   (version "2.1.0")
+   (source
+    (origin
+      (method git-fetch)
+      (uri (git-reference
+            (url "https://github.com/szermatt/emacs-bash-completion.git")
+            (commit version)))
+      (file-name (git-file-name name version))
+      (sha256
+       (base32 "1a1wxcqzh0javjmxwi3lng5i99xiylm8lm04kv4q1lh9bli6vmv0"))))
+   (inputs `(("bash" ,bash)))
+   (build-system emacs-build-system)
+   (arguments
+    `(#:phases
+      (modify-phases %standard-phases
+        (add-after 'unpack 'make-git-checkout-writable
+          (λ _
+            (for-each make-file-writable (find-files "."))
+            #t))
+        (add-before 'install 'configure
+          (lambda* (#:key inputs #:allow-other-keys)
+            (let ((bash (assoc-ref inputs "bash")))
+              (emacs-substitute-variables "bash-completion.el"
+                ("bash-completion-prog" (string-append bash "/bin/bash"))))
+            #t)))))
+   (home-page "https://github.com/szermatt/emacs-bash-completion")
+   (synopsis "Bash completion for the shell buffer")
+   (description
+    "@code{bash-completion} defines dynamic completion hooks for shell-mode
 and shell-command prompts that are based on Bash completion.")
-    (license license:gpl2+)))
+   (license license:gpl2+)))
 
 (define-public emacs-easy-kill
   (package
@@ -11794,28 +11794,28 @@ match and total match information in the mode-line in various search modes.")
 
 (define-public emacs-finalize
   (package
-    (name "emacs-finalize")
-    (version "2.0.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/skeeto/elisp-finalize.git")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
+  (name "emacs-finalize")
+  (version "2.0.0")
+  (source
+    (origin
+      (method git-fetch)
+      (uri (git-reference
+            (url "https://github.com/skeeto/elisp-finalize.git")
+            (commit version)))
+      (file-name (git-file-name name version))
+      (sha256
         (base32 "1gvlm4i62af5jscwz0jccc8ra0grprxpg2rlq91d5nn8dn5lpy79"))))
-    (build-system emacs-build-system)
-    (propagated-inputs
-     `(("emacs-cl-generic" ,emacs-cl-generic)))
-    (home-page "https://github.com/skeeto/elisp-finalize")
-    (synopsis "Finalizers for Emacs Lisp")
-    (description
-     "This package will allows to immediately run a callback (a finalizer)
+  (build-system emacs-build-system)
+  (propagated-inputs
+    `(("emacs-cl-generic" ,emacs-cl-generic)))
+  (home-page "https://github.com/skeeto/elisp-finalize")
+  (synopsis "Finalizers for Emacs Lisp")
+  (description
+    "This package will allows to immediately run a callback (a finalizer)
 after its registered lisp object has been garbage collected.  This allows for
 extra resources, such as buffers and processes, to be cleaned up after the
 object has been freed.")
-    (license license:unlicense)))
+  (license license:unlicense)))
 
 (define-public emacs-emacsql
   (package
@@ -15304,7 +15304,7 @@ type @code{C-h b}, or any incomplete key sequence plus @code{C-h}, to run
 @code{helm-descbinds}.  The bindings are presented in a similar way as
 @code{describe-bindings} does, but you can use completion to find the command
 you searched for and execute it, or view its documentation.")
-      (license license:gpl3+))))
+    (license license:gpl3+))))
 
 (define-public emacs-helm-emms
   (let ((commit "b785cb845a98a643eba9d5d53c9c0b4e6810a3cd"))
@@ -16961,27 +16961,27 @@ or a window into some windows according to a layout recipe.")
 
 (define-public emacs-e2wm
   (package
-    (name "emacs-e2wm")
-    (version "1.4")
-    (home-page "https://github.com/kiwanami/emacs-window-manager")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url home-page)
-                    (commit (string-append "v" version))))
-              (sha256
-               (base32
-                "12midsrx07pdrsr1qbl2rpi7xyhxqx08bkz7n7gf8vsmqkpfp56s"))
-              (file-name (git-file-name name version))))
-    (build-system emacs-build-system)
-    (propagated-inputs
-     `(("emacs-window-layout" ,emacs-window-layout)))
-    (synopsis "Equilibrium Emacs Window Manager")
-    (description "E2WM is a window manager for Emacs.  It enables to
+      (name "emacs-e2wm")
+      (version "1.4")
+      (home-page "https://github.com/kiwanami/emacs-window-manager")
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url home-page)
+                      (commit (string-append "v" version))))
+                (sha256
+                 (base32
+                  "12midsrx07pdrsr1qbl2rpi7xyhxqx08bkz7n7gf8vsmqkpfp56s"))
+                (file-name (git-file-name name version))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       `(("emacs-window-layout" ,emacs-window-layout)))
+      (synopsis "Equilibrium Emacs Window Manager")
+      (description "E2WM is a window manager for Emacs.  It enables to
 customize the place of pop-up window, how the windows are split, how the
 buffers are located in the windows, keybinds to manipulate windows and
 buffers, etc.  It also has plug-ins to help your Emacs life.")
-    (license license:gpl3+)))
+      (license license:gpl3+)))
 
 (define-public emacs-ctable
   (let ((commit "b8830d1ca95abb100a81bc32011bd17d5ecba000"))
@@ -18894,26 +18894,26 @@ and article extracts for Wikipedia.")
 
 (define-public emacs-webfeeder
   (package
-    (name "emacs-webfeeder")
-    (version "1.0.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append
+  (name "emacs-webfeeder")
+  (version "1.0.0")
+  (source
+    (origin
+      (method url-fetch)
+      (uri (string-append
              "https://elpa.gnu.org/packages/webfeeder-"
              version
              ".tar"))
-       (sha256
+      (sha256
         (base32
-         "06y5vxw9m6pmbrzb8v2i3w9dnhgqxz06vyx1knmgi9cczlrj4a64"))))
-    (build-system emacs-build-system)
-    (home-page "https://gitlab.com/Ambrevar/emacs-webfeeder")
-    (synopsis "Build RSS and Atom webfeeds from HTML files")
-    (description
-     "Webfeeder is an Emacs library to generate RSS and Atom feeds from HTML
+          "06y5vxw9m6pmbrzb8v2i3w9dnhgqxz06vyx1knmgi9cczlrj4a64"))))
+  (build-system emacs-build-system)
+  (home-page "https://gitlab.com/Ambrevar/emacs-webfeeder")
+  (synopsis "Build RSS and Atom webfeeds from HTML files")
+  (description
+    "Webfeeder is an Emacs library to generate RSS and Atom feeds from HTML
 files.  The various elements of the HTML input are parsed with customizable
 functions (e.g. @code{webfeeder-title-function}).")
-    (license license:gpl3+)))
+  (license license:gpl3+)))
 
 (define-public emacs-evil-numbers
   (let ((commit "6ea1c8c3a9b37bed63d48f1128e9a4910e68187e"))
@@ -19075,15 +19075,15 @@ text-property translator.")
     (name "emacs-org-noter")
     (version "1.3.0")
     (source
-     (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://stable.melpa.org/packages/org-noter-"
-             version
-             ".el"))
-       (sha256
-        (base32
-         "1hczwva73gsyanl1ldhdvql01gy0hy2g861yzkaklyb763sx58x4"))))
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "https://stable.melpa.org/packages/org-noter-"
+               version
+               ".el"))
+        (sha256
+          (base32
+            "1hczwva73gsyanl1ldhdvql01gy0hy2g861yzkaklyb763sx58x4"))))
     (build-system emacs-build-system)
     (propagated-inputs `(("emacs-org" ,emacs-org)))
     (home-page "https://github.com/weirdNox/org-noter")
@@ -19478,30 +19478,30 @@ contains a track position, playback will start at the specified position.")
 
 (define-public emacs-org-jira
   (package
-    (name "emacs-org-jira")
-    (version "4.3.1")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/ahungry/org-jira.git")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "1l80r2a9zzbfk2c78i40h0ww79vm9v4j6xi2h5i4w9kqh10rs6h2"))))
-    (build-system emacs-build-system)
-    (propagated-inputs
-     `(("emacs-request" ,emacs-request)
-       ("emacs-s" ,emacs-s)
-       ("emacs-dash" ,emacs-dash)
-       ("emacs-org" ,emacs-org)))
-    (home-page "https://github.com/ahungry/org-jira")
-    (synopsis "Syncing between Jira and Org-mode")
-    (description
-     "This package provides an extension to org-mode for syncing issues with
+   (name "emacs-org-jira")
+   (version "4.3.1")
+   (source
+    (origin
+     (method git-fetch)
+     (uri (git-reference
+           (url "https://github.com/ahungry/org-jira.git")
+           (commit version)))
+     (file-name (git-file-name name version))
+     (sha256
+      (base32
+       "1l80r2a9zzbfk2c78i40h0ww79vm9v4j6xi2h5i4w9kqh10rs6h2"))))
+   (build-system emacs-build-system)
+   (propagated-inputs
+    `(("emacs-request" ,emacs-request)
+      ("emacs-s" ,emacs-s)
+      ("emacs-dash" ,emacs-dash)
+      ("emacs-org" ,emacs-org)))
+   (home-page "https://github.com/ahungry/org-jira")
+   (synopsis "Syncing between Jira and Org-mode")
+   (description
+    "This package provides an extension to org-mode for syncing issues with
 JIRA issue servers.")
-    (license license:gpl3+)))
+   (license license:gpl3+)))
 
 (define-public emacs-systemd-mode
   (package
@@ -19811,28 +19811,3 @@ such as:
 - swap windows à-la @code{windmove}.
 @end itemize\n")
     (license license:gpl3+)))
-
-(define-public emacs-flycheck-cpplint
-  (let ((commit "1d8a090861572258ab704915263feeb3a436c3d2")
-        (revision "1"))
-    (package
-      (name "emacs-flycheck-cpplint")
-      (version (git-version "0.1" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://github.com/flycheck/flycheck-google-cpplint")
-               (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "0l6sg83f6z8x2alnblpv03rj442sbnkkkcbf8i0agjmx3713a5yx"))))
-      (build-system emacs-build-system)
-      (propagated-inputs
-       `(("flycheck-mode" ,emacs-flycheck)))
-      (synopsis "Google C++ checker for Flycheck")
-      (description "This package provides a interface for @code{cpplint} over
-Flycheck plugin.  @code{cpplint} is a static code checker for C++, following
-Google guidelines.")
-      (home-page "https://github.com/flycheck/flycheck-google-cpplint")
-      (license license:gpl3+))))
-- 
cgit v1.2.3


From 1524e757e1fafe5acf4ec44d8a9811ec5f06a86f Mon Sep 17 00:00:00 2001
From: Mathieu Othacehe <m.othacehe@gmail.com>
Date: Tue, 12 Nov 2019 16:11:36 +0100
Subject: gnu: Add emacs-flycheck-cpplint.

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

(limited to 'gnu/packages/emacs-xyz.scm')

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 7481b6c226..5bbc33d451 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -19811,3 +19811,28 @@ such as:
 - swap windows à-la @code{windmove}.
 @end itemize\n")
     (license license:gpl3+)))
+
+(define-public emacs-flycheck-cpplint
+  (let ((commit "1d8a090861572258ab704915263feeb3a436c3d2")
+        (revision "1"))
+    (package
+      (name "emacs-flycheck-cpplint")
+      (version (git-version "0.1" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/flycheck/flycheck-google-cpplint")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "0l6sg83f6z8x2alnblpv03rj442sbnkkkcbf8i0agjmx3713a5yx"))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       `(("flycheck-mode" ,emacs-flycheck)))
+      (synopsis "Google C++ checker for Flycheck")
+      (description "This package provides a interface for @code{cpplint} over
+Flycheck plugin.  @code{cpplint} is a static code checker for C++, following
+Google guidelines.")
+      (home-page "https://github.com/flycheck/flycheck-google-cpplint")
+      (license license:gpl3+))))
-- 
cgit v1.2.3


From 6cf5dcfe4385f867b788c94f8d3ce38d539a52e0 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Tue, 12 Nov 2019 17:26:15 +0100
Subject: gnu: emacs-auctex: Update to 12.2.0.

* gnu/packages/emacs-xyz.scm (emacs-auctex): Update to 12.2.0.
---
 gnu/packages/emacs-xyz.scm | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'gnu/packages/emacs-xyz.scm')

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 5bbc33d451..f74dbeed3d 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -1580,17 +1580,14 @@ as a library for other Emacs packages.")
 (define-public emacs-auctex
   (package
     (name "emacs-auctex")
-    (version "12.1.2")
+    (version "12.2.0")
     (source
      (origin
        (method url-fetch)
-       (uri (string-append
-             "https://elpa.gnu.org/packages/auctex-"
-             version
-             ".tar"))
+       (uri (string-append "https://elpa.gnu.org/packages/auctex-"
+                           version ".tar"))
        (sha256
-        (base32
-         "1yibg2anpmyr2a27wm4xqjsvsi9km2jzb56bf7cwyj8dnjfsd11n"))))
+        (base32 "0j919l3q5sq6h1k1kmk4kyv0vkzl4f98fxcd64v34x5q1ahjhg48"))))
     (build-system emacs-build-system)
     ;; We use 'emacs' because AUCTeX requires dbus at compile time
     ;; ('emacs-minimal' does not provide dbus).
-- 
cgit v1.2.3


From 35338b50011cdaf15f0b211c478bb321cc714b6e Mon Sep 17 00:00:00 2001
From: David Wilson <david@daviwil.com>
Date: Mon, 11 Nov 2019 06:54:59 -0800
Subject: gnu: Add emacs-spacegray-theme.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/emacs-xyz.scm (emacs-spacegray-theme) New variable.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/packages/emacs-xyz.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

(limited to 'gnu/packages/emacs-xyz.scm')

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index f74dbeed3d..187b38716e 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -56,6 +56,7 @@
 ;;; Copyright © 2019 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
 ;;; Copyright © 2019 Stephen Webber <montokapro@gmail.com>
 ;;; Copyright © 2019 Leo Prikler <leo.prikler@student.tugraz.at>
+;;; Copyright © 2019 David Wilson <david@daviwil.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -4878,6 +4879,30 @@ is to keep colors easily distinguishable, contrast enough and still pleasant
 for the eyes.")
     (license license:expat))) ; MIT license
 
+(define-public emacs-spacegray-theme
+  (let ((commit "9826265c2bceb2ebc1c5e16a45021da0253ace97")
+        (revision "0"))
+    (package
+      (name "emacs-spacegray-theme")
+      (version (git-version "0" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/bruce/emacs-spacegray-theme.git")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "0aplwmm17ypbns5blc4rf5rr6dasj0zp5ibykpfl43fh4bd8z89n"))))
+      (build-system emacs-build-system)
+      (home-page "https://github.com/bruce/emacs-spacegray-theme")
+      (synopsis "Port of Sublime Text's Spacegray theme for Emacs")
+      (description
+       "@code{spacegray-theme} is an Emacs port of the Spacegray theme from
+Sublime Text.  It features a dark blue/gray background and soft blue, green,
+orange and red as accent colors.")
+      (license license:expat)))) ; MIT license
+
 (define-public emacs-2048-game
   (package
     (name "emacs-2048-game")
-- 
cgit v1.2.3


From 5a17042e70e9ebd0d0c95b101d55ba384b05b22d Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt <mail@ambrevar.xyz>
Date: Thu, 14 Nov 2019 15:39:56 +0100
Subject: gnu: Add emacs-helm-fish-completion.

* gnu/packages/emacs-xyz.scm (emacs-helm-fish-completion): New variable.
---
 gnu/packages/emacs-xyz.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

(limited to 'gnu/packages/emacs-xyz.scm')

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 187b38716e..52d6e9544b 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -19858,3 +19858,28 @@ Flycheck plugin.  @code{cpplint} is a static code checker for C++, following
 Google guidelines.")
       (home-page "https://github.com/flycheck/flycheck-google-cpplint")
       (license license:gpl3+))))
+
+(define-public emacs-helm-fish-completion
+  (let ((commit "ef764dd123040fe67ef8b62a1c13842e940b0963")
+        (revision "1"))
+    (package
+      (name "emacs-helm-fish-completion")
+      (version (git-version "0.1" revision commit))
+      (home-page "https://github.com/emacs-helm/helm-fish-completion")
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url home-page)
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "0k80kpapwfq2rv1lb0r994d0w6czl92xrmnkmrg0a05f4b3q0lb4"))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       `(("helm" ,emacs-helm)
+         ("fish-completion" ,emacs-fish-completion)))
+      (synopsis "Helm interface for Emacs fish-completion")
+      (description "Helm Fish Completion is a Helm interface for Emacs
+fish-completion.  It can be used in both Eshell and M-x shell.")
+      (license license:gpl3+))))
-- 
cgit v1.2.3


From b02a9523b394a7683692c50ddf9c945d269881b7 Mon Sep 17 00:00:00 2001
From: Mathieu Othacehe <m.othacehe@gmail.com>
Date: Fri, 15 Nov 2019 11:04:23 +0100
Subject: gnu: emacs-flycheck-cpplint: Set cpplint path.

* gnu/packages/emacs-xyz.scm (emacs-flycheck-cpplint)[inputs]: Add cpplint.
[arguments]: Add a set-cpplint-path phase to set the path of cpplint.
---
 gnu/packages/emacs-xyz.scm | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'gnu/packages/emacs-xyz.scm')

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 52d6e9544b..7cb949eb84 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -91,6 +91,7 @@
   #:use-module (gnu packages bash)
   #:use-module (gnu packages cmake)
   #:use-module (gnu packages code)
+  #:use-module (gnu packages cpp)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages databases)
   #:use-module (gnu packages dictionaries)
@@ -19850,6 +19851,17 @@ such as:
          (sha256
           (base32 "0l6sg83f6z8x2alnblpv03rj442sbnkkkcbf8i0agjmx3713a5yx"))))
       (build-system emacs-build-system)
+      (arguments
+       `(#:phases
+         (modify-phases %standard-phases
+           (add-after 'unpack 'set-cpplint-path
+             (lambda _
+               (substitute* "flycheck-google-cpplint.el"
+                 (("\"cpplint.py\"")
+                  (string-append "\"" (which "cpplint") "\"")))
+               #t)))))
+      (inputs
+       `(("cpplint" ,cpplint)))
       (propagated-inputs
        `(("flycheck-mode" ,emacs-flycheck)))
       (synopsis "Google C++ checker for Flycheck")
-- 
cgit v1.2.3