all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Greg Hogan <code@greghogan.com>
To: 73993@debbugs.gnu.org
Cc: liliana.prikler@gmail.com, Greg Hogan <code@greghogan.com>
Subject: [bug#73993] [PATCH v3] gnu: git-sizer: Pin git version.
Date: Mon,  9 Dec 2024 15:30:52 +0000	[thread overview]
Message-ID: <98c9da16b8fe18f553d46262e2292fcca7bf4699.1733758114.git.code@greghogan.com> (raw)
In-Reply-To: <12475749a8d371488d9ae1fa331ad10dd24aa644.1729796653.git.code@greghogan.com>

* gnu/packages/version-control.scm (git-sizer)
[arguments]<#:phases>: Hard-code git path in 'fix-paths.
[native-inputs]: Remove git.
[inputs]: Add git-minimal/pinned.

Change-Id: If6178a0e1c453ea47a1f70cd507639b5be2142b0
---
 gnu/packages/version-control.scm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 3339e79390..eb9dcfa198 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -4479,7 +4479,12 @@ (define-public git-sizer
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'fix-paths
-           (lambda* (#:key outputs #:allow-other-keys)
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (substitute* '("src/github.com/github/git-sizer/git/git.go")
+               (("gitBin, err := findGitBin\\(\\)")
+                (string-append "gitBin := \""
+                               (search-input-file inputs "bin/git")
+                               "\"\n\tvar err error")))
              (substitute* '("src/github.com/github/git-sizer/git_sizer_test.go")
                (("bin/git-sizer")
                 (string-append (assoc-ref outputs "out")
@@ -4493,7 +4498,7 @@ (define-public git-sizer
                          ;; Git repository.
                          '("TestBomb" "TestFromSubdir" "TestRefgroups"
                            "TestRefSelections" "TestTaggedTags"))))))))
-    (native-inputs (list git))
+    (inputs (list git-minimal/pinned))
     (propagated-inputs
      (list go-github-com-cli-safeexec
            go-github-com-davecgh-go-spew

base-commit: 9d09b0cf841fb657a1aec12e9bab68e00c2b493c
-- 
2.46.0





      parent reply	other threads:[~2024-12-09 15:40 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-24 19:05 [bug#73993] [PATCH] gnu: git-sizer: Pin git version Greg Hogan
2024-11-29  9:40 ` Liliana Marie Prikler
2024-12-05 21:06   ` Greg Hogan
2024-12-05 21:04 ` [bug#73993] [PATCH v2 0/3] Pin git for git-sizer Greg Hogan
2024-12-05 21:04   ` [bug#73993] [PATCH v2 1/3] gnu: git-sizer: Propagate git Greg Hogan
2024-12-18 11:02     ` Ludovic Courtès
2024-12-05 21:04   ` [bug#73993] [PATCH v2 2/3] gnu: git-sizer: Use gexps Greg Hogan
2024-12-18 11:03     ` Ludovic Courtès
2024-12-05 21:04   ` [bug#73993] [PATCH v2 3/3] gnu: git-sizer: Pin git version Greg Hogan
2024-12-06 21:19     ` Liliana Marie Prikler
2024-12-09 15:30 ` Greg Hogan [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=98c9da16b8fe18f553d46262e2292fcca7bf4699.1733758114.git.code@greghogan.com \
    --to=code@greghogan.com \
    --cc=73993@debbugs.gnu.org \
    --cc=liliana.prikler@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.