GNU bug report logs - #44945
[PATCH] Bump version of libgit2 from 1.0.1 -> 1.1.0

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 44945 in the body.
You can then email your comments to 44945 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Holger Peters <holger.peters <at> posteo.de>
To: guix-patches <at> gnu.org
Cc: Holger Peters <holger.peters <at> posteo.de>
Subject: [PATCH] Bump version of libgit2 from 1.0.1 -> 1.1.0
Date: Sun, 29 Nov 2020 14:12:29 +0100

* gnu/packages/emacs-xyz.scm (libgit2): Bump version.
---
 gnu/packages/version-control.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 29de995665..bc5b55b594 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -666,7 +666,7 @@ to GitHub contributions calendar.")
 (define-public libgit2
   (package
     (name "libgit2")
-    (version "1.0.1")
+    (version "1.1.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/libgit2/libgit2/"
@@ -674,7 +674,7 @@ to GitHub contributions calendar.")
                                   "/libgit2-" version ".tar.gz"))
               (sha256
                (base32
-                "0nlg35pxhh548nn7aa3y1m81mf81nkbzz86i2psps4f474n497v8"))
+                "1fjdglkh04qv3b4alg621pxa689i0wlf8m7nf2755zawjr2zhwxd"))
               (patches (search-patches "libgit2-mtime-0.patch"))
               (snippet '(begin
                           (delete-file-recursively "deps") #t))
-- 
2.28.0

Message #8 received at 44945 <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: Holger Peters <holger.peters <at> posteo.de>
Cc: 44945 <at> debbugs.gnu.org
Subject: Re: [bug#44945] [PATCH] Bump version of libgit2 from 1.0.1 -> 1.1.0
Date: Sun, 29 Nov 2020 13:09:48 -0500

On Sun, Nov 29, 2020 at 02:12:29PM +0100, Holger Peters wrote:
> * gnu/packages/emacs-xyz.scm (libgit2): Bump version.

Thanks! Did you check if guile-git still works after this?

Message #13 received at 44945 <at> debbugs.gnu.org (full text, mbox):

From: Holger Peters <holger.peters <at> posteo.de>
To: Leo Famulari <leo <at> famulari.name>
Cc: 44945 <at> debbugs.gnu.org
Subject: Re: [bug#44945] [PATCH] Bump version of libgit2 from 1.0.1 -> 1.1.0
Date: Tue, 1 Dec 2020 17:43:22 +0100

>> * gnu/packages/emacs-xyz.scm (libgit2): Bump version.
> Thanks! Did you check if guile-git still works after this?


I tried it out. It seems so:

   successfully built /gnu/store/3487vk6hs2vlw0sfw75am6m228vdixd7-guile-git-0.4.0.drv

Message #18 received at 44945-done <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: Holger Peters <holger.peters <at> posteo.de>
Cc: 44945-done <at> debbugs.gnu.org
Subject: Re: [bug#44945] [PATCH] Bump version of libgit2 from 1.0.1 -> 1.1.0
Date: Thu, 3 Dec 2020 19:00:35 -0500

[Message part 1 (text/plain, inline)]

On Tue, Dec 01, 2020 at 05:43:22PM +0100, Holger Peters wrote:
> I tried it out. It seems so:
> 
>    successfully built /gnu/store/3487vk6hs2vlw0sfw75am6m228vdixd7-guile-git-0.4.0.drv

Great!

I used `guix refresh --list-dependent libgit2` to see which packages
would be rebuilt as a consequence of changing libgit2, and tested
several of them against the update, and found that it caused failures of
packages using python-pygit2:

------
$ ./pre-inst-env guix build --no-grafts stagit rust-libgit2-sys <at> 0.8.2 offlate \
python-pygit2 emacs-evil-magit fritzing kopete kate r-stm jucipp celestia-gtk \
celestia rust-libgit2-sys <at> 0.10 gitg guix emacs-magit gwl gitless guix-build-coordinator \
--keep-going
[... it does a lot of work ...]
gcc -pthread -Wno-unused-result -Wsign-compare -DNDEBUG -g -fwrapv -O3 -Wall -fPIC -I/usr/local/include -I/gnu/store/q9rm8h9imazsq2c4qiv2yjpvlvliywqb-python-3.8.2/include/python3.8 -c src/blob.c -o build/temp.linux-x86_64-3.8/src/blob.o
In file included from src/blob.h:34:0,
                 from src/blob.c:30:
src/types.h:36:2: error: #error You need a compatible libgit2 version (0.99.x or 1.0.x)
 #error You need a compatible libgit2 version (0.99.x or 1.0.x)
  ^~~~~
error: command 'gcc' failed with exit status 1
command "python" "-c" "import setuptools, tokenize;__file__='setup.py';f=getattr(tokenize, 'open', open)(__file__);code=f.read().replace('\\r\\n', '\\n');f.close();exec(compile(code, __file__, 'exec'))" "build" failed with status 1
builder for `/gnu/store/0fvjfybgr66vygz1w5x6739fqsi14f9b-python-pygit2-1.1.0.drv' failed with exit code 1
build of /gnu/store/0fvjfybgr66vygz1w5x6739fqsi14f9b-python-pygit2-1.1.0.drv failed
------

I fixed this by updating python-pygit2 to the latest version, which is
compatible with libgit2 1.1.0.

I also tested the most important libgit2 user: Guix itself. Guix
commands are designed to compose usefully so you can do these arcane
wizard-ish Unix command substitutions:

------
$ $(./pre-inst-env guix build guix)/bin/guix pull
Updating channel 'guix' from Git repository at 'https://git.savannah.gnu.org/git/guix.git'...
Authenticating channel 'guix', commits 9edb3f6 to 4496e03 (6 new commits)...
Building from this channel:
  guix      https://git.savannah.gnu.org/git/guix.git	4496e03
Computing Guix derivation for 'x86_64-linux'...
[... it does more work ...]
New in this revision:
  105 new packages: catfish, cgoban, chicken-agrep, chicken-datatype, chicken-iset, chicken-srfi-1, chicken-srfi-14, chicken-srfi-69, chicken-test, cl-array-operations,
    cl-check-it, cl-clamp, …
  135 packages upgraded: altermime <at> 0.3.11, b4 <at> 0.5.3, cava <at> 0.7.3, cl-alexandria <at> 1.2, cl-bst <at> 2.0-0.8545aed, cl-ironclad <at> 0.52, cl-simple-parallel-tasks <at> 1.0-1.ce7b60f,
    cl-stumpwm <at> 20.11, cl-webkit <at> 2.4-10.5ce3ea1, cpupower <at> 5.9.12, dfu-util <at> 0.10, drbd-utils <at> 9.15.1, …

News for channel 'guix'
  Local substitute servers discovery is now supported
  Logical Volume Manager (LVM) now supported on Guix System


hint: Run `guix pull --news' to read all the news.
------

It worked for me, so I pushed it as
68fa8fb0cb9f887a6d6069c897a16dc8fce0036d.

Thank you for the contribution!

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.