From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id mDhROKIwumPluAAAbAwnHQ (envelope-from ) for ; Sun, 08 Jan 2023 03:55:30 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id 3PFYOKIwumPrMQAA9RJhRA (envelope-from ) for ; Sun, 08 Jan 2023 03:55:30 +0100 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 9032F27F86 for ; Sun, 8 Jan 2023 03:55:30 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pELl8-00064P-GE; Sat, 07 Jan 2023 21:50:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pELl4-00061S-Pg for bug-guix@gnu.org; Sat, 07 Jan 2023 21:50:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pELl4-00020H-DJ for bug-guix@gnu.org; Sat, 07 Jan 2023 21:50:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pELl4-0007u4-1u for bug-guix@gnu.org; Sat, 07 Jan 2023 21:50:02 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#60635: Update emacs-compat and magit References: <87pmbq5598.fsf@163.com> In-Reply-To: <87pmbq5598.fsf@163.com> Resent-From: Feng Shu Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sun, 08 Jan 2023 02:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60635 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 60635@debbugs.gnu.org Received: via spool by 60635-submit@debbugs.gnu.org id=B60635.167314615330316 (code B ref 60635); Sun, 08 Jan 2023 02:50:02 +0000 Received: (at 60635) by debbugs.gnu.org; 8 Jan 2023 02:49:13 +0000 Received: from localhost ([127.0.0.1]:59494 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pELkH-0007su-BB for submit@debbugs.gnu.org; Sat, 07 Jan 2023 21:49:13 -0500 Received: from m12.mail.163.com ([220.181.12.214]:35870) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pELkD-0007sT-7Q for 60635@debbugs.gnu.org; Sat, 07 Jan 2023 21:49:11 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version: Content-Type; bh=wun0Nk/ydYDzdnhh+TfxtmdHGwN34v6nflwoDmgiHhk=; b=TclJB6fs1ABjUdm2FPyuEggeLY1ICOmX/qs8xxJM9ah5STkdHR7ASh1GyPBFyQ KvnYYAYNi5daqqJ0NAlLxbpaarUNFbfXr/Q9ZQMApwBVbxr7YES9Ayg4VjyFMM5H iClIJ7+ToLYs3r/6EFhByV6JUefDRQx3RJpC49HnlR0Ug= Received: from Guix (unknown [49.88.145.87]) by zwqz-smtp-mta-g0-1 (Coremail) with SMTP id _____wDHwx0WL7pj_ogmAA--.19915S2; Sun, 08 Jan 2023 10:48:55 +0800 (CST) From: Feng Shu Date: Sun, 08 Jan 2023 10:48:54 +0800 Message-ID: <87tu11oi5l.fsf@163.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-CM-TRANSID: _____wDHwx0WL7pj_ogmAA--.19915S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvj4RWlk3UUUUU X-Originating-IP: [49.88.145.87] X-CM-SenderInfo: 5wxpt2lkx6il2tof0z/1tbiRRzw1GDuySXVTwAAsF 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1673146530; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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: dkim-signature; bh=wun0Nk/ydYDzdnhh+TfxtmdHGwN34v6nflwoDmgiHhk=; b=SgM6pEcAW3oVbuMGB5k4LH0vpFPCwpVKbkoz0n3JGn+PcffHDzmuvoYfB21PmiXnml5MQU KvxPSVlnw0ZO1ZZRQhE3sSaU0kehiCEhBvoZSCuK98cXRl9x049WoxJNZIQGZc++rCsCZl M5eb0qH77MZPpz8GGUXOdOtD2MDIQeGcoLkD4STvwjKta7ZK97luAvuC+5G9GeNpMm8wMJ 3Myl3yfOSUfTF863kmA+yTJi4K5IruOIdBqYYEJWI0RH2iNxyDjBgsC/1Ah4ij3L0iHVMK Mk239C4mIjz+iYQFDRLVzj2nSO5BSB7yagh7vYZAC0RpmeRtJk+TQCbfNQTMlw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=163.com header.s=s110527 header.b=TclJB6fs; 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"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=163.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1673146530; a=rsa-sha256; cv=none; b=TA/CWHJ8KERS9J7VVaF/wxwGKNS8MfczL8WO9o/K+FcFDFh9rU/1//XHsJdksaTO29imrY fmgKr8Vh93C76TZ+clB/bgPFcxOq8Bl4QOyYB3w6je+lT/klp475y88l7XiFdA3PhIj9z+ 9PP1jtY3A4WY8brQ4fv5Utrekqn6/2kXmrktxsXyMr7/EPM08nGg7/0QT5gPF7O4RZ1F0u npqjxm2CUXsPKQ9Fco1FDtqNc9CB+iMtT87pxMNESyyJOBW8y7f7836IxlO5ETO+thYHLj /CGRxuAupgY/eKr+bXZshIqOQ/LUrvGz90NOYW45h+HOP8vv9RkAJEidInZqyw== X-Spam-Score: 5.94 X-Migadu-Queue-Id: 9032F27F86 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=163.com header.s=s110527 header.b=TclJB6fs; 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"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=163.com (policy=none) X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: 5.94 X-TUID: di68D1HLYvtF --=-=-= Content-Type: text/plain I think it is compat's problem, when I update compat to 29.1.1.0, the problem is disapear when I update compat, magit build fail, so update it too. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-emacs-compat-Update-to-29.1.1.0.patch >From d00ac6d39bc5d1eae94710571715ebbeb202917a Mon Sep 17 00:00:00 2001 From: Feng Shu Date: Sun, 8 Jan 2023 10:34:10 +0800 Subject: [PATCH 1/2] gnu: emacs-compat: Update to 29.1.1.0. * gnu/packages/emacs-xyz.scm (emacs-compat): Update to 29.1.1.0. --- gnu/packages/emacs-xyz.scm | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 466fb65fd3..32801f370c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7794,24 +7794,21 @@ (define-public emacs-tup-mode (license license:gpl3+))) (define-public emacs-compat - (let ((commit "8a32564247ad3baee571252a2004c3d347962d01")) ;version bump - (package - (name "emacs-compat") - (version "29.1.0.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://git.sr.ht/~pkal/compat") - (commit commit))) - (file-name (git-file-name name version)) + (package + (name "emacs-compat") + (version "29.1.1.0") + (source (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "compat-" version ".tar")) (sha256 (base32 - "0wxv63cqrw7pd5vg5hwh48bf326766x6mzz1qw8shhkrycr43fks")))) - (build-system emacs-build-system) - (home-page "https://git.sr.ht/~pkal/compat") - (synopsis "Emacs Lisp Compatibility Library") - (description - "To allow for the usage of Emacs functions and macros that are defined + "0b371rilcbkjmb1fdaib7fnrngkm1q7xdmv15a3xvmpalvfwmrwc")))) + (build-system emacs-build-system) + (home-page "https://git.sr.ht/~pkal/compat") + (synopsis "Emacs Lisp Compatibility Library") + (description + "To allow for the usage of Emacs functions and macros that are defined in newer versions of Emacs, @code{compat.el} provides definitions that are installed ONLY if necessary. These reimplementations of functions and macros are at least subsets of the actual implementations. Be @@ -7822,7 +7819,7 @@ (define-public emacs-compat implemented to a meaningful degree. The main audience for this library are not regular users, but package maintainers. Therefore commands and user options are usually not implemented here.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-company (package -- 2.38.1 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0002-gnu-emacs-magit-Update-to-3.3.0-0.b908c79.patch >From dc6fff7f3a595165de76bfb61095123e7444a951 Mon Sep 17 00:00:00 2001 From: Feng Shu Date: Sun, 8 Jan 2023 10:45:13 +0800 Subject: [PATCH 2/2] gnu: emacs-magit: Update to 3.3.0-0.b908c79. * gnu/packages/emacs-xyz.scm (emacs-magit): Update to 3.3.0-0.b908c79. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 32801f370c..808c751303 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1160,7 +1160,7 @@ (define-public emacs-libgit (license license:gpl3+)))) (define-public emacs-magit - (let ((commit "36059e0b881cb1465cb5ad0099e55e00845a8222") + (let ((commit "b908c79b44f5c282eec44f19fc1d9967f041dd5c") (revision "0")) (package (name "emacs-magit") @@ -1173,7 +1173,7 @@ (define-public emacs-magit (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "12r5z7jbqh74rb9763smh4sblswzwi41wybzcvsy0zhw2r8lpmzv")))) + (base32 "1wybli5xrxkn8b7d7nm7h44avip9pjc24ig73hh15xg2wjm90zzc")))) (build-system emacs-build-system) (arguments (list -- 2.38.1 --=-=-= Content-Type: text/plain -- --=-=-=--