From c0e7242aa18d9b88a1d737f0b22389b680d3ada7 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Tue, 23 Nov 2021 20:35:00 +0100
Subject: gnu: libgit2: Reintroduce 1.1.0.

* gnu/packages/version-control.scm (libgit2-1.1): New variable.
* gnu/packages/patches/libgit2-mtime-0.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
---
 gnu/packages/patches/libgit2-mtime-0.patch | 14 ++++++++++++++
 gnu/packages/version-control.scm           | 18 ++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 gnu/packages/patches/libgit2-mtime-0.patch

(limited to 'gnu/packages')

diff --git a/gnu/packages/patches/libgit2-mtime-0.patch b/gnu/packages/patches/libgit2-mtime-0.patch
new file mode 100644
index 0000000000..a6fdb50fff
--- /dev/null
+++ b/gnu/packages/patches/libgit2-mtime-0.patch
@@ -0,0 +1,14 @@
+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
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 5c5335ce15..a44c553c71 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -850,6 +850,24 @@ write native speed custom Git applications in any language with bindings.")
     ;; GPLv2 with linking exception
     (license license:gpl2)))
 
+(define-public libgit2-1.1
+  (package
+    (inherit libgit2)
+    (name "libgit2")
+    (version "1.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://github.com/libgit2/libgit2/"
+                                  "releases/download/v" version
+                                  "/libgit2-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1fjdglkh04qv3b4alg621pxa689i0wlf8m7nf2755zawjr2zhwxd"))
+              (patches (search-patches "libgit2-mtime-0.patch"))
+              (snippet '(begin
+                          (delete-file-recursively "deps") #t))
+              (modules '((guix build utils)))))))
+
 (define-public git-crypt
   (package
     (name "git-crypt")
-- 
cgit v1.2.3