From patchwork Thu Nov 9 19:38:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve George X-Patchwork-Id: 56195 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 65D0027BBEA; Thu, 9 Nov 2023 19:45:07 +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=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 8554427BBE2 for ; Thu, 9 Nov 2023 19:45:06 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r1AvI-0008PN-O4; Thu, 09 Nov 2023 14:42:40 -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 1r1AvH-0008NQ-1K for guix-patches@gnu.org; Thu, 09 Nov 2023 14:42:39 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r1AvG-0007sa-PZ for guix-patches@gnu.org; Thu, 09 Nov 2023 14:42:38 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r1Avu-0006oP-1o; Thu, 09 Nov 2023 14:43:18 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67024] [PATCH 54/54] gnu: Add stgit-2. Resent-From: Steve George Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, guix-patches@gnu.org Resent-Date: Thu, 09 Nov 2023 19:43:17 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67024 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67024@debbugs.gnu.org Cc: Steve George , efraim@flashner.co.il X-Debbugs-Original-Xcc: efraim@flashner.co.il Received: via spool by 67024-submit@debbugs.gnu.org id=B67024.169955897625789 (code B ref 67024); Thu, 09 Nov 2023 19:43:17 +0000 Received: (at 67024) by debbugs.gnu.org; 9 Nov 2023 19:42:56 +0000 Received: from localhost ([127.0.0.1]:48945 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r1AvX-0006hn-FK for submit@debbugs.gnu.org; Thu, 09 Nov 2023 14:42:55 -0500 Received: from mailtransmit04.runbox.com ([2a0c:5a00:149::25]:38698) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r1AvC-0006dH-Hv for 67024@debbugs.gnu.org; Thu, 09 Nov 2023 14:42:38 -0500 Received: from mailtransmit02.runbox ([10.9.9.162] helo=aibo.runbox.com) by mailtransmit04.runbox.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1r1AuT-001cB7-II for 67024@debbugs.gnu.org; Thu, 09 Nov 2023 20:41:49 +0100 Received: from [10.9.9.73] (helo=submission02.runbox) by mailtransmit02.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1r1AuT-0004Gz-2l for 67024@debbugs.gnu.org; Thu, 09 Nov 2023 20:41:49 +0100 Received: by submission02.runbox with esmtpsa [Authenticated ID (641962)] (TLS1.2:ECDHE_SECP256R1__RSA_SHA256__AES_256_GCM:256) (Exim 4.93) id 1r1AuO-0047eT-24; Thu, 09 Nov 2023 20:41:44 +0100 From: Steve George Date: Thu, 9 Nov 2023 19:38:51 +0000 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231109184212.173223-1-steve@futurile.net> References: <20231109184212.173223-1-steve@futurile.net> 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/version-control.scm (stgit-2): New variable. Change-Id: Ic5f29a5f0e3b5caa6c2aee4daf65d7e5dc09a6d5 --- gnu/packages/version-control.scm | 60 ++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 1cc870e3c6a..1a3fe24fe1b 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -74,6 +74,7 @@ (define-module (gnu packages version-control) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix hg-download) + #:use-module (guix build-system cargo) #:use-module (guix build-system cmake) #:use-module (guix build-system copy) #:use-module (guix build-system gnu) @@ -91,6 +92,7 @@ (define-module (gnu packages version-control) #:use-module (gnu packages boost) #:use-module (gnu packages check) #:use-module (gnu packages cook) + #:use-module (gnu packages crates-io) #:use-module (gnu packages curl) #:use-module (gnu packages databases) #:use-module (gnu packages docbook) @@ -1517,6 +1519,64 @@ (define-public git-flow lot easier.") (license license:bsd-2))) +(define-public stgit-2 + (package + (name "stgit") + (version "2.4.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/stacked-git/stgit") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0cgv7chxqkjaqmzi4691in26j2fm8r0vanw8xzb9cqnz6350wvvj")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-anstyle" ,rust-anstyle-1) + ("rust-anyhow" ,rust-anyhow-1) + ("rust-bstr" ,rust-bstr-1) + ("rust-bzip2-rs" ,rust-bzip2-rs-0.1) + ("rust-clap" ,rust-clap-4) + ("rust-ctrlc" ,rust-ctrlc-3) + ("rust-curl" ,rust-curl-0.4) + ("rust-encoding_rs" ,rust-encoding-rs-0.8) + ("rust-flate2" ,rust-flate2-1) + ("rust-gix" ,rust-gix-0.54) + ("rust-indexmap" ,rust-indexmap-2) + ("rust-is-terminal" ,rust-is-terminal-0.4) + ("rust-nom" ,rust-nom-7) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-strsim" ,rust-strsim-0.10) + ("rust-tar" ,rust-tar-0.4) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-termcolor" ,rust-termcolor-1) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-time" ,rust-time-0.3)))) + (native-inputs (list pkg-config)) + (inputs (list openssl zlib curl)) + (home-page "https://stacked-git.github.io/") + (synopsis "Stacked Git (StGit) manages Git commits as a stack of patches") + (description "StGit uses a patch stack workflow. Each individual patch +focuses on a single concern, while a stack of patches forms a series of commits. +Patches are stored as normal git commits, allowing easy merging of StGit +patches into other repositories using standard Git. + +Features include: +@itemize +@item Import and export patches from Git with @command{stg commit} and +@command{stg uncommit} +@item Create new patches and add them to the stack with @command{stg new} +@item Update a patch from the working tree with @command{stg refresh} and +@command{stg edit} +@item See information about the stack or patch with @command{stg series} and +@command{stg show} +@item Export and send a series of patches by email using @command{stg email} +@end itemize") + (license license:gpl2))) + (define-public stgit (package (name "stgit")