summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/rust-apps.scm2
-rw-r--r--gnu/packages/version-control.scm45
-rw-r--r--gnu/packages/video.scm2
3 files changed, 2 insertions, 47 deletions
diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index 7a188083f82..1a2a412457b 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -4253,7 +4253,7 @@ background agent taking care of maintaining the necessary state.")
4253 (list pkg-config)) 4253 (list pkg-config))
4254 (inputs 4254 (inputs
4255 (cons* curl 4255 (cons* curl
4256 libgit2-1.9/pinned 4256 libgit2-1.9
4257 libssh2 4257 libssh2
4258 openssl 4258 openssl
4259 sqlite 4259 sqlite
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 4157187c015..5fdbf1dfce2 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -1485,51 +1485,6 @@ write native speed custom Git applications in any language with bindings.")
1485 ;; GPLv2 with linking exception 1485 ;; GPLv2 with linking exception
1486 (license license:gpl2))) 1486 (license license:gpl2)))
1487 1487
1488(define-public libgit2-1.9/pinned
1489 ;; This is a pinned version used as a dependency for 'rust-cargo-c'.
1490 ;; Update periodically.
1491 (package/inherit libgit2-1.9
1492 (version "1.9.2")
1493 (source (origin
1494 (inherit (package-source libgit2-1.9))
1495 (method git-fetch)
1496 (uri (git-reference
1497 (url "https://github.com/libgit2/libgit2")
1498 (commit (string-append "v" version))))
1499 (file-name (git-file-name "libgit2" version))
1500 (sha256
1501 (base32
1502 "1f3wnw0s5fx4lf68i400mj6l7qyw9hf6mr7i2xlqqmp9q23q89sc"))
1503 (patches
1504 (search-patches "libgit2-uninitialized-proxy-settings.patch"
1505 "libgit2-proxy-reconnection.patch"
1506 "libgit2-path-max.patch"))))
1507 (arguments
1508 (list #:configure-flags
1509 #~(list "-DUSE_NTLMCLIENT=OFF" ;TODO: package this
1510 "-DREGEX_BACKEND=pcre2"
1511 "-DUSE_HTTP_PARSER=http-parser"
1512 "-DUSE_SSH=ON" ; cmake fails to find libssh if this is missing
1513 ;; See https://github.com/libgit2/libgit2/issues/7169
1514 #$@(if (target-32bit?)
1515 '("-DCMAKE_C_FLAGS=-D_FILE_OFFSET_BITS=64")
1516 '()))
1517 #:phases
1518 #~(modify-phases %standard-phases
1519 ;; Run checks more verbosely, unless we are cross-compiling.
1520 (replace 'check
1521 (lambda* (#:key (tests? #t) #:allow-other-keys)
1522 (if tests?
1523 (invoke "./libgit2_tests" "-v" "-Q")
1524 ;; Tests may be disabled if cross-compiling.
1525 (format #t "Test suite not run.~%")))))))
1526 (inputs
1527 (list libssh2 http-parser))
1528 (propagated-inputs
1529 ;; These libraries are in 'Requires.private' in libgit2.pc.
1530 (list openssl pcre2 zlib))
1531 (properties '((hidden? . #t)))))
1532
1533(define-public libgit2-1.8 1488(define-public libgit2-1.8
1534 (package 1489 (package
1535 (inherit libgit2-1.9) 1490 (inherit libgit2-1.9)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index c81680737cf..ac32b06a438 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -7090,7 +7090,7 @@ result in several formats:
7090 '()) 7090 '())
7091 (list pkg-config rust-cargo-c))) 7091 (list pkg-config rust-cargo-c)))
7092 (inputs 7092 (inputs
7093 (cons* libgit2-1.9/pinned zlib (cargo-inputs 'rav1e))) 7093 (cons* libgit2-1.9 zlib (cargo-inputs 'rav1e)))
7094 (home-page "https://github.com/xiph/rav1e/") 7094 (home-page "https://github.com/xiph/rav1e/")
7095 (synopsis "Fast and safe AV1 encoder") 7095 (synopsis "Fast and safe AV1 encoder")
7096 (description "@code{rav1e} is an AV1 video encoder. It is designed to 7096 (description "@code{rav1e} is an AV1 video encoder. It is designed to