bug#27087: Simplify some emacs packages by using emacs-build-system

bug#27087: Simplify some emacs packages by using emacs-build-system

[Alex Kost]

There are several emacs packages that were made before
'emacs-build-system' was introduced.  Nowadays they look
over-complicated.  The upcoming patchset will simplify these packages.

This patchset consist of 3 patches for 3 packages, but they are mostly
the same.  Should I make a single commit instead (to fix all at once)?

-- 
Alex

bug#27087: [PATCH 1/3] gnu: git-modes: Use 'emacs-build-system'.

[Alex Kost]

* gnu/packages/emacs.scm (git-modes): Use 'emacs-build-system'.
[arguments, native-inputs]: Remove.
---
 gnu/packages/emacs.scm | 26 +-------------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index a85177d81..a0a34fad2 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -386,31 +386,7 @@ when typing parentheses directly or commenting out code line by line.")
               (sha256
                (base32
                 "0xxrmf0jnyljxvllc22qa0v8lgi4k1ldnayjm5hf68m25jsr378l"))))
-    (build-system gnu-build-system)
-    (arguments
-     `(#:modules ((guix build gnu-build-system)
-                  (guix build emacs-utils)
-                  (guix build utils))
-       #:imported-modules (,@%gnu-build-system-modules
-                           (guix build emacs-utils))
-
-       #:make-flags (list (string-append "PREFIX="
-                                         (assoc-ref %outputs "out"))
-                          ;; Don't put .el files in a 'git-modes'
-                          ;; sub-directory.
-                          (string-append "LISPDIR="
-                                         (assoc-ref %outputs "out")
-                                         "/share/emacs/site-lisp"))
-       #:tests? #f  ; no check target
-       #:phases (modify-phases %standard-phases
-                  (delete 'configure)
-                  (add-after 'install 'emacs-autoloads
-                             (lambda* (#:key outputs #:allow-other-keys)
-                               (let* ((out  (assoc-ref outputs "out"))
-                                      (lisp (string-append
-                                             out "/share/emacs/site-lisp/")))
-                                 (emacs-generate-autoloads ,name lisp)))))))
-    (native-inputs `(("emacs" ,emacs-minimal)))
+    (build-system emacs-build-system)
     (home-page "https://github.com/magit/git-modes")
     (synopsis "Emacs major modes for Git configuration files")
     (description
-- 
2.13.0

bug#27087: [PATCH 2/3] gnu: emacs-paredit: Use 'emacs-build-system'.

[Alex Kost]

* gnu/packages/emacs.scm (paredit): Use 'emacs-build-system'.
[arguments, native-inputs]: Remove.
---
 gnu/packages/emacs.scm | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index a0a34fad2..7494d9e08 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -335,28 +335,7 @@ metadata.")
               (sha256
                (base32
                 "0pp3n8q6kc70blqsaw0zlzp6bc327dpgdrjr0cnh7hqg1lras7ka"))))
-    (build-system trivial-build-system)
-    (native-inputs `(("emacs" ,emacs-minimal)))
-    (arguments
-     `(#:modules ((guix build utils)
-                  (guix build emacs-utils))
-       #:builder
-       (begin
-         (use-modules (guix build utils))
-         (use-modules (guix build emacs-utils))
-
-         (let* ((emacs    (string-append (assoc-ref %build-inputs "emacs")
-                                         "/bin/emacs"))
-                (source   (assoc-ref %build-inputs "source"))
-                (lisp-dir (string-append %output
-                                         "/share/emacs/site-lisp"))
-                (target   (string-append lisp-dir "/paredit.el")))
-           (mkdir-p lisp-dir)
-           (copy-file source target)
-           (with-directory-excursion lisp-dir
-             (parameterize ((%emacs emacs))
-               (emacs-generate-autoloads ,name lisp-dir)
-               (emacs-batch-eval '(byte-compile-file "paredit.el"))))))))
+    (build-system emacs-build-system)
     (home-page "http://mumble.net/~campbell/emacs/paredit/")
     (synopsis "Emacs minor mode for editing parentheses")
     (description
-- 
2.13.0

bug#27087: [PATCH 3/3] gnu: emacs-let-alist: Use 'emacs-build-system'.

[Alex Kost]

* gnu/packages/emacs.scm (let-alist): Use 'emacs-build-system'.
[arguments, native-inputs]: Remove.
---
 gnu/packages/emacs.scm | 25 +------------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 7494d9e08..36faa7c25 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -649,30 +649,7 @@ programs.")
               (sha256
                (base32
                 "07312bvvyz86lf64vdkxg2l1wgfjl25ljdjwlf1bdzj01c4hm88x"))))
-    (build-system trivial-build-system)
-    (arguments
-     `(#:modules ((guix build utils)
-                  (guix build emacs-utils))
-
-       #:builder (begin
-                   (use-modules (guix build emacs-utils)
-                                (guix build utils))
-
-                   (let* ((out     (assoc-ref %outputs "out"))
-                          (lispdir (string-append out
-                                                  "/share/emacs/site-lisp/"
-                                                  "guix.d/let-alist-"
-                                                  ,version))
-                          (emacs   (assoc-ref %build-inputs "emacs")))
-
-                     (mkdir-p lispdir)
-                     (copy-file (assoc-ref %build-inputs "source")
-                                (string-append lispdir "/let-alist.el"))
-
-                     (setenv "PATH" (string-append emacs "/bin"))
-                     (emacs-byte-compile-directory lispdir)
-                     #t))))
-    (native-inputs `(("emacs" ,emacs-minimal)))
+    (build-system emacs-build-system)
     (home-page "https://elpa.gnu.org/packages/let-alist.html")
     (synopsis "Easily let-bind values of an assoc-list by their names")
     (description
-- 
2.13.0

bug#27087: Simplify some emacs packages by using emacs-build-system

[Ricardo Wurmus]

Alex Kost <alezost@gmail.com> writes:

> There are several emacs packages that were made before
> 'emacs-build-system' was introduced.  Nowadays they look
> over-complicated.  The upcoming patchset will simplify these packages.
>
> This patchset consist of 3 patches for 3 packages, but they are mostly
> the same.  Should I make a single commit instead (to fix all at once)?

The patch set looks good to me, thanks!
Please commit them all separately.

-- 
Ricardo

GPG: BCA6 89B6 3655 3801 C3C6  2150 197A 5888 235F ACAC
https://elephly.net

bug#27087: Simplify some emacs packages by using emacs-build-system

[Alex Kost]

Ricardo Wurmus (2017-05-30 23:48 +0200) wrote:

> Alex Kost <alezost@gmail.com> writes:
>
>> There are several emacs packages that were made before
>> 'emacs-build-system' was introduced.  Nowadays they look
>> over-complicated.  The upcoming patchset will simplify these packages.
>>
>> This patchset consist of 3 patches for 3 packages, but they are mostly
>> the same.  Should I make a single commit instead (to fix all at once)?
>
> The patch set looks good to me, thanks!
> Please commit them all separately.

Done, thanks!

-- 
Alex