From patchwork Wed Feb 8 15:43:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andr=C3=A9_Batista?= X-Patchwork-Id: 46742 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 BB5C31634B; Wed, 8 Feb 2023 15:45:16 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED 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 BBA0B16303 for ; Wed, 8 Feb 2023 15:45:14 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pPmd9-0006R8-CP; Wed, 08 Feb 2023 10:45:07 -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 1pPmd4-0006QV-Hg for guix-patches@gnu.org; Wed, 08 Feb 2023 10:45:02 -0500 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 1pPmd4-0001T2-5y for guix-patches@gnu.org; Wed, 08 Feb 2023 10:45:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pPmd3-0003fr-M7 for guix-patches@gnu.org; Wed, 08 Feb 2023 10:45:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61246] [PATCH v2] gnu: libgit2: Update to 1.5.1. Resent-From: =?utf-8?b?QW5kcsOp?= Batista Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 08 Feb 2023 15:45:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61246 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61246@debbugs.gnu.org Received: via spool by 61246-submit@debbugs.gnu.org id=B61246.167587107014054 (code B ref 61246); Wed, 08 Feb 2023 15:45:01 +0000 Received: (at 61246) by debbugs.gnu.org; 8 Feb 2023 15:44:30 +0000 Received: from localhost ([127.0.0.1]:56355 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPmcX-0003eW-T2 for submit@debbugs.gnu.org; Wed, 08 Feb 2023 10:44:30 -0500 Received: from mx0.riseup.net ([198.252.153.6]:56948) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPmcS-0003e7-UT for 61246@debbugs.gnu.org; Wed, 08 Feb 2023 10:44:28 -0500 Received: from fews2.riseup.net (fews2-pn.riseup.net [10.0.1.84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mail.riseup.net", Issuer "R3" (not verified)) by mx0.riseup.net (Postfix) with ESMTPS id 4PBknZ5w2lz9sxB for <61246@debbugs.gnu.org>; Wed, 8 Feb 2023 15:44:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1675871058; bh=joANxmxvoaBNgVEF54IKzrHL7/5o7GEgNiXViV81sTs=; h=Date:From:To:Subject:References:In-Reply-To:From; b=rVYVUseUnsaFQsleJZfRhZp7y6dqL4iCycBFXLp8ica4shjAu5FkEgBwSfaxUj8c9 O8J6EmDKnpU+aR9gi5FUfiBeFNujXAnOOSlpb07IxClmlEWw77cG9oq8vqLTlSXM6r lwnXPSRlX4eq51B4tun7VFFmv4/fYm1jncgNCZwY= X-Riseup-User-ID: 697327D9398C1F951AF4824355E508D0C11CAF392DC97B54661711F48A143F4E Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews2.riseup.net (Postfix) with ESMTPSA id 4PBknX6PVzz1yCw for <61246@debbugs.gnu.org>; Wed, 8 Feb 2023 15:44:16 +0000 (UTC) Date: Wed, 8 Feb 2023 12:43:58 -0300 From: =?utf-8?b?QW5kcsOp?= Batista Message-ID: References: <20230203031129.3529-1-nandre@riseup.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230203031129.3529-1-nandre@riseup.net> 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 There were both a missing space on the copyright and a missing texi 'command' tag on the previous patch to guix.texi. Please, apply this one instead. From 97b1752180ac89f78fdbbbec7d6c4aaf0a18bdbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Batista?= Date: Wed, 8 Feb 2023 12:28:25 -0300 Subject: [PATCH] gnu: libgit2: Update to 1.5.1. To: guix-patches@gnu.org Cc: 61246@debbugs.gnu.org * gnu/packages/version-control.scm (libgit2): Update to 1.5.1. [source]: Remove snippet to comment out the "10 years ago" test, which was removed on newer versions. (libgit2-1.4): New variable. Update to 1.4.5. (libgit2-1.3): Inherit from 'libgit2-1.4'. Update to 1.3.2. (libgit2-1.1): Update to 1.1.1. Add back the snippet which comments out the "10 years ago" test that remains on this older version. * doc/guix.texi (Using a Custom Guix Channel): Add note and example on how to exempt a local guix repository from git ownership checks. --- doc/guix.texi | 20 ++++++++++++- gnu/packages/version-control.scm | 50 +++++++++++++++++++++----------- 2 files changed, 52 insertions(+), 18 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 2b1ad77ba5..5314488d7e 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -81,7 +81,7 @@ Copyright @copyright{} 2020, 2021 Brice Waegeneire@* Copyright @copyright{} 2020 R Veera Kumar@* Copyright @copyright{} 2020, 2021 Pierre Langlois@* Copyright @copyright{} 2020 pinoaffe@* -Copyright @copyright{} 2020 André Batista@* +Copyright @copyright{} 2020, 2023 André Batista@* Copyright @copyright{} 2020, 2021 Alexandru-Sergiu Marton@* Copyright @copyright{} 2020 raingloom@* Copyright @copyright{} 2020 Daniel Brooks@* @@ -5411,6 +5411,24 @@ From there on, @command{guix pull} will fetch code from the @code{super-hacks} branch of the repository at @code{example.org}. The authentication concern is addressed below (@pxref{Channel Authentication}). +Note that you can specify a local directory on the @code{url} field above if +the channel that you intend to use resides on a local file system. However, +in this case @command{guix} checks said directory for ownership before any +further processing. This means that if the user is not the directory owner, +but wants to use it as their default, they will then need to set it as a safe +directory in their global git configuration file. Otherwise, @command{guix} +will refuse to even read it. Supposing your system-wide local directory is at +@code{/src/guix.git}, you would then create a git configuration file at +@code{~/.gitconfig} with the following contents: + +@example +[safe] + directory = /src/guix.git +@end example + +@noindent +This also applies to the root user. + @node Replicating Guix @section Replicating Guix diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 78a89cfd5b..2f1eb27b3c 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -799,7 +799,7 @@ (define-public git-cal (define-public libgit2 (package (name "libgit2") - (version "1.4.3") + (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). @@ -810,18 +810,11 @@ (define-public libgit2 (file-name (git-file-name name version)) (sha256 (base32 - "02x1a4zrzpzjd0yxnsi8njh5hgihc1iy1v4r0fnl8m4ckcgp6x2s")) + "04ypzpicpgq1wh6anwcmjjyh2b854lvjhxq0hq2hbsx7kb14qc1b")) (modules '((guix build utils))) (snippet '(begin - (delete-file-recursively "deps") - - ;; The "refs:revparse::date" test is time-dependent: it - ;; assumes "HEAD@{10 years ago}" matches a specific commit. - ;; See . - (substitute* "tests/refs/revparse.c" - (("test_object.*10 years ago.*" all) - (string-append "// " all "\n"))))))) + (delete-file-recursively "deps"))))) (build-system cmake-build-system) (outputs '("out" "debug")) (arguments @@ -863,10 +856,10 @@ (define-public libgit2 ;; GPLv2 with linking exception (license license:gpl2))) -(define-public libgit2-1.3 +(define-public libgit2-1.4 (package (inherit libgit2) - (version "1.3.0") + (version "1.4.5") (source (origin (inherit (package-source libgit2)) (method git-fetch) @@ -876,7 +869,22 @@ (define-public libgit2-1.3 (file-name (git-file-name "libgit2" version)) (sha256 (base32 - "0vgpb2175a5dhqiy1iwywwppahgqhi340i8bsvafjpvkw284vazd")))) + "0q754ipc6skagszi93lcy6qr09ibavivm2q5i5fhpdblvlnv2p7x")))))) + +(define-public libgit2-1.3 + (package + (inherit libgit2-1.4) + (version "1.3.2") + (source (origin + (inherit (package-source libgit2-1.4)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/libgit2/libgit2") + (commit (string-append "v" version)))) + (file-name (git-file-name "libgit2" version)) + (sha256 + (base32 + "1dngga8jq419z6ps65wpmh2jihcf70k6r98pb1m1yiwj7qqh9792")))) (arguments (substitute-keyword-arguments (package-arguments libgit2) ((#:phases _ '%standard-phases) @@ -892,17 +900,25 @@ (define-public libgit2-1.3 (define-public libgit2-1.1 (package (inherit libgit2-1.3) - (version "1.1.0") + (version "1.1.1") (source (origin (inherit (package-source libgit2-1.3)) (file-name #f) ;use the default name (method url-fetch) (uri (string-append "https://github.com/libgit2/libgit2/" - "releases/download/v" version - "/libgit2-" version ".tar.gz")) + "archive/refs/tags/v" version ".tar.gz")) (sha256 (base32 - "1fjdglkh04qv3b4alg621pxa689i0wlf8m7nf2755zawjr2zhwxd")) + "085644zkjydjba9y162z4s020lfij3c191851ah13iv47wvjb98k")) + (snippet + '(begin + (delete-file-recursively "deps") + ;; The "refs:revparse::date" test is time-dependent: it + ;; assumes "HEAD@{10 years ago}" matches a specific commit. + ;; See . + (substitute* "tests/refs/revparse.c" + (("test_object.*10 years ago.*" all) + (string-append "// " all "\n"))))) (patches (search-patches "libgit2-mtime-0.patch")))))) (define-public git-crypt