From patchwork Mon Dec 6 03:16:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: jgart X-Patchwork-Id: 34991 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 F2A7F27BBEA; Mon, 6 Dec 2021 03:19:16 +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 990BC27BBE9 for ; Mon, 6 Dec 2021 03:19:16 +0000 (GMT) Received: from localhost ([::1]:32796 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mu4X5-0000Rf-KW for patchwork@mira.cbaines.net; Sun, 05 Dec 2021 22:19:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46770) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mu4Ww-0000RH-Ah for guix-patches@gnu.org; Sun, 05 Dec 2021 22:19:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48635) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mu4Wr-0002C6-Qq for guix-patches@gnu.org; Sun, 05 Dec 2021 22:19:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mu4Wr-0002N6-LD for guix-patches@gnu.org; Sun, 05 Dec 2021 22:19:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52296] [PATCH v2] gnu: Add git-absorb. References: <20211205015750.GB950@gac.attlocal.net> In-Reply-To: <20211205015750.GB950@gac.attlocal.net> Resent-From: jgart Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 06 Dec 2021 03:19:01 +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.16387606879018 (code B ref 52296); Mon, 06 Dec 2021 03:19:01 +0000 Received: (at 52296) by debbugs.gnu.org; 6 Dec 2021 03:18:07 +0000 Received: from localhost ([127.0.0.1]:60180 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mu4Vy-0002LO-Qc for submit@debbugs.gnu.org; Sun, 05 Dec 2021 22:18:07 -0500 Received: from mx1.dismail.de ([78.46.223.134]:7063) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mu4Vx-0002Ko-2A for 52296@debbugs.gnu.org; Sun, 05 Dec 2021 22:18:06 -0500 Received: from mx1.dismail.de (localhost [127.0.0.1]) by mx1.dismail.de (OpenSMTPD) with ESMTP id e7ece78a for <52296@debbugs.gnu.org>; Mon, 6 Dec 2021 04:17:57 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=dismail.de; h=from:to:cc :subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=20190914; bh=MS74XiiOXf1fxU3VmV+8m gDrTDS85zVjJ3ok2TkkCMw=; b=bvgYRYFB9nttfdNY4uuPMM5XbcAtWj6vLLry5 Dve6tvf7LCmsQq1uqJJiqft5XNECEVqgJPkvLxciK7E/N1bCH0NDp4O6xpePqbzu E6+JdYKOmmss6xa5gExWEdLzhqtuqJcO0t4y4SwKlXaPXAWGNJH/9WFgf2ve+5BW 4TiBjqlWZR3b8DP5NA9mDUhY4u1dy00zsHeAQDMbosbkYkYyYl3K8s0BreVp0Rp9 St6SwHEAALOOUeGxZsCSTmBKlq5Te7T+PPFwVt4A7x8MlC40j2Nhn5esSvM8Cig2 09ljWKHgm3woh9f0KdYv7cNIz+wC8vtt3CK+CS4W5dvSrP5HA== Received: from smtp2.dismail.de ( [10.240.26.12]) by mx1.dismail.de (OpenSMTPD) with ESMTP id 8b35fb33 for <52296@debbugs.gnu.org>; Mon, 6 Dec 2021 04:17:57 +0100 (CET) Received: from smtp2.dismail.de (localhost [127.0.0.1]) by smtp2.dismail.de (OpenSMTPD) with ESMTP id 3bea3e92 for <52296@debbugs.gnu.org>; Mon, 6 Dec 2021 04:17:57 +0100 (CET) Received: by dismail.de (OpenSMTPD) with ESMTPSA id 1dd95495 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO); Mon, 6 Dec 2021 04:17:56 +0100 (CET) Date: Sun, 5 Dec 2021 22:16:27 -0500 Message-Id: <20211206031626.8061-1-jgart@dismail.de> X-Mailer: git-send-email 2.34.0 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 Hi Nicolas, Here's the updated and smaller patchset. It worked! :) all best, jgart * gnu/packages/rust-apps.scm (git-absorb): New variable. --- gnu/packages/rust-apps.scm | 53 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index be60f3f376..02f9592adc 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,58 @@ (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) + ("rust-slog" ,rust-slog-2) + ("rust-slog-async" ,rust-slog-async-2) + ("rust-slog-term" ,rust-slog-term-2)) + #:cargo-development-inputs + (("rust-tempfile" ,rust-tempfile-3)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-version-requirements + (lambda _ + (substitute* "Cargo.toml" + (("2.5") "2") + (("~2.3\"") "2\"") + (("3.1") "3")))) + (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")