From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53002) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dhSbK-0002bi-7E for guix-patches@gnu.org; Mon, 14 Aug 2017 23:33:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dhSbG-0000FS-6d for guix-patches@gnu.org; Mon, 14 Aug 2017 23:33:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:57161) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dhSbG-0000FM-3t for guix-patches@gnu.org; Mon, 14 Aug 2017 23:33:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dhSbF-0007I1-Tc for guix-patches@gnu.org; Mon, 14 Aug 2017 23:33:01 -0400 Subject: [bug#28093] [PATCH] gnu: cgit: Don't build cgit's special 'git:src' input. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:52906) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dhSa2-0001v2-Jh for guix-patches@gnu.org; Mon, 14 Aug 2017 23:31:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dhSZy-000899-NA for guix-patches@gnu.org; Mon, 14 Aug 2017 23:31:46 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:50565) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dhSZy-00088v-Fs for guix-patches@gnu.org; Mon, 14 Aug 2017 23:31:42 -0400 Received: from jasmine.lan (c-73-165-108-70.hsd1.pa.comcast.net [73.165.108.70]) by mail.messagingengine.com (Postfix) with ESMTPA id 3F3C6246A3 for ; Mon, 14 Aug 2017 23:31:41 -0400 (EDT) From: Leo Famulari Date: Mon, 14 Aug 2017 23:31:37 -0400 Message-Id: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 28093@debbugs.gnu.org * gnu/packages/version-control.scm (cgit)[inputs]: Replace the git@2.10 package with an origin reference of the source code. (git@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 ;;; Copyright © 2015 Kyle Meyer ;;; Copyright © 2015, 2017 Ricardo Wurmus -;;; Copyright © 2016 Leo Famulari +;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; Copyright © 2017 Vasile Dumitrascu @@ -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@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@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