From patchwork Sun Apr 23 12:27:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 49442 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 1AD6D27BBE2; Sun, 23 Apr 2023 13:30:36 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,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 D440027BBE9 for ; Sun, 23 Apr 2023 13:30:34 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pqYqD-00039Z-Ny; Sun, 23 Apr 2023 08:29:17 -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 1pqYq5-00036C-OS for guix-patches@gnu.org; Sun, 23 Apr 2023 08:29:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pqYq5-0001wg-Fz for guix-patches@gnu.org; Sun, 23 Apr 2023 08:29:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pqYq5-0006Qc-C7 for guix-patches@gnu.org; Sun, 23 Apr 2023 08:29:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63017] [PATCH v2 24/24] gnu: git-lfs: Update to 3.3.0. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 23 Apr 2023 12:29:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63017 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63017@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 63017-submit@debbugs.gnu.org id=B63017.168225291624528 (code B ref 63017); Sun, 23 Apr 2023 12:29:09 +0000 Received: (at 63017) by debbugs.gnu.org; 23 Apr 2023 12:28:36 +0000 Received: from localhost ([127.0.0.1]:44790 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pqYpX-0006NS-Fp for submit@debbugs.gnu.org; Sun, 23 Apr 2023 08:28:36 -0400 Received: from 15.mo582.mail-out.ovh.net ([188.165.39.161]:35101) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pqYpK-0006Lu-HI for 63017@debbugs.gnu.org; Sun, 23 Apr 2023 08:28:23 -0400 Received: from director4.ghost.mail-out.ovh.net (unknown [10.109.138.153]) by mo582.mail-out.ovh.net (Postfix) with ESMTP id 1DF6B23260 for <63017@debbugs.gnu.org>; Sun, 23 Apr 2023 12:28:21 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-zkzwk (unknown [10.110.171.164]) by director4.ghost.mail-out.ovh.net (Postfix) with ESMTPS id D00081FDE5; Sun, 23 Apr 2023 12:28:20 +0000 (UTC) Received: from ngraves.fr ([37.59.142.109]) by ghost-submission-6684bf9d7b-zkzwk with ESMTPSA id m31wMGQkRWRTKgEAeWLu+w (envelope-from ); Sun, 23 Apr 2023 12:28:20 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-109S0032827c753-cf98-4bb7-b1be-836aeda4796c, EDF19EEF7CB87F1BB4CF904116A7601ECA35D520) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 Date: Sun, 23 Apr 2023 14:27:48 +0200 Message-Id: <20230423122748.6770-24-ngraves@ngraves.fr> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230423122748.6770-1-ngraves@ngraves.fr> References: <20230423122748.6770-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 2622502362178249442 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvhedrfedtkedgheefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeethfekgeeuteehgeeihfejhfduheeuheekieehfedufeejjedtieeuffekueevgeenucffohhmrghinhepghhoqdhgohhlrghnghdrohhrghdpghhithhhuhgsrdgtohhmpdhgohhlrghnghdrohhrghenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegtddrudegvddpfeejrdehledrudegvddruddtleenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieeftddujeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekvddpmhhouggvpehsmhhtphhouhht 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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-lfs): Update to 3.3.0. [arguments] Use gexp. Add phase fix-embed-x-net (publicsuffix/table.go doesn't work with symlinked data). [native-inputs] Add git-minimal. Add ruby-asciidoctor. [propagated-inputs] Add go-github-com-xeipuuv-gojsonschema, go-github-com-xeipuuv-gojsonreference, go-github-com-xeipuuv-gojsonpointer, go-golang-org-x-net, go-golang.org-x-sync-semaphore, go-github-com-ssgelm-cookiejarparser, go-github-com-rubyist-tracerx, go-github-com-olekukonko-ts, go-github-com-leonelquinteros-gotext, go-github-com-git-lfs-wildmatch-v2, go-github-com-git-lfs-pktline, go-github-com-git-lfs-go-netrc, go-github-com-git-lfs-gitobj-v2, go-github-com-dpotapov-go-spnego, go-github-com-avast-retry-go, go-github-com-mattn-go-isatty, go-github-com-pkg-errors, go-github-com-spf13-cobra. --- gnu/packages/version-control.scm | 81 +++++++++++++++++++++----------- 1 file changed, 54 insertions(+), 27 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 4d6c8ecb1e..8789da6577 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -47,6 +47,7 @@ ;;; Copyright © 2022 Maxime Devos ;;; Copyright © 2022 Dhruvin Gandhi ;;; Copyright © 2015, 2022 David Thompson +;;; Copyright © 2023 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -125,6 +126,7 @@ (define-module (gnu packages version-control) #: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) #:use-module (gnu packages admin) @@ -3023,7 +3025,7 @@ (define-public go-github-com-git-lfs-gitobj-v2 (define-public git-lfs (package (name "git-lfs") - (version "2.13.3") + (version "3.3.0") (source (origin (method git-fetch) (uri (git-reference @@ -3032,35 +3034,60 @@ (define-public git-lfs (file-name (git-file-name name version)) (sha256 (base32 - "0r7dmqhkhz91d3n7qfpny483x8f1n88yya22j2fvx75rgg33z2sg")))) + "1g268pplld04b9myhlrwc4fd8r1hvfyya5ja8wr558rar3pgsp5g")))) (build-system go-build-system) (arguments - `(#:import-path "github.com/git-lfs/git-lfs" - #:install-source? #f - #:phases - (modify-phases %standard-phases - (add-before 'build 'man-gen - ;; Without this, the binary generated in 'build - ;; phase won't have any embedded usage-text. - (lambda _ - (with-directory-excursion "src/github.com/git-lfs/git-lfs" - (invoke "make" "mangen")))) - (add-after 'build 'build-man-pages - (lambda _ - (with-directory-excursion "src/github.com/git-lfs/git-lfs" - (invoke "make" "man")) - #t)) - (add-after 'install 'install-man-pages - (lambda* (#:key outputs #:allow-other-keys) - (with-directory-excursion "src/github.com/git-lfs/git-lfs/man" - (let ((out (assoc-ref outputs "out"))) - (for-each - (lambda (manpage) - (install-file manpage (string-append out "/share/man/man1"))) - (find-files "." "^git-lfs.*\\.1$")))) - #t))))) + (list + #:import-path "github.com/git-lfs/git-lfs" + #:install-source? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-embed-x-net + (lambda _ + (delete-file-recursively "src/golang.org/x/net/publicsuffix/data") + (copy-recursively + #$(file-append (this-package-input "go-golang-org-x-net") + "/src/golang.org/x/net/publicsuffix/data") + "src/golang.org/x/net/publicsuffix/data"))) + (add-before 'build 'man-gen + ;; Without this, the binary generated in 'build + ;; phase won't have any embedded usage-text. + (lambda _ + (with-directory-excursion "src/github.com/git-lfs/git-lfs" + (invoke "make" "mangen")))) + (add-after 'build 'build-man-pages + (lambda _ + (with-directory-excursion "src/github.com/git-lfs/git-lfs" + (invoke "make" "man")))) + (add-after 'install 'install-man-pages + (lambda* (#:key outputs #:allow-other-keys) + (with-directory-excursion "src/github.com/git-lfs/git-lfs/man" + (for-each + (lambda (manpage) + (install-file manpage + (string-append #$output "/share/man/man1"))) + (find-files "." "^git-lfs.*\\.1$")))))))) ;; make `ronn` available during build for man page generation - (native-inputs (list ronn-ng)) + (native-inputs (list ronn-ng git-minimal ruby-asciidoctor)) + (propagated-inputs + (list go-github-com-xeipuuv-gojsonschema + go-github-com-xeipuuv-gojsonreference + go-github-com-xeipuuv-gojsonpointer + go-golang-org-x-net + go-golang.org-x-sync-semaphore + go-github-com-ssgelm-cookiejarparser + go-github-com-rubyist-tracerx + go-github-com-olekukonko-ts + go-github-com-leonelquinteros-gotext + go-github-com-git-lfs-wildmatch-v2 + go-github-com-git-lfs-pktline + go-github-com-git-lfs-go-netrc + go-github-com-git-lfs-gitobj-v2 + go-github-com-dpotapov-go-spnego + go-github-com-avast-retry-go + go-github-com-mattn-go-isatty + go-github-com-pkg-errors + go-github-com-spf13-cobra)) (home-page "https://git-lfs.github.com/") (synopsis "Git extension for versioning large files") (description