diff options
Diffstat (limited to 'gnu/packages/emacs.scm')
| -rw-r--r-- | gnu/packages/emacs.scm | 67 |
1 files changed, 39 insertions, 28 deletions
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index ca3c077399..9c759510a8 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -156,7 +156,8 @@ (list line "\"~/.guix-profile/include\"" "\"/var/guix/profiles/system/profile/include\"") - " "))))))) + " "))) + #t)))) (build-system glib-or-gtk-build-system) (arguments `(#:phases @@ -166,7 +167,8 @@ ;; Use `pwd', not `/bin/pwd'. (substitute* (find-files "." "^Makefile\\.in$") (("/bin/pwd") - "pwd")))) + "pwd")) + #t)) (add-after 'install 'install-site-start ;; Use 'guix-emacs' in "site-start.el". This way, Emacs packages ;; provided by Guix and installed in @@ -542,7 +544,7 @@ operations.") (source (assoc-ref %build-inputs "source")) (lisp-dir (string-append %output "/share/emacs/site-lisp"))) (setenv "PATH" PATH) - (system* tar "xvf" source) + (invoke tar "xvf" source) (install-file (string-append ,name "-" ,version "/magit-svn.el") lisp-dir) @@ -552,7 +554,8 @@ operations.") (emacs-generate-autoloads ,name lisp-dir) (setenv "EMACSLOADPATH" (string-append ":" magit ":" dash ":" with-editor)) - (emacs-batch-eval '(byte-compile-file "magit-svn.el")))))))) + (emacs-batch-eval '(byte-compile-file "magit-svn.el")))) + #t)))) (home-page "https://github.com/magit/magit-svn") (synopsis "Git-SVN extension to Magit") (description @@ -882,21 +885,23 @@ provides an optional IDE-like error list.") "08f9lj77jlk96grqgjsv63s2i8ywvp4wvnmgmhnslwyx2lsdxza3")) (modules '((guix build utils))) (snippet - '(substitute* "Makefile" - (("/usr/bin/install-info") - ;; No need to use 'install-info' since it would create a - ;; useless 'dir' file. - "true") - (("^INFODIR=.*") - ;; Install Info files to $out/share/info, not $out/info. - "INFODIR := $(PREFIX)/share/info\n") - (("/site-lisp/emms") - ;; Install directly in share/emacs/site-lisp, not in a - ;; sub-directory. - "/site-lisp") - (("^all: (.*)\n" _ rest) - ;; Build 'emms-print-metadata'. - (string-append "all: " rest " emms-print-metadata\n")))))) + '(begin + (substitute* "Makefile" + (("/usr/bin/install-info") + ;; No need to use 'install-info' since it would create a + ;; useless 'dir' file. + "true") + (("^INFODIR=.*") + ;; Install Info files to $out/share/info, not $out/info. + "INFODIR := $(PREFIX)/share/info\n") + (("/site-lisp/emms") + ;; Install directly in share/emacs/site-lisp, not in a + ;; sub-directory. + "/site-lisp") + (("^all: (.*)\n" _ rest) + ;; Build 'emms-print-metadata'. + (string-append "all: " rest " emms-print-metadata\n"))) + #t)))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) @@ -1056,9 +1061,11 @@ within a specified width. It is useful for displaying long track titles.") (modules '((guix build utils))) (snippet ;; We don't want to build and install the PDF. - '(substitute* "doc/Makefile.in" - (("^doc_DATA = .*$") - "doc_DATA =\n"))))) + '(begin + (substitute* "doc/Makefile.in" + (("^doc_DATA = .*$") + "doc_DATA =\n")) + #t)))) (build-system gnu-build-system) (arguments '(#:phases @@ -2821,7 +2828,8 @@ SuperCollider is a platform for audio synthesis and algorithmic composition.") '(begin (for-each delete-file '("dot-emacs.el" "Makefile")) (install-file "6.945-config/mit-scheme-doc.el" ".") - (delete-file-recursively "6.945-config"))) + (delete-file-recursively "6.945-config") + #t)) (file-name (string-append name "-" version ".tar.bz2")) (method url-fetch) (uri (string-append "http://groups.csail.mit.edu/mac/users/gjs/" @@ -3998,7 +4006,8 @@ programming language.") (substitute* "lisp/Makefile" (("^\tjulia-mode.elc\\\\\n") "") (("^all: \\$\\(ELC\\) ess-custom.el julia-mode.el") - "all: $(ELC) ess-custom.el")))))) + "all: $(ELC) ess-custom.el")) + #t)))) (build-system gnu-build-system) (arguments (let ((base-directory "/share/emacs/site-lisp/guix.d/ess")) @@ -5291,7 +5300,8 @@ mode-line.") ;; warnings about a missing directory. (substitute* "yasnippet.el" (("^ +'yas-installed-snippets-dir\\)\\)\n") - "))\n")))))) + "))\n")) + #t)))) (build-system emacs-build-system) (home-page "https://github.com/joaotavora/yasnippet") (synopsis "Yet another snippet extension for Emacs") @@ -5335,7 +5345,8 @@ abbreviation and automatically expand it into function templates.") dir))) (scandir "." (lambda (fname) (and (string-match "-mode$" fname) - (directory-exists? fname))))))))) + (directory-exists? fname)))))) + #t))) (home-page "https://github.com/AndreaCrotti/yasnippet-snippets") (synopsis "Collection of YASnippet snippets for many languages") (description @@ -7299,7 +7310,7 @@ for external literate programming tools for exporting, weaving and tangling.") (setenv "PATH" (string-append (assoc-ref %build-inputs "tar") "/bin" ":" (assoc-ref %build-inputs "gzip") "/bin")) - (system* "tar" "xvf" (assoc-ref %build-inputs "source")) + (invoke "tar" "xvf" (assoc-ref %build-inputs "source")) (chdir (string-append "eless" "-" ,version)) (substitute* "eless" (("/usr/bin/env bash") (string-append (assoc-ref %build-inputs "bash") @@ -7666,7 +7677,7 @@ Features: (setenv "PATH" (string-append (assoc-ref %build-inputs "tar") "/bin" ":" (assoc-ref %build-inputs "gzip") "/bin")) - (system* "tar" "xvf" (assoc-ref %build-inputs "source")) + (invoke "tar" "xvf" (assoc-ref %build-inputs "source")) (chdir (string-append ,name "-" ,version)) ;; Patch shebangs (substitute* "epipe" |