From patchwork Tue Apr 28 14:33:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christine Lemmer-Webber X-Patchwork-Id: 21711 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 CF5C427BBEA; Tue, 28 Apr 2020 15:35:43 +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 [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 8AEBB27BBE4 for ; Tue, 28 Apr 2020 15:35:43 +0100 (BST) Received: from localhost ([::1]:32962 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTRKo-0001jU-Sr for patchwork@mira.cbaines.net; Tue, 28 Apr 2020 10:35:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45876) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTRK0-0000zI-Qp for guix-patches@gnu.org; Tue, 28 Apr 2020 10:35:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTRJC-0002CE-Bd for guix-patches@gnu.org; Tue, 28 Apr 2020 10:34:52 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57706) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jTRJB-0002Au-U0 for guix-patches@gnu.org; Tue, 28 Apr 2020 10:34:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jTRJB-0002hW-LV for guix-patches@gnu.org; Tue, 28 Apr 2020 10:34:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40417] Add emacs-magit-annex Resent-From: Christopher Lemmer Webber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 28 Apr 2020 14:34:01 +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: Kyle Meyer Cc: 40417@debbugs.gnu.org Received: via spool by 40417-submit@debbugs.gnu.org id=B40417.158808443210367 (code B ref 40417); Tue, 28 Apr 2020 14:34:01 +0000 Received: (at 40417) by debbugs.gnu.org; 28 Apr 2020 14:33:52 +0000 Received: from localhost ([127.0.0.1]:41019 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jTRJ1-0002h9-QE for submit@debbugs.gnu.org; Tue, 28 Apr 2020 10:33:52 -0400 Received: from dustycloud.org ([50.116.34.160]:43122) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jTRIz-0002gz-H4 for 40417@debbugs.gnu.org; Tue, 28 Apr 2020 10:33:50 -0400 Received: from twig (localhost [127.0.0.1]) by dustycloud.org (Postfix) with ESMTPS id D5B5D26679; Tue, 28 Apr 2020 10:33:48 -0400 (EDT) References: <875zegcq6w.fsf@dustycloud.org> <87k12w6v2p.fsf@kyleam.com> <874ktyc4ma.fsf@dustycloud.org> <87369h3o7f.fsf@kyleam.com> <87mu6wbv6w.fsf@dustycloud.org> <87wo60v425.fsf@kyleam.com> User-agent: mu4e 1.2.0; emacs 26.3 From: Christopher Lemmer Webber In-reply-to: <87wo60v425.fsf@kyleam.com> Date: Tue, 28 Apr 2020 10:33:48 -0400 Message-ID: <87mu6vu1bn.fsf@dustycloud.org> MIME-Version: 1.0 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 Kyle Meyer writes: > 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) Done. The messages are gone, yay! Is it good to push now then, I'd assume? - Chris PS: I didn't realize you were a (the?) developer of the package I'm submitting to Guix, and doing the review! That's wonderful! From 0e7c9c1236a60dbe96c7a9bc19c9e1cf2ba342e7 Mon Sep 17 00:00:00 2001 From: Christopher Lemmer Webber Date: Thu, 2 Apr 2020 15:03:27 -0400 Subject: [PATCH] gnu: Add emacs-magit-annex. * gnu/packages/emacs-xyz.scm (emacs-magit-annex): New variable. --- gnu/packages/emacs-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a0275cbe18..b4c12f57ea 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -475,6 +475,31 @@ these arguments. The prototypical use is for the command to call an external process, passing on the arguments as command line arguments.") (license license:gpl3+))) +(define-public emacs-magit-annex + (let ((commit "ef5dce6267e9118a5eca82a22bcad0b67826c23a") + (revision "1")) + (package + (name "emacs-magit-annex") + (version (git-version "1.7.1" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/magit/magit-annex.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0vzkydgl889cq173zjl89g2vrddb9abc4a8gljiz3b4a7n5b1nrd")))) + (build-system emacs-build-system) + (propagated-inputs + `(("magit" ,emacs-magit) + ("transient" ,emacs-transient))) + (home-page "https://github.com/magit/magit-annex/") + (synopsis "Git-annex support for Magit") + (description + "Magit-annex adds a few git-annex operations to the Magit interface.") + (license license:gpl3+)))) + (define-public emacs-minions (package (name "emacs-minions") -- 2.26.0