From patchwork Sat May 2 04:26:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jack Hill X-Patchwork-Id: 21821 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id BC6FF27BBE4; Sat, 2 May 2020 05:28:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:470:142::17]) by mira.cbaines.net (Postfix) with ESMTP id 8002427BBE1 for ; Sat, 2 May 2020 05:28:11 +0100 (BST) Received: from localhost ([::1]:39910 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jUjl4-00024w-VY for patchwork@mira.cbaines.net; Sat, 02 May 2020 00:28:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44704) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jUjkz-00024P-1L for guix-patches@gnu.org; Sat, 02 May 2020 00:28:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jUjky-0004dS-Fc for guix-patches@gnu.org; Sat, 02 May 2020 00:28:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39521) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jUjkw-0004cg-Qi for guix-patches@gnu.org; Sat, 02 May 2020 00:28:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jUjkw-0003b3-MZ for guix-patches@gnu.org; Sat, 02 May 2020 00:28:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41016] [PATCH] gnu: emacs-next: Upgrade to 27.0.91. Resent-From: Jack Hill Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 02 May 2020 04:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 41016 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41016@debbugs.gnu.org Cc: Jack Hill X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.158839364013765 (code B ref -1); Sat, 02 May 2020 04:28:02 +0000 Received: (at submit) by debbugs.gnu.org; 2 May 2020 04:27:20 +0000 Received: from localhost ([127.0.0.1]:51067 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUjkG-0003Zx-Ke for submit@debbugs.gnu.org; Sat, 02 May 2020 00:27:20 -0400 Received: from lists.gnu.org ([209.51.188.17]:44904) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUjkF-0003Zp-1Q for submit@debbugs.gnu.org; Sat, 02 May 2020 00:27:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44562) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jUjkE-0001uE-G0 for guix-patches@gnu.org; Sat, 02 May 2020 00:27:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jUjkD-0003mI-Cp for guix-patches@gnu.org; Sat, 02 May 2020 00:27:18 -0400 Received: from minsky.hcoop.net ([104.248.1.95]:45054) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jUjkC-0003l2-RF for guix-patches@gnu.org; Sat, 02 May 2020 00:27:17 -0400 Received: from [2001:470:8:9f5:f948:e83a:c72a:f39b] (helo=alperton.home.eronel.org) by minsky.hcoop.net with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1jUjk5-0007O3-2i; Sat, 02 May 2020 00:27:09 -0400 From: Jack Hill Date: Sat, 2 May 2020 00:26:56 -0400 Message-Id: <20200502042656.14461-1-jackhill@jackhill.us> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Received-SPF: pass client-ip=104.248.1.95; envelope-from=jackhill@jackhill.us; helo=minsky.hcoop.net X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/02 00:27:12 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs.scm (emacs-next): Upgrade to 27.0.91. [inputs]: Remove imagemagick. --- gnu/packages/emacs.scm | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index ab7cc20d10..039d0d16b2 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2019 Valentin Ignatev ;;; Copyright © 2019 Leo Prikler ;;; Copyright © 2019 Amin Bandali +;;; Copyright © 2020 Jack Hill ;;; ;;; This file is part of GNU Guix. ;;; @@ -69,6 +70,7 @@ #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (guix utils) + #:use-module (ice-9 match) #:use-module (srfi srfi-1)) (define-public emacs @@ -242,9 +244,9 @@ languages.") (license license:gpl3+))) (define-public emacs-next - (let ((commit "36abf6864604b3061c2e070f8997491fa2bce44c") + (let ((commit "c36c5a3dedbb2e0349be1b6c3b7567ea7b594f1c") (revision "0") - (emacs-version "27.0.50")) + (emacs-version "27.0.91")) (package (inherit emacs) (name "emacs-next") @@ -256,7 +258,7 @@ languages.") (url "https://git.savannah.gnu.org/git/emacs.git") (commit commit))) (sha256 - (base32 "1ckn607p0clz0dhhlizvv7l03p4nminy48h53xrpz55w4rcrcm2l")) + (base32 "0mlrg2npy1r79laahkgzhxd1qassfcdz8qk1cpw7mqgf6y5x505h")) (file-name (git-file-name name version)) (patches (search-patches "emacs27-exec-path.patch" "emacs-fix-scheme-indent-function.patch" @@ -321,7 +323,13 @@ languages.") (inputs `(("jansson" ,jansson) ("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 + ,@(let ((package-eq? (lambda (symbol input-item) + (match input-item + ((name package) + (eq? symbol package)))))) + (delete imagemagick (package-inputs emacs) package-eq?)))) (native-inputs `(("autoconf" ,autoconf) ; needed when building from trunk ,@(package-native-inputs emacs)))