From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id GM/BFfs6hWJrXQEAbAwnHQ (envelope-from ) for ; Wed, 18 May 2022 20:29:15 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id mHLGFfs6hWLwMQEA9RJhRA (envelope-from ) for ; Wed, 18 May 2022 20:29:15 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id CD1D42EE1E for ; Wed, 18 May 2022 20:29:14 +0200 (CEST) Received: from localhost ([::1]:51110 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nrOQ5-0001jz-Rz for larch@yhetil.org; Wed, 18 May 2022 14:29:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48794) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nrOPt-0001ji-WC for bug-guix@gnu.org; Wed, 18 May 2022 14:29:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39757) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nrOPt-0007yU-O7 for bug-guix@gnu.org; Wed, 18 May 2022 14:29:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nrOPt-0000dN-Ja for bug-guix@gnu.org; Wed, 18 May 2022 14:29:01 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#55501: [PACTH] emacs-evil fails compilation by emacs-28.1, but upstream has newer commits which should compile Resent-From: Maze Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Wed, 18 May 2022 18:29:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55501 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 55501@debbugs.gnu.org Cc: Maze Received: via spool by 55501-submit@debbugs.gnu.org id=B55501.16528984912372 (code B ref 55501); Wed, 18 May 2022 18:29:01 +0000 Received: (at 55501) by debbugs.gnu.org; 18 May 2022 18:28:11 +0000 Received: from localhost ([127.0.0.1]:33651 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nrOP4-0000cB-Ra for submit@debbugs.gnu.org; Wed, 18 May 2022 14:28:11 -0400 Received: from mx1.polytechnique.org ([129.104.30.34]:46574) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nrNQl-000551-DV for 55501@debbugs.gnu.org; Wed, 18 May 2022 13:25:52 -0400 Received: from ubik (unknown [199.167.29.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ssl.polytechnique.org (Postfix) with ESMTPSA id F1D30564C2F for <55501@debbugs.gnu.org>; Wed, 18 May 2022 19:25:48 +0200 (CEST) Received: from maze by ubik with local (Exim 4.95) (envelope-from ) id 1nrNQM-0006aX-Tn; Thu, 19 May 2022 01:25:26 +0800 Date: Thu, 19 May 2022 01:25:26 +0800 From: Maze Message-ID: <20220518172526.z4p37ze36mn6svlb@ubik.pkbd.org> X-PGP-Key: http://data.pkbd.org/pgp/maze/pubkey.asc References: <20220518055859.37vzr3fwlindwwnd@ubik.pkbd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="72ab24abd533jdcw" Content-Disposition: inline In-Reply-To: <20220518055859.37vzr3fwlindwwnd@ubik.pkbd.org> X-AV-Checked: ClamAV using ClamSMTP at svoboda.polytechnique.org (Wed May 18 19:25:49 2022 +0200 (CEST)) X-Mailman-Approved-At: Wed, 18 May 2022 14:28:09 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1652898555; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post; bh=j7M+WflRMe8aX/sHYtSo+WqJVdNjet568Jl00m5fnrk=; b=Lc5lmPVTI9e8hoC+N8JDYhVr3PtxHrYqSn9EHRFghg3AT9DstopgzzwpAOZE6zmy2QACRt LWjb4Hc2S55hw+poU3iE9PcSrOOdGbtVNmOwT95b1w8b8LFvk5LO9eVrweU/grwY3dRTZt BIBXKfu51eMm7VNWDlcSPfwYU984t2AtYEY/st8ggjGDfSEzeKOAy7/f6bQqRaorYvzKkC SNNOmUGK8aGSXuk9AfAkG8ZCW2TqTdWRLwBx9mlihcDWIqCAu78as3wU0hmgyOrx3Sxthm vJcXy8viDl+p9AIOnxNtaHXYUOSIMil8HZWrRHFewIYBVZ0BC/noocMkcUvXLQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1652898555; a=rsa-sha256; cv=none; b=pHGp7bkwV2gCkOzCdWjt97Osr1Q6X+W4soikIs/7yxrK0tEQAXN804jTykt8byX4/6JQ0a TCjguPksxBgEurirXNPg8RZOi/NmAUuSiYl0qO+uot2eKjQXqdQQ8MrTlCvONJeI7o5Fs5 T1SX9q7+wVfZXCDtRjuheCHlkGYpx6ttWasskp1t5N7babmwUw0VLqoJA03oNuV2zTd6R1 ApLqWGu8Gieovi7wmsDGoRDxFKd+jzuRQzFHlkrkGvyhYKt/uQ4x2MnpKGTz4my6mfGcX0 2khG5RldSviMHpWjy/GBQXG1MhjzWGKSBSK1AdTb90YwZDcjcnnvpqTAVHG+8g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -3.84 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: CD1D42EE1E X-Spam-Score: -3.84 X-Migadu-Scanner: scn1.migadu.com X-TUID: bsKH9SWoHcvd --72ab24abd533jdcw Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Below a patch for emacs-evil. Since upstream declared the new version 1.15.0 in a commit message without creating a tag, I have to git-reference to a commit. I tried to reproduce the way it's done on other emacs extensions. Other than this, it should be just bumping the upstream version so that it gets byte compiled succesfully with emacs 28. I tested that it builds and installs on a private channel local to my machi= ne. * gnu/packages/emacs-xyz.scm Bump emacs-evil to versions 1.15.0 So that it can be built by emacs-28 1 file changed, 33 insertions(+), 36 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index c43fa5a..9423441 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12073,41 +12073,44 @@ news items, openrc and runscripts.") (license license:gpl2+))) =20 (define-public emacs-evil - (package - (name "emacs-evil") - (version "1.14.2") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/emacs-evil/evil") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1mhm1hd6gzxc2vvihh1w1j8f30xp0ssqcxnp8fx22niz04fk5df8")))) - (arguments - (list - #:phases - #~(modify-phases %standard-phases - (add-before 'check 'fix-test-helpers - (lambda _ - (substitute* "evil-test-helpers.el" - (("\\(undo-tree-mode 1\\)") "")))) - (add-before 'install 'make-info - (lambda _ - (with-directory-excursion "doc/build/texinfo" - (invoke "makeinfo" "--no-split" - "-o" "evil.info" "evil.texi"))))))) - (build-system emacs-build-system) - (native-inputs (list texinfo)) - (home-page "https://github.com/emacs-evil/evil") - (synopsis "Extensible Vi layer for Emacs") - (description - "Evil is an extensible vi layer for Emacs. It emulates the + (let ((commit "008a6cdb12f15e748979a7d1c2f26c34c84dedbf") + (version "1.15.0") ; not tagged upstream, but see commit message + (revision "0")) + (package + (name "emacs-evil") + (version (git-version version revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emacs-evil/evil") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1hxhw1rsm0wbrhz85gfabncanijpxd47g5yrdnl3bbm499z1gsvg")))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'fix-test-helpers + (lambda _ + (substitute* "evil-test-helpers.el" + (("\\(undo-tree-mode 1\\)") "")) + #t)) + (add-before 'install 'make-info + (lambda _ + (with-directory-excursion "doc/build/texinfo" + (invoke "makeinfo" "--no-split" + "-o" "evil.info" "evil.texi"))))))) + (build-system emacs-build-system) + (native-inputs (list texinfo)) + (home-page "https://github.com/emacs-evil/evil") + (synopsis "Extensible Vi layer for Emacs") + (description + "Evil is an extensible vi layer for Emacs. It emulates the main features of Vim, and provides facilities for writing custom extensions.") - (license license:gpl3+))) + (license license:gpl3+)))) =20 (define-public emacs-evil-collection (package --72ab24abd533jdcw Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEKVHA3r1NlqbmUUw3r7AdUDjovc0FAmKFLAYACgkQr7AdUDjo vc0Xzgf9GVLr1s9JY2rOCJjSFb3vdUF8LMPNHi6GRwY1R/rb8T9ahwzL8PTnnDaS xM5L9LlBcK+B9gyxUCV+T0tK585Xf9FMK8fb2cnCxAVXrQMovzhhOuWcUBbzKPnX fpSTqVL7OduG4+VkNayEF7+tCwGSpicIKGD30MSMOV5QKQNbW/zSfVzmhiC/OPof cYxRc5gm0eEFzZiixSuyeU9S7i3DUq4tykZXohfMMCDEA7XBpAKIUUlDPXPjx9P9 Zan53vc1cTgnP7mfcrw67s45mRm+vq0mLyp3IDW5rS/toxfTtujRLL7HDYI0CpMN NhU9rQYsBYi8nbRSgFZ/6CvIUdIYwA== =ynQ6 -----END PGP SIGNATURE----- --72ab24abd533jdcw--