guix_mirror_bot pushed a commit to branch master
in repository guix.
commit 2e3e470dd8eefd63b273c2fd121c274a047a4a15
Author: Efraim Flashner <[email protected]>
AuthorDate: Tue Dec 30 15:27:41 2025 +0200
gnu: libgit2-1.8: Inherit from libgit2-1.9.
* gnu/packages/version-control.scm (libgit2-1.8, libgit2-1.9): Reverse
the inheritance between these two versions.
Change-Id: Ic1e34a20253ab1f6ed4dde50f608b2c33d146000
---
gnu/packages/version-control.scm | 54 ++++++++++++++++++++++++----------------
1 file changed, 32 insertions(+), 22 deletions(-)
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 83de4191cb..797e0d7d70 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -1226,10 +1226,10 @@ which has been extracted into a standalone library for
compatibility with
other git-like projects such as @code{libgit2}.")
(license license:lgpl2.1+))))
-(define-public libgit2-1.8
+(define-public libgit2-1.9
(package
(name "libgit2")
- (version "1.8.4")
+ (version "1.9.1")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1238,9 +1238,11 @@ other git-like projects such as @code{libgit2}.")
(file-name (git-file-name "libgit2" version))
(sha256
(base32
- "0jydckwn0bbrp2kbcr1ih1bz4sc6yhx7lrl22lqcgnf2v6ml6n01"))
+ "1k7h0phxz1i8i8qhd4dsyii62f30f33gmrpziqgri1ndnazkf4pz"))
(patches
- (search-patches "libgit2-uninitialized-proxy-settings.patch"))
+ (search-patches "libgit2-uninitialized-proxy-settings.patch"
+ "libgit2-proxy-reconnection.patch"
+ "libgit2-path-max.patch"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -1306,6 +1308,32 @@ write native speed custom Git applications in any
language with bindings.")
;; GPLv2 with linking exception
(license license:gpl2)))
+(define-public libgit2-1.8
+ (package
+ (inherit libgit2-1.9)
+ (version "1.8.4")
+ (source (origin
+ (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
+ "0jydckwn0bbrp2kbcr1ih1bz4sc6yhx7lrl22lqcgnf2v6ml6n01"))
+ (patches
+ (search-patches "libgit2-uninitialized-proxy-settings.patch"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (for-each delete-file-recursively
+ '("deps/chromium-zlib"
+ "deps/llhttp"
+ "deps/ntlmclient"
+ "deps/pcre"
+ "deps/winhttp"
+ "deps/zlib"))))))))
+
(define-public libgit2-1.7
(package
(inherit libgit2-1.8)
@@ -1387,24 +1415,6 @@ write native speed custom Git applications in any
language with bindings.")
;; Default version of libgit2.
libgit2-1.5)
-(define-public libgit2-1.9
- (package
- (inherit libgit2-1.8)
- (version "1.9.1")
- (source (origin
- (inherit (package-source libgit2-1.8))
- (uri (git-reference
- (url "https://github.com/libgit2/libgit2";)
- (commit (string-append "v" version))))
- (file-name (git-file-name "libgit2" version))
- (patches
- (search-patches "libgit2-uninitialized-proxy-settings.patch"
- "libgit2-proxy-reconnection.patch"
- "libgit2-path-max.patch"))
- (sha256
- (base32
- "1k7h0phxz1i8i8qhd4dsyii62f30f33gmrpziqgri1ndnazkf4pz"))))))
-
(define-public libgit2-1.4
(package
(inherit libgit2)
