guix_mirror_bot pushed a commit to branch master
in repository guix.
commit 0ca2a361fa963051ed4b0fbd0a161290765b879c
Author: Ludovic Courtès <[email protected]>
AuthorDate: Tue Jun 16 22:59:40 2026 +0200
gnu: rust-cargo-c, rav1e: Depend on a pinned version of libgit2.
This allows us to upgrade a subset of the dependents of [email protected].
* gnu/packages/version-control.scm (libgit2-1.9/pinned): New variable.
* gnu/packages/rust-apps.scm (rust-cargo-c)[inputs]: Use it instead of
‘libgit2-1.9’.
* gnu/packages/video.scm (rav1e)[inputs]: Likewise.
Signed-off-by: Ludovic Courtès <[email protected]>
---
gnu/packages/rust-apps.scm | 2 +-
gnu/packages/version-control.scm | 38 +++++++++++++++++++++++++++++++++++++-
gnu/packages/video.scm | 2 +-
3 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index ca1fe48776..cc7396649f 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -4283,7 +4283,7 @@ background agent taking care of maintaining the necessary
state.")
(list pkg-config))
(inputs
(cons* curl
- libgit2-1.9
+ libgit2-1.9/pinned
libssh2
openssl
sqlite
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 9a2e24d1c0..e57f2441eb 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Nikita Karetnikov <[email protected]>
;;; Copyright © 2013 Cyril Roelandt <[email protected]>
-;;; Copyright © 2013-2022, 2024-2025 Ludovic Courtès <[email protected]>
+;;; Copyright © 2013-2022, 2024-2026 Ludovic Courtès <[email protected]>
;;; Copyright © 2013, 2014 Andreas Enge <[email protected]>
;;; Copyright © 2015, 2016 Mathieu Lirzin <[email protected]>
;;; Copyright © 2014, 2015, 2016 Mark H Weaver <[email protected]>
@@ -1426,6 +1426,42 @@ write native speed custom Git applications in any
language with bindings.")
;; GPLv2 with linking exception
(license license:gpl2)))
+(define-public libgit2-1.9/pinned
+ ;; This is a pinned version used as a dependency for 'rust-cargo-c'.
+ ;; Update periodically.
+ (package/inherit libgit2-1.9
+ (version "1.9.2")
+ (source (origin
+ (inherit (package-source libgit2-1.9))
+ (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
+ "1f3wnw0s5fx4lf68i400mj6l7qyw9hf6mr7i2xlqqmp9q23q89sc"))))
+ (arguments
+ (list #:configure-flags
+ #~(list "-DUSE_NTLMCLIENT=OFF" ;TODO: package this
+ "-DREGEX_BACKEND=pcre2"
+ "-DUSE_HTTP_PARSER=http-parser"
+ "-DUSE_SSH=ON" ; cmake fails to find libssh if this is
missing
+ ;; See https://github.com/libgit2/libgit2/issues/7169
+ #$@(if (target-32bit?)
+ '("-DCMAKE_C_FLAGS=-D_FILE_OFFSET_BITS=64")
+ '()))
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; Run checks more verbosely, unless we are cross-compiling.
+ (replace 'check
+ (lambda* (#:key (tests? #t) #:allow-other-keys)
+ (if tests?
+ (invoke "./libgit2_tests" "-v" "-Q")
+ ;; Tests may be disabled if cross-compiling.
+ (format #t "Test suite not run.~%")))))))
+ (properties '((hidden? . #t)))))
+
(define-public libgit2-1.8
(package
(inherit libgit2-1.9)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 04232dd694..887166f121 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -6856,7 +6856,7 @@ result in several formats:
'())
(list pkg-config rust-cargo-c)))
(inputs
- (cons* libgit2-1.9 zlib (cargo-inputs 'rav1e)))
+ (cons* libgit2-1.9/pinned zlib (cargo-inputs 'rav1e)))
(home-page "https://github.com/xiph/rav1e/";)
(synopsis "Fast and safe AV1 encoder")
(description "@code{rav1e} is an AV1 video encoder. It is designed to
