From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51859) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dhVSQ-0006O6-LU for guix-patches@gnu.org; Tue, 15 Aug 2017 02:36:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dhVSM-0002Hm-Mf for guix-patches@gnu.org; Tue, 15 Aug 2017 02:36:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:57191) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dhVSM-0002Hi-Iq for guix-patches@gnu.org; Tue, 15 Aug 2017 02:36:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dhVSM-0000Jl-9C for guix-patches@gnu.org; Tue, 15 Aug 2017 02:36:02 -0400 Subject: [bug#28093] [PATCH] gnu: cgit: Don't build cgit's special 'git:src' input. Resent-Message-ID: Date: Tue, 15 Aug 2017 07:35:31 +0100 From: Christopher Baines Message-ID: <20170815073531.4b72ab02@cbaines.net> In-Reply-To: References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; boundary="Sig_/1482cOtmdwjsk+G8K6m3uBU"; protocol="application/pgp-signature" 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: Leo Famulari Cc: 28093@debbugs.gnu.org --Sig_/1482cOtmdwjsk+G8K6m3uBU Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On Mon, 14 Aug 2017 23:31:37 -0400 Leo Famulari wrote: > * 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. It would be useful if outside of the changelog, but in the commit message, you could put why you are making the change. As far as I can tell, this won't change the cgit package, so I'm guessing the intent is to neaten up the code? > --- > gnu/packages/version-control.scm | 31 ++++++++++++------------------- > 1 file changed, 12 insertions(+), 19 deletions(-) >=20 > 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 =C2=A9 2015, 2016, 2017 Efraim Flashner > ;;; Copyright =C2=A9 2015 Kyle Meyer > ;;; Copyright =C2=A9 2015, 2017 Ricardo Wurmus > -;;; Copyright =C2=A9 2016 Leo Famulari > +;;; Copyright =C2=A9 2016, 2017 Leo Famulari > ;;; Copyright =C2=A9 2016, 2017 ng0 > ;;; Copyright =C2=A9 2017 Tobias > Geerinckx-Rice ;;; Copyright =C2=A9 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/"))) > =20 > -;; 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/") --Sig_/1482cOtmdwjsk+G8K6m3uBU Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAlmSljRfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE 9Xe8aQ/+K7IIKenfMLD6mGgFuBceVoFbxL8SlemXl5FVPc1AqJdzedhcWfS1zVDO bF4bDUzEZa8Lj4C6b5WbczyhOKBiZR5GK+QlxD+BHtx6NgaJ0RTVGbf2dPTLWK8w hFCv8iohETLQsMV45q8nr2SWimgUbICuH9ihC/T85izf1AxwnGfTx7SMRdn8c+5s b6N0iQqQqHgQjaCI4cJQBI0z+nnxVkFeSUtVSzXy6b1p4ziZo+gk+1LDrd5obwsS WLqBQB1GJWZ91tmZTddcQG5uquaLrdVyzPzYT94YxLmro/Ze7eGtk8VZ+QJOVIsg vq280DeP8o/WEwWLeVBvM4c+Ryj3ogZu1V0qh2kSO3MbkbTMOnKznscPS0vFvc9L 5N7LbUHIaU7avN/KkX0wW3YdwE0z+UWvMlEY1HL1w8iGdIPdGrbhYg/Bu/TNPkAS VEeHiUND6dS8mlO4ErU8FaJtAUKdC8iymQKGZUKMPXpLINaQTIT65Su6TP4d5FDZ pZklW7zZEEukOTd6JybFd2w+0HtceHdJ75zSeHSe4PmSk/x8r7I35FiaK32dE1Ak PHKS6f6mTq1m7eENSRcpsgyiR2KHg1Kl8YozdVB6bYb7f8PI+YX/gf2/+YdMAq8c kRzf+D3CtlQwkWnL5bU0ISToh4Kb1U/X7kdEpxe3DarxDaqT93A= =urhU -----END PGP SIGNATURE----- --Sig_/1482cOtmdwjsk+G8K6m3uBU--