2013-01-13 11:12:22 -05:00
|
|
|
;;; GNU Guix --- Functional package management for GNU
|
2020-10-26 22:01:45 -04:00
|
|
|
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2019, 2021 Ludovic Courtès <ludo@gnu.org>
|
2019-01-16 10:03:52 -05:00
|
|
|
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
|
2014-07-29 04:00:56 -04:00
|
|
|
;;; Copyright © 2014 Taylan Ulrich Bayirli/Kammer <taylanbayirli@gmail.com>
|
gnu: emacs: Update to 27.1.
* gnu/packages/emacs.scm (emacs): Update to 27.1.
[source]: In snippet, use 'find-files' to find 'eshell/esh-groups.el'
if it exists, but gracefully handle its absence.
[arguments]: Add "--with-cairo" to configure-flags. Add 'restore-emacs-pdmp'
and 'make-compressed-files-writable' phases. Explicitly return #t from
'install-site-start' phase.
[inputs]: Add cairo, pango, harfbuzz, jansson, and gmp. Remove imagemagick.
(emacs-next): Remove variable.
(emacs-minimal, emacs-xwidgets): Use 'package/inherit'.
[arguments]: Remove 'restore-emacs-pdmp' phase.
(emacs-no-x): Use 'package/inherit'.
[arguments]: Remove "--with-cairo" from configure-flags. Remove
'restore-emacs-pdmp' phase.
[inputs]: Remove cairo, pango, and harfbuzz.
(emacs-no-x-toolkit): Use 'package/inherit'.
[arguments]: Remove 'restore-emacs-pdmp' phase. Remove superfluous
quasiquote+unquote-splicing pair.
(emacs-wide-int): Use 'package/inherit'.
(guile-emacs): Use 'package/inherit'.
[arguments]: Remove "--with-cairo" from configure-flags. Remove
'restore-emacs-pdmp' phase.
* gnu/packages/patches/emacs-ignore-empty-xim-styles.patch,
gnu/packages/patches/emacs-source-date-epoch.patch: Adapt to
apply cleanly to emacs-27.1.
* gnu/packages/patches/emacs-exec-path.patch: Replace with the previous
contents of 'emacs27-exec-path.patch', but remove the superfluous comment
about it being "like emacs-exec-path.patch, but for Emacs 27".
* gnu/packages/patches/emacs27-exec-path.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove 'emacs27-exec-path.patch'.
2019-04-23 02:35:03 -04:00
|
|
|
;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Mark H Weaver <mhw@netris.org>
|
2019-01-16 10:03:52 -05:00
|
|
|
;;; Copyright © 2014, 2015, 2016, 2017 Alex Kost <alezost@gmail.com>
|
|
|
|
;;; Copyright © 2016, 2018 Arun Isaac <arunisaac@systemreboot.net>
|
|
|
|
;;; Copyright © 2016 Federico Beffa <beffa@fbengineering.ch>
|
|
|
|
;;; Copyright © 2016 David Thompson <dthompson2@worcester.edu>
|
mailmap: Update entries for Nikita.
* .mailmap: change email and name for Nikita.
* Makefile.am, doc/guix.texi, etc/completion/fish/guix.fish,
gnu/packages/accessibility.scm, gnu/packages/admin.scm,
gnu/packages/audio.scm, gnu/packages/autotools.scm, gnu/packages/cdrom.scm,
gnu/packages/check.scm, gnu/packages/cinnamon.scm,
gnu/packages/compression.scm, gnu/packages/crypto.scm,
gnu/packages/databases.scm, gnu/packages/django.scm, gnu/packages/dns.scm,
gnu/packages/elixir.scm, gnu/packages/emacs-xyz.scm, gnu/packages/emacs.scm,
gnu/packages/enlightenment.scm, gnu/packages/erlang.scm,
gnu/packages/fonts.scm, gnu/packages/fontutils.scm, gnu/packages/forth.scm,
gnu/packages/fvwm.scm, gnu/packages/games.scm, gnu/packages/gl.scm,
gnu/packages/gnome.scm, gnu/packages/gnunet.scm, gnu/packages/gnupg.scm,
gnu/packages/gtk.scm, gnu/packages/guile-wm.scm, gnu/packages/guile-xyz.scm,
gnu/packages/haskell-apps.scm, gnu/packages/haskell-check.scm,
gnu/packages/haskell-crypto.scm, gnu/packages/haskell-xyz.scm,
gnu/packages/haskell.scm, gnu/packages/image-viewers.scm,
gnu/packages/image.scm, gnu/packages/irc.scm, gnu/packages/language.scm,
gnu/packages/libcanberra.scm, gnu/packages/linux.scm,
gnu/packages/lisp-xyz.scm, gnu/packages/lisp.scm, gnu/packages/lolcode.scm,
gnu/packages/lxde.scm, gnu/packages/lxqt.scm, gnu/packages/mail.scm,
gnu/packages/markup.scm, gnu/packages/mate.scm, gnu/packages/maths.scm,
gnu/packages/mc.scm, gnu/packages/messaging.scm, gnu/packages/music.scm,
gnu/packages/ncurses.scm, gnu/packages/networking.scm,
gnu/packages/nickle.scm, gnu/packages/openbox.scm, gnu/packages/pdf.scm,
gnu/packages/perl-check.scm, gnu/packages/perl.scm,
gnu/packages/python-compression.scm, gnu/packages/python-crypto.scm,
gnu/packages/python-web.scm, gnu/packages/python-xyz.scm,
gnu/packages/python.scm, gnu/packages/qt.scm, gnu/packages/ruby.scm,
gnu/packages/rust.scm, gnu/packages/scheme.scm,
gnu/packages/serialization.scm, gnu/packages/shells.scm,
gnu/packages/ssh.scm, gnu/packages/suckless.scm, gnu/packages/tbb.scm,
gnu/packages/telephony.scm, gnu/packages/text-editors.scm,
gnu/packages/textutils.scm, gnu/packages/time.scm, gnu/packages/tls.scm,
gnu/packages/tor.scm, gnu/packages/version-control.scm,
gnu/packages/video.scm, gnu/packages/vim.scm, gnu/packages/web.scm,
gnu/packages/wm.scm, gnu/packages/xdisorg.scm, gnu/packages/xfce.scm,
gnu/packages/xml.scm, gnu/packages/xorg.scm, gnu/services/certbot.scm,
gnu/services/desktop.scm, gnu/services/version-control.scm,
gnu/services/web.scm, guix/import/hackage.scm, guix/licenses.scm: Likewise.
Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
2020-05-11 07:05:45 -04:00
|
|
|
;;; Copyright © 2016 Nikita <nikita@n0.is>
|
2019-01-16 10:03:52 -05:00
|
|
|
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
|
2020-03-22 12:40:25 -04:00
|
|
|
;;; Copyright © 2017, 2019, 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
2019-01-16 10:03:52 -05:00
|
|
|
;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com>
|
|
|
|
;;; Copyright © 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
|
2017-05-26 06:29:04 -04:00
|
|
|
;;; Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
|
2019-01-16 10:03:52 -05:00
|
|
|
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
|
|
|
|
;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com>
|
2021-03-25 16:03:39 -04:00
|
|
|
;;; Copyright © 2018, 2019, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
|
2019-04-30 17:43:45 -04:00
|
|
|
;;; Copyright © 2019 Jesse John Gildersleve <jessejohngildersleve@zohomail.eu>
|
2019-12-17 23:49:49 -05:00
|
|
|
;;; Copyright © 2019 Valentin Ignatev <valentignatev@gmail.com>
|
|
|
|
;;; Copyright © 2019 Leo Prikler <leo.prikler@student.tugraz.at>
|
2020-03-28 16:23:32 -04:00
|
|
|
;;; Copyright © 2019 Amin Bandali <bandali@gnu.org>
|
2020-05-02 00:26:56 -04:00
|
|
|
;;; Copyright © 2020 Jack Hill <jackhill@jackhill.us>
|
2020-08-31 23:35:41 -04:00
|
|
|
;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com>
|
2013-01-13 11:12:22 -05:00
|
|
|
;;;
|
|
|
|
;;; This file is part of GNU Guix.
|
|
|
|
;;;
|
|
|
|
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
|
|
|
;;; under the terms of the GNU General Public License as published by
|
|
|
|
;;; the Free Software Foundation; either version 3 of the License, or (at
|
|
|
|
;;; your option) any later version.
|
|
|
|
;;;
|
|
|
|
;;; GNU Guix is distributed in the hope that it will be useful, but
|
|
|
|
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
;;; GNU General Public License for more details.
|
|
|
|
;;;
|
|
|
|
;;; You should have received a copy of the GNU General Public License
|
|
|
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
2013-01-17 19:06:24 -05:00
|
|
|
(define-module (gnu packages emacs)
|
2015-03-04 11:02:07 -05:00
|
|
|
#:use-module ((guix licenses) #:prefix license:)
|
2013-01-13 11:12:22 -05:00
|
|
|
#:use-module (guix packages)
|
|
|
|
#:use-module (guix download)
|
2015-05-10 10:29:54 -04:00
|
|
|
#:use-module (guix git-download)
|
2013-01-13 11:12:22 -05:00
|
|
|
#:use-module (guix build-system gnu)
|
2014-12-09 17:11:02 -05:00
|
|
|
#:use-module (guix build-system glib-or-gtk)
|
2013-01-17 19:06:47 -05:00
|
|
|
#:use-module (gnu packages)
|
2019-01-16 10:03:52 -05:00
|
|
|
#:use-module (gnu packages acl)
|
2014-07-24 11:38:42 -04:00
|
|
|
#:use-module (gnu packages autotools)
|
2015-08-19 15:57:08 -04:00
|
|
|
#:use-module (gnu packages base)
|
2015-03-04 11:02:07 -05:00
|
|
|
#:use-module (gnu packages compression)
|
2019-01-16 10:03:52 -05:00
|
|
|
#:use-module (gnu packages fontutils)
|
2016-09-27 13:17:21 -04:00
|
|
|
#:use-module (gnu packages fribidi)
|
|
|
|
#:use-module (gnu packages gd)
|
2019-01-16 10:03:52 -05:00
|
|
|
#:use-module (gnu packages gettext)
|
|
|
|
#:use-module (gnu packages glib)
|
2019-04-30 17:43:45 -04:00
|
|
|
#:use-module (gnu packages gnome) ; for librsvg
|
2019-01-16 10:03:52 -05:00
|
|
|
#:use-module (gnu packages gtk)
|
|
|
|
#:use-module (gnu packages guile)
|
|
|
|
#:use-module (gnu packages image)
|
2021-05-29 09:44:23 -04:00
|
|
|
#:use-module (gnu packages linux) ; alsa-lib, gpm
|
2019-04-30 17:43:45 -04:00
|
|
|
#:use-module (gnu packages mail) ; for mailutils
|
gnu: emacs: Update to 27.1.
* gnu/packages/emacs.scm (emacs): Update to 27.1.
[source]: In snippet, use 'find-files' to find 'eshell/esh-groups.el'
if it exists, but gracefully handle its absence.
[arguments]: Add "--with-cairo" to configure-flags. Add 'restore-emacs-pdmp'
and 'make-compressed-files-writable' phases. Explicitly return #t from
'install-site-start' phase.
[inputs]: Add cairo, pango, harfbuzz, jansson, and gmp. Remove imagemagick.
(emacs-next): Remove variable.
(emacs-minimal, emacs-xwidgets): Use 'package/inherit'.
[arguments]: Remove 'restore-emacs-pdmp' phase.
(emacs-no-x): Use 'package/inherit'.
[arguments]: Remove "--with-cairo" from configure-flags. Remove
'restore-emacs-pdmp' phase.
[inputs]: Remove cairo, pango, and harfbuzz.
(emacs-no-x-toolkit): Use 'package/inherit'.
[arguments]: Remove 'restore-emacs-pdmp' phase. Remove superfluous
quasiquote+unquote-splicing pair.
(emacs-wide-int): Use 'package/inherit'.
(guile-emacs): Use 'package/inherit'.
[arguments]: Remove "--with-cairo" from configure-flags. Remove
'restore-emacs-pdmp' phase.
* gnu/packages/patches/emacs-ignore-empty-xim-styles.patch,
gnu/packages/patches/emacs-source-date-epoch.patch: Adapt to
apply cleanly to emacs-27.1.
* gnu/packages/patches/emacs-exec-path.patch: Replace with the previous
contents of 'emacs27-exec-path.patch', but remove the superfluous comment
about it being "like emacs-exec-path.patch, but for Emacs 27".
* gnu/packages/patches/emacs27-exec-path.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove 'emacs27-exec-path.patch'.
2019-04-23 02:35:03 -04:00
|
|
|
#:use-module (gnu packages multiprecision)
|
2019-01-16 10:03:52 -05:00
|
|
|
#:use-module (gnu packages ncurses)
|
|
|
|
#:use-module (gnu packages pkg-config)
|
|
|
|
#:use-module (gnu packages texinfo)
|
|
|
|
#:use-module (gnu packages tls)
|
2019-12-17 23:49:49 -05:00
|
|
|
#:use-module (gnu packages web) ; for jansson
|
2019-01-18 17:29:14 -05:00
|
|
|
#:use-module (gnu packages webkit)
|
2019-01-16 10:03:52 -05:00
|
|
|
#:use-module (gnu packages xml)
|
|
|
|
#:use-module (gnu packages xorg)
|
2014-07-29 04:00:56 -04:00
|
|
|
#:use-module (guix utils)
|
2019-01-16 10:03:52 -05:00
|
|
|
#:use-module (srfi srfi-1))
|
2013-01-13 11:12:22 -05:00
|
|
|
|
|
|
|
(define-public emacs
|
|
|
|
(package
|
|
|
|
(name "emacs")
|
2021-03-25 16:03:39 -04:00
|
|
|
(version "27.2")
|
2013-01-13 11:12:22 -05:00
|
|
|
(source (origin
|
2020-03-22 12:44:24 -04:00
|
|
|
(method url-fetch)
|
|
|
|
(uri (string-append "mirror://gnu/emacs/emacs-"
|
|
|
|
version ".tar.xz"))
|
|
|
|
(sha256
|
|
|
|
(base32
|
2021-03-25 16:03:39 -04:00
|
|
|
"1ff182gjw9wqsbx1kj5gl2r5pbqhp4ar54g04j33fgz6g17cr9xl"))
|
2020-03-22 12:44:24 -04:00
|
|
|
(patches (search-patches "emacs-exec-path.patch"
|
|
|
|
"emacs-fix-scheme-indent-function.patch"
|
2020-08-02 14:46:58 -04:00
|
|
|
"emacs-ignore-empty-xim-styles.patch"
|
2020-03-22 12:44:24 -04:00
|
|
|
"emacs-source-date-epoch.patch"))
|
|
|
|
(modules '((guix build utils)))
|
|
|
|
(snippet
|
|
|
|
'(with-directory-excursion "lisp"
|
|
|
|
;; Delete the bundled byte-compiled elisp files and generated
|
|
|
|
;; autoloads.
|
|
|
|
(for-each delete-file
|
|
|
|
(append (find-files "." "\\.elc$")
|
|
|
|
(find-files "." "loaddefs\\.el$")
|
gnu: emacs: Update to 27.1.
* gnu/packages/emacs.scm (emacs): Update to 27.1.
[source]: In snippet, use 'find-files' to find 'eshell/esh-groups.el'
if it exists, but gracefully handle its absence.
[arguments]: Add "--with-cairo" to configure-flags. Add 'restore-emacs-pdmp'
and 'make-compressed-files-writable' phases. Explicitly return #t from
'install-site-start' phase.
[inputs]: Add cairo, pango, harfbuzz, jansson, and gmp. Remove imagemagick.
(emacs-next): Remove variable.
(emacs-minimal, emacs-xwidgets): Use 'package/inherit'.
[arguments]: Remove 'restore-emacs-pdmp' phase.
(emacs-no-x): Use 'package/inherit'.
[arguments]: Remove "--with-cairo" from configure-flags. Remove
'restore-emacs-pdmp' phase.
[inputs]: Remove cairo, pango, and harfbuzz.
(emacs-no-x-toolkit): Use 'package/inherit'.
[arguments]: Remove 'restore-emacs-pdmp' phase. Remove superfluous
quasiquote+unquote-splicing pair.
(emacs-wide-int): Use 'package/inherit'.
(guile-emacs): Use 'package/inherit'.
[arguments]: Remove "--with-cairo" from configure-flags. Remove
'restore-emacs-pdmp' phase.
* gnu/packages/patches/emacs-ignore-empty-xim-styles.patch,
gnu/packages/patches/emacs-source-date-epoch.patch: Adapt to
apply cleanly to emacs-27.1.
* gnu/packages/patches/emacs-exec-path.patch: Replace with the previous
contents of 'emacs27-exec-path.patch', but remove the superfluous comment
about it being "like emacs-exec-path.patch, but for Emacs 27".
* gnu/packages/patches/emacs27-exec-path.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove 'emacs27-exec-path.patch'.
2019-04-23 02:35:03 -04:00
|
|
|
(find-files "eshell" "^esh-groups\\.el$")))
|
2017-02-09 17:10:49 -05:00
|
|
|
|
2020-03-22 12:44:24 -04:00
|
|
|
;; Make sure Tramp looks for binaries in the right places on
|
|
|
|
;; remote Guix System machines, where 'getconf PATH' returns
|
|
|
|
;; something bogus.
|
|
|
|
(substitute* "net/tramp-sh.el"
|
|
|
|
;; Patch the line after "(defcustom tramp-remote-path".
|
|
|
|
(("\\(tramp-default-remote-path")
|
|
|
|
(format #f "(tramp-default-remote-path ~s ~s ~s ~s "
|
|
|
|
"~/.guix-profile/bin" "~/.guix-profile/sbin"
|
|
|
|
"/run/current-system/profile/bin"
|
|
|
|
"/run/current-system/profile/sbin")))
|
2017-10-16 10:44:57 -04:00
|
|
|
|
2020-03-22 12:44:24 -04:00
|
|
|
;; Make sure Man looks for C header files in the right
|
|
|
|
;; places.
|
|
|
|
(substitute* "man.el"
|
|
|
|
(("\"/usr/local/include\"" line)
|
|
|
|
(string-join
|
|
|
|
(list line
|
|
|
|
"\"~/.guix-profile/include\""
|
|
|
|
"\"/var/guix/profiles/system/profile/include\"")
|
|
|
|
" ")))
|
|
|
|
#t))))
|
2014-12-09 17:11:02 -05:00
|
|
|
(build-system glib-or-gtk-build-system)
|
2013-01-13 11:12:22 -05:00
|
|
|
(arguments
|
2019-08-29 21:37:52 -04:00
|
|
|
`(#:tests? #f ; no check target
|
2019-04-30 17:30:12 -04:00
|
|
|
#:configure-flags (list "--with-modules"
|
gnu: emacs: Update to 27.1.
* gnu/packages/emacs.scm (emacs): Update to 27.1.
[source]: In snippet, use 'find-files' to find 'eshell/esh-groups.el'
if it exists, but gracefully handle its absence.
[arguments]: Add "--with-cairo" to configure-flags. Add 'restore-emacs-pdmp'
and 'make-compressed-files-writable' phases. Explicitly return #t from
'install-site-start' phase.
[inputs]: Add cairo, pango, harfbuzz, jansson, and gmp. Remove imagemagick.
(emacs-next): Remove variable.
(emacs-minimal, emacs-xwidgets): Use 'package/inherit'.
[arguments]: Remove 'restore-emacs-pdmp' phase.
(emacs-no-x): Use 'package/inherit'.
[arguments]: Remove "--with-cairo" from configure-flags. Remove
'restore-emacs-pdmp' phase.
[inputs]: Remove cairo, pango, and harfbuzz.
(emacs-no-x-toolkit): Use 'package/inherit'.
[arguments]: Remove 'restore-emacs-pdmp' phase. Remove superfluous
quasiquote+unquote-splicing pair.
(emacs-wide-int): Use 'package/inherit'.
(guile-emacs): Use 'package/inherit'.
[arguments]: Remove "--with-cairo" from configure-flags. Remove
'restore-emacs-pdmp' phase.
* gnu/packages/patches/emacs-ignore-empty-xim-styles.patch,
gnu/packages/patches/emacs-source-date-epoch.patch: Adapt to
apply cleanly to emacs-27.1.
* gnu/packages/patches/emacs-exec-path.patch: Replace with the previous
contents of 'emacs27-exec-path.patch', but remove the superfluous comment
about it being "like emacs-exec-path.patch, but for Emacs 27".
* gnu/packages/patches/emacs27-exec-path.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove 'emacs27-exec-path.patch'.
2019-04-23 02:35:03 -04:00
|
|
|
"--with-cairo"
|
2019-04-30 17:30:12 -04:00
|
|
|
"--disable-build-details")
|
2018-05-28 12:23:07 -04:00
|
|
|
#:phases
|
2016-01-01 09:12:40 -05:00
|
|
|
(modify-phases %standard-phases
|
2020-03-21 23:16:08 -04:00
|
|
|
(add-after 'unpack 'patch-program-file-names
|
|
|
|
(lambda _
|
|
|
|
(substitute* '("src/callproc.c"
|
|
|
|
"lisp/term.el"
|
|
|
|
"lisp/htmlfontify.el"
|
|
|
|
"lisp/textmodes/artist.el"
|
|
|
|
"lisp/progmodes/sh-script.el")
|
|
|
|
(("\"/bin/sh\"")
|
2020-03-27 10:24:02 -04:00
|
|
|
(format #f "~s" (which "sh"))))
|
2020-03-21 23:16:08 -04:00
|
|
|
#t))
|
2016-01-01 09:12:40 -05:00
|
|
|
(add-before 'configure 'fix-/bin/pwd
|
|
|
|
(lambda _
|
|
|
|
;; Use `pwd', not `/bin/pwd'.
|
|
|
|
(substitute* (find-files "." "^Makefile\\.in$")
|
|
|
|
(("/bin/pwd")
|
2018-03-23 01:59:15 -04:00
|
|
|
"pwd"))
|
|
|
|
#t))
|
2016-01-01 09:12:40 -05:00
|
|
|
(add-after 'install 'install-site-start
|
2020-02-27 14:20:58 -05:00
|
|
|
;; Use 'guix-emacs' in "site-start.el", which is used autoload the
|
|
|
|
;; Elisp packages found in EMACSLOADPATH.
|
2016-01-01 09:12:40 -05:00
|
|
|
(lambda* (#:key inputs outputs #:allow-other-keys)
|
2017-02-18 03:24:41 -05:00
|
|
|
(let* ((out (assoc-ref outputs "out"))
|
2019-12-04 23:40:32 -05:00
|
|
|
(lisp-dir (string-append out "/share/emacs/site-lisp"))
|
gnu: emacs: Update to 27.1.
* gnu/packages/emacs.scm (emacs): Update to 27.1.
[source]: In snippet, use 'find-files' to find 'eshell/esh-groups.el'
if it exists, but gracefully handle its absence.
[arguments]: Add "--with-cairo" to configure-flags. Add 'restore-emacs-pdmp'
and 'make-compressed-files-writable' phases. Explicitly return #t from
'install-site-start' phase.
[inputs]: Add cairo, pango, harfbuzz, jansson, and gmp. Remove imagemagick.
(emacs-next): Remove variable.
(emacs-minimal, emacs-xwidgets): Use 'package/inherit'.
[arguments]: Remove 'restore-emacs-pdmp' phase.
(emacs-no-x): Use 'package/inherit'.
[arguments]: Remove "--with-cairo" from configure-flags. Remove
'restore-emacs-pdmp' phase.
[inputs]: Remove cairo, pango, and harfbuzz.
(emacs-no-x-toolkit): Use 'package/inherit'.
[arguments]: Remove 'restore-emacs-pdmp' phase. Remove superfluous
quasiquote+unquote-splicing pair.
(emacs-wide-int): Use 'package/inherit'.
(guile-emacs): Use 'package/inherit'.
[arguments]: Remove "--with-cairo" from configure-flags. Remove
'restore-emacs-pdmp' phase.
* gnu/packages/patches/emacs-ignore-empty-xim-styles.patch,
gnu/packages/patches/emacs-source-date-epoch.patch: Adapt to
apply cleanly to emacs-27.1.
* gnu/packages/patches/emacs-exec-path.patch: Replace with the previous
contents of 'emacs27-exec-path.patch', but remove the superfluous comment
about it being "like emacs-exec-path.patch, but for Emacs 27".
* gnu/packages/patches/emacs27-exec-path.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove 'emacs27-exec-path.patch'.
2019-04-23 02:35:03 -04:00
|
|
|
(emacs (string-append out "/bin/emacs")))
|
2020-03-22 12:40:25 -04:00
|
|
|
|
|
|
|
;; This is duplicated from emacs-utils to prevent coupling.
|
|
|
|
(define* (emacs-byte-compile-directory dir)
|
|
|
|
(let ((expr `(progn
|
|
|
|
(setq byte-compile-debug t)
|
|
|
|
(byte-recompile-directory
|
|
|
|
(file-name-as-directory ,dir) 0 1))))
|
|
|
|
(invoke emacs "--quick" "--batch"
|
2020-03-27 10:24:02 -04:00
|
|
|
(format #f "--eval=~s" expr))))
|
2020-03-22 12:40:25 -04:00
|
|
|
|
2017-02-18 03:24:41 -05:00
|
|
|
(copy-file (assoc-ref inputs "guix-emacs.el")
|
|
|
|
(string-append lisp-dir "/guix-emacs.el"))
|
2016-01-01 09:12:40 -05:00
|
|
|
(with-output-to-file (string-append lisp-dir "/site-start.el")
|
|
|
|
(lambda ()
|
2017-02-18 03:44:52 -05:00
|
|
|
(display
|
|
|
|
(string-append "(when (require 'guix-emacs nil t)\n"
|
|
|
|
" (guix-emacs-autoload-packages))\n"))))
|
2019-12-08 22:45:00 -05:00
|
|
|
;; Remove the extraneous subdirs.el file, as it causes Emacs to
|
|
|
|
;; add recursively all the the sub-directories of a profile's
|
|
|
|
;; share/emacs/site-lisp union when added to EMACSLOADPATH,
|
|
|
|
;; which leads to conflicts.
|
|
|
|
(delete-file (string-append lisp-dir "/subdirs.el"))
|
2019-12-04 23:40:32 -05:00
|
|
|
;; Byte compile the site-start files.
|
gnu: emacs: Update to 27.1.
* gnu/packages/emacs.scm (emacs): Update to 27.1.
[source]: In snippet, use 'find-files' to find 'eshell/esh-groups.el'
if it exists, but gracefully handle its absence.
[arguments]: Add "--with-cairo" to configure-flags. Add 'restore-emacs-pdmp'
and 'make-compressed-files-writable' phases. Explicitly return #t from
'install-site-start' phase.
[inputs]: Add cairo, pango, harfbuzz, jansson, and gmp. Remove imagemagick.
(emacs-next): Remove variable.
(emacs-minimal, emacs-xwidgets): Use 'package/inherit'.
[arguments]: Remove 'restore-emacs-pdmp' phase.
(emacs-no-x): Use 'package/inherit'.
[arguments]: Remove "--with-cairo" from configure-flags. Remove
'restore-emacs-pdmp' phase.
[inputs]: Remove cairo, pango, and harfbuzz.
(emacs-no-x-toolkit): Use 'package/inherit'.
[arguments]: Remove 'restore-emacs-pdmp' phase. Remove superfluous
quasiquote+unquote-splicing pair.
(emacs-wide-int): Use 'package/inherit'.
(guile-emacs): Use 'package/inherit'.
[arguments]: Remove "--with-cairo" from configure-flags. Remove
'restore-emacs-pdmp' phase.
* gnu/packages/patches/emacs-ignore-empty-xim-styles.patch,
gnu/packages/patches/emacs-source-date-epoch.patch: Adapt to
apply cleanly to emacs-27.1.
* gnu/packages/patches/emacs-exec-path.patch: Replace with the previous
contents of 'emacs27-exec-path.patch', but remove the superfluous comment
about it being "like emacs-exec-path.patch, but for Emacs 27".
* gnu/packages/patches/emacs27-exec-path.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove 'emacs27-exec-path.patch'.
2019-04-23 02:35:03 -04:00
|
|
|
(emacs-byte-compile-directory lisp-dir))
|
|
|
|
#t))
|
|
|
|
(add-after 'glib-or-gtk-wrap 'restore-emacs-pdmp
|
|
|
|
;; restore the dump file that Emacs installs somewhere in
|
|
|
|
;; libexec/ to its original state
|
|
|
|
(lambda* (#:key outputs target #:allow-other-keys)
|
|
|
|
(let* ((libexec (string-append (assoc-ref outputs "out")
|
|
|
|
"/libexec"))
|
|
|
|
;; each of these find-files should return one file
|
|
|
|
(pdmp (find-files libexec "^emacs\\.pdmp$"))
|
|
|
|
(pdmp-real (find-files libexec
|
|
|
|
"^\\.emacs\\.pdmp-real$")))
|
|
|
|
(for-each (lambda (wrapper real)
|
|
|
|
(delete-file wrapper)
|
|
|
|
(rename-file real wrapper))
|
|
|
|
pdmp pdmp-real))
|
|
|
|
#t))
|
2020-08-28 09:34:00 -04:00
|
|
|
(add-after 'glib-or-gtk-wrap 'strip-double-wrap
|
|
|
|
(lambda* (#:key outputs #:allow-other-keys)
|
|
|
|
;; Directly copy emacs-X.Y to emacs, so that it is not wrapped
|
|
|
|
;; twice. This also fixes a minor issue, where WMs would not be
|
2020-10-26 22:01:45 -04:00
|
|
|
;; able to track emacs back to emacs.desktop.
|
2020-08-28 09:34:00 -04:00
|
|
|
(with-directory-excursion (assoc-ref outputs "out")
|
2020-10-26 22:01:45 -04:00
|
|
|
(copy-file
|
|
|
|
(car (find-files "bin" "^emacs-([0-9]+\\.)+[0-9]+$"))
|
|
|
|
"bin/emacs")
|
2020-08-28 09:34:00 -04:00
|
|
|
#t)))
|
2021-04-17 13:06:18 -04:00
|
|
|
(add-after 'strip-double-wrap 'wrap-emacs-paths
|
|
|
|
(lambda* (#:key inputs outputs #:allow-other-keys)
|
2021-04-17 13:06:17 -04:00
|
|
|
(let* ((out (assoc-ref outputs "out"))
|
|
|
|
(lisp-dirs (find-files (string-append out "/share/emacs")
|
|
|
|
"^lisp$"
|
|
|
|
#:directories? #t)))
|
|
|
|
(for-each
|
|
|
|
(lambda (prog)
|
|
|
|
(wrap-program prog
|
2021-04-17 13:06:18 -04:00
|
|
|
;; emacs-next and variants rely on uname being in PATH for
|
|
|
|
;; Tramp. Tramp paths can't be hardcoded, because they
|
|
|
|
;; need to be portable.
|
|
|
|
`("PATH" suffix
|
|
|
|
,(map (lambda (in) (string-append in "/bin"))
|
|
|
|
(list (assoc-ref inputs "gzip")
|
|
|
|
(assoc-ref inputs "coreutils"))))
|
2021-04-17 13:06:17 -04:00
|
|
|
`("EMACSLOADPATH" suffix ,lisp-dirs)))
|
|
|
|
(find-files (string-append out "/bin")
|
|
|
|
;; Matches versioned and unversioned emacs binaries.
|
|
|
|
;; We don't patch emacsclient, because it takes its
|
|
|
|
;; environment variables from emacs.
|
|
|
|
;; Likewise, we don't need to patch helper binaries
|
|
|
|
;; like etags, ctags or ebrowse.
|
|
|
|
"^emacs(-[0-9]+(\\.[0-9]+)*)?$"))
|
|
|
|
#t)))
|
gnu: emacs: Update to 27.1.
* gnu/packages/emacs.scm (emacs): Update to 27.1.
[source]: In snippet, use 'find-files' to find 'eshell/esh-groups.el'
if it exists, but gracefully handle its absence.
[arguments]: Add "--with-cairo" to configure-flags. Add 'restore-emacs-pdmp'
and 'make-compressed-files-writable' phases. Explicitly return #t from
'install-site-start' phase.
[inputs]: Add cairo, pango, harfbuzz, jansson, and gmp. Remove imagemagick.
(emacs-next): Remove variable.
(emacs-minimal, emacs-xwidgets): Use 'package/inherit'.
[arguments]: Remove 'restore-emacs-pdmp' phase.
(emacs-no-x): Use 'package/inherit'.
[arguments]: Remove "--with-cairo" from configure-flags. Remove
'restore-emacs-pdmp' phase.
[inputs]: Remove cairo, pango, and harfbuzz.
(emacs-no-x-toolkit): Use 'package/inherit'.
[arguments]: Remove 'restore-emacs-pdmp' phase. Remove superfluous
quasiquote+unquote-splicing pair.
(emacs-wide-int): Use 'package/inherit'.
(guile-emacs): Use 'package/inherit'.
[arguments]: Remove "--with-cairo" from configure-flags. Remove
'restore-emacs-pdmp' phase.
* gnu/packages/patches/emacs-ignore-empty-xim-styles.patch,
gnu/packages/patches/emacs-source-date-epoch.patch: Adapt to
apply cleanly to emacs-27.1.
* gnu/packages/patches/emacs-exec-path.patch: Replace with the previous
contents of 'emacs27-exec-path.patch', but remove the superfluous comment
about it being "like emacs-exec-path.patch, but for Emacs 27".
* gnu/packages/patches/emacs27-exec-path.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove 'emacs27-exec-path.patch'.
2019-04-23 02:35:03 -04:00
|
|
|
(add-before 'reset-gzip-timestamps 'make-compressed-files-writable
|
|
|
|
;; The 'reset-gzip-timestamps phase will throw a permission error
|
|
|
|
;; if gzip files aren't writable then. This phase is needed when
|
|
|
|
;; building from a git checkout.
|
|
|
|
(lambda _
|
|
|
|
(for-each make-file-writable
|
|
|
|
(find-files %output ".*\\.t?gz$"))
|
|
|
|
#t)))))
|
2013-01-13 11:12:22 -05:00
|
|
|
(inputs
|
gnu: Move numerous "inputs" which should be "native-inputs".
* gnu/packages/avahi.scm, gnu/packages/cdrom.scm, gnu/packages/cryptsetup.scm,
gnu/packages/curl.scm, gnu/packages/emacs.scm, gnu/packages/fontutils.scm,
gnu/packages/gdb.scm, gnu/packages/geeqie.scm, gnu/packages/ghostscript.scm,
gnu/packages/glib.scm, gnu/packages/gnome.scm, gnu/packages/gnunet.scm,
gnu/packages/gnupg.scm, gnu/packages/gnuzilla.scm, gnu/packages/graphviz.scm,
gnu/packages/groff.scm, gnu/packages/gstreamer.scm, gnu/packages/gtk.scm,
gnu/packages/gv.scm, gnu/packages/imagemagick.scm, gnu/packages/irssi.scm,
gnu/packages/kde.scm, gnu/packages/libcanberra.scm, gnu/packages/libtiff.scm,
gnu/packages/linux.scm, gnu/packages/lvm.scm, gnu/packages/mp3.scm,
gnu/packages/netpbm.scm, gnu/packages/parted.scm, gnu/packages/pdf.scm,
gnu/packages/pulseaudio.scm, gnu/packages/qemu.scm, gnu/packages/qt.scm,
gnu/packages/ratpoison.scm, gnu/packages/rdf.scm, gnu/packages/slim.scm,
gnu/packages/texlive.scm, gnu/packages/version-control.scm,
gnu/packages/video.scm, gnu/packages/vpn.scm, gnu/packages/w3m.scm,
gnu/packages/xml.scm, gnu/packages/xnee.scm, gnu/packages/xorg.scm,
gnu/packages/zip.scm: Move some build-time dependencies from `inputs' to
`native-inputs'.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2013-12-15 06:01:56 -05:00
|
|
|
`(("gnutls" ,gnutls)
|
2013-01-13 11:12:22 -05:00
|
|
|
("ncurses" ,ncurses)
|
|
|
|
|
2021-04-17 13:06:18 -04:00
|
|
|
;; Required for "core" functionality, such as dired and compression.
|
|
|
|
("coreutils" ,coreutils)
|
|
|
|
("gzip" ,gzip)
|
|
|
|
|
2019-04-30 17:43:45 -04:00
|
|
|
;; Avoid Emacs's limited movemail substitute that retrieves POP3 email
|
|
|
|
;; only via insecure channels. This is not needed for (modern) IMAP.
|
|
|
|
("mailutils" ,mailutils)
|
|
|
|
|
2013-01-13 11:12:22 -05:00
|
|
|
;; TODO: Add the optional dependencies.
|
2021-05-29 09:44:23 -04:00
|
|
|
("gpm" ,gpm)
|
2015-03-19 18:04:59 -04:00
|
|
|
("libx11" ,libx11)
|
2014-09-20 08:49:20 -04:00
|
|
|
("gtk+" ,gtk+)
|
gnu: emacs: Update to 27.1.
* gnu/packages/emacs.scm (emacs): Update to 27.1.
[source]: In snippet, use 'find-files' to find 'eshell/esh-groups.el'
if it exists, but gracefully handle its absence.
[arguments]: Add "--with-cairo" to configure-flags. Add 'restore-emacs-pdmp'
and 'make-compressed-files-writable' phases. Explicitly return #t from
'install-site-start' phase.
[inputs]: Add cairo, pango, harfbuzz, jansson, and gmp. Remove imagemagick.
(emacs-next): Remove variable.
(emacs-minimal, emacs-xwidgets): Use 'package/inherit'.
[arguments]: Remove 'restore-emacs-pdmp' phase.
(emacs-no-x): Use 'package/inherit'.
[arguments]: Remove "--with-cairo" from configure-flags. Remove
'restore-emacs-pdmp' phase.
[inputs]: Remove cairo, pango, and harfbuzz.
(emacs-no-x-toolkit): Use 'package/inherit'.
[arguments]: Remove 'restore-emacs-pdmp' phase. Remove superfluous
quasiquote+unquote-splicing pair.
(emacs-wide-int): Use 'package/inherit'.
(guile-emacs): Use 'package/inherit'.
[arguments]: Remove "--with-cairo" from configure-flags. Remove
'restore-emacs-pdmp' phase.
* gnu/packages/patches/emacs-ignore-empty-xim-styles.patch,
gnu/packages/patches/emacs-source-date-epoch.patch: Adapt to
apply cleanly to emacs-27.1.
* gnu/packages/patches/emacs-exec-path.patch: Replace with the previous
contents of 'emacs27-exec-path.patch', but remove the superfluous comment
about it being "like emacs-exec-path.patch, but for Emacs 27".
* gnu/packages/patches/emacs27-exec-path.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove 'emacs27-exec-path.patch'.
2019-04-23 02:35:03 -04:00
|
|
|
("cairo" ,cairo)
|
|
|
|
("pango" ,pango)
|
|
|
|
("harfbuzz" ,harfbuzz)
|
2015-03-19 18:04:59 -04:00
|
|
|
("libxft" ,libxft)
|
2013-04-13 16:08:09 -04:00
|
|
|
("libtiff" ,libtiff)
|
2014-02-21 04:48:22 -05:00
|
|
|
("giflib" ,giflib)
|
gnu: Replace uses of 'libjpeg' with 'libjpeg-turbo'.
* gnu/packages/abiword.scm (abiword)[inputs]: Change from LIBJPEG to
LIBJPEG-TURBO.
* gnu/packages/admin.scm (testdisk)[inputs]: Likewise.
* gnu/packages/algebra.scm (giac)[inputs]: Likewise.
* gnu/packages/animation.scm (synfig)[inputs]: Likewise.
* gnu/packages/astronomy.scm (gnuastro, celestia)[inputs]: Likewise.
* gnu/packages/cdrom.scm (dvdstyler)[inputs]: Likewise.
* gnu/packages/cran.scm (r-jpeg, r-tiff, r-readbitmap)[inputs]: Likewise.
* gnu/packages/cups.scm (cups-filters, hplip)[inputs]: Likewise.
* gnu/packages/display-managers.scm (slim)[inputs]: Likewise.
* gnu/packages/ebook.scm (fbreader)[inputs]: Likewise.
* gnu/packages/emacs.scm (emacs)[inputs]: Likewise.
* gnu/packages/enlightenment.scm (efl)[propagated-inputs]: Likewise.
* gnu/packages/fltk.scm (fltk, ntk)[inputs]: Likewise.
* gnu/packages/fontutils.scm (fontforge)[inputs]: Likewise.
* gnu/packages/freedesktop.scm (weston)[inputs]: Likewise.
* gnu/packages/game-development.scm (sfml, allegro, aseprite, python-pygame,
eureka, ioquake3)[inputs]: Likewise.
* gnu/packages/games.scm (adanaxisgpl, freedroidrpg, irrlicht, minetest,
fizmo, supertuxkart, gzdoom, xmoto, xonotic)[inputs]: Likewise.
* gnu/packages/gd.scm (gd, perl-gd)[inputs]: Likewise.
* gnu/packages/ghostscript.scm (lcms)[inputs]: Likewise.
(ghostscript)[inputs, native-inputs]: Likewise.
* gnu/packages/gimp.scm (gegl, gimp)[inputs]: Likewise.
* gnu/packages/gnome.scm (libgnomeui, eog, tracker-miners, gthumb)[inputs]: Likewise.
* gnu/packages/gnunet.scm (libextractor)[inputs]: Likewise.
* gnu/packages/gnustep.scm (windowmaker)[inputs]: Likewise.
* gnu/packages/graphics.scm (blender, blender-2.79, openimageio,
openscenegraph, openscenegraph-3.4, povray, fgallery)[inputs]: Likewise.
* gnu/packages/graphviz.scm (graphviz)[inputs]: Likewise.
* gnu/packages/gstreamer.scm (gst-plugins-good)[inputs]: Likewise.
* gnu/packages/gtk.scm (gdk-pixbuf)[inputs]: Likewise.
* gnu/packages/image-processing.scm (dcmtk, mia, vtk, opencv, vips, nip2, vxl,
insight-toolkit)[inputs]: Likewise.
* gnu/packages/image-viewers.scm (gpicview, luminance-hdr)[inputs]: Likewise.
* gnu/packages/image.scm (jpegoptim, libtiff, leptonica, imlib2, freeimage,
vigra, libwebp, libmng, jasper, steghide, jp2a)[inputs]: Likewise.
* gnu/packages/imagemagick.scm (imagemagick, graphicsmagick)[inputs]: Likewise.
* gnu/packages/java.scm (icedtea-6, icedtea-7, openjdk9, openjdk11,
openjdk12)[inputs]: Likewise.
* gnu/packages/kde-frameworks.scm (khtml)[inputs]: Likewise.
* gnu/packages/kodi.scm (kodi)[inputs]: Likewise.
* gnu/packages/machine-learning.scm (dlib, tensorflow)[inputs]: Likewise.
* gnu/packages/mate.scm (atril, eom)[inputs]: Likewise.
* gnu/packages/maths.scm (hdf4, hdf-java, hdf-eos2, netcdf)[inputs]: Likewise.
* gnu/packages/netpbm.scm (netpbm)[inputs]: Likewise.
* gnu/packages/pdf.scm (zathura-pdf-mupdf, podofo, mupdf, fbida)[inputs]: Likewise.
* gnu/packages/photo.scm (libraw, libpano13, enblend-enfuse, darktable, hugin,
rawtherapee)[inputs]: Likewise.
* gnu/packages/prolog.scm (swi-prolog)[native-inputs]: Likewise.
* gnu/packages/python-xyz.scm (python-hdf4, python-pillow)[inputs]: Likewise.
* gnu/packages/qt.scm (qtbase, qtwebkit)[inputs]: Likewise.
* gnu/packages/rdesktop.scm (freerdp)[inputs]: Likewise.
* gnu/packages/scanner.scm (sane-backends, xsane)[inputs]: Likewise.
* gnu/packages/scheme.scm (racket)[inputs]: Likewise.
* gnu/packages/scribus.scm (scribus)[inputs]: Likewise.
* gnu/packages/sdl.scm (sdl-image)[propagated-inputs]: Likewise.
(guile-sdl)[native-inputs]: Likewise.
* gnu/packages/spice.scm (spice-gtk)[inputs]: Likewise.
* gnu/packages/statistics.scm (r-with-tests)[inputs]: Likewise.
* gnu/packages/tcl.scm (perl-tk)[inputs]: Likewise.
* gnu/packages/upnp.scm (readymedia)[inputs]: Likewise.
* gnu/packages/video.scm (mplayer, mpv, v4l-utils, motion)[inputs]: Likewise.
* gnu/packages/web-browsers.scm (dillo, links)[inputs]: Likewise.
* gnu/packages/web.scm (netsurf)[inputs]: Likewise.
* gnu/packages/webkit.scm (webkitgtk)[inputs]: Likewise.
* gnu/packages/wine.scm (wine)[inputs]: Likewise.
* gnu/packages/wv.scm (wv)[inputs]: Likewise.
* gnu/packages/wxwidgets.scm (wxwidgets, wxwidgets-2)[inputs]: Likewise.
* gnu/packages/xdisorg.scm (xscreensaver)[inputs]: Likewise.
* gnu/packages/xfce.scm (tumbler)[inputs]: Likewise.
* gnu/packages/xfig.scm (xfig, transfig)[inputs]: Likewise.
* gnu/packages/xorg.scm (xpra)[inputs]: Likewise.
2020-01-17 13:27:01 -05:00
|
|
|
("libjpeg" ,libjpeg-turbo)
|
2014-10-08 03:49:43 -04:00
|
|
|
("acl" ,acl)
|
gnu: emacs: Update to 27.1.
* gnu/packages/emacs.scm (emacs): Update to 27.1.
[source]: In snippet, use 'find-files' to find 'eshell/esh-groups.el'
if it exists, but gracefully handle its absence.
[arguments]: Add "--with-cairo" to configure-flags. Add 'restore-emacs-pdmp'
and 'make-compressed-files-writable' phases. Explicitly return #t from
'install-site-start' phase.
[inputs]: Add cairo, pango, harfbuzz, jansson, and gmp. Remove imagemagick.
(emacs-next): Remove variable.
(emacs-minimal, emacs-xwidgets): Use 'package/inherit'.
[arguments]: Remove 'restore-emacs-pdmp' phase.
(emacs-no-x): Use 'package/inherit'.
[arguments]: Remove "--with-cairo" from configure-flags. Remove
'restore-emacs-pdmp' phase.
[inputs]: Remove cairo, pango, and harfbuzz.
(emacs-no-x-toolkit): Use 'package/inherit'.
[arguments]: Remove 'restore-emacs-pdmp' phase. Remove superfluous
quasiquote+unquote-splicing pair.
(emacs-wide-int): Use 'package/inherit'.
(guile-emacs): Use 'package/inherit'.
[arguments]: Remove "--with-cairo" from configure-flags. Remove
'restore-emacs-pdmp' phase.
* gnu/packages/patches/emacs-ignore-empty-xim-styles.patch,
gnu/packages/patches/emacs-source-date-epoch.patch: Adapt to
apply cleanly to emacs-27.1.
* gnu/packages/patches/emacs-exec-path.patch: Replace with the previous
contents of 'emacs27-exec-path.patch', but remove the superfluous comment
about it being "like emacs-exec-path.patch, but for Emacs 27".
* gnu/packages/patches/emacs27-exec-path.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove 'emacs27-exec-path.patch'.
2019-04-23 02:35:03 -04:00
|
|
|
("jansson" ,jansson)
|
|
|
|
("gmp" ,gmp)
|
2013-04-13 16:08:09 -04:00
|
|
|
|
|
|
|
;; When looking for libpng `configure' links with `-lpng -lz', so we
|
|
|
|
;; must also provide zlib as an input.
|
|
|
|
("libpng" ,libpng)
|
2015-03-04 11:02:07 -05:00
|
|
|
("zlib" ,zlib)
|
2013-04-13 16:08:09 -04:00
|
|
|
|
2015-04-04 03:32:04 -04:00
|
|
|
("librsvg" ,librsvg)
|
2015-03-19 18:04:59 -04:00
|
|
|
("libxpm" ,libxpm)
|
2013-04-13 16:08:09 -04:00
|
|
|
("libxml2" ,libxml2)
|
2014-02-21 04:48:22 -05:00
|
|
|
("libice" ,libice)
|
|
|
|
("libsm" ,libsm)
|
|
|
|
("alsa-lib" ,alsa-lib)
|
2016-01-01 09:12:40 -05:00
|
|
|
("dbus" ,dbus)
|
2016-09-27 13:17:22 -04:00
|
|
|
|
|
|
|
;; multilingualization support
|
|
|
|
("libotf" ,libotf)
|
|
|
|
("m17n-lib" ,m17n-lib)))
|
gnu: Move numerous "inputs" which should be "native-inputs".
* gnu/packages/avahi.scm, gnu/packages/cdrom.scm, gnu/packages/cryptsetup.scm,
gnu/packages/curl.scm, gnu/packages/emacs.scm, gnu/packages/fontutils.scm,
gnu/packages/gdb.scm, gnu/packages/geeqie.scm, gnu/packages/ghostscript.scm,
gnu/packages/glib.scm, gnu/packages/gnome.scm, gnu/packages/gnunet.scm,
gnu/packages/gnupg.scm, gnu/packages/gnuzilla.scm, gnu/packages/graphviz.scm,
gnu/packages/groff.scm, gnu/packages/gstreamer.scm, gnu/packages/gtk.scm,
gnu/packages/gv.scm, gnu/packages/imagemagick.scm, gnu/packages/irssi.scm,
gnu/packages/kde.scm, gnu/packages/libcanberra.scm, gnu/packages/libtiff.scm,
gnu/packages/linux.scm, gnu/packages/lvm.scm, gnu/packages/mp3.scm,
gnu/packages/netpbm.scm, gnu/packages/parted.scm, gnu/packages/pdf.scm,
gnu/packages/pulseaudio.scm, gnu/packages/qemu.scm, gnu/packages/qt.scm,
gnu/packages/ratpoison.scm, gnu/packages/rdf.scm, gnu/packages/slim.scm,
gnu/packages/texlive.scm, gnu/packages/version-control.scm,
gnu/packages/video.scm, gnu/packages/vpn.scm, gnu/packages/w3m.scm,
gnu/packages/xml.scm, gnu/packages/xnee.scm, gnu/packages/xorg.scm,
gnu/packages/zip.scm: Move some build-time dependencies from `inputs' to
`native-inputs'.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2013-12-15 06:01:56 -05:00
|
|
|
(native-inputs
|
2017-02-18 03:24:41 -05:00
|
|
|
`(("guix-emacs.el" ,(search-auxiliary-file "emacs/guix-emacs.el"))
|
|
|
|
("pkg-config" ,pkg-config)
|
gnu: Move numerous "inputs" which should be "native-inputs".
* gnu/packages/avahi.scm, gnu/packages/cdrom.scm, gnu/packages/cryptsetup.scm,
gnu/packages/curl.scm, gnu/packages/emacs.scm, gnu/packages/fontutils.scm,
gnu/packages/gdb.scm, gnu/packages/geeqie.scm, gnu/packages/ghostscript.scm,
gnu/packages/glib.scm, gnu/packages/gnome.scm, gnu/packages/gnunet.scm,
gnu/packages/gnupg.scm, gnu/packages/gnuzilla.scm, gnu/packages/graphviz.scm,
gnu/packages/groff.scm, gnu/packages/gstreamer.scm, gnu/packages/gtk.scm,
gnu/packages/gv.scm, gnu/packages/imagemagick.scm, gnu/packages/irssi.scm,
gnu/packages/kde.scm, gnu/packages/libcanberra.scm, gnu/packages/libtiff.scm,
gnu/packages/linux.scm, gnu/packages/lvm.scm, gnu/packages/mp3.scm,
gnu/packages/netpbm.scm, gnu/packages/parted.scm, gnu/packages/pdf.scm,
gnu/packages/pulseaudio.scm, gnu/packages/qemu.scm, gnu/packages/qt.scm,
gnu/packages/ratpoison.scm, gnu/packages/rdf.scm, gnu/packages/slim.scm,
gnu/packages/texlive.scm, gnu/packages/version-control.scm,
gnu/packages/video.scm, gnu/packages/vpn.scm, gnu/packages/w3m.scm,
gnu/packages/xml.scm, gnu/packages/xnee.scm, gnu/packages/xorg.scm,
gnu/packages/zip.scm: Move some build-time dependencies from `inputs' to
`native-inputs'.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2013-12-15 06:01:56 -05:00
|
|
|
("texinfo" ,texinfo)))
|
2015-10-01 05:28:19 -04:00
|
|
|
|
|
|
|
(native-search-paths
|
|
|
|
(list (search-path-specification
|
2017-06-03 15:56:36 -04:00
|
|
|
(variable "EMACSLOADPATH")
|
2021-04-17 13:06:17 -04:00
|
|
|
(files '("share/emacs/site-lisp")))
|
2017-06-03 15:56:36 -04:00
|
|
|
(search-path-specification
|
2015-10-01 05:28:19 -04:00
|
|
|
(variable "INFOPATH")
|
|
|
|
(files '("share/info")))))
|
|
|
|
|
2017-03-29 18:48:16 -04:00
|
|
|
(home-page "https://www.gnu.org/software/emacs/")
|
gnu: Use synopses from the Womb.
* gnu/packages/algebra.scm,
gnu/packages/aspell.scm,
gnu/packages/autotools.scm,
gnu/packages/base.scm,
gnu/packages/bash.scm,
gnu/packages/bison.scm,
gnu/packages/cdrom.scm,
gnu/packages/cflow.scm,
gnu/packages/compression.scm,
gnu/packages/cpio.scm,
gnu/packages/cppi.scm,
gnu/packages/ddrescue.scm,
gnu/packages/dejagnu.scm,
gnu/packages/ed.scm,
gnu/packages/emacs.scm,
gnu/packages/fdisk.scm,
gnu/packages/gawk.scm,
gnu/packages/gcc.scm,
packages/gcc.scm, b/gnu/packages/gcc.scm,
4b982 100644
s/gcc.scm,
s/gcc.scm,
@@
%standard-phases)))))
`((gcc-libc . ,(assoc-ref inputs "libc"))))
The GNU Compiler Collection")
GNU Compiler Collection")
n
ompiler Collection includes compiler front ends for C, C++,
tran, OpenMP for C/C++/Fortran, Java, and Ada, as well as
gnu/packages/gdb.scm,
gnu/packages/gettext.scm,
gnu/packages/ghostscript.scm,
gnu/packages/glib.scm,
gnu/packages/global.scm,
gnu/packages/gnupg.scm,
gnu/packages/gnutls.scm,
gnu/packages/gperf.scm,
gnu/packages/gprolog.scm,
gnu/packages/groff.scm,
gnu/packages/grub.scm,
gnu/packages/gsasl.scm,
gnu/packages/guile.scm,
gnu/packages/help2man.scm,
gnu/packages/idutils.scm,
gnu/packages/indent.scm,
gnu/packages/less.scm,
gnu/packages/libidn.scm,
gnu/packages/libsigsegv.scm,
gnu/packages/libunistring.scm,
gnu/packages/linux.scm,
gnu/packages/lsh.scm,
gnu/packages/m4.scm,
gnu/packages/mailutils.scm,
gnu/packages/multiprecision.scm,
gnu/packages/nano.scm,
gnu/packages/ncurses.scm,
gnu/packages/nettle.scm,
gnu/packages/oggvorbis.scm,
gnu/packages/parted.scm,
gnu/packages/pth.scm,
gnu/packages/readline.scm,
gnu/packages/recutils.scm,
gnu/packages/scheme.scm,
gnu/packages/screen.scm,
gnu/packages/shishi.scm,
gnu/packages/smalltalk.scm,
gnu/packages/system.scm,
gnu/packages/texinfo.scm,
gnu/packages/time.scm,
gnu/packages/wdiff.scm,
gnu/packages/wget.scm,
gnu/packages/which.scm: Use synopses from the Womb.
2013-04-17 12:04:25 -04:00
|
|
|
(synopsis "The extensible, customizable, self-documenting text editor")
|
2013-01-13 11:12:22 -05:00
|
|
|
(description
|
2013-12-01 16:33:23 -05:00
|
|
|
"GNU Emacs is an extensible and highly customizable text editor. It is
|
|
|
|
based on an Emacs Lisp interpreter with extensions for text editing. Emacs
|
|
|
|
has been extended in essentially all areas of computing, giving rise to a
|
|
|
|
vast array of packages supporting, e.g., email, IRC and XMPP messaging,
|
|
|
|
spreadsheets, remote server editing, and much more. Emacs includes extensive
|
|
|
|
documentation on all aspects of the system, from basic editing to writing
|
|
|
|
large Lisp programs. It has full Unicode support for nearly all human
|
|
|
|
languages.")
|
2015-03-04 11:02:07 -05:00
|
|
|
(license license:gpl3+)))
|
2013-01-21 15:25:43 -05:00
|
|
|
|
2020-08-31 23:35:41 -04:00
|
|
|
(define-public emacs-next
|
|
|
|
(let ((commit "2ea34662c20f71d35dd52a5ed996542c7386b9cb")
|
2020-09-14 18:08:19 -04:00
|
|
|
(revision "0"))
|
gnu: Fix erroneous uses of 'package/inherit'.
These packages use a different source/version from the inherited package, and
thus should not inherit replacements.
* gnu/packages/check.scm (googletest-1.8, python-pytest-runner-2): Use record
inheritance instead of PACKAGE/INHERIT.
* gnu/packages/crates-io.scm (rust-bindgen-0.49, rust-bytes-0.4,
rust-colored-1.9.1, rust-difference-1, rust-docopt-0.8, rust-html5ever-0.23,
rust-http-0.1, rust-http-body-0.1, rust-loom-0.2, rust-loom-0.1,
rust-pulldown-cmark-0.0.8, rust-ring-0.13, rust-rustls-0.12, rust-sct-0.3,
rust-term-0.2, rust-untrusted-0.6, rust-webpki-0.18, rust-webpki-roots-0.17,
rust-webpki-roots-0.14): Likewise.
* gnu/packages/emacs.scm (emacs-next, emacs-next-pgtk, guile-emacs): Likewise.
* gnu/packages/guile.scm (guile-2.2.4): Likewise.
* gnu/packages/maths.scm (hdf5-1.10, hdf5-1.12): Likewise.
* gnu/packages/protobuf.scm (protobuf-3.6, protobuf-3.5, python-protobuf-3.6):
Likewise.
* gnu/packages/python-web.scm (python2-html2text): Likewise.
* gnu/packages/python-xyz.scm (python-pygments/fixed, python2-numpy,
python2-urwid, python2-markdown, python2-fonttools): Likewise.
* gnu/packages/racket.scm (racket): Likewise.
* gnu/packages/sequoia.scm (sequoia4pEp): Likewise.
2021-05-23 08:07:34 -04:00
|
|
|
(package
|
|
|
|
(inherit emacs)
|
2020-08-31 23:35:41 -04:00
|
|
|
(name "emacs-next")
|
2020-09-14 18:08:19 -04:00
|
|
|
(version (git-version "28.0.50" revision commit))
|
2020-08-31 23:35:41 -04:00
|
|
|
(source
|
|
|
|
(origin
|
|
|
|
(inherit (package-source emacs))
|
|
|
|
(method git-fetch)
|
|
|
|
(uri (git-reference
|
|
|
|
(url "https://git.savannah.gnu.org/git/emacs.git/")
|
|
|
|
(commit commit)))
|
|
|
|
(file-name (git-file-name name version))
|
|
|
|
(sha256
|
|
|
|
(base32
|
|
|
|
"0igjm9kwiswn2dpiy2k9xikbdfc7njs07ry48fqz70anljj8y7y3"))))
|
|
|
|
(native-inputs
|
|
|
|
`(("autoconf" ,autoconf)
|
2021-04-17 13:06:17 -04:00
|
|
|
,@(package-native-inputs emacs))))))
|
2020-08-31 23:35:41 -04:00
|
|
|
|
2020-11-19 09:36:11 -05:00
|
|
|
(define-public emacs-next-pgtk
|
2021-02-01 01:33:07 -05:00
|
|
|
(let ((commit "ae18c8ec4f0ef37c8c9cda473770ff47e41291e2")
|
|
|
|
(revision "1"))
|
gnu: Fix erroneous uses of 'package/inherit'.
These packages use a different source/version from the inherited package, and
thus should not inherit replacements.
* gnu/packages/check.scm (googletest-1.8, python-pytest-runner-2): Use record
inheritance instead of PACKAGE/INHERIT.
* gnu/packages/crates-io.scm (rust-bindgen-0.49, rust-bytes-0.4,
rust-colored-1.9.1, rust-difference-1, rust-docopt-0.8, rust-html5ever-0.23,
rust-http-0.1, rust-http-body-0.1, rust-loom-0.2, rust-loom-0.1,
rust-pulldown-cmark-0.0.8, rust-ring-0.13, rust-rustls-0.12, rust-sct-0.3,
rust-term-0.2, rust-untrusted-0.6, rust-webpki-0.18, rust-webpki-roots-0.17,
rust-webpki-roots-0.14): Likewise.
* gnu/packages/emacs.scm (emacs-next, emacs-next-pgtk, guile-emacs): Likewise.
* gnu/packages/guile.scm (guile-2.2.4): Likewise.
* gnu/packages/maths.scm (hdf5-1.10, hdf5-1.12): Likewise.
* gnu/packages/protobuf.scm (protobuf-3.6, protobuf-3.5, python-protobuf-3.6):
Likewise.
* gnu/packages/python-web.scm (python2-html2text): Likewise.
* gnu/packages/python-xyz.scm (python-pygments/fixed, python2-numpy,
python2-urwid, python2-markdown, python2-fonttools): Likewise.
* gnu/packages/racket.scm (racket): Likewise.
* gnu/packages/sequoia.scm (sequoia4pEp): Likewise.
2021-05-23 08:07:34 -04:00
|
|
|
(package
|
|
|
|
(inherit emacs-next)
|
2020-11-19 09:36:11 -05:00
|
|
|
(name "emacs-next-pgtk")
|
|
|
|
(version (git-version "28.0.50" revision commit))
|
|
|
|
(source
|
|
|
|
(origin
|
|
|
|
(method git-fetch)
|
|
|
|
(uri (git-reference
|
2020-11-28 16:22:06 -05:00
|
|
|
(url "https://git.savannah.gnu.org/git/emacs.git/")
|
2020-11-19 09:36:11 -05:00
|
|
|
(commit commit)))
|
|
|
|
(file-name (git-file-name name version))
|
|
|
|
(sha256
|
|
|
|
(base32
|
2021-02-01 01:33:07 -05:00
|
|
|
"07hgfqh965zmra0rbmnf63p3lsinpv5hn5payqcrjx25pl75xnaf"))))
|
2020-11-19 09:36:11 -05:00
|
|
|
(arguments
|
|
|
|
(substitute-keyword-arguments (package-arguments emacs-next)
|
|
|
|
((#:configure-flags flags ''())
|
|
|
|
`(cons* "--with-pgtk" "--with-xwidgets" ,flags))))
|
|
|
|
(propagated-inputs
|
|
|
|
`(("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
|
|
|
|
("glib-networking" ,glib-networking)))
|
|
|
|
(inputs
|
|
|
|
`(("webkitgtk" ,webkitgtk)
|
|
|
|
,@(package-inputs emacs-next)))
|
|
|
|
(home-page "https://github.com/masm11/emacs")
|
|
|
|
(synopsis "Emacs text editor with @code{pgtk} and @code{xwidgets} support")
|
|
|
|
(description "This is an unofficial Emacs fork build with a pure-GTK
|
|
|
|
graphical toolkit to work natively on Wayland. In addition to that, xwidgets
|
|
|
|
also enabled and works without glitches even on X server."))))
|
|
|
|
|
2016-05-11 16:25:29 -04:00
|
|
|
(define-public emacs-minimal
|
2015-03-19 18:05:21 -04:00
|
|
|
;; This is the version that you should use as an input to packages that just
|
|
|
|
;; need to byte-compile .el files.
|
gnu: emacs: Update to 27.1.
* gnu/packages/emacs.scm (emacs): Update to 27.1.
[source]: In snippet, use 'find-files' to find 'eshell/esh-groups.el'
if it exists, but gracefully handle its absence.
[arguments]: Add "--with-cairo" to configure-flags. Add 'restore-emacs-pdmp'
and 'make-compressed-files-writable' phases. Explicitly return #t from
'install-site-start' phase.
[inputs]: Add cairo, pango, harfbuzz, jansson, and gmp. Remove imagemagick.
(emacs-next): Remove variable.
(emacs-minimal, emacs-xwidgets): Use 'package/inherit'.
[arguments]: Remove 'restore-emacs-pdmp' phase.
(emacs-no-x): Use 'package/inherit'.
[arguments]: Remove "--with-cairo" from configure-flags. Remove
'restore-emacs-pdmp' phase.
[inputs]: Remove cairo, pango, and harfbuzz.
(emacs-no-x-toolkit): Use 'package/inherit'.
[arguments]: Remove 'restore-emacs-pdmp' phase. Remove superfluous
quasiquote+unquote-splicing pair.
(emacs-wide-int): Use 'package/inherit'.
(guile-emacs): Use 'package/inherit'.
[arguments]: Remove "--with-cairo" from configure-flags. Remove
'restore-emacs-pdmp' phase.
* gnu/packages/patches/emacs-ignore-empty-xim-styles.patch,
gnu/packages/patches/emacs-source-date-epoch.patch: Adapt to
apply cleanly to emacs-27.1.
* gnu/packages/patches/emacs-exec-path.patch: Replace with the previous
contents of 'emacs27-exec-path.patch', but remove the superfluous comment
about it being "like emacs-exec-path.patch, but for Emacs 27".
* gnu/packages/patches/emacs27-exec-path.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove 'emacs27-exec-path.patch'.
2019-04-23 02:35:03 -04:00
|
|
|
(package/inherit emacs
|
2016-05-11 16:25:29 -04:00
|
|
|
(name "emacs-minimal")
|
|
|
|
(synopsis "The extensible text editor (used only for byte-compilation)")
|
|
|
|
(build-system gnu-build-system)
|
|
|
|
(arguments
|
2019-05-21 16:51:00 -04:00
|
|
|
(substitute-keyword-arguments (package-arguments emacs)
|
|
|
|
((#:configure-flags flags ''())
|
gnu: emacs: Update to 27.1.
* gnu/packages/emacs.scm (emacs): Update to 27.1.
[source]: In snippet, use 'find-files' to find 'eshell/esh-groups.el'
if it exists, but gracefully handle its absence.
[arguments]: Add "--with-cairo" to configure-flags. Add 'restore-emacs-pdmp'
and 'make-compressed-files-writable' phases. Explicitly return #t from
'install-site-start' phase.
[inputs]: Add cairo, pango, harfbuzz, jansson, and gmp. Remove imagemagick.
(emacs-next): Remove variable.
(emacs-minimal, emacs-xwidgets): Use 'package/inherit'.
[arguments]: Remove 'restore-emacs-pdmp' phase.
(emacs-no-x): Use 'package/inherit'.
[arguments]: Remove "--with-cairo" from configure-flags. Remove
'restore-emacs-pdmp' phase.
[inputs]: Remove cairo, pango, and harfbuzz.
(emacs-no-x-toolkit): Use 'package/inherit'.
[arguments]: Remove 'restore-emacs-pdmp' phase. Remove superfluous
quasiquote+unquote-splicing pair.
(emacs-wide-int): Use 'package/inherit'.
(guile-emacs): Use 'package/inherit'.
[arguments]: Remove "--with-cairo" from configure-flags. Remove
'restore-emacs-pdmp' phase.
* gnu/packages/patches/emacs-ignore-empty-xim-styles.patch,
gnu/packages/patches/emacs-source-date-epoch.patch: Adapt to
apply cleanly to emacs-27.1.
* gnu/packages/patches/emacs-exec-path.patch: Replace with the previous
contents of 'emacs27-exec-path.patch', but remove the superfluous comment
about it being "like emacs-exec-path.patch, but for Emacs 27".
* gnu/packages/patches/emacs27-exec-path.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove 'emacs27-exec-path.patch'.
2019-04-23 02:35:03 -04:00
|
|
|
`(list "--with-gnutls=no" "--disable-build-details"))
|
|
|
|
((#:phases phases)
|
|
|
|
`(modify-phases ,phases
|
2020-08-28 09:34:00 -04:00
|
|
|
(delete 'restore-emacs-pdmp)
|
|
|
|
(delete 'strip-double-wrap)))))
|
2016-05-11 16:25:29 -04:00
|
|
|
(inputs
|
2020-03-22 12:46:39 -04:00
|
|
|
`(("guix-emacs.el" ,(search-auxiliary-file "emacs/guix-emacs.el"))
|
2021-04-17 13:06:18 -04:00
|
|
|
("ncurses" ,ncurses)
|
|
|
|
("coreutils" ,coreutils)
|
|
|
|
("gzip" ,gzip)))
|
2016-05-11 16:25:29 -04:00
|
|
|
(native-inputs
|
|
|
|
`(("pkg-config" ,pkg-config)))))
|
|
|
|
|
2019-01-18 17:29:14 -05:00
|
|
|
(define-public emacs-xwidgets
|
gnu: emacs: Update to 27.1.
* gnu/packages/emacs.scm (emacs): Update to 27.1.
[source]: In snippet, use 'find-files' to find 'eshell/esh-groups.el'
if it exists, but gracefully handle its absence.
[arguments]: Add "--with-cairo" to configure-flags. Add 'restore-emacs-pdmp'
and 'make-compressed-files-writable' phases. Explicitly return #t from
'install-site-start' phase.
[inputs]: Add cairo, pango, harfbuzz, jansson, and gmp. Remove imagemagick.
(emacs-next): Remove variable.
(emacs-minimal, emacs-xwidgets): Use 'package/inherit'.
[arguments]: Remove 'restore-emacs-pdmp' phase.
(emacs-no-x): Use 'package/inherit'.
[arguments]: Remove "--with-cairo" from configure-flags. Remove
'restore-emacs-pdmp' phase.
[inputs]: Remove cairo, pango, and harfbuzz.
(emacs-no-x-toolkit): Use 'package/inherit'.
[arguments]: Remove 'restore-emacs-pdmp' phase. Remove superfluous
quasiquote+unquote-splicing pair.
(emacs-wide-int): Use 'package/inherit'.
(guile-emacs): Use 'package/inherit'.
[arguments]: Remove "--with-cairo" from configure-flags. Remove
'restore-emacs-pdmp' phase.
* gnu/packages/patches/emacs-ignore-empty-xim-styles.patch,
gnu/packages/patches/emacs-source-date-epoch.patch: Adapt to
apply cleanly to emacs-27.1.
* gnu/packages/patches/emacs-exec-path.patch: Replace with the previous
contents of 'emacs27-exec-path.patch', but remove the superfluous comment
about it being "like emacs-exec-path.patch, but for Emacs 27".
* gnu/packages/patches/emacs27-exec-path.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove 'emacs27-exec-path.patch'.
2019-04-23 02:35:03 -04:00
|
|
|
(package/inherit emacs
|
2019-01-18 17:29:14 -05:00
|
|
|
(name "emacs-xwidgets")
|
|
|
|
(synopsis "The extensible, customizable, self-documenting text
|
|
|
|
editor (with xwidgets support)")
|
|
|
|
(build-system gnu-build-system)
|
|
|
|
(arguments
|
2019-05-21 16:51:00 -04:00
|
|
|
(substitute-keyword-arguments (package-arguments emacs)
|
|
|
|
((#:configure-flags flags ''())
|
gnu: emacs: Update to 27.1.
* gnu/packages/emacs.scm (emacs): Update to 27.1.
[source]: In snippet, use 'find-files' to find 'eshell/esh-groups.el'
if it exists, but gracefully handle its absence.
[arguments]: Add "--with-cairo" to configure-flags. Add 'restore-emacs-pdmp'
and 'make-compressed-files-writable' phases. Explicitly return #t from
'install-site-start' phase.
[inputs]: Add cairo, pango, harfbuzz, jansson, and gmp. Remove imagemagick.
(emacs-next): Remove variable.
(emacs-minimal, emacs-xwidgets): Use 'package/inherit'.
[arguments]: Remove 'restore-emacs-pdmp' phase.
(emacs-no-x): Use 'package/inherit'.
[arguments]: Remove "--with-cairo" from configure-flags. Remove
'restore-emacs-pdmp' phase.
[inputs]: Remove cairo, pango, and harfbuzz.
(emacs-no-x-toolkit): Use 'package/inherit'.
[arguments]: Remove 'restore-emacs-pdmp' phase. Remove superfluous
quasiquote+unquote-splicing pair.
(emacs-wide-int): Use 'package/inherit'.
(guile-emacs): Use 'package/inherit'.
[arguments]: Remove "--with-cairo" from configure-flags. Remove
'restore-emacs-pdmp' phase.
* gnu/packages/patches/emacs-ignore-empty-xim-styles.patch,
gnu/packages/patches/emacs-source-date-epoch.patch: Adapt to
apply cleanly to emacs-27.1.
* gnu/packages/patches/emacs-exec-path.patch: Replace with the previous
contents of 'emacs27-exec-path.patch', but remove the superfluous comment
about it being "like emacs-exec-path.patch, but for Emacs 27".
* gnu/packages/patches/emacs27-exec-path.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove 'emacs27-exec-path.patch'.
2019-04-23 02:35:03 -04:00
|
|
|
`(cons "--with-xwidgets" ,flags))
|
|
|
|
((#:phases phases)
|
|
|
|
`(modify-phases ,phases
|
2020-08-28 09:34:00 -04:00
|
|
|
(delete 'restore-emacs-pdmp)
|
|
|
|
(delete 'strip-double-wrap)))))
|
2019-01-18 17:29:14 -05:00
|
|
|
(inputs
|
|
|
|
`(("webkitgtk" ,webkitgtk)
|
|
|
|
("libxcomposite" ,libxcomposite)
|
|
|
|
,@(package-inputs emacs)))))
|
|
|
|
|
2016-05-11 16:25:29 -04:00
|
|
|
(define-public emacs-no-x
|
gnu: emacs: Update to 27.1.
* gnu/packages/emacs.scm (emacs): Update to 27.1.
[source]: In snippet, use 'find-files' to find 'eshell/esh-groups.el'
if it exists, but gracefully handle its absence.
[arguments]: Add "--with-cairo" to configure-flags. Add 'restore-emacs-pdmp'
and 'make-compressed-files-writable' phases. Explicitly return #t from
'install-site-start' phase.
[inputs]: Add cairo, pango, harfbuzz, jansson, and gmp. Remove imagemagick.
(emacs-next): Remove variable.
(emacs-minimal, emacs-xwidgets): Use 'package/inherit'.
[arguments]: Remove 'restore-emacs-pdmp' phase.
(emacs-no-x): Use 'package/inherit'.
[arguments]: Remove "--with-cairo" from configure-flags. Remove
'restore-emacs-pdmp' phase.
[inputs]: Remove cairo, pango, and harfbuzz.
(emacs-no-x-toolkit): Use 'package/inherit'.
[arguments]: Remove 'restore-emacs-pdmp' phase. Remove superfluous
quasiquote+unquote-splicing pair.
(emacs-wide-int): Use 'package/inherit'.
(guile-emacs): Use 'package/inherit'.
[arguments]: Remove "--with-cairo" from configure-flags. Remove
'restore-emacs-pdmp' phase.
* gnu/packages/patches/emacs-ignore-empty-xim-styles.patch,
gnu/packages/patches/emacs-source-date-epoch.patch: Adapt to
apply cleanly to emacs-27.1.
* gnu/packages/patches/emacs-exec-path.patch: Replace with the previous
contents of 'emacs27-exec-path.patch', but remove the superfluous comment
about it being "like emacs-exec-path.patch, but for Emacs 27".
* gnu/packages/patches/emacs27-exec-path.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove 'emacs27-exec-path.patch'.
2019-04-23 02:35:03 -04:00
|
|
|
(package/inherit emacs
|
2015-03-19 18:05:21 -04:00
|
|
|
(name "emacs-no-x")
|
|
|
|
(synopsis "The extensible, customizable, self-documenting text
|
|
|
|
editor (console only)")
|
|
|
|
(build-system gnu-build-system)
|
|
|
|
(inputs (fold alist-delete
|
|
|
|
(package-inputs emacs)
|
|
|
|
'("libx11" "gtk+" "libxft" "libtiff" "giflib" "libjpeg"
|
2017-08-14 13:32:54 -04:00
|
|
|
"imagemagick" "libpng" "librsvg" "libxpm" "libice"
|
gnu: emacs: Update to 27.1.
* gnu/packages/emacs.scm (emacs): Update to 27.1.
[source]: In snippet, use 'find-files' to find 'eshell/esh-groups.el'
if it exists, but gracefully handle its absence.
[arguments]: Add "--with-cairo" to configure-flags. Add 'restore-emacs-pdmp'
and 'make-compressed-files-writable' phases. Explicitly return #t from
'install-site-start' phase.
[inputs]: Add cairo, pango, harfbuzz, jansson, and gmp. Remove imagemagick.
(emacs-next): Remove variable.
(emacs-minimal, emacs-xwidgets): Use 'package/inherit'.
[arguments]: Remove 'restore-emacs-pdmp' phase.
(emacs-no-x): Use 'package/inherit'.
[arguments]: Remove "--with-cairo" from configure-flags. Remove
'restore-emacs-pdmp' phase.
[inputs]: Remove cairo, pango, and harfbuzz.
(emacs-no-x-toolkit): Use 'package/inherit'.
[arguments]: Remove 'restore-emacs-pdmp' phase. Remove superfluous
quasiquote+unquote-splicing pair.
(emacs-wide-int): Use 'package/inherit'.
(guile-emacs): Use 'package/inherit'.
[arguments]: Remove "--with-cairo" from configure-flags. Remove
'restore-emacs-pdmp' phase.
* gnu/packages/patches/emacs-ignore-empty-xim-styles.patch,
gnu/packages/patches/emacs-source-date-epoch.patch: Adapt to
apply cleanly to emacs-27.1.
* gnu/packages/patches/emacs-exec-path.patch: Replace with the previous
contents of 'emacs27-exec-path.patch', but remove the superfluous comment
about it being "like emacs-exec-path.patch, but for Emacs 27".
* gnu/packages/patches/emacs27-exec-path.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove 'emacs27-exec-path.patch'.
2019-04-23 02:35:03 -04:00
|
|
|
"libsm" "cairo" "pango" "harfbuzz"
|
2015-03-19 18:05:21 -04:00
|
|
|
|
2017-08-14 13:32:54 -04:00
|
|
|
;; These depend on libx11, so remove them as well.
|
gnu: emacs: Update to 27.1.
* gnu/packages/emacs.scm (emacs): Update to 27.1.
[source]: In snippet, use 'find-files' to find 'eshell/esh-groups.el'
if it exists, but gracefully handle its absence.
[arguments]: Add "--with-cairo" to configure-flags. Add 'restore-emacs-pdmp'
and 'make-compressed-files-writable' phases. Explicitly return #t from
'install-site-start' phase.
[inputs]: Add cairo, pango, harfbuzz, jansson, and gmp. Remove imagemagick.
(emacs-next): Remove variable.
(emacs-minimal, emacs-xwidgets): Use 'package/inherit'.
[arguments]: Remove 'restore-emacs-pdmp' phase.
(emacs-no-x): Use 'package/inherit'.
[arguments]: Remove "--with-cairo" from configure-flags. Remove
'restore-emacs-pdmp' phase.
[inputs]: Remove cairo, pango, and harfbuzz.
(emacs-no-x-toolkit): Use 'package/inherit'.
[arguments]: Remove 'restore-emacs-pdmp' phase. Remove superfluous
quasiquote+unquote-splicing pair.
(emacs-wide-int): Use 'package/inherit'.
(guile-emacs): Use 'package/inherit'.
[arguments]: Remove "--with-cairo" from configure-flags. Remove
'restore-emacs-pdmp' phase.
* gnu/packages/patches/emacs-ignore-empty-xim-styles.patch,
gnu/packages/patches/emacs-source-date-epoch.patch: Adapt to
apply cleanly to emacs-27.1.
* gnu/packages/patches/emacs-exec-path.patch: Replace with the previous
contents of 'emacs27-exec-path.patch', but remove the superfluous comment
about it being "like emacs-exec-path.patch, but for Emacs 27".
* gnu/packages/patches/emacs27-exec-path.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove 'emacs27-exec-path.patch'.
2019-04-23 02:35:03 -04:00
|
|
|
"libotf" "m17n-lib" "dbus")))
|
|
|
|
(arguments
|
|
|
|
(substitute-keyword-arguments (package-arguments emacs)
|
|
|
|
((#:configure-flags flags ''())
|
|
|
|
`(delete "--with-cairo" ,flags))
|
|
|
|
((#:phases phases)
|
|
|
|
`(modify-phases ,phases
|
2020-08-28 09:34:00 -04:00
|
|
|
(delete 'restore-emacs-pdmp)
|
|
|
|
(delete 'strip-double-wrap)))))))
|
2015-03-19 18:05:21 -04:00
|
|
|
|
2014-07-29 04:00:56 -04:00
|
|
|
(define-public emacs-no-x-toolkit
|
gnu: emacs: Update to 27.1.
* gnu/packages/emacs.scm (emacs): Update to 27.1.
[source]: In snippet, use 'find-files' to find 'eshell/esh-groups.el'
if it exists, but gracefully handle its absence.
[arguments]: Add "--with-cairo" to configure-flags. Add 'restore-emacs-pdmp'
and 'make-compressed-files-writable' phases. Explicitly return #t from
'install-site-start' phase.
[inputs]: Add cairo, pango, harfbuzz, jansson, and gmp. Remove imagemagick.
(emacs-next): Remove variable.
(emacs-minimal, emacs-xwidgets): Use 'package/inherit'.
[arguments]: Remove 'restore-emacs-pdmp' phase.
(emacs-no-x): Use 'package/inherit'.
[arguments]: Remove "--with-cairo" from configure-flags. Remove
'restore-emacs-pdmp' phase.
[inputs]: Remove cairo, pango, and harfbuzz.
(emacs-no-x-toolkit): Use 'package/inherit'.
[arguments]: Remove 'restore-emacs-pdmp' phase. Remove superfluous
quasiquote+unquote-splicing pair.
(emacs-wide-int): Use 'package/inherit'.
(guile-emacs): Use 'package/inherit'.
[arguments]: Remove "--with-cairo" from configure-flags. Remove
'restore-emacs-pdmp' phase.
* gnu/packages/patches/emacs-ignore-empty-xim-styles.patch,
gnu/packages/patches/emacs-source-date-epoch.patch: Adapt to
apply cleanly to emacs-27.1.
* gnu/packages/patches/emacs-exec-path.patch: Replace with the previous
contents of 'emacs27-exec-path.patch', but remove the superfluous comment
about it being "like emacs-exec-path.patch, but for Emacs 27".
* gnu/packages/patches/emacs27-exec-path.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove 'emacs27-exec-path.patch'.
2019-04-23 02:35:03 -04:00
|
|
|
(package/inherit emacs
|
2014-07-29 04:00:56 -04:00
|
|
|
(name "emacs-no-x-toolkit")
|
|
|
|
(synopsis "The extensible, customizable, self-documenting text
|
|
|
|
editor (without an X toolkit)" )
|
2014-12-09 17:11:02 -05:00
|
|
|
(build-system gnu-build-system)
|
2014-10-08 03:49:43 -04:00
|
|
|
(inputs (append `(("inotify-tools" ,inotify-tools))
|
|
|
|
(alist-delete "gtk+" (package-inputs emacs))))
|
2019-03-05 14:38:32 -05:00
|
|
|
(arguments
|
gnu: emacs: Update to 27.1.
* gnu/packages/emacs.scm (emacs): Update to 27.1.
[source]: In snippet, use 'find-files' to find 'eshell/esh-groups.el'
if it exists, but gracefully handle its absence.
[arguments]: Add "--with-cairo" to configure-flags. Add 'restore-emacs-pdmp'
and 'make-compressed-files-writable' phases. Explicitly return #t from
'install-site-start' phase.
[inputs]: Add cairo, pango, harfbuzz, jansson, and gmp. Remove imagemagick.
(emacs-next): Remove variable.
(emacs-minimal, emacs-xwidgets): Use 'package/inherit'.
[arguments]: Remove 'restore-emacs-pdmp' phase.
(emacs-no-x): Use 'package/inherit'.
[arguments]: Remove "--with-cairo" from configure-flags. Remove
'restore-emacs-pdmp' phase.
[inputs]: Remove cairo, pango, and harfbuzz.
(emacs-no-x-toolkit): Use 'package/inherit'.
[arguments]: Remove 'restore-emacs-pdmp' phase. Remove superfluous
quasiquote+unquote-splicing pair.
(emacs-wide-int): Use 'package/inherit'.
(guile-emacs): Use 'package/inherit'.
[arguments]: Remove "--with-cairo" from configure-flags. Remove
'restore-emacs-pdmp' phase.
* gnu/packages/patches/emacs-ignore-empty-xim-styles.patch,
gnu/packages/patches/emacs-source-date-epoch.patch: Adapt to
apply cleanly to emacs-27.1.
* gnu/packages/patches/emacs-exec-path.patch: Replace with the previous
contents of 'emacs27-exec-path.patch', but remove the superfluous comment
about it being "like emacs-exec-path.patch, but for Emacs 27".
* gnu/packages/patches/emacs27-exec-path.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove 'emacs27-exec-path.patch'.
2019-04-23 02:35:03 -04:00
|
|
|
(substitute-keyword-arguments (package-arguments emacs)
|
|
|
|
((#:configure-flags flags ''())
|
|
|
|
`(cons "--with-x-toolkit=no" ,flags))
|
|
|
|
((#:phases phases)
|
|
|
|
`(modify-phases ,phases
|
2020-08-28 09:34:00 -04:00
|
|
|
(delete 'restore-emacs-pdmp)
|
|
|
|
(delete 'strip-double-wrap)))))))
|
2014-07-29 04:00:56 -04:00
|
|
|
|
2019-12-28 18:41:48 -05:00
|
|
|
(define-public emacs-wide-int
|
gnu: emacs: Update to 27.1.
* gnu/packages/emacs.scm (emacs): Update to 27.1.
[source]: In snippet, use 'find-files' to find 'eshell/esh-groups.el'
if it exists, but gracefully handle its absence.
[arguments]: Add "--with-cairo" to configure-flags. Add 'restore-emacs-pdmp'
and 'make-compressed-files-writable' phases. Explicitly return #t from
'install-site-start' phase.
[inputs]: Add cairo, pango, harfbuzz, jansson, and gmp. Remove imagemagick.
(emacs-next): Remove variable.
(emacs-minimal, emacs-xwidgets): Use 'package/inherit'.
[arguments]: Remove 'restore-emacs-pdmp' phase.
(emacs-no-x): Use 'package/inherit'.
[arguments]: Remove "--with-cairo" from configure-flags. Remove
'restore-emacs-pdmp' phase.
[inputs]: Remove cairo, pango, and harfbuzz.
(emacs-no-x-toolkit): Use 'package/inherit'.
[arguments]: Remove 'restore-emacs-pdmp' phase. Remove superfluous
quasiquote+unquote-splicing pair.
(emacs-wide-int): Use 'package/inherit'.
(guile-emacs): Use 'package/inherit'.
[arguments]: Remove "--with-cairo" from configure-flags. Remove
'restore-emacs-pdmp' phase.
* gnu/packages/patches/emacs-ignore-empty-xim-styles.patch,
gnu/packages/patches/emacs-source-date-epoch.patch: Adapt to
apply cleanly to emacs-27.1.
* gnu/packages/patches/emacs-exec-path.patch: Replace with the previous
contents of 'emacs27-exec-path.patch', but remove the superfluous comment
about it being "like emacs-exec-path.patch, but for Emacs 27".
* gnu/packages/patches/emacs27-exec-path.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove 'emacs27-exec-path.patch'.
2019-04-23 02:35:03 -04:00
|
|
|
(package/inherit emacs
|
2019-12-28 18:41:48 -05:00
|
|
|
(name "emacs-wide-int")
|
|
|
|
(synopsis "The extensible, customizable, self-documenting text
|
|
|
|
editor (with wide ints)" )
|
|
|
|
(arguments
|
|
|
|
(substitute-keyword-arguments (package-arguments emacs)
|
|
|
|
((#:configure-flags flags)
|
|
|
|
`(cons "--with-wide-int" ,flags))))))
|
|
|
|
|
2015-05-10 10:29:54 -04:00
|
|
|
(define-public guile-emacs
|
2019-02-25 18:05:18 -05:00
|
|
|
(let ((commit "41120e0f595b16387eebfbf731fff70481de1b4b")
|
|
|
|
(revision "0"))
|
gnu: Fix erroneous uses of 'package/inherit'.
These packages use a different source/version from the inherited package, and
thus should not inherit replacements.
* gnu/packages/check.scm (googletest-1.8, python-pytest-runner-2): Use record
inheritance instead of PACKAGE/INHERIT.
* gnu/packages/crates-io.scm (rust-bindgen-0.49, rust-bytes-0.4,
rust-colored-1.9.1, rust-difference-1, rust-docopt-0.8, rust-html5ever-0.23,
rust-http-0.1, rust-http-body-0.1, rust-loom-0.2, rust-loom-0.1,
rust-pulldown-cmark-0.0.8, rust-ring-0.13, rust-rustls-0.12, rust-sct-0.3,
rust-term-0.2, rust-untrusted-0.6, rust-webpki-0.18, rust-webpki-roots-0.17,
rust-webpki-roots-0.14): Likewise.
* gnu/packages/emacs.scm (emacs-next, emacs-next-pgtk, guile-emacs): Likewise.
* gnu/packages/guile.scm (guile-2.2.4): Likewise.
* gnu/packages/maths.scm (hdf5-1.10, hdf5-1.12): Likewise.
* gnu/packages/protobuf.scm (protobuf-3.6, protobuf-3.5, python-protobuf-3.6):
Likewise.
* gnu/packages/python-web.scm (python2-html2text): Likewise.
* gnu/packages/python-xyz.scm (python-pygments/fixed, python2-numpy,
python2-urwid, python2-markdown, python2-fonttools): Likewise.
* gnu/packages/racket.scm (racket): Likewise.
* gnu/packages/sequoia.scm (sequoia4pEp): Likewise.
2021-05-23 08:07:34 -04:00
|
|
|
(package
|
|
|
|
(inherit emacs)
|
2019-02-25 18:05:18 -05:00
|
|
|
(name "guile-emacs")
|
|
|
|
(version (git-version "0.0.0" revision commit))
|
|
|
|
(source (origin
|
|
|
|
(method git-fetch)
|
|
|
|
(uri (git-reference
|
|
|
|
(url "https://git.hcoop.net/git/bpt/emacs.git")
|
|
|
|
(commit commit)))
|
|
|
|
(file-name (git-file-name name version))
|
|
|
|
(patches (search-patches "guile-emacs-fix-configure.patch"))
|
|
|
|
(sha256
|
|
|
|
(base32
|
|
|
|
"0lvcvsz0f4mawj04db35p1dvkffdqkz8pkhc0jzh9j9x2i63kcz6"))))
|
|
|
|
(native-inputs
|
|
|
|
`(("autoconf" ,autoconf)
|
|
|
|
("automake" ,automake)
|
|
|
|
("guile" ,guile-for-guile-emacs)
|
|
|
|
,@(package-native-inputs emacs)))
|
|
|
|
(arguments
|
|
|
|
(substitute-keyword-arguments `(;; Build fails if we allow parallel build.
|
|
|
|
#:parallel-build? #f
|
|
|
|
;; Tests aren't passing for now.
|
|
|
|
#:tests? #f
|
|
|
|
,@(package-arguments emacs))
|
gnu: emacs: Update to 27.1.
* gnu/packages/emacs.scm (emacs): Update to 27.1.
[source]: In snippet, use 'find-files' to find 'eshell/esh-groups.el'
if it exists, but gracefully handle its absence.
[arguments]: Add "--with-cairo" to configure-flags. Add 'restore-emacs-pdmp'
and 'make-compressed-files-writable' phases. Explicitly return #t from
'install-site-start' phase.
[inputs]: Add cairo, pango, harfbuzz, jansson, and gmp. Remove imagemagick.
(emacs-next): Remove variable.
(emacs-minimal, emacs-xwidgets): Use 'package/inherit'.
[arguments]: Remove 'restore-emacs-pdmp' phase.
(emacs-no-x): Use 'package/inherit'.
[arguments]: Remove "--with-cairo" from configure-flags. Remove
'restore-emacs-pdmp' phase.
[inputs]: Remove cairo, pango, and harfbuzz.
(emacs-no-x-toolkit): Use 'package/inherit'.
[arguments]: Remove 'restore-emacs-pdmp' phase. Remove superfluous
quasiquote+unquote-splicing pair.
(emacs-wide-int): Use 'package/inherit'.
(guile-emacs): Use 'package/inherit'.
[arguments]: Remove "--with-cairo" from configure-flags. Remove
'restore-emacs-pdmp' phase.
* gnu/packages/patches/emacs-ignore-empty-xim-styles.patch,
gnu/packages/patches/emacs-source-date-epoch.patch: Adapt to
apply cleanly to emacs-27.1.
* gnu/packages/patches/emacs-exec-path.patch: Replace with the previous
contents of 'emacs27-exec-path.patch', but remove the superfluous comment
about it being "like emacs-exec-path.patch, but for Emacs 27".
* gnu/packages/patches/emacs27-exec-path.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove 'emacs27-exec-path.patch'.
2019-04-23 02:35:03 -04:00
|
|
|
((#:configure-flags flags ''())
|
|
|
|
`(delete "--with-cairo" ,flags))
|
2019-02-25 18:05:18 -05:00
|
|
|
((#:phases phases)
|
|
|
|
`(modify-phases ,phases
|
|
|
|
(add-after 'unpack 'autogen
|
|
|
|
(lambda _
|
|
|
|
(invoke "sh" "autogen.sh")))
|
|
|
|
;; Build sometimes fails: deps/dispnew.d: No such file or directory
|
|
|
|
(add-before 'build 'make-deps-dir
|
|
|
|
(lambda _
|
gnu: emacs: Update to 27.1.
* gnu/packages/emacs.scm (emacs): Update to 27.1.
[source]: In snippet, use 'find-files' to find 'eshell/esh-groups.el'
if it exists, but gracefully handle its absence.
[arguments]: Add "--with-cairo" to configure-flags. Add 'restore-emacs-pdmp'
and 'make-compressed-files-writable' phases. Explicitly return #t from
'install-site-start' phase.
[inputs]: Add cairo, pango, harfbuzz, jansson, and gmp. Remove imagemagick.
(emacs-next): Remove variable.
(emacs-minimal, emacs-xwidgets): Use 'package/inherit'.
[arguments]: Remove 'restore-emacs-pdmp' phase.
(emacs-no-x): Use 'package/inherit'.
[arguments]: Remove "--with-cairo" from configure-flags. Remove
'restore-emacs-pdmp' phase.
[inputs]: Remove cairo, pango, and harfbuzz.
(emacs-no-x-toolkit): Use 'package/inherit'.
[arguments]: Remove 'restore-emacs-pdmp' phase. Remove superfluous
quasiquote+unquote-splicing pair.
(emacs-wide-int): Use 'package/inherit'.
(guile-emacs): Use 'package/inherit'.
[arguments]: Remove "--with-cairo" from configure-flags. Remove
'restore-emacs-pdmp' phase.
* gnu/packages/patches/emacs-ignore-empty-xim-styles.patch,
gnu/packages/patches/emacs-source-date-epoch.patch: Adapt to
apply cleanly to emacs-27.1.
* gnu/packages/patches/emacs-exec-path.patch: Replace with the previous
contents of 'emacs27-exec-path.patch', but remove the superfluous comment
about it being "like emacs-exec-path.patch, but for Emacs 27".
* gnu/packages/patches/emacs27-exec-path.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove 'emacs27-exec-path.patch'.
2019-04-23 02:35:03 -04:00
|
|
|
(invoke "mkdir" "-p" "src/deps")))
|
2020-08-28 09:34:00 -04:00
|
|
|
(delete 'restore-emacs-pdmp)
|
|
|
|
(delete 'strip-double-wrap))))))))
|
2015-05-10 10:29:54 -04:00
|
|
|
|
2019-01-16 10:03:52 -05:00
|
|
|
(define-public m17n-db
|
2014-08-02 22:20:23 -04:00
|
|
|
(package
|
2019-01-16 10:03:52 -05:00
|
|
|
(name "m17n-db")
|
|
|
|
(version "1.8.0")
|
|
|
|
(source
|
|
|
|
(origin
|
|
|
|
(method url-fetch)
|
|
|
|
(uri (string-append "mirror://savannah/m17n/m17n-db-"
|
|
|
|
version ".tar.gz"))
|
|
|
|
(sha256
|
|
|
|
(base32
|
|
|
|
"0vfw7z9i2s9np6nmx1d4dlsywm044rkaqarn7akffmb6bf1j6zv5"))))
|
2014-08-02 22:20:23 -04:00
|
|
|
(build-system gnu-build-system)
|
2016-10-20 14:23:11 -04:00
|
|
|
(inputs
|
2019-01-16 10:03:52 -05:00
|
|
|
`(("gettext" ,gettext-minimal)))
|
2014-11-25 12:01:38 -05:00
|
|
|
(arguments
|
2019-01-16 10:03:52 -05:00
|
|
|
`(#:configure-flags
|
|
|
|
(list (string-append "--with-charmaps="
|
|
|
|
(assoc-ref %build-inputs "libc")
|
|
|
|
"/share/i18n/charmaps"))))
|
|
|
|
;; With `guix lint' the home-page URI returns a small page saying
|
|
|
|
;; that your browser does not handle frames. This triggers the "URI
|
|
|
|
;; returns suspiciously small file" warning.
|
|
|
|
(home-page "https://www.nongnu.org/m17n/")
|
|
|
|
(synopsis "Multilingual text processing library (database)")
|
|
|
|
(description "The m17n library realizes multilingualization of
|
|
|
|
many aspects of applications. The m17n library represents
|
|
|
|
multilingual text as an object named M-text. M-text is a string with
|
|
|
|
attributes called text properties, and designed to substitute for
|
|
|
|
string in C. Text properties carry any information required to input,
|
|
|
|
display and edit the text.
|
2014-12-09 17:20:41 -05:00
|
|
|
|
2019-01-16 10:03:52 -05:00
|
|
|
This package contains the library database.")
|
|
|
|
(license license:lgpl2.1+)))
|
2016-06-29 01:39:42 -04:00
|
|
|
|
2019-01-16 10:03:52 -05:00
|
|
|
(define-public m17n-lib
|
2016-11-17 08:02:33 -05:00
|
|
|
(package
|
2019-01-16 10:03:52 -05:00
|
|
|
(name "m17n-lib")
|
|
|
|
(version "1.8.0")
|
2016-11-17 08:02:33 -05:00
|
|
|
(source
|
|
|
|
(origin
|
|
|
|
(method url-fetch)
|
2019-01-16 10:03:52 -05:00
|
|
|
(uri (string-append "mirror://savannah/m17n/m17n-lib-"
|
|
|
|
version ".tar.gz"))
|
2016-11-17 08:02:33 -05:00
|
|
|
(sha256
|
|
|
|
(base32
|
2019-01-16 10:03:52 -05:00
|
|
|
"0jp61y09xqj10mclpip48qlfhniw8gwy8b28cbzxy8hq8pkwmfkq"))))
|
2016-12-14 16:25:52 -05:00
|
|
|
(build-system gnu-build-system)
|
|
|
|
(inputs
|
2019-01-16 10:03:52 -05:00
|
|
|
`(("fribidi" ,fribidi)
|
|
|
|
("gd" ,gd)
|
|
|
|
("libotf" ,libotf)
|
|
|
|
("libxft" ,libxft)
|
|
|
|
("libxml2" ,libxml2)
|
|
|
|
("m17n-db" ,m17n-db)))
|
2015-07-23 02:42:53 -04:00
|
|
|
(arguments
|
2019-01-16 10:03:52 -05:00
|
|
|
`(#:parallel-build? #f))
|
|
|
|
;; With `guix lint' the home-page URI returns a small page saying
|
|
|
|
;; that your browser does not handle frames. This triggers the "URI
|
|
|
|
;; returns suspiciously small file" warning.
|
|
|
|
(home-page "https://www.nongnu.org/m17n/")
|
|
|
|
(synopsis "Multilingual text processing library (runtime)")
|
|
|
|
(description "The m17n library realizes multilingualization of
|
|
|
|
many aspects of applications. The m17n library represents
|
|
|
|
multilingual text as an object named M-text. M-text is a string with
|
|
|
|
attributes called text properties, and designed to substitute for
|
|
|
|
string in C. Text properties carry any information required to input,
|
|
|
|
display and edit the text.
|
2015-07-23 04:15:36 -04:00
|
|
|
|
2019-01-16 10:03:52 -05:00
|
|
|
This package contains the library runtime.")
|
|
|
|
(license license:lgpl2.1+)))
|