From e0e23164202ad9328ffeadde5e900857cb008124 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 22 Nov 2021 11:49:00 -0500 Subject: gnu: libgit2: Update to 1.3.0. * gnu/packages/patches/libgit2-mtime-0.patch: Delete file. * gnu/local.mk (dist_patch_DATA): De-register it. * gnu/packages/version-control.scm (libgit2): Update to 1.3.0. [source]: Remove patch and simplify snippet. [phases]: Remove trailing #t. --- gnu/packages/version-control.scm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'gnu/packages/version-control.scm') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index b8f99f1885..9d1c84b563 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -786,19 +786,20 @@ to GitHub contributions calendar.") (define-public libgit2 (package (name "libgit2") - (version "1.1.0") + (version "1.3.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/libgit2/libgit2/" - "releases/download/v" version - "/libgit2-" version ".tar.gz")) + ;; Since v1.1.1, release artifacts are no longer offered (see: + ;; https://github.com/libgit2/libgit2/discussions/5932#discussioncomment-1682729). + (method git-fetch) + (uri (git-reference + (url "https://github.com/libgit2/libgit2") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1fjdglkh04qv3b4alg621pxa689i0wlf8m7nf2755zawjr2zhwxd")) - (patches (search-patches "libgit2-mtime-0.patch")) - (snippet '(begin - (delete-file-recursively "deps") #t)) - (modules '((guix build utils))))) + "0vgpb2175a5dhqiy1iwywwppahgqhi340i8bsvafjpvkw284vazd")) + (modules '((guix build utils))) + (snippet '(delete-file-recursively "deps")))) (build-system cmake-build-system) (outputs '("out" "debug")) (arguments @@ -820,8 +821,7 @@ to GitHub contributions calendar.") (("#!/bin/sh") (string-append "#!" (which "sh")))) (substitute* "tests/clar/fs.h" (("/bin/cp") (which "cp")) - (("/bin/rm") (which "rm"))) - #t)) + (("/bin/rm") (which "rm"))))) ;; Run checks more verbosely, unless we are cross-compiling. (replace 'check (lambda* (#:key (tests? #t) #:allow-other-keys) -- cgit v1.2.3