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.master
parent
12f68319e8
commit
e0e2316420
|
@ -1347,7 +1347,6 @@ dist_patch_DATA = \
|
||||||
%D%/packages/patches/libcyaml-libyaml-compat.patch \
|
%D%/packages/patches/libcyaml-libyaml-compat.patch \
|
||||||
%D%/packages/patches/libexpected-nofetch.patch \
|
%D%/packages/patches/libexpected-nofetch.patch \
|
||||||
%D%/packages/patches/libgeotiff-adapt-test-script-for-proj-6.2.patch \
|
%D%/packages/patches/libgeotiff-adapt-test-script-for-proj-6.2.patch \
|
||||||
%D%/packages/patches/libgit2-mtime-0.patch \
|
|
||||||
%D%/packages/patches/libgnome-encoding.patch \
|
%D%/packages/patches/libgnome-encoding.patch \
|
||||||
%D%/packages/patches/libgnomeui-utf8.patch \
|
%D%/packages/patches/libgnomeui-utf8.patch \
|
||||||
%D%/packages/patches/libgrss-CVE-2016-2001.patch \
|
%D%/packages/patches/libgrss-CVE-2016-2001.patch \
|
||||||
|
|
|
@ -1,14 +0,0 @@
|
||||||
The Clar test framework has a bug whereby it skips the parsing phase
|
|
||||||
on files with mtime=0.
|
|
||||||
|
|
||||||
Reported upstream at <https://github.com/vmg/clar/pull/78>.
|
|
||||||
|
|
||||||
diff --git a/tests/generate.py b/tests/generate.py
|
|
||||||
index b639c8f..111ca41 100644
|
|
||||||
--- a/tests/generate.py
|
|
||||||
+++ b/tests/generate.py
|
|
||||||
@@ -63,3 +63,3 @@ class Module(object):
|
|
||||||
|
|
||||||
- self.mtime = 0
|
|
||||||
+ self.mtime = None # Guix sets all file mtimes to '0'
|
|
||||||
self.enabled = True
|
|
|
@ -786,19 +786,20 @@ to GitHub contributions calendar.")
|
||||||
(define-public libgit2
|
(define-public libgit2
|
||||||
(package
|
(package
|
||||||
(name "libgit2")
|
(name "libgit2")
|
||||||
(version "1.1.0")
|
(version "1.3.0")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
;; Since v1.1.1, release artifacts are no longer offered (see:
|
||||||
(uri (string-append "https://github.com/libgit2/libgit2/"
|
;; https://github.com/libgit2/libgit2/discussions/5932#discussioncomment-1682729).
|
||||||
"releases/download/v" version
|
(method git-fetch)
|
||||||
"/libgit2-" version ".tar.gz"))
|
(uri (git-reference
|
||||||
|
(url "https://github.com/libgit2/libgit2")
|
||||||
|
(commit (string-append "v" version))))
|
||||||
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1fjdglkh04qv3b4alg621pxa689i0wlf8m7nf2755zawjr2zhwxd"))
|
"0vgpb2175a5dhqiy1iwywwppahgqhi340i8bsvafjpvkw284vazd"))
|
||||||
(patches (search-patches "libgit2-mtime-0.patch"))
|
(modules '((guix build utils)))
|
||||||
(snippet '(begin
|
(snippet '(delete-file-recursively "deps"))))
|
||||||
(delete-file-recursively "deps") #t))
|
|
||||||
(modules '((guix build utils)))))
|
|
||||||
(build-system cmake-build-system)
|
(build-system cmake-build-system)
|
||||||
(outputs '("out" "debug"))
|
(outputs '("out" "debug"))
|
||||||
(arguments
|
(arguments
|
||||||
|
@ -820,8 +821,7 @@ to GitHub contributions calendar.")
|
||||||
(("#!/bin/sh") (string-append "#!" (which "sh"))))
|
(("#!/bin/sh") (string-append "#!" (which "sh"))))
|
||||||
(substitute* "tests/clar/fs.h"
|
(substitute* "tests/clar/fs.h"
|
||||||
(("/bin/cp") (which "cp"))
|
(("/bin/cp") (which "cp"))
|
||||||
(("/bin/rm") (which "rm")))
|
(("/bin/rm") (which "rm")))))
|
||||||
#t))
|
|
||||||
;; Run checks more verbosely, unless we are cross-compiling.
|
;; Run checks more verbosely, unless we are cross-compiling.
|
||||||
(replace 'check
|
(replace 'check
|
||||||
(lambda* (#:key (tests? #t) #:allow-other-keys)
|
(lambda* (#:key (tests? #t) #:allow-other-keys)
|
||||||
|
|
Reference in New Issue