GNU bug report logs - #28093
[PATCH] gnu: cgit: Don't build cgit's special 'git:src' input.

Previous Next

Full log

View this message in rfc822 format

From: Leo Famulari <leo <at> famulari.name>
To: 28093 <at> debbugs.gnu.org
Subject: [bug#28093] [PATCH] gnu: cgit: Don't build cgit's special 'git:src' input.
Date: Mon, 14 Aug 2017 23:31:37 -0400

* gnu/packages/version-control.scm (cgit)[inputs]: Replace the git <at> 2.10
package with an origin reference of the source code.
(git <at> 2.10): Remove variable.
---
 gnu/packages/version-control.scm | 31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 7c1f02d5a..3f76ed7f3 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -9,7 +9,7 @@
 ;;; Copyright © 2015, 2016, 2017 Efraim Flashner <efraim <at> flashner.co.il>
 ;;; Copyright © 2015 Kyle Meyer <kyle <at> kyleam.com>
 ;;; Copyright © 2015, 2017 Ricardo Wurmus <rekado <at> elephly.net>
-;;; Copyright © 2016 Leo Famulari <leo <at> famulari.name>
+;;; Copyright © 2016, 2017 Leo Famulari <leo <at> famulari.name>
 ;;; Copyright © 2016, 2017 ng0 <contact.ng0 <at> cryptolab.net>
 ;;; Copyright © 2017 Tobias Geerinckx-Rice <me <at> tobias.gr>
 ;;; Copyright © 2017 Vasile Dumitrascu <va511e <at> yahoo.com>
@@ -121,6 +121,8 @@ as well as the classic centralized workflow.")
 (define-public git
   (package
    (name "git")
+   ;; XXX When updating Git, check if the special 'git:src' input to cgit needs
+   ;; to be updated as well.
    (version "2.14.1")
    (source (origin
             (method url-fetch)
@@ -349,23 +351,6 @@ everything from small to very large projects with speed and efficiency.")
    (license license:gpl2)
    (home-page "https://git-scm.com/")))
 
-;; Some dependent packages directly access internal interfaces which
-;; have changed in 2.12. TODO: Remove this for cgit > 1.1.
-(define-public git <at> 2.10
-  (package
-    (inherit git)
-    (version "2.10.4")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://kernel.org/software/scm/git/git-"
-                                  version ".tar.xz"))
-              (sha256
-               (base32
-                "1pni4mgih5w42813dxljl61s7xmcpdnar34d9m4548hzpljjyd4l"))))
-    (arguments
-     `(#:tests? #f
-       ,@(package-arguments git)))))
-
 (define-public libgit2
   (package
     (name "libgit2")
@@ -502,6 +487,8 @@ collaboration using typical untrusted file hosts or services.")
 (define-public cgit
   (package
     (name "cgit")
+    ;; XXX When updating cgit, try removing the special 'git:src' input and
+    ;; using the source of the git package.
     (version "1.1")
     (source (origin
               (method url-fetch)
@@ -546,7 +533,13 @@ collaboration using typical untrusted file hosts or services.")
      ;; For building manpage.
      `(("asciidoc" ,asciidoc)))
     (inputs
-     `(("git:src" ,(package-source git <at> 2.10))
+     `(("git:src"
+        ,(origin
+           (method url-fetch)
+           (uri "mirror://kernel.org/software/scm/git/git-2.10.4.tar.xz")
+           (sha256
+            (base32
+             "1pni4mgih5w42813dxljl61s7xmcpdnar34d9m4548hzpljjyd4l"))))
        ("openssl" ,openssl)
        ("zlib" ,zlib)))
     (home-page "https://git.zx2c4.com/cgit/")
-- 
2.14.1

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.