2013-01-13 16:12:22 +00:00
|
|
|
;;; GNU Guix --- Functional package management for GNU
|
2022-05-26 11:17:41 +00:00
|
|
|
;;; Copyright © 2013-2017, 2019, 2021-2022 Ludovic Courtès <ludo@gnu.org>
|
2019-01-16 15:03:52 +00:00
|
|
|
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
|
2014-07-29 08:00:56 +00: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 06:35:03 +00:00
|
|
|
;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Mark H Weaver <mhw@netris.org>
|
2019-01-16 15:03:52 +00: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 11:05:45 +00:00
|
|
|
;;; Copyright © 2016 Nikita <nikita@n0.is>
|
2019-01-16 15:03:52 +00:00
|
|
|
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
|
2020-03-22 16:40:25 +00:00
|
|
|
;;; Copyright © 2017, 2019, 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
2019-01-16 15:03:52 +00:00
|
|
|
;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com>
|
|
|
|
;;; Copyright © 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
|
2017-05-26 10:29:04 +00:00
|
|
|
;;; Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
|
2019-01-16 15:03:52 +00:00
|
|
|
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
|
|
|
|
;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com>
|
2021-03-25 20:03:39 +00:00
|
|
|
;;; Copyright © 2018, 2019, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
|
2019-04-30 21:43:45 +00:00
|
|
|
;;; Copyright © 2019 Jesse John Gildersleve <jessejohngildersleve@zohomail.eu>
|
2019-12-18 04:49:49 +00:00
|
|
|
;;; Copyright © 2019 Valentin Ignatev <valentignatev@gmail.com>
|
2021-11-13 06:44:57 +00:00
|
|
|
;;; Copyright © 2019, 2021 Liliana Marie Prikler <liliana.prikler@gmail.com>
|
2020-03-28 20:23:32 +00:00
|
|
|
;;; Copyright © 2019 Amin Bandali <bandali@gnu.org>
|
2020-05-02 04:26:56 +00:00
|
|
|
;;; Copyright © 2020 Jack Hill <jackhill@jackhill.us>
|
2020-09-01 03:35:41 +00:00
|
|
|
;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com>
|
2022-07-20 04:08:17 +00:00
|
|
|
;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com>
|
2013-01-13 16:12:22 +00: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-18 00:06:24 +00:00
|
|
|
(define-module (gnu packages emacs)
|
2015-03-04 16:02:07 +00:00
|
|
|
#:use-module ((guix licenses) #:prefix license:)
|
2013-01-13 16:12:22 +00:00
|
|
|
#:use-module (guix packages)
|
2022-04-10 11:28:05 +00:00
|
|
|
#:use-module (guix gexp)
|
2013-01-13 16:12:22 +00:00
|
|
|
#:use-module (guix download)
|
2015-05-10 14:29:54 +00:00
|
|
|
#:use-module (guix git-download)
|
2022-08-05 22:37:43 +00:00
|
|
|
#:use-module (guix build-system)
|
2013-01-13 16:12:22 +00:00
|
|
|
#:use-module (guix build-system gnu)
|
2014-12-09 22:11:02 +00:00
|
|
|
#:use-module (guix build-system glib-or-gtk)
|
2013-01-18 00:06:47 +00:00
|
|
|
#:use-module (gnu packages)
|
2019-01-16 15:03:52 +00:00
|
|
|
#:use-module (gnu packages acl)
|
2014-07-24 15:38:42 +00:00
|
|
|
#:use-module (gnu packages autotools)
|
2015-08-19 19:57:08 +00:00
|
|
|
#:use-module (gnu packages base)
|
2015-03-04 16:02:07 +00:00
|
|
|
#:use-module (gnu packages compression)
|
2019-01-16 15:03:52 +00:00
|
|
|
#:use-module (gnu packages fontutils)
|
2022-04-10 11:28:05 +00:00
|
|
|
#:use-module (gnu packages freedesktop)
|
2016-09-27 17:17:21 +00:00
|
|
|
#:use-module (gnu packages fribidi)
|
2022-08-05 22:37:43 +00:00
|
|
|
#:use-module (gnu packages gcc)
|
2016-09-27 17:17:21 +00:00
|
|
|
#:use-module (gnu packages gd)
|
2019-01-16 15:03:52 +00:00
|
|
|
#:use-module (gnu packages gettext)
|
2021-11-13 06:44:57 +00:00
|
|
|
#:use-module (gnu packages ghostscript)
|
2019-01-16 15:03:52 +00:00
|
|
|
#:use-module (gnu packages glib)
|
2019-04-30 21:43:45 +00:00
|
|
|
#:use-module (gnu packages gnome) ; for librsvg
|
2019-01-16 15:03:52 +00:00
|
|
|
#:use-module (gnu packages gtk)
|
|
|
|
#:use-module (gnu packages guile)
|
|
|
|
#:use-module (gnu packages image)
|
2021-05-29 13:44:23 +00:00
|
|
|
#:use-module (gnu packages linux) ; alsa-lib, gpm
|
2019-04-30 21:43:45 +00: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 06:35:03 +00:00
|
|
|
#:use-module (gnu packages multiprecision)
|
2019-01-16 15:03:52 +00:00
|
|
|
#:use-module (gnu packages ncurses)
|
2021-11-13 06:44:57 +00:00
|
|
|
#:use-module (gnu packages pdf)
|
2019-01-16 15:03:52 +00:00
|
|
|
#:use-module (gnu packages pkg-config)
|
2019-04-30 22:06:56 +00:00
|
|
|
#:use-module (gnu packages selinux)
|
2022-07-20 04:08:17 +00:00
|
|
|
#:use-module (gnu packages sqlite)
|
2019-01-16 15:03:52 +00:00
|
|
|
#:use-module (gnu packages texinfo)
|
|
|
|
#:use-module (gnu packages tls)
|
2019-12-18 04:49:49 +00:00
|
|
|
#:use-module (gnu packages web) ; for jansson
|
2019-01-18 22:29:14 +00:00
|
|
|
#:use-module (gnu packages webkit)
|
2019-01-16 15:03:52 +00:00
|
|
|
#:use-module (gnu packages xml)
|
|
|
|
#:use-module (gnu packages xorg)
|
2014-07-29 08:00:56 +00:00
|
|
|
#:use-module (guix utils)
|
gnu: Restore emacs' supported systems.
Recently, librsvg was updated to depend upon rust. That change inadvertently
restricted the "supported" systems of emacs (among other packages) to
x86_64-linux only, since that is the only system declared in the rust
package's list of supported systems. This unintentionally made emacs
unavailable on all other systems.
This change fixes that by removing the rust dependency from some packages.
The packages remain unchanged from the perspective of an x86_64-linux system,
but from the perspective of other systems, the packages are now supported
again (albeit without certain optional SVG features).
* gnu/packages/gtk.scm (gtk+, gtk+-2)[propagated-inputs]: If compiling for
x86_64, use gdk-pixbuf+svg as the "gdk-pixbuf" input, as usual. Otherwise,
use gdk-pixbuf, which avoids adding librsvg (thus rust) to the closure of
inputs. Note that both gtk+ and gtk+-2 are in the transitive closure of
inputs of emacs, so these two changes are necessary.
* gnu/packages/emacs (emacs)[inputs]: If compiling for x86_64, add librsvg to
the inputs, as usual. Otherwise, do not add it, which avoids adding rust to
the closure of inputs.
2021-03-09 07:13:39 +00:00
|
|
|
#:use-module (ice-9 match)
|
2019-01-16 15:03:52 +00:00
|
|
|
#:use-module (srfi srfi-1))
|
2013-01-13 16:12:22 +00:00
|
|
|
|
2022-08-05 22:37:43 +00:00
|
|
|
(define (%emacs-modules build-system)
|
|
|
|
(let ((which (build-system-name build-system)))
|
|
|
|
`((guix build ,(symbol-append which '-build-system))
|
|
|
|
(guix build utils)
|
|
|
|
(srfi srfi-1)
|
|
|
|
(ice-9 ftw))))
|
|
|
|
|
2013-01-13 16:12:22 +00:00
|
|
|
(define-public emacs
|
|
|
|
(package
|
|
|
|
(name "emacs")
|
2022-04-10 11:23:43 +00:00
|
|
|
(version "28.1")
|
2013-01-13 16:12:22 +00:00
|
|
|
(source (origin
|
2020-03-22 16:44:24 +00:00
|
|
|
(method url-fetch)
|
|
|
|
(uri (string-append "mirror://gnu/emacs/emacs-"
|
|
|
|
version ".tar.xz"))
|
|
|
|
(sha256
|
|
|
|
(base32
|
2022-04-10 11:23:43 +00:00
|
|
|
"1qbmmmhnjhn4lvzsnyk7l5ganbi6wzbm38jc1a7hhyh3k78b7c98"))
|
2020-03-22 16:44:24 +00:00
|
|
|
(patches (search-patches "emacs-exec-path.patch"
|
|
|
|
"emacs-fix-scheme-indent-function.patch"
|
|
|
|
"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 06:35:03 +00:00
|
|
|
(find-files "eshell" "^esh-groups\\.el$")))
|
2017-02-09 22:10:49 +00:00
|
|
|
|
2020-03-22 16:44:24 +00:00
|
|
|
;; Make sure Tramp looks for binaries in the right places on
|
|
|
|
;; remote Guix System machines, where 'getconf PATH' returns
|
|
|
|
;; something bogus.
|
2022-06-22 01:22:26 +00:00
|
|
|
(substitute* "net/tramp.el"
|
2020-03-22 16:44:24 +00:00
|
|
|
;; 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 14:44:57 +00:00
|
|
|
|
2020-03-22 16:44:24 +00: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\"")
|
2022-04-10 11:28:05 +00:00
|
|
|
" ")))))))
|
2014-12-09 22:11:02 +00:00
|
|
|
(build-system glib-or-gtk-build-system)
|
2013-01-13 16:12:22 +00:00
|
|
|
(arguments
|
2022-04-10 11:28:05 +00:00
|
|
|
(list
|
|
|
|
#:tests? #f ; no check target
|
2022-08-05 22:37:43 +00:00
|
|
|
#:modules (%emacs-modules build-system)
|
2022-04-10 11:28:05 +00:00
|
|
|
#:configure-flags #~(list "--with-modules"
|
|
|
|
"--with-cairo"
|
2022-08-05 22:37:43 +00:00
|
|
|
"--with-native-compilation"
|
2022-04-10 11:28:05 +00:00
|
|
|
"--disable-build-details")
|
2022-08-05 22:37:43 +00:00
|
|
|
#:make-flags #~(list "NATIVE_FULL_AOT=1")
|
2022-04-10 11:28:05 +00:00
|
|
|
#:phases
|
|
|
|
#~(modify-phases %standard-phases
|
2022-08-05 22:37:43 +00:00
|
|
|
(add-after 'set-paths 'set-libgccjit-path
|
|
|
|
(lambda* (#:key inputs #:allow-other-keys)
|
|
|
|
(define (first-subdirectory/absolute directory)
|
|
|
|
(let ((files (scandir
|
|
|
|
directory
|
|
|
|
(lambda (file)
|
|
|
|
(and (not (member file '("." "..")))
|
|
|
|
(file-is-directory? (string-append
|
|
|
|
directory "/"
|
|
|
|
file)))))))
|
|
|
|
(and (not (null? files))
|
|
|
|
(string-append directory "/" (car files)))))
|
|
|
|
(let* ((libgccjit-libdir
|
|
|
|
(first-subdirectory/absolute ;; version
|
|
|
|
(first-subdirectory/absolute ;; host type
|
|
|
|
(search-input-directory inputs "lib/gcc")))))
|
|
|
|
(setenv "LIBRARY_PATH"
|
|
|
|
(string-append (getenv "LIBRARY_PATH")
|
|
|
|
":" libgccjit-libdir)))))
|
2022-04-10 11:32:27 +00:00
|
|
|
(add-after 'unpack 'enable-elogind
|
|
|
|
(lambda _
|
|
|
|
(substitute* "configure.ac"
|
|
|
|
(("libsystemd") "libelogind"))
|
|
|
|
(when (file-exists? "configure")
|
|
|
|
(delete-file "configure"))))
|
2022-04-10 11:28:05 +00:00
|
|
|
(add-after 'unpack 'patch-program-file-names
|
|
|
|
(lambda* (#:key inputs #:allow-other-keys)
|
|
|
|
(substitute* '("src/callproc.c"
|
|
|
|
"lisp/term.el"
|
|
|
|
"lisp/htmlfontify.el"
|
|
|
|
"lisp/textmodes/artist.el"
|
|
|
|
"lisp/progmodes/sh-script.el")
|
|
|
|
(("\"/bin/sh\"")
|
|
|
|
(format #f "~s" (search-input-file inputs "/bin/sh"))))
|
|
|
|
(substitute* "lisp/doc-view.el"
|
|
|
|
(("\"(gs|dvipdf|ps2pdf|pdftotext)\"" all what)
|
2022-05-14 20:06:57 +00:00
|
|
|
(let ((replacement (false-if-exception
|
|
|
|
(search-input-file
|
|
|
|
inputs
|
|
|
|
(string-append "/bin/" what)))))
|
2022-04-10 11:28:05 +00:00
|
|
|
(if replacement
|
|
|
|
(string-append "\"" replacement "\"")
|
|
|
|
all))))
|
|
|
|
;; match ".gvfs-fuse-daemon-real" and ".gvfsd-fuse-real"
|
|
|
|
;; respectively when looking for GVFS processes.
|
|
|
|
(substitute* "lisp/net/tramp-gvfs.el"
|
|
|
|
(("\\(tramp-compat-process-running-p \"(.*)\"\\)" all process)
|
|
|
|
(format #f "(or ~a (tramp-compat-process-running-p ~s))"
|
|
|
|
all (string-append "." process "-real"))))))
|
2022-08-05 22:37:43 +00:00
|
|
|
(add-after 'unpack 'patch-compilation-driver
|
|
|
|
(lambda _
|
|
|
|
(substitute* "lisp/emacs-lisp/comp.el"
|
|
|
|
(("\\(defcustom native-comp-driver-options nil")
|
|
|
|
(format
|
|
|
|
#f "(defcustom native-comp-driver-options '(~@{~s~^ ~})"
|
|
|
|
(string-append
|
|
|
|
"-B" #$(this-package-input "binutils") "/bin/")
|
|
|
|
(string-append
|
|
|
|
"-B" #$(this-package-input "glibc") "/lib/")
|
|
|
|
(string-append
|
|
|
|
"-B" #$(this-package-input "libgccjit") "/lib/")
|
|
|
|
(string-append
|
|
|
|
"-B" #$(this-package-input "libgccjit") "/lib/gcc/"))))))
|
2022-04-10 11:28:05 +00:00
|
|
|
(add-before 'configure 'fix-/bin/pwd
|
|
|
|
(lambda _
|
|
|
|
;; Use `pwd', not `/bin/pwd'.
|
|
|
|
(substitute* (find-files "." "^Makefile\\.in$")
|
|
|
|
(("/bin/pwd")
|
|
|
|
"pwd"))))
|
|
|
|
(add-after 'install 'install-site-start
|
|
|
|
;; Use 'guix-emacs' in "site-start.el", which is used autoload the
|
|
|
|
;; Elisp packages found in EMACSLOADPATH.
|
|
|
|
(lambda* (#:key inputs outputs #:allow-other-keys)
|
|
|
|
(let* ((out (assoc-ref outputs "out"))
|
|
|
|
(lisp-dir (string-append out "/share/emacs/site-lisp"))
|
|
|
|
(emacs (string-append out "/bin/emacs")))
|
2020-03-22 16:40:25 +00:00
|
|
|
|
2022-04-10 11:28:05 +00: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"
|
|
|
|
(format #f "--eval=~s" expr))))
|
2020-03-22 16:40:25 +00:00
|
|
|
|
2022-04-10 11:28:05 +00:00
|
|
|
(copy-file #$(local-file
|
|
|
|
(search-auxiliary-file "emacs/guix-emacs.el"))
|
|
|
|
(string-append lisp-dir "/guix-emacs.el"))
|
|
|
|
(with-output-to-file (string-append lisp-dir "/site-start.el")
|
|
|
|
(lambda ()
|
|
|
|
(display
|
|
|
|
(string-append
|
|
|
|
"(when (require 'guix-emacs nil t)\n"
|
|
|
|
" (guix-emacs-autoload-packages)\n"
|
|
|
|
" (advice-add 'package-load-all-descriptors"
|
|
|
|
" :after #'guix-emacs-load-package-descriptors))"))))
|
|
|
|
;; 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"))
|
|
|
|
;; Byte compile the site-start files.
|
|
|
|
(emacs-byte-compile-directory lisp-dir))))
|
|
|
|
(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 ought to only match a single file,
|
|
|
|
;; but even if not (find-files) sorts by string<,
|
|
|
|
;; so the Nth element in one maps to the Nth element of
|
|
|
|
;; the other
|
|
|
|
(pdmp (find-files libexec "\\.pdmp$"))
|
|
|
|
(pdmp-real (find-files libexec "\\.pdmp-real$")))
|
|
|
|
(for-each rename-file pdmp-real pdmp))))
|
|
|
|
(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
|
|
|
|
;; able to track emacs back to emacs.desktop.
|
|
|
|
(with-directory-excursion (assoc-ref outputs "out")
|
|
|
|
(copy-file
|
|
|
|
(car (find-files "bin" "^emacs-([0-9]+\\.)+[0-9]+$"))
|
|
|
|
"bin/emacs"))))
|
|
|
|
(add-after 'strip-double-wrap 'wrap-emacs-paths
|
|
|
|
(lambda* (#:key inputs outputs #:allow-other-keys)
|
|
|
|
(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
|
|
|
|
;; 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 dirname
|
|
|
|
(list (search-input-file inputs "/bin/gzip")
|
|
|
|
;; for coreutils
|
|
|
|
(search-input-file inputs "/bin/yes"))))
|
|
|
|
`("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]+)*)?$"))))))))
|
2013-01-13 16:12:22 +00:00
|
|
|
(inputs
|
2022-04-10 11:28:05 +00:00
|
|
|
(list gnutls
|
|
|
|
ncurses
|
2013-01-13 16:12:22 +00:00
|
|
|
|
2022-08-05 22:37:43 +00:00
|
|
|
;; To "unshadow" ld-wrapper in native builds
|
|
|
|
(make-ld-wrapper "ld-wrapper" #:binutils binutils)
|
|
|
|
|
|
|
|
;; For native compilation
|
|
|
|
binutils
|
|
|
|
glibc
|
|
|
|
libgccjit
|
|
|
|
|
2022-04-10 11:28:05 +00:00
|
|
|
;; Required for "core" functionality, such as dired and compression.
|
|
|
|
coreutils
|
|
|
|
gzip
|
2021-04-17 17:06:18 +00:00
|
|
|
|
2022-04-10 11:28:05 +00:00
|
|
|
;; Avoid Emacs's limited movemail substitute that retrieves POP3
|
|
|
|
;; email only via insecure channels.
|
|
|
|
;; This is not needed for (modern) IMAP.
|
|
|
|
mailutils
|
2019-04-30 21:43:45 +00:00
|
|
|
|
2022-04-10 11:28:05 +00:00
|
|
|
gpm
|
|
|
|
libx11
|
|
|
|
gtk+
|
|
|
|
cairo
|
|
|
|
pango
|
|
|
|
harfbuzz
|
|
|
|
libxft
|
|
|
|
libtiff
|
|
|
|
giflib
|
2022-05-21 01:46:37 +00:00
|
|
|
lcms
|
2022-04-10 11:28:05 +00:00
|
|
|
libjpeg-turbo
|
2019-04-30 22:06:56 +00:00
|
|
|
libselinux
|
2022-04-10 11:28:05 +00:00
|
|
|
acl
|
|
|
|
jansson
|
|
|
|
gmp
|
|
|
|
ghostscript
|
|
|
|
poppler
|
2022-04-10 11:32:27 +00:00
|
|
|
elogind
|
2013-04-13 20:08:09 +00:00
|
|
|
|
2022-04-10 11:28:05 +00:00
|
|
|
;; When looking for libpng `configure' links with `-lpng -lz', so we
|
|
|
|
;; must also provide zlib as an input.
|
|
|
|
libpng
|
|
|
|
zlib
|
|
|
|
(if (target-x86-64?)
|
|
|
|
librsvg-bootstrap
|
|
|
|
librsvg-2.40)
|
|
|
|
libxpm
|
|
|
|
libxml2
|
|
|
|
libice
|
|
|
|
libsm
|
|
|
|
alsa-lib
|
|
|
|
dbus
|
2016-09-27 17:17:22 +00:00
|
|
|
|
2022-04-10 11:28:05 +00:00
|
|
|
;; multilingualization support
|
|
|
|
libotf
|
|
|
|
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 11:01:56 +00:00
|
|
|
(native-inputs
|
2022-04-10 11:32:27 +00:00
|
|
|
(list autoconf pkg-config texinfo))
|
2015-10-01 09:28:19 +00:00
|
|
|
(native-search-paths
|
|
|
|
(list (search-path-specification
|
2017-06-03 19:56:36 +00:00
|
|
|
(variable "EMACSLOADPATH")
|
2021-04-17 17:06:17 +00:00
|
|
|
(files '("share/emacs/site-lisp")))
|
2022-08-05 22:37:43 +00:00
|
|
|
(search-path-specification
|
|
|
|
(variable "EMACSNATIVELOADPATH")
|
|
|
|
(files '("lib/emacs/native-site-lisp")))
|
2017-06-03 19:56:36 +00:00
|
|
|
(search-path-specification
|
2015-10-01 09:28:19 +00:00
|
|
|
(variable "INFOPATH")
|
|
|
|
(files '("share/info")))))
|
|
|
|
|
2017-03-29 22:48:16 +00: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 16:04:25 +00:00
|
|
|
(synopsis "The extensible, customizable, self-documenting text editor")
|
2013-01-13 16:12:22 +00:00
|
|
|
(description
|
2013-12-01 21:33:23 +00: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 16:02:07 +00:00
|
|
|
(license license:gpl3+)))
|
2013-01-21 20:25:43 +00:00
|
|
|
|
2020-09-01 03:35:41 +00:00
|
|
|
(define-public emacs-next
|
2022-06-04 15:23:40 +00:00
|
|
|
(let ((commit "0a5477b448e6b62bcedc1803e531ec7686eea48d")
|
|
|
|
(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 12:07:34 +00:00
|
|
|
(package
|
|
|
|
(inherit emacs)
|
2020-09-01 03:35:41 +00:00
|
|
|
(name "emacs-next")
|
2022-04-28 16:39:36 +00:00
|
|
|
(version (git-version "29.0.50" revision commit))
|
2020-09-01 03:35:41 +00: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
|
2022-06-04 15:23:40 +00:00
|
|
|
"0dqmrawkvbypxp8gcnspnhhmfamzp3l62gfgp1pw2l6svz58v991"))))
|
2022-07-20 04:08:17 +00:00
|
|
|
(inputs
|
|
|
|
(modify-inputs (package-inputs emacs)
|
|
|
|
(prepend sqlite)))
|
2020-09-01 03:35:41 +00:00
|
|
|
(native-inputs
|
2021-12-13 16:18:24 +00:00
|
|
|
(modify-inputs (package-native-inputs emacs)
|
|
|
|
(prepend autoconf))))))
|
2020-09-01 03:35:41 +00:00
|
|
|
|
2020-11-19 14:36:11 +00:00
|
|
|
(define-public emacs-next-pgtk
|
2022-04-28 16:40:27 +00:00
|
|
|
(package
|
|
|
|
(inherit emacs-next)
|
|
|
|
(name "emacs-next-pgtk")
|
2022-09-16 12:53:53 +00:00
|
|
|
(source
|
|
|
|
(origin
|
|
|
|
(inherit (package-source emacs-next))
|
2022-09-19 04:23:41 +00:00
|
|
|
(patches
|
|
|
|
(append (search-patches "emacs-pgtk-super-key-fix.patch")
|
|
|
|
(origin-patches (package-source emacs-next))))))
|
2022-04-28 16:40:27 +00:00
|
|
|
(arguments
|
|
|
|
(substitute-keyword-arguments (package-arguments emacs-next)
|
2022-05-14 22:07:43 +00:00
|
|
|
((#:configure-flags flags #~'())
|
|
|
|
#~(cons* "--with-pgtk" "--with-xwidgets" #$flags))))
|
2022-04-28 16:40:27 +00:00
|
|
|
(propagated-inputs
|
|
|
|
(list gsettings-desktop-schemas glib-networking))
|
|
|
|
(inputs
|
2022-05-14 22:07:43 +00:00
|
|
|
(modify-inputs (package-inputs emacs-next)
|
|
|
|
(prepend webkitgtk-with-libsoup2)))
|
2022-04-28 16:40:27 +00:00
|
|
|
(home-page "https://github.com/masm11/emacs")
|
|
|
|
(synopsis "Emacs text editor with @code{pgtk} and @code{xwidgets} support")
|
|
|
|
(description "This Emacs build implements graphical UI purely in terms of
|
|
|
|
GTK and also enables xwidgets.")))
|
2020-11-19 14:36:11 +00:00
|
|
|
|
2016-05-11 20:25:29 +00:00
|
|
|
(define-public emacs-minimal
|
2015-03-19 22:05:21 +00: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 06:35:03 +00:00
|
|
|
(package/inherit emacs
|
2016-05-11 20:25:29 +00:00
|
|
|
(name "emacs-minimal")
|
|
|
|
(synopsis "The extensible text editor (used only for byte-compilation)")
|
|
|
|
(build-system gnu-build-system)
|
|
|
|
(arguments
|
2019-05-21 20:51:00 +00:00
|
|
|
(substitute-keyword-arguments (package-arguments emacs)
|
2022-05-14 22:22:38 +00:00
|
|
|
((#:configure-flags flags #~'())
|
2022-05-14 19:55:29 +00:00
|
|
|
#~(list "--with-gnutls=no" "--disable-build-details"))
|
2022-08-05 22:37:43 +00:00
|
|
|
((#:modules _) (%emacs-modules build-system))
|
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 06:35:03 +00:00
|
|
|
((#:phases phases)
|
2022-05-14 19:55:29 +00:00
|
|
|
#~(modify-phases #$phases
|
|
|
|
(delete 'restore-emacs-pdmp)
|
|
|
|
(delete 'strip-double-wrap)))))
|
2022-08-05 22:37:43 +00:00
|
|
|
(inputs (list ncurses coreutils gzip
|
|
|
|
(make-ld-wrapper "ld-wrapper" #:binutils binutils)
|
|
|
|
binutils glibc libgccjit zlib))
|
2022-05-14 22:22:38 +00:00
|
|
|
(native-inputs (list autoconf pkg-config))))
|
2016-05-11 20:25:29 +00:00
|
|
|
|
2019-01-18 22:29:14 +00: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 06:35:03 +00:00
|
|
|
(package/inherit emacs
|
2019-01-18 22:29:14 +00:00
|
|
|
(name "emacs-xwidgets")
|
|
|
|
(synopsis "The extensible, customizable, self-documenting text
|
|
|
|
editor (with xwidgets support)")
|
|
|
|
(build-system gnu-build-system)
|
|
|
|
(arguments
|
2019-05-21 20:51:00 +00:00
|
|
|
(substitute-keyword-arguments (package-arguments emacs)
|
2022-05-14 22:10:19 +00:00
|
|
|
((#:configure-flags flags #~'())
|
|
|
|
#~(cons "--with-xwidgets" #$flags))
|
2022-08-05 22:37:43 +00:00
|
|
|
((#:modules _) (%emacs-modules build-system))
|
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 06:35:03 +00:00
|
|
|
((#:phases phases)
|
2022-05-14 22:10:19 +00:00
|
|
|
#~(modify-phases #$phases
|
|
|
|
(delete 'restore-emacs-pdmp)
|
|
|
|
(delete 'strip-double-wrap)))))
|
2019-01-18 22:29:14 +00:00
|
|
|
(inputs
|
2022-05-14 22:10:19 +00:00
|
|
|
(modify-inputs (package-inputs emacs)
|
|
|
|
(prepend webkitgtk-with-libsoup2 libxcomposite)))))
|
2019-01-18 22:29:14 +00:00
|
|
|
|
2016-05-11 20:25:29 +00: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 06:35:03 +00:00
|
|
|
(package/inherit emacs
|
2015-03-19 22:05:21 +00:00
|
|
|
(name "emacs-no-x")
|
|
|
|
(synopsis "The extensible, customizable, self-documenting text
|
|
|
|
editor (console only)")
|
|
|
|
(build-system gnu-build-system)
|
2022-05-14 22:10:59 +00:00
|
|
|
(inputs (modify-inputs (package-inputs emacs)
|
|
|
|
(delete "libx11" "gtk+" "libxft" "libtiff" "giflib" "libjpeg"
|
|
|
|
"imagemagick" "libpng" "librsvg" "libxpm" "libice"
|
|
|
|
"libsm" "cairo" "pango" "harfbuzz"
|
|
|
|
;; These depend on libx11, so remove them as well.
|
|
|
|
"libotf" "m17n-lib" "dbus")))
|
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 06:35:03 +00:00
|
|
|
(arguments
|
|
|
|
(substitute-keyword-arguments (package-arguments emacs)
|
2022-05-14 22:10:59 +00:00
|
|
|
((#:configure-flags flags #~'())
|
|
|
|
#~(delete "--with-cairo" #$flags))
|
2022-08-05 22:37:43 +00:00
|
|
|
((#:modules _) (%emacs-modules build-system))
|
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 06:35:03 +00:00
|
|
|
((#:phases phases)
|
2022-05-14 22:10:59 +00:00
|
|
|
#~(modify-phases #$phases
|
|
|
|
(delete 'restore-emacs-pdmp)
|
|
|
|
(delete 'strip-double-wrap)))))))
|
2015-03-19 22:05:21 +00:00
|
|
|
|
2014-07-29 08:00:56 +00: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 06:35:03 +00:00
|
|
|
(package/inherit emacs
|
2014-07-29 08:00:56 +00:00
|
|
|
(name "emacs-no-x-toolkit")
|
|
|
|
(synopsis "The extensible, customizable, self-documenting text
|
|
|
|
editor (without an X toolkit)" )
|
2014-12-09 22:11:02 +00:00
|
|
|
(build-system gnu-build-system)
|
2022-05-14 22:11:22 +00:00
|
|
|
(inputs (modify-inputs (package-inputs emacs)
|
|
|
|
(delete "gtk+")
|
|
|
|
(prepend inotify-tools)))
|
2019-03-05 19:38:32 +00: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 06:35:03 +00:00
|
|
|
(substitute-keyword-arguments (package-arguments emacs)
|
2022-05-14 22:11:22 +00:00
|
|
|
((#:configure-flags flags #~'())
|
|
|
|
#~(cons "--with-x-toolkit=no" #$flags))
|
2022-08-05 22:37:43 +00:00
|
|
|
((#:modules _) (%emacs-modules build-system))
|
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 06:35:03 +00:00
|
|
|
((#:phases phases)
|
2022-05-14 22:11:22 +00:00
|
|
|
#~(modify-phases #$phases
|
2020-08-28 13:34:00 +00:00
|
|
|
(delete 'restore-emacs-pdmp)
|
|
|
|
(delete 'strip-double-wrap)))))))
|
2014-07-29 08:00:56 +00:00
|
|
|
|
2019-12-28 23:41:48 +00: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 06:35:03 +00:00
|
|
|
(package/inherit emacs
|
2019-12-28 23:41:48 +00: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)
|
2022-05-14 22:11:41 +00:00
|
|
|
#~(cons "--with-wide-int" #$flags))))))
|
2019-12-28 23:41:48 +00:00
|
|
|
|
2015-05-10 14:29:54 +00:00
|
|
|
(define-public guile-emacs
|
2019-02-25 23:05:18 +00: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 12:07:34 +00:00
|
|
|
(package
|
|
|
|
(inherit emacs)
|
2019-02-25 23:05:18 +00: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
|
2022-05-26 11:19:42 +00:00
|
|
|
(modify-inputs (package-native-inputs emacs)
|
|
|
|
(prepend autoconf automake guile-for-guile-emacs)))
|
2019-02-25 23:05:18 +00:00
|
|
|
(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 06:35:03 +00:00
|
|
|
((#:configure-flags flags ''())
|
2022-05-26 11:17:41 +00:00
|
|
|
#~(delete "--with-cairo" #$flags))
|
2019-02-25 23:05:18 +00:00
|
|
|
((#:phases phases)
|
2022-05-26 11:17:41 +00:00
|
|
|
#~(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 _
|
|
|
|
(invoke "mkdir" "-p" "src/deps")))
|
|
|
|
(delete 'restore-emacs-pdmp)
|
|
|
|
(delete 'strip-double-wrap))))))))
|
2015-05-10 14:29:54 +00:00
|
|
|
|
2019-01-16 15:03:52 +00:00
|
|
|
(define-public m17n-db
|
2014-08-03 02:20:23 +00:00
|
|
|
(package
|
2019-01-16 15:03:52 +00: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-03 02:20:23 +00:00
|
|
|
(build-system gnu-build-system)
|
2016-10-20 18:23:11 +00:00
|
|
|
(inputs
|
2019-01-16 15:03:52 +00:00
|
|
|
`(("gettext" ,gettext-minimal)))
|
2014-11-25 17:01:38 +00:00
|
|
|
(arguments
|
2019-01-16 15:03:52 +00: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 22:20:41 +00:00
|
|
|
|
2019-01-16 15:03:52 +00:00
|
|
|
This package contains the library database.")
|
|
|
|
(license license:lgpl2.1+)))
|
2016-06-29 05:39:42 +00:00
|
|
|
|
2019-01-16 15:03:52 +00:00
|
|
|
(define-public m17n-lib
|
2016-11-17 13:02:33 +00:00
|
|
|
(package
|
2019-01-16 15:03:52 +00:00
|
|
|
(name "m17n-lib")
|
|
|
|
(version "1.8.0")
|
2016-11-17 13:02:33 +00:00
|
|
|
(source
|
|
|
|
(origin
|
|
|
|
(method url-fetch)
|
2019-01-16 15:03:52 +00:00
|
|
|
(uri (string-append "mirror://savannah/m17n/m17n-lib-"
|
|
|
|
version ".tar.gz"))
|
2016-11-17 13:02:33 +00:00
|
|
|
(sha256
|
|
|
|
(base32
|
2019-01-16 15:03:52 +00:00
|
|
|
"0jp61y09xqj10mclpip48qlfhniw8gwy8b28cbzxy8hq8pkwmfkq"))))
|
2016-12-14 21:25:52 +00:00
|
|
|
(build-system gnu-build-system)
|
|
|
|
(inputs
|
2021-12-13 16:18:24 +00:00
|
|
|
(list fribidi
|
|
|
|
gd
|
|
|
|
libotf
|
|
|
|
libxft
|
|
|
|
libxml2
|
|
|
|
m17n-db))
|
2015-07-23 06:42:53 +00:00
|
|
|
(arguments
|
2019-01-16 15:03:52 +00: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 08:15:36 +00:00
|
|
|
|
2019-01-16 15:03:52 +00:00
|
|
|
This package contains the library runtime.")
|
|
|
|
(license license:lgpl2.1+)))
|