diff mbox series

[bug#67592,01/14] gnu: libgit2: Update to 1.7.1.

Message ID 82f968303dafb78229fd392c37f4cff702fb5d28.1701551502.git.rteissier.code@chillpc.fr
State New
Headers show
Series gnu: rust-git2: Update to 0.18.1 | expand

Commit Message

Rémi Teissier Dec. 2, 2023, 9:33 p.m. UTC 
Change-Id: I53c7d49c2809599c79b31491859ef35d4314a770
---
 gnu/packages/version-control.scm | 58 +++++++++++++++++++++++++++++---
 1 file changed, 54 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index e1d7e19703..0c52778c7f 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -823,7 +823,7 @@  (define-public git-cal
 (define-public libgit2
   (package
     (name "libgit2")
-    (version "1.5.1")
+    (version "1.7.1")
     (source (origin
               ;; Since v1.1.1, release artifacts are no longer offered (see:
               ;; https://github.com/libgit2/libgit2/discussions/5932#discussioncomment-1682729).
@@ -834,11 +834,19 @@  (define-public libgit2
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "04ypzpicpgq1wh6anwcmjjyh2b854lvjhxq0hq2hbsx7kb14qc1b"))
+                "1wq6a91k97gbsyafla39yvn1lnr559hqc41ksz1qxv7flf5kyvfx"))
               (modules '((guix build utils)))
               (snippet
                '(begin
-                  (delete-file-recursively "deps")))))
+                  ;TODO: package unversioned xdiff project
+                  (delete-file-recursively "deps/chromium-zlib")
+                  (delete-file-recursively "deps/http-parser")
+                  (delete-file-recursively "deps/ntlmclient")
+                  (delete-file-recursively "deps/pcre")
+                  (delete-file-recursively "deps/winhttp")
+                  (delete-file-recursively "deps/zlib")
+                  ))
+              ))
     (build-system cmake-build-system)
     (outputs '("out" "debug"))
     (arguments
@@ -886,9 +894,51 @@  (define-public libgit2
     ;; GPLv2 with linking exception
     (license license:gpl2)))
 
-(define-public libgit2-1.4
+(define-public libgit2-1.6
   (package
     (inherit libgit2)
+    (name "libgit2")
+    (version "1.6.4")
+    (source (origin
+              ;; 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
+                "078jnis7lwzb38ha5lcrs8hzi4br3c8v7c9xaqkvkcaa8nifcvcm"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin
+                  (delete-file-recursively "deps")))))))
+
+(define-public libgit2-1.5
+  (package
+    (inherit libgit2-1.6)
+    (name "libgit2")
+    (version "1.5.1")
+    (source (origin
+              ;; 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
+                "04ypzpicpgq1wh6anwcmjjyh2b854lvjhxq0hq2hbsx7kb14qc1b"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin
+                  (delete-file-recursively "deps")))))))
+
+(define-public libgit2-1.4
+  (package
+    (inherit libgit2-1.5)
     (version "1.4.5")
     (source (origin
               (inherit (package-source libgit2))