amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: emacs-next: Upgrade to 27.0.91.

Browse source 
* gnu/packages/emacs.scm (emacs-next): Upgrade to 27.0.91.
[inputs]: Remove imagemagick.

Co-authored-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Jack Hill 2020-05-02 00:26:56 -04:00 • committed by Ludovic Courtès
parent 0701274446
commit ef0cb0dd1d
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
gnu/packages/emacs.scm
View file

@ -20,6 +20,7 @@
;;; Copyright © 2019 Valentin Ignatev <valentignatev@gmail.com> ;;; Copyright © 2019 Valentin Ignatev <valentignatev@gmail.com>
;;; Copyright © 2019 Leo Prikler <leo.prikler@student.tugraz.at> ;;; Copyright © 2019 Leo Prikler <leo.prikler@student.tugraz.at>
;;; Copyright © 2019 Amin Bandali <bandali@gnu.org> ;;; Copyright © 2019 Amin Bandali <bandali@gnu.org>
;;; Copyright © 2020 Jack Hill <jackhill@jackhill.us>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -69,6 +70,7 @@
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (ice-9 match)
#:use-module (srfi srfi-1)) #:use-module (srfi srfi-1))
(define-public emacs (define-public emacs
@ -242,9 +244,9 @@ languages.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-next (define-public emacs-next
(let ((commit "36abf6864604b3061c2e070f8997491fa2bce44c") (let ((commit "c36c5a3dedbb2e0349be1b6c3b7567ea7b594f1c")
(revision "0") (revision "0")
(emacs-version "27.0.50")) (emacs-version "27.0.91"))
(package (package
(inherit emacs) (inherit emacs)
(name "emacs-next") (name "emacs-next")
@ -256,7 +258,7 @@ languages.")
(url "https://git.savannah.gnu.org/git/emacs.git") (url "https://git.savannah.gnu.org/git/emacs.git")
(commit commit))) (commit commit)))
(sha256 (sha256
(base32 "1ckn607p0clz0dhhlizvv7l03p4nminy48h53xrpz55w4rcrcm2l")) (base32 "0mlrg2npy1r79laahkgzhxd1qassfcdz8qk1cpw7mqgf6y5x505h"))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(patches (search-patches "emacs27-exec-path.patch" (patches (search-patches "emacs27-exec-path.patch"
"emacs-fix-scheme-indent-function.patch" "emacs-fix-scheme-indent-function.patch"
@ -321,7 +323,9 @@ languages.")
(inputs (inputs
`(("jansson" ,jansson) `(("jansson" ,jansson)
("harfbuzz" ,harfbuzz) ("harfbuzz" ,harfbuzz)
,@(package-inputs emacs))) ;; Emacs no longer uses ImageMagick by default
;; https://git.savannah.gnu.org/cgit/emacs.git/tree/etc/NEWS?h=emacs-27.0.91&id=c36c5a3dedbb2e0349be1b6c3b7567ea7b594f1c#n102
,@(alist-delete "imagemagick" (package-inputs emacs))))
(native-inputs (native-inputs
`(("autoconf" ,autoconf) ; needed when building from trunk `(("autoconf" ,autoconf) ; needed when building from trunk
,@(package-native-inputs emacs))) ,@(package-native-inputs emacs)))