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

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

[Leo Famulari]

* 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 <efraim@flashner.co.il>
 ;;; Copyright © 2015 Kyle Meyer <kyle@kyleam.com>
 ;;; Copyright © 2015, 2017 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2016, 2017 ng0 <contact.ng0@cryptolab.net>
 ;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2017 Vasile Dumitrascu <va511e@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@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

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

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 3511 bytes --]

On Mon, 14 Aug 2017 23:31:37 -0400
Leo Famulari <leo@famulari.name> 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(-)
> 
> 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@flashner.co.il> ;;; Copyright © 2015 Kyle Meyer
> <kyle@kyleam.com> ;;; Copyright © 2015, 2017 Ricardo Wurmus
> <rekado@elephly.net> -;;; Copyright © 2016 Leo Famulari
> <leo@famulari.name> +;;; Copyright © 2016, 2017 Leo Famulari
> <leo@famulari.name> ;;; Copyright © 2016, 2017 ng0
> <contact.ng0@cryptolab.net> ;;; Copyright © 2017 Tobias
> Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017 Vasile Dumitrascu
> <va511e@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@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/")


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 963 bytes --]

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

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 1128 bytes --]

On Tue, Aug 15, 2017 at 07:35:31AM +0100, Christopher Baines wrote:
> On Mon, 14 Aug 2017 23:31:37 -0400
> Leo Famulari <leo@famulari.name> 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?

Recently we started running the test suite of the "main" git package.

That caused the build of this package to fail, which also made cgit
fail to build, and that was annoying.

But, we don't even need to build this source code as a package, since it
gets built within the cgit build process, and we don't run the tests
there.

So, I figured we might as well not provide this as a package at all,
since it's really just intended to provide source code to cgit.

Does that sound reasonable?

If so, I'll summarize this in the commit message.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

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

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 1331 bytes --]

On Tue, 15 Aug 2017 15:21:36 -0400
Leo Famulari <leo@famulari.name> wrote:

> On Tue, Aug 15, 2017 at 07:35:31AM +0100, Christopher Baines wrote:
> > On Mon, 14 Aug 2017 23:31:37 -0400
> > Leo Famulari <leo@famulari.name> 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?  
> 
> Recently we started running the test suite of the "main" git package.
> 
> That caused the build of this package to fail, which also made cgit
> fail to build, and that was annoying.
> 
> But, we don't even need to build this source code as a package, since
> it gets built within the cgit build process, and we don't run the
> tests there.
> 
> So, I figured we might as well not provide this as a package at all,
> since it's really just intended to provide source code to cgit.
> 
> Does that sound reasonable?

Yep, makes sense, and the diff looks good to me.

> If so, I'll summarize this in the commit message.

Great :D

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 963 bytes --]

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

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 1290 bytes --]

Leo Famulari <leo@famulari.name> writes:

> On Tue, Aug 15, 2017 at 07:35:31AM +0100, Christopher Baines wrote:
>> On Mon, 14 Aug 2017 23:31:37 -0400
>> Leo Famulari <leo@famulari.name> 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?
>
> Recently we started running the test suite of the "main" git package.
>
> That caused the build of this package to fail, which also made cgit
> fail to build, and that was annoying.

cgit was not affected by the failing git@2.10 package since it only uses
the *source* derivation.  It does not care about what's going on in
git's [arguments]. :-)

So this patch won't change anything from cgits perspective.  I'm
slightly in favor of keeping git@2.10 until it's really uneeded (awkward
if we have to add it back later), but no strong opinion either way.

I would probably have done this instead of disabling tests if I had
thought about it.


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

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

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 707 bytes --]

On Tue, Aug 15, 2017 at 10:15:38PM +0200, Marius Bakke wrote:
> cgit was not affected by the failing git@2.10 package since it only uses
> the *source* derivation.  It does not care about what's going on in
> git's [arguments]. :-)

Ah, that's right.

> So this patch won't change anything from cgits perspective.  I'm
> slightly in favor of keeping git@2.10 until it's really uneeded (awkward
> if we have to add it back later), but no strong opinion either way.
> 
> I would probably have done this instead of disabling tests if I had
> thought about it.

This change won't make a measurable difference to Hydra's workload, but
I'd still like to avoid building this package unnecessarily.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

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

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 517 bytes --]

Leo Famulari <leo@famulari.name> writes:
>> So this patch won't change anything from cgits perspective.  I'm
>> slightly in favor of keeping git@2.10 until it's really uneeded (awkward
>> if we have to add it back later), but no strong opinion either way.
>> 
>> I would probably have done this instead of disabling tests if I had
>> thought about it.
>
> This change won't make a measurable difference to Hydra's workload, but
> I'd still like to avoid building this package unnecessarily.

Sounds good!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]