[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: gnu: cgit: Don't build cgit's special 'git:src' input.
From: |
Leo Famulari |
Subject: |
01/01: gnu: cgit: Don't build cgit's special 'git:src' input. |
Date: |
Tue, 15 Aug 2017 17:59:43 -0400 (EDT) |
lfam pushed a commit to branch master
in repository guix.
commit 8343d373d5038d230652a51190f6a7c986674df6
Author: Leo Famulari <address@hidden>
Date: Mon Aug 14 23:31:37 2017 -0400
gnu: cgit: Don't build cgit's special 'git:src' input.
This special version of Git is only used within the build process of
cgit. We don't need to build it otherwise, so the package is removed
with this commit.
* gnu/packages/version-control.scm (cgit)[inputs]: Replace the
address@hidden
package with an origin reference of the source code.
(address@hidden): Remove variable.
---
gnu/packages/version-control.scm | 34 +++++++++++++++-------------------
1 file changed, 15 insertions(+), 19 deletions(-)
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 7c1f02d..869672c 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -9,7 +9,7 @@
;;; Copyright © 2015, 2016, 2017 Efraim Flashner <address@hidden>
;;; Copyright © 2015 Kyle Meyer <address@hidden>
;;; Copyright © 2015, 2017 Ricardo Wurmus <address@hidden>
-;;; Copyright © 2016 Leo Famulari <address@hidden>
+;;; Copyright © 2016, 2017 Leo Famulari <address@hidden>
;;; Copyright © 2016, 2017 ng0 <address@hidden>
;;; Copyright © 2017 Tobias Geerinckx-Rice <address@hidden>
;;; Copyright © 2017 Vasile Dumitrascu <address@hidden>
@@ -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 address@hidden
- (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,16 @@ collaboration using typical untrusted file hosts or
services.")
;; For building manpage.
`(("asciidoc" ,asciidoc)))
(inputs
- `(("git:src" ,(package-source address@hidden))
+ `(;; Cgit directly accesses some internal Git interfaces that changed in
+ ;; Git 2.12. Try removing this special input and using the source of
the
+ ;; Git package for cgit > 1.1.
+ ("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/")