summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2026-06-16 22:59:40 +0200
committerLudovic Courtès <ludo@gnu.org>2026-06-22 11:52:39 +0200
commit0ca2a361fa963051ed4b0fbd0a161290765b879c (patch)
treec645c2055a5defb1a8b9570fdb9119bc51024a08 /gnu
parenta9963ff397470ad91a01b0dc0bbb3c3a04ce3b26 (diff)
gnu: rust-cargo-c, rav1e: Depend on a pinned version of libgit2.
This allows us to upgrade a subset of the dependents of libgit2@1.9. * 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 <ludo@gnu.org>
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/rust-apps.scm2
-rw-r--r--gnu/packages/version-control.scm38
-rw-r--r--gnu/packages/video.scm2
3 files changed, 39 insertions, 3 deletions
diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index ca1fe487765..cc7396649f0 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.")
4283 (list pkg-config)) 4283 (list pkg-config))
4284 (inputs 4284 (inputs
4285 (cons* curl 4285 (cons* curl
4286 libgit2-1.9 4286 libgit2-1.9/pinned
4287 libssh2 4287 libssh2
4288 openssl 4288 openssl
4289 sqlite 4289 sqlite
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 9a2e24d1c01..e57f2441ebf 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -1,7 +1,7 @@
1;;; GNU Guix --- Functional package management for GNU 1;;; GNU Guix --- Functional package management for GNU
2;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org> 2;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
3;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com> 3;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
4;;; Copyright © 2013-2022, 2024-2025 Ludovic Courtès <ludo@gnu.org> 4;;; Copyright © 2013-2022, 2024-2026 Ludovic Courtès <ludo@gnu.org>
5;;; Copyright © 2013, 2014 Andreas Enge <andreas@enge.fr> 5;;; Copyright © 2013, 2014 Andreas Enge <andreas@enge.fr>
6;;; Copyright © 2015, 2016 Mathieu Lirzin <mthl@gnu.org> 6;;; Copyright © 2015, 2016 Mathieu Lirzin <mthl@gnu.org>
7;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org> 7;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
@@ -1426,6 +1426,42 @@ write native speed custom Git applications in any language with bindings.")
1426 ;; GPLv2 with linking exception 1426 ;; GPLv2 with linking exception
1427 (license license:gpl2))) 1427 (license license:gpl2)))
1428 1428
1429(define-public libgit2-1.9/pinned
1430 ;; This is a pinned version used as a dependency for 'rust-cargo-c'.
1431 ;; Update periodically.
1432 (package/inherit libgit2-1.9
1433 (version "1.9.2")
1434 (source (origin
1435 (inherit (package-source libgit2-1.9))
1436 (method git-fetch)
1437 (uri (git-reference
1438 (url "https://github.com/libgit2/libgit2")
1439 (commit (string-append "v" version))))
1440 (file-name (git-file-name "libgit2" version))
1441 (sha256
1442 (base32
1443 "1f3wnw0s5fx4lf68i400mj6l7qyw9hf6mr7i2xlqqmp9q23q89sc"))))
1444 (arguments
1445 (list #:configure-flags
1446 #~(list "-DUSE_NTLMCLIENT=OFF" ;TODO: package this
1447 "-DREGEX_BACKEND=pcre2"
1448 "-DUSE_HTTP_PARSER=http-parser"
1449 "-DUSE_SSH=ON" ; cmake fails to find libssh if this is missing
1450 ;; See https://github.com/libgit2/libgit2/issues/7169
1451 #$@(if (target-32bit?)
1452 '("-DCMAKE_C_FLAGS=-D_FILE_OFFSET_BITS=64")
1453 '()))
1454 #:phases
1455 #~(modify-phases %standard-phases
1456 ;; Run checks more verbosely, unless we are cross-compiling.
1457 (replace 'check
1458 (lambda* (#:key (tests? #t) #:allow-other-keys)
1459 (if tests?
1460 (invoke "./libgit2_tests" "-v" "-Q")
1461 ;; Tests may be disabled if cross-compiling.
1462 (format #t "Test suite not run.~%")))))))
1463 (properties '((hidden? . #t)))))
1464
1429(define-public libgit2-1.8 1465(define-public libgit2-1.8
1430 (package 1466 (package
1431 (inherit libgit2-1.9) 1467 (inherit libgit2-1.9)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 04232dd694f..887166f1212 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -6856,7 +6856,7 @@ result in several formats:
6856 '()) 6856 '())
6857 (list pkg-config rust-cargo-c))) 6857 (list pkg-config rust-cargo-c)))
6858 (inputs 6858 (inputs
6859 (cons* libgit2-1.9 zlib (cargo-inputs 'rav1e))) 6859 (cons* libgit2-1.9/pinned zlib (cargo-inputs 'rav1e)))
6860 (home-page "https://github.com/xiph/rav1e/") 6860 (home-page "https://github.com/xiph/rav1e/")
6861 (synopsis "Fast and safe AV1 encoder") 6861 (synopsis "Fast and safe AV1 encoder")
6862 (description "@code{rav1e} is an AV1 video encoder. It is designed to 6862 (description "@code{rav1e} is an AV1 video encoder. It is designed to