From patchwork Wed Mar 20 17:47:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 62022 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 B18FC27BBEB; Wed, 20 Mar 2024 17:57: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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS 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 87DD127BBE2 for ; Wed, 20 Mar 2024 17:57:39 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rn0Bp-0002Ax-7J; Wed, 20 Mar 2024 13:57:25 -0400 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 1rn0Bm-0002AV-Ja for guix-patches@gnu.org; Wed, 20 Mar 2024 13:57:22 -0400 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 1rn0Bm-0006iW-Bg for guix-patches@gnu.org; Wed, 20 Mar 2024 13:57:22 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rn0CP-0005D1-PG for guix-patches@gnu.org; Wed, 20 Mar 2024 13:58:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69548] [PATCH v2] gnu: Add git-extras. References: <025880776c6df96b0e34ee83575eb0905d2323b8.1709570697.git.code@greghogan.com> In-Reply-To: <025880776c6df96b0e34ee83575eb0905d2323b8.1709570697.git.code@greghogan.com> Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Mar 2024 17:58:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69548 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69548@debbugs.gnu.org Cc: Greg Hogan Received: via spool by 69548-submit@debbugs.gnu.org id=B69548.171095742219856 (code B ref 69548); Wed, 20 Mar 2024 17:58:01 +0000 Received: (at 69548) by debbugs.gnu.org; 20 Mar 2024 17:57:02 +0000 Received: from localhost ([127.0.0.1]:53359 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rn0BP-00059f-SO for submit@debbugs.gnu.org; Wed, 20 Mar 2024 13:57:02 -0400 Received: from mail-qk1-f171.google.com ([209.85.222.171]:48231) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rn0BK-00059B-NR for 69548@debbugs.gnu.org; Wed, 20 Mar 2024 13:56:58 -0400 Received: by mail-qk1-f171.google.com with SMTP id af79cd13be357-789f00aba19so10485185a.0 for <69548@debbugs.gnu.org>; Wed, 20 Mar 2024 10:56:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20230601.gappssmtp.com; s=20230601; t=1710957309; x=1711562109; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Ct61EKdnLqMkRiqz/JVqjJkRnxOnOFDqnPVSLsu+5Us=; b=JR+ClOw5fmk8HfcfAStDm+avW10feRwTGSC2F9K+0PpHdQ2mCdXbO9MYP6cTw4+o7o ajaHpzM2cy+r7KpI+GDYHiDkxUl1HTs/6bFmVUlCMk8xEcnMEsoH3MO54+l1onY3L3xd kWg1aMDK9mWTY2oteZvAFi5oeagkEY7X9NfJXt4PybZqCS/BiM8zBwNHWFbYlvvpL42c 05Pwi+StX8ejPW7uCx7Y2775CqRYUcFbe15/dAeQ6KOL/uVH/4O8+6PKS6V0dfciiOkZ nv6P9iEFdDt0aywr8qhLna0IUaZJE724ARztHVoCchlecUrU8Jds1jkKfnbKLCjvBrGl Q1jA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710957309; x=1711562109; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Ct61EKdnLqMkRiqz/JVqjJkRnxOnOFDqnPVSLsu+5Us=; b=QL3sGPd2IEkYU+0TTVIYExdBrrEb9bwY6KFq1jBbSczh31/Kv51clMY3EgfIA7a/l0 T4ZNQ/96t7qmSmot1dcv8r6gCpj40bZVx6TCNfU5KqZ7dC0hDO2YTqf1GU/FUIyiPjr3 EcU1/xgUyfgteDiRnNkdwCp3/nCPKbGakXsmpmQ27sxVbz2uDjSESVNVkgudHls0Vepg aEPaK63NzTdip4NFYbvVMIXCwFudtfqBnFPGEpEOoMn+HpdYhPIMRUPK9lw4AdaruEuK juJyK+IA3ktypfEDYpHv0BvjmqK3A5ObiChCmWX+N+AJ5kYdPdhddq2bjLI84EuXN8LW knQA== X-Gm-Message-State: AOJu0Ywwy0x6zibJr3btkrUWFL9oQkegFGyLE5ojXwO3mBuZMRjZGf6x eCNWaJMz5ZolblJ5teDsNvTUx/gZ4+rVXE0XJrDrlpGRaDcznvdsKpf42Si9InphrSYTw5FTkRH X X-Google-Smtp-Source: AGHT+IFqL5pYvMrXlEtSMEnDi0lqHXYizJ1adFIhbkdr7r+Jt4jK7dyunclIUVRINcborFSZK2A8ug== X-Received: by 2002:a05:620a:45ab:b0:789:f7d5:806 with SMTP id bp43-20020a05620a45ab00b00789f7d50806mr14374265qkb.68.1710956871574; Wed, 20 Mar 2024 10:47:51 -0700 (PDT) Received: from ip-10-114-89-186.evoforge.org (ec2-52-70-167-183.compute-1.amazonaws.com. [52.70.167.183]) by smtp.gmail.com with ESMTPSA id p1-20020ae9f301000000b0078838c7acbfsm6793059qkg.42.2024.03.20.10.47.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Mar 2024 10:47:51 -0700 (PDT) From: Greg Hogan Date: Wed, 20 Mar 2024 17:47:04 +0000 Message-ID: X-Mailer: git-send-email 2.44.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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Second version moves all propagated inputs except git to inputs and instead injects the requisite bin directories into PATH at the beginning of each script. Also removes the unused bootstrap, build, and check phases. * gnu/packages/version-control.scm (git-extras): New variable. Change-Id: I7493ec9284559596d35546211b5f642f851dc485 --- gnu/packages/version-control.scm | 72 ++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) base-commit: 61655b2479b43e6294e753280e888919b3a38c80 diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 946b1f5aac..763d46b1f9 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -104,6 +104,7 @@ (define-module (gnu packages version-control) #:use-module (gnu packages file) #:use-module (gnu packages flex) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages gawk) #:use-module (gnu packages gettext) #:use-module (gnu packages gl) #:use-module (gnu packages glib) @@ -120,6 +121,7 @@ (define-module (gnu packages version-control) #:use-module (gnu packages guile-xyz) #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) + #:use-module (gnu packages less) #:use-module (gnu packages linux) #:use-module (gnu packages mail) #:use-module (gnu packages man) @@ -140,6 +142,7 @@ (define-module (gnu packages version-control) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages readline) + #:use-module (gnu packages rsync) #:use-module (gnu packages ruby) #:use-module (gnu packages sqlite) #:use-module (gnu packages texinfo) @@ -3971,6 +3974,75 @@ (define-public gitlint commit messages for style.") (license license:expat))) +(define-public git-extras + (package + (name "git-extras") + (version "7.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tj/git-extras") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1zvmc8rrrmfn0wv603l0ql7h00mdknqvh6dnb86xhi6kfl018mbv")))) + (build-system gnu-build-system) + (arguments + (list + #:make-flags + #~(list (string-append "PREFIX=" #$output)) + #:phases + #~(modify-phases %standard-phases + ;; No configure script, build process, or tests. + (delete 'bootstrap) + (delete 'configure) + (delete 'build) + (delete 'check) + (add-after 'unpack 'hardcode-dependency-paths + (lambda* (#:key inputs #:allow-other-keys) + ;; The Makefile injects helper scripts and functions into each + ;; script. This substitution injects a PATH appending the bin + ;; directory of each non-propagated input in order to minimize + ;; the number of packages propagated to the profile. + (substitute* "Makefile" + (("head -1 bin/\\$\\(COMMAND\\) > \\$\\(TEMPFILE\\); \\\\" line) + (string-append + line "\n" + "echo 'PATH=$$PATH:" + (string-join + (map (lambda (name) (assoc-ref inputs name)) + (list "coreutils-minimal" + "curl" + "findutils" + "gawk" + "less" + "ncurses" + "procps" + "rsync" + "sed" + "util-linux")) + "/bin:") + "' >> $(TEMPFILE); \\")))))))) + (propagated-inputs (list git)) + (inputs + (list coreutils-minimal + curl + findutils + gawk + less + ncurses + procps + rsync + sed + util-linux)) + (home-page "https://github.com/tj/git-extras") + (synopsis "Additional Git utilities") + (description "The git-extras package provides a collection of additional +git commands for repository metrics and summarization, commit and log editing, +developer workflow, and project and release management.") + (license license:expat))) + (define-public hut (package (name "hut")