From patchwork Sun Dec 5 07:01:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: jgart X-Patchwork-Id: 34971 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 0870627BBEC; Sun, 5 Dec 2021 07:03:44 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6B38227BBEA for ; Sun, 5 Dec 2021 07:03:43 +0000 (GMT) Received: from localhost ([::1]:41420 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mtlYg-0002Mn-FO for patchwork@mira.cbaines.net; Sun, 05 Dec 2021 02:03:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48710) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mtlYB-0001xi-8j for guix-patches@gnu.org; Sun, 05 Dec 2021 02:03:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:44624) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mtlY7-00008l-Cm for guix-patches@gnu.org; Sun, 05 Dec 2021 02:03:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mtlY7-0007jL-9k for guix-patches@gnu.org; Sun, 05 Dec 2021 02:03:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52296] [PATCH 4/4] gnu: Add git-absorb. Resent-From: jgart Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 05 Dec 2021 07:03:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52296 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52296@debbugs.gnu.org Cc: jgart Received: via spool by 52296-submit@debbugs.gnu.org id=B52296.163868772629604 (code B ref 52296); Sun, 05 Dec 2021 07:03:03 +0000 Received: (at 52296) by debbugs.gnu.org; 5 Dec 2021 07:02:06 +0000 Received: from localhost ([127.0.0.1]:56162 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mtlXB-0007hL-VK for submit@debbugs.gnu.org; Sun, 05 Dec 2021 02:02:06 -0500 Received: from mx1.dismail.de ([78.46.223.134]:36052) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mtlX7-0007gE-Ju for 52296@debbugs.gnu.org; Sun, 05 Dec 2021 02:02:02 -0500 Received: from mx1.dismail.de (localhost [127.0.0.1]) by mx1.dismail.de (OpenSMTPD) with ESMTP id 524e72d3 for <52296@debbugs.gnu.org>; Sun, 5 Dec 2021 08:01:56 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=dismail.de; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=20190914; bh=ijgTNh/E /GtbpX5nOPkjhFq9fsEBspOJ7ldVKqOjSm0=; b=KR+Xxez6Q1tYlmEBJ64XueUb 0cdqYk6pgVwNN6U32xld2G1wCq0gcjfsT4WpFuSp4wRCsRng+5TbB0Wu/jwh6tkR WxLYmXwFM5c6BjbJTnZ53AFn42pDx3w2pf4muHSNjXjQJNBsDAkm7sI/hzVlHiZt yngVSIKZ37T0kycgaWcOxDROY0/n2zCU0ibL9qf3nEAAuf5j9t1cfuByCXCEvF5p urVOFXjHDECiyL4RVpvK8QxGecetS+0UKR3uiVyzhN+rSL4EFHIP/McMiP0pcl2+ 0HFb8DEcz8AMGJ9gfARYpz69aU3IqAUY4gC360jI9e4dwXwQkTz7FMdMoujYVw== Received: from smtp2.dismail.de ( [10.240.26.12]) by mx1.dismail.de (OpenSMTPD) with ESMTP id 0ceedb19 for <52296@debbugs.gnu.org>; Sun, 5 Dec 2021 08:01:55 +0100 (CET) Received: from smtp2.dismail.de (localhost [127.0.0.1]) by smtp2.dismail.de (OpenSMTPD) with ESMTP id 9023f0dc for <52296@debbugs.gnu.org>; Sun, 5 Dec 2021 08:01:55 +0100 (CET) Received: by dismail.de (OpenSMTPD) with ESMTPSA id da9cd508 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO); Sun, 5 Dec 2021 08:01:54 +0100 (CET) Date: Sun, 5 Dec 2021 02:01:28 -0500 Message-Id: <20211205070128.1212-4-jgart@dismail.de> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211205070128.1212-1-jgart@dismail.de> References: <20211205070128.1212-1-jgart@dismail.de> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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" Reply-to: jgart X-ACL-Warn: , jgart via Guix-patches X-Patchwork-Original-From: jgart via Guix-patches via From: jgart X-getmail-retrieved-from-mailbox: Patches * gnu/packages/rust-apps.scm (git-absorb): New variable. --- gnu/packages/rust-apps.scm | 47 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index be60f3f376..6ce98610f5 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2021 Alexandru-Sergiu Marton ;;; Copyright © 2021 Maxim Cournoyer ;;; Copyright © 2021 Petr Hodina +;;; Copyright © 2021 jgart ;;; ;;; This file is part of GNU Guix. ;;; @@ -1204,6 +1205,52 @@ (define-public tealdeer Full featured offline client with caching support.") (license (list license:expat license:asl2.0)))) +(define-public git-absorb + (package + (name "git-absorb") + (version "0.6.6") + (source + (origin + ;; crates.io does not include the manual page. + (method git-fetch) + (uri (git-reference + (url "https://github.com/tummychow/git-absorb") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "04v10bn24acify34vh5ayymsr1flcyb05f3az9k1s2m6nlxy5gb9")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-anyhow" ,rust-anyhow-1) + ("rust-clap" ,rust-clap-2) + ("rust-git2" ,rust-git2-0.13) + ("rust-memchr" ,rust-memchr-2.3) + ("rust-slog" ,rust-slog-2) + ("rust-slog-async" ,rust-slog-async-2.5) + ("rust-slog-term" ,rust-slog-term-2)) + #:cargo-development-inputs + (("rust-tempfile" ,rust-tempfile-3.1)) + #:phases + (modify-phases %standard-phases + (add-after 'install 'install-manual-page + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (man (string-append out "/share/man/man1"))) + (install-file "Documentation/git-absorb.1" man))))))) + (inputs + `(("zlib" ,zlib))) + (home-page "https://github.com/tummychow/git-absorb") + (synopsis "Git tool for making automatic fixup commits") + (description +"@code{git absorb} allows the user to automatically absorb staged changes +into their current branch. @code{git absorb} will automatically identify +which commits are safe to modify, and which staged changes belong to each +of those commits. It will then write @code{fixup!} commits for each of +those changes.") + (license license:bsd-3))) + (define-public zoxide (package (name "zoxide")