Merge branch 'master' into core-updates

Conflicts:
	gnu/local.mk
	gnu/packages/backup.scm
	gnu/packages/emacs-xyz.scm
	gnu/packages/guile.scm
	gnu/packages/lisp.scm
	gnu/packages/openldap.scm
	gnu/packages/package-management.scm
	gnu/packages/web.scm
	gnu/packages/xorg.scm
This commit is contained in:
Marius Bakke 2020-04-30 23:47:49 +02:00
commit 8bf8cd9b85
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
69 changed files with 6231 additions and 782 deletions

View file

@ -401,6 +401,17 @@ editor (without an X toolkit)" )
((#:configure-flags cf)
`(cons "--with-x-toolkit=no" ,cf)))))))
(define-public emacs-wide-int
(package
(inherit emacs)
(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))))))
(define-public guile-emacs
(let ((commit "41120e0f595b16387eebfbf731fff70481de1b4b")
(revision "0"))