From patchwork Tue Apr 28 00:37:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kyle Meyer X-Patchwork-Id: 21692 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 4BFD727BBE1; Tue, 28 Apr 2020 01:38:10 +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.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id C164D27BBE4 for ; Tue, 28 Apr 2020 01:38:09 +0100 (BST) Received: from localhost ([::1]:37284 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTEGH-0000Cf-5x for patchwork@mira.cbaines.net; Mon, 27 Apr 2020 20:38:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55828) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTEGB-0000CH-D1 for guix-patches@gnu.org; Mon, 27 Apr 2020 20:38:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTEGA-0003bU-Io for guix-patches@gnu.org; Mon, 27 Apr 2020 20:38:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55119) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jTEGA-0003bP-7U for guix-patches@gnu.org; Mon, 27 Apr 2020 20:38:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jTEGA-0001tA-5G for guix-patches@gnu.org; Mon, 27 Apr 2020 20:38:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40417] Add emacs-magit-annex Resent-From: Kyle Meyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 28 Apr 2020 00:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40417 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Christopher Lemmer Webber Cc: 40417@debbugs.gnu.org Received: via spool by 40417-submit@debbugs.gnu.org id=B40417.15880342447214 (code B ref 40417); Tue, 28 Apr 2020 00:38:02 +0000 Received: (at 40417) by debbugs.gnu.org; 28 Apr 2020 00:37:24 +0000 Received: from localhost ([127.0.0.1]:38432 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jTEFO-0001s2-Mk for submit@debbugs.gnu.org; Mon, 27 Apr 2020 20:37:24 -0400 Received: from pb-smtp21.pobox.com ([173.228.157.53]:53083) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jTEFM-0001rt-7w for 40417@debbugs.gnu.org; Mon, 27 Apr 2020 20:37:13 -0400 Received: from pb-smtp21.pobox.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id 11CE5C87AF; Mon, 27 Apr 2020 20:37:11 -0400 (EDT) (envelope-from kyle@kyleam.com) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:in-reply-to:references:date:message-id:mime-version :content-type:content-transfer-encoding; s=sasl; bh=dd31u4aX4Qqd cT+kccIoFcbxdng=; b=Esr8y1N8dS6T1gOaqgc4S5IVEYmDdRTNARn/ggH3Hc9N 9xWq9l6vmUavuriLOol37IYfUyby47WfQwfg1JRYIgAVA7L/r9D2yQx1RzxGSVz4 3B5le/NqB+xXeaRhZ79S6WJRFPFjcfiIVUF9Ff9mo8MWJufdgKyYXxYv0BNp7kE= Received: from pb-smtp21.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id 0AA0AC87AE; Mon, 27 Apr 2020 20:37:11 -0400 (EDT) (envelope-from kyle@kyleam.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=kyleam.com; h=from:to:cc:subject:in-reply-to:references:date:message-id:mime-version:content-type:content-transfer-encoding; s=mesmtp; bh=BaP0j5lhjLVW6r0E3pdD7X/D5DVCrBPTsoiWmem3+9A=; b=kaSHJALEwChVG9F08jDTCr+2/WA9SPU2GQSUQOr26w1RuCBPbNgiWj52BPlcNh+eCr4goi2ElySRz8NbS/2s0DTGu1zkuWaK4/KTV8E79nRd+SNllfxW+Ge45d2GCIcSf5NvReYGn+pFiheUHAPJS66Dpl1eXN+Cau6dpTHkCAU= Received: from localhost (unknown [45.33.91.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp21.pobox.com (Postfix) with ESMTPSA id 6E67AC87AD; Mon, 27 Apr 2020 20:37:08 -0400 (EDT) (envelope-from kyle@kyleam.com) From: Kyle Meyer In-Reply-To: <87mu6wbv6w.fsf@dustycloud.org> References: <875zegcq6w.fsf@dustycloud.org> <87k12w6v2p.fsf@kyleam.com> <874ktyc4ma.fsf@dustycloud.org> <87369h3o7f.fsf@kyleam.com> <87mu6wbv6w.fsf@dustycloud.org> Date: Tue, 28 Apr 2020 00:37:06 +0000 Message-ID: <87wo60v425.fsf@kyleam.com> MIME-Version: 1.0 X-Pobox-Relay-ID: 644B6C04-88E8-11EA-813C-8D86F504CC47-24757444!pb-smtp21.pobox.com 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 Christopher Lemmer Webber writes: > Ok, revised patch. It works fine, though I am getting these errors: > > Compiling /gnu/store/3lc8vna2n2nhcdkfiqldg426ngjmzjnm-emacs-magit-annex-1.7.1-1.0bc9673/share/emacs/site-lisp/magit-annex-autoloads.el... > > In toplevel form: > magit-annex-autoloads.el:10:45:Warning: reference to free variable > ‘magit-mode-map’ > > In end of data: > magit-annex-autoloads.el:60:1:Warning: the function ‘transient-append-suffix’ > is not known to be defined. Hmm, I'm not sure about these. I thought generated -autoloads.el files typically have a "no-byte-compile: t" in their ";; Local Variables: " trailer. Anyway, despite being unsightly, functionally these are fine; those expressions are within an (eval-after-load 'magit ...), and the referenced items will be loaded with magit.el. > In end of data: > magit-annex.el:834:1:Warning: the function ‘magit-log-setup-buffer’ is not > known to be defined. > Done (Total of 2 files compiled) > > That seems strange/alarming. This one points to a real problem, though you'd only see it when calling the command magit-annex-unused-log. Magit renamed magit-git-log to magit-log-setup-buffer. Magit-annex's master tracks Magit's, so it uses the new name, but the former is what is in the commit that Guix's Magit is built from. I've pushed a compatibility kludge to Magit-annex so that it will fall back to the old name. Could you squash this commit into your commit? diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index c56766047d..b4c12f57ea 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -476,7 +476,7 @@ (define-public emacs-magit-popup (license license:gpl3+))) (define-public emacs-magit-annex - (let ((commit "0bc96737634e78ac7c7f8a3f73190531c0890914") + (let ((commit "ef5dce6267e9118a5eca82a22bcad0b67826c23a") (revision "1")) (package (name "emacs-magit-annex") @@ -489,7 +489,7 @@ (define-public emacs-magit-annex (file-name (git-file-name name version)) (sha256 (base32 - "1lm8412n2046fz8n7rfbadyww2074lsxq0w4gm1x1alraz5im5h4")))) + "0vzkydgl889cq173zjl89g2vrddb9abc4a8gljiz3b4a7n5b1nrd")))) (build-system emacs-build-system) (propagated-inputs `(("magit" ,emacs-magit)