From patchwork Sat Dec 2 21:33:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?R=C3=A9mi_Teissier?= X-Patchwork-Id: 57236 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 7D8DE27BBE9; Sat, 2 Dec 2023 21:35:33 +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,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 27B2927BBE2 for ; Sat, 2 Dec 2023 21:35:32 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r9XdW-000540-DE; Sat, 02 Dec 2023 16:34:54 -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 1r9XdU-00053G-Q5 for guix-patches@gnu.org; Sat, 02 Dec 2023 16:34:52 -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 1r9XdU-0007gq-I3 for guix-patches@gnu.org; Sat, 02 Dec 2023 16:34:52 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r9Xde-0000ZX-11 for guix-patches@gnu.org; Sat, 02 Dec 2023 16:35:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67592] [PATCH 01/14] gnu: libgit2: Update to 1.7.1. Resent-From: =?utf-8?b?UsOpbWk=?= Teissier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 02 Dec 2023 21:35:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67592 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67592@debbugs.gnu.org Cc: =?utf-8?b?UsOpbWk=?= Teissier Received: via spool by 67592-submit@debbugs.gnu.org id=B67592.17015528561972 (code B ref 67592); Sat, 02 Dec 2023 21:35:01 +0000 Received: (at 67592) by debbugs.gnu.org; 2 Dec 2023 21:34:16 +0000 Received: from localhost ([127.0.0.1]:58778 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9Xct-0000Vi-LL for submit@debbugs.gnu.org; Sat, 02 Dec 2023 16:34:16 -0500 Received: from vps-1eeb809a.vps.ovh.net ([217.182.171.220]:37852 helo=mail.chillpc.fr) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9Xcr-0000Va-9M for 67592@debbugs.gnu.org; Sat, 02 Dec 2023 16:34:13 -0500 Received: from localhost.localdomain (91-164-64-51.subs.proxad.net [91.164.64.51]) by mail.chillpc.fr (Postfix) with ESMTPSA id D93B7203E4; Sat, 2 Dec 2023 21:34:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=chillpc.fr; s=mail; t=1701552842; bh=X8WZh8daSJ5PKxNJlkAHRnk43X6zaFUAVo+gf6W8j9o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DFP4YjOWr9xdQPYQK4ual3PMW8x0CaGXkQHsGkXLc8lP/1GdGtCSLiK9CskQxk8L7 gJ+MqRScRBryqolzUA3SAzpYXnPfwCjSUDZyf6VX9fIXKsf5Wm67S2D/Uom7iOU/vl p8b1hvxtufDNJapXXTzInRKK4kX4Awe3CNpHjPqxsiGmHG4DPgxD9D1oVLf69n4WYo jTgeXoKSRDVmPxXfziHr/22ijm6Z2m38Z43EmOcwlbdjsra5TcONXo74Jw6XMbfbXp O830nXfIHn6i/NhPXeQwf+GMkt8+N6AkwMM2UIdHMWM8mWzsVcDz1Xa52jh1yeSveM 3ABtSn4aAf8gA== From: =?utf-8?b?UsOpbWk=?= Teissier Date: Sat, 2 Dec 2023 22:33:02 +0100 Message-ID: <82f968303dafb78229fd392c37f4cff702fb5d28.1701551502.git.rteissier.code@chillpc.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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 Change-Id: I53c7d49c2809599c79b31491859ef35d4314a770 --- gnu/packages/version-control.scm | 58 +++++++++++++++++++++++++++++--- 1 file changed, 54 insertions(+), 4 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index e1d7e19703..0c52778c7f 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -823,7 +823,7 @@ (define-public git-cal (define-public libgit2 (package (name "libgit2") - (version "1.5.1") + (version "1.7.1") (source (origin ;; Since v1.1.1, release artifacts are no longer offered (see: ;; https://github.com/libgit2/libgit2/discussions/5932#discussioncomment-1682729). @@ -834,11 +834,19 @@ (define-public libgit2 (file-name (git-file-name name version)) (sha256 (base32 - "04ypzpicpgq1wh6anwcmjjyh2b854lvjhxq0hq2hbsx7kb14qc1b")) + "1wq6a91k97gbsyafla39yvn1lnr559hqc41ksz1qxv7flf5kyvfx")) (modules '((guix build utils))) (snippet '(begin - (delete-file-recursively "deps"))))) + ;TODO: package unversioned xdiff project + (delete-file-recursively "deps/chromium-zlib") + (delete-file-recursively "deps/http-parser") + (delete-file-recursively "deps/ntlmclient") + (delete-file-recursively "deps/pcre") + (delete-file-recursively "deps/winhttp") + (delete-file-recursively "deps/zlib") + )) + )) (build-system cmake-build-system) (outputs '("out" "debug")) (arguments @@ -886,9 +894,51 @@ (define-public libgit2 ;; GPLv2 with linking exception (license license:gpl2))) -(define-public libgit2-1.4 +(define-public libgit2-1.6 (package (inherit libgit2) + (name "libgit2") + (version "1.6.4") + (source (origin + ;; Since v1.1.1, release artifacts are no longer offered (see: + ;; https://github.com/libgit2/libgit2/discussions/5932#discussioncomment-1682729). + (method git-fetch) + (uri (git-reference + (url "https://github.com/libgit2/libgit2") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "078jnis7lwzb38ha5lcrs8hzi4br3c8v7c9xaqkvkcaa8nifcvcm")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "deps"))))))) + +(define-public libgit2-1.5 + (package + (inherit libgit2-1.6) + (name "libgit2") + (version "1.5.1") + (source (origin + ;; Since v1.1.1, release artifacts are no longer offered (see: + ;; https://github.com/libgit2/libgit2/discussions/5932#discussioncomment-1682729). + (method git-fetch) + (uri (git-reference + (url "https://github.com/libgit2/libgit2") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "04ypzpicpgq1wh6anwcmjjyh2b854lvjhxq0hq2hbsx7kb14qc1b")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "deps"))))))) + +(define-public libgit2-1.4 + (package + (inherit libgit2-1.5) (version "1.4.5") (source (origin (inherit (package-source libgit2))