From patchwork Mon Dec 9 15:30:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 34693 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 A76DB27BBEA; Mon, 9 Dec 2024 15:40:25 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 28E7027BBE9 for ; Mon, 9 Dec 2024 15:40:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tKfrl-0007A7-8f; Mon, 09 Dec 2024 10:40:09 -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 1tKfrf-00071P-5R for guix-patches@gnu.org; Mon, 09 Dec 2024 10:40:04 -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 1tKfre-0006S9-Fu for guix-patches@gnu.org; Mon, 09 Dec 2024 10:40:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=Mbw3nqv6MzmgExm++hR7AQCxv20vbdKLNkyY5moZ0zo=; b=iE7WLbLtL51LlAJNnSAwBfqZSTEzm47bepVidnNOfQ5pYgAHHumNrJbWt2xJvNIKdliO6P8r1Z5i+mo2X/8uNfJvffKXS5oc3tQHWYt/YnW9NuWPFDwzuikqL4OueFENvkSLMtssJh8hWRy7/wLFxxsXUZDYsPfVsMFw9pmkHJseOsrlabdB7fbY1FQr0HrprHU21ljmckbNQ3K+CprCoYOpGUUfm0iSDxGyWnQ54kmowygNOvpNZzSy2ouKI9RN07g4fOwiE2HP05YUDHpaMbdNuJJ3n6jtSxi0zYHgFDR1q9ogPi9wo+PR3jBwg01SSNLCvkd32l51sxw8YzSSGA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tKfre-0003aa-A6 for guix-patches@gnu.org; Mon, 09 Dec 2024 10:40:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#73993] [PATCH v3] gnu: git-sizer: Pin git version. References: <12475749a8d371488d9ae1fa331ad10dd24aa644.1729796653.git.code@greghogan.com> In-Reply-To: <12475749a8d371488d9ae1fa331ad10dd24aa644.1729796653.git.code@greghogan.com> Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 09 Dec 2024 15:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73993 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73993@debbugs.gnu.org Cc: liliana.prikler@gmail.com, Greg Hogan Received: via spool by 73993-submit@debbugs.gnu.org id=B73993.173375877713743 (code B ref 73993); Mon, 09 Dec 2024 15:40:02 +0000 Received: (at 73993) by debbugs.gnu.org; 9 Dec 2024 15:39:37 +0000 Received: from localhost ([127.0.0.1]:55217 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tKfrF-0003Za-Bi for submit@debbugs.gnu.org; Mon, 09 Dec 2024 10:39:37 -0500 Received: from mail-qk1-f182.google.com ([209.85.222.182]:46183) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tKfrD-0003ZI-ID for 73993@debbugs.gnu.org; Mon, 09 Dec 2024 10:39:36 -0500 Received: by mail-qk1-f182.google.com with SMTP id af79cd13be357-7b6c2bc1d21so174978685a.0 for <73993@debbugs.gnu.org>; Mon, 09 Dec 2024 07:39:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20230601.gappssmtp.com; s=20230601; t=1733758710; x=1734363510; 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=Mbw3nqv6MzmgExm++hR7AQCxv20vbdKLNkyY5moZ0zo=; b=2Ym6Lxg6cpD9cENFg3MQ9OIp0urB23OIXEKEPvPpCn+s0cs4aYgutBXVV0Cat2m7wj y1C/Ll5a6/DXqj8yx2AbC4TZPdmIKTVn4q7RkYkOExh+J8ZigUX1x98y+CKDKUe6bu0f slun8SXJYkCj/Q+ynstZZezeL7F38fr2LZjVuNEZXF/1gQAn5fGqf6ELXuQ+oU5RovdM H4Cee5sfzcur0OrSdlWJFoI9CI1lzJsjTDOTfuIxuvZ6WpdFzHBU0JL/resrOiAvs84u PJIr6lTo/82FEWtH7FrdeOBXKrdhD5b+nDfWAaoe5vMOG2J53v2T9dfThcj+dm28tOk6 WwVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733758710; x=1734363510; 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=Mbw3nqv6MzmgExm++hR7AQCxv20vbdKLNkyY5moZ0zo=; b=A5Z+wVYLk7L1X9167LGY3bxVI2hnk5wMmpwIOgKZS/ape4TEGg1Lz6Adlp7CZQR9BJ DAockkkT4wXZc9/GXoEIc4duKQ9Ii96MGjPXYtP/9gIZ1jpjnc1Bvj0OZ07nXGmsL7o2 oPMEUqcbigYt7Dv0L/72NpQjS9AJKLdtjZjAkNRYIci/JgLSk9OyLtYeeritzDmfp+MK /mcQhNupOxBg9J+jyt6SBPiSu4CKMAohZ0WJqyIHmzGNFViWdPIhzcNMoXLZ+vZzzoAt TMFnJX4WaMU7SKeN5xqXh69V9zcX2+OxByOmMd3ixJd81SMPcOyV06ajwHLkZmysS248 32EA== X-Gm-Message-State: AOJu0YzSlln3Z73GNqB1/c82hAejPvGLMn+1zOdmLbQ7r3b0AJPAu1g8 5hi2JfBBLqhce/oADJLfAkeeadKD5ZRs8xeGyUPxxp6aJJZb+F2cGdXwa1+0Bx0H+qL8657OwEc M X-Gm-Gg: ASbGncvcxPvywtystdBD2qsuSkQE0SXcTzp0MCbxRQ+4rkatXHtdEjh1pX5XnJinHdQ rlk5IOULGLcaHcN14DvlnWQdYgkrYvMxnriu9QOvbD/wCuZmMvVYhUv2tKTuRISaV/P5Mo+Q3oF 2MAwc03XlR4CVHW5zv5lkKIGeQDiDiyq+IMghfJMNcER7b9kdSVwbdQX+o9xAksJB1wE5IIhIm2 HZkKTvpKlTIicNs1H05EIWl1Bq/2+ph6goH6+fymfpGpsvdWw6Xa5v2EqVrCDQN1uw5kY4oh8Hw oTNCAVyUz+aI4Cu2M+qHAPDcO5V0OtBqEcfidqWRGFmtp9pMtg== X-Google-Smtp-Source: AGHT+IENr32tZ6U1bFYYr1DJspGqOGf7agDQ9MwSNEDTwwkp2dZXwGEiMOuzLC3z7ZHNjJlxq+aZnA== X-Received: by 2002:a05:620a:8806:b0:7b6:d9b6:b53 with SMTP id af79cd13be357-7b6dcee33b7mr116644985a.60.1733758709560; Mon, 09 Dec 2024 07:38:29 -0800 (PST) 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 af79cd13be357-7b6ce23a3fdsm192353385a.99.2024.12.09.07.38.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Dec 2024 07:38:29 -0800 (PST) From: Greg Hogan Date: Mon, 9 Dec 2024 15:30:52 +0000 Message-ID: <98c9da16b8fe18f553d46262e2292fcca7bf4699.1733758114.git.code@greghogan.com> X-Mailer: git-send-email 2.46.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 * 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(-) base-commit: 9d09b0cf841fb657a1aec12e9bab68e00c2b493c 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