Re: 03/04: gnu: Add git-when-merged.

Re: 03/04: gnu: Add git-when-merged.

[Mark H Weaver]

Hi Kyle and Ludovic,

ludo@gnu.org (Ludovic Courtès) writes:

> civodul pushed a commit to branch master
> in repository guix.
>
> commit 243bdcc12e40c8dbd1129fa5b613d8f247744f31
> Author: Kyle Meyer <kyle@kyleam.com>
> Date:   Mon Nov 12 16:24:23 2018 -0500
>
>     gnu: Add git-when-merged.
>     
>     * gnu/packages/version-control.scm (git-when-merged): New variable.
>     
>     Signed-off-by: Ludovic Courtès <ludo@gnu.org>
> ---
>  gnu/packages/version-control.scm | 52 ++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 52 insertions(+)

The license field of this package is incorrect.  It has this:

  (license license:gpl2)

which is understandable given that GitHub shows the license as "GPL-2.0"
on the main project page <https://github.com/mhagger/git-when-merged>.
However, if you look at the actual code, there's only one source file
and it has a proper GNU GPLv2+ copyright notice at the top.

  https://github.com/mhagger/git-when-merged/blob/master/bin/git-when-merged

The only other files in the repository are README.md and COPYING.

A lesson here is that we cannot trust the GitHub license information, or
at least that we should we suspicious when we see "GPL-2.0".

      Mark


> diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
> index 04d2804..fd90513 100644
> --- a/gnu/packages/version-control.scm
> +++ b/gnu/packages/version-control.scm
> @@ -2279,3 +2279,55 @@ used to keep a folder in sync between computers.")
>      ;; The web app is released under the AGPLv3+.
>      (license (list license:gpl3+
>                     license:agpl3+))))
> +
> +(define-public git-when-merged
> +  ;; Use an unreleased version to get a PY3 compatibility fix.
> +  (let ((commit "ab6af7865a0ba55ba364a6c507e0be6f84f31c6d"))
> +    (package
> +      (name "git-when-merged")
> +      (version (string-append "1.2.0-" (string-take commit 7)))
> +      (source (origin
> +                (method git-fetch)
> +                (uri (git-reference
> +                      (url "https://github.com/mhagger/git-when-merged/")
> +                      (commit commit)))
> +                (file-name (git-file-name name version))
> +                (sha256
> +                 (base32
> +                  "0iyk2psf97bc9h43m89p3xjmm79fsx99i7px29g4lcnmdy5kmz0p"))))
> +      (build-system gnu-build-system)
> +      (arguments
> +       `(#:tests? #f                    ; there are no tests
> +         #:phases
> +         (modify-phases %standard-phases
> +           (delete 'configure)
> +           (delete 'build)
> +           (replace 'install
> +             (lambda* (#:key outputs #:allow-other-keys)
> +               (install-file "bin/git-when-merged"
> +                             (string-append (assoc-ref outputs "out")
> +                                            "/bin"))
> +               #t))
> +           (add-before 'install 'patch-git
> +             (lambda* (#:key inputs #:allow-other-keys)
> +               (let ((git (string-append (assoc-ref inputs "git")
> +                                         "/bin/git")))
> +                 (substitute* "bin/git-when-merged"
> +                   (("'git'") (string-append "'" git "'")))
> +                 #t)))
> +           (add-after 'install 'wrap-script
> +             (lambda* (#:key outputs #:allow-other-keys)
> +               (wrap-program (string-append (assoc-ref outputs "out")
> +                                            "/bin/git-when-merged")
> +                 `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH"))))
> +               #t)))))
> +      (inputs
> +       `(("git" ,git)
> +         ("python" ,python-wrapper)))
> +      (home-page "https://github.com/mhagger/git-when-merged")
> +      (synopsis "Determine when a commit was merged into a Git branch")
> +      (description "This Git extension defines a subcommand,
> +@code{when-merged}, whose core operation is to find the merge that brought a
> +given commit into the specified ref(s).  It has various options that control
> +how information about the merge is displayed.")
> +      (license license:gpl2))))

Re: 03/04: gnu: Add git-when-merged.

[Kyle Meyer]

Mark H Weaver <mhw@netris.org> writes:

>>     * gnu/packages/version-control.scm (git-when-merged): New variable.

[...]

> The license field of this package is incorrect.  It has this:
>
>   (license license:gpl2)
>
> which is understandable given that GitHub shows the license as "GPL-2.0"
> on the main project page <https://github.com/mhagger/git-when-merged>.
> However, if you look at the actual code, there's only one source file
> and it has a proper GNU GPLv2+ copyright notice at the top.

Sorry about that, and thanks for spotting my mistake.  I'm happy to send
a patch to guix-patches, but I imagine it is easier for someone with
push access to correct it.

-- 
Kyle

Re: 03/04: gnu: Add git-when-merged.

[Ludovic Courtès]

Hi Mark,

Mark H Weaver <mhw@netris.org> skribis:

> ludo@gnu.org (Ludovic Courtès) writes:
>
>> civodul pushed a commit to branch master
>> in repository guix.
>>
>> commit 243bdcc12e40c8dbd1129fa5b613d8f247744f31
>> Author: Kyle Meyer <kyle@kyleam.com>
>> Date:   Mon Nov 12 16:24:23 2018 -0500
>>
>>     gnu: Add git-when-merged.
>>     
>>     * gnu/packages/version-control.scm (git-when-merged): New variable.
>>     
>>     Signed-off-by: Ludovic Courtès <ludo@gnu.org>
>> ---
>>  gnu/packages/version-control.scm | 52 ++++++++++++++++++++++++++++++++++++++++
>>  1 file changed, 52 insertions(+)
>
> The license field of this package is incorrect.  It has this:
>
>   (license license:gpl2)
>
> which is understandable given that GitHub shows the license as "GPL-2.0"
> on the main project page <https://github.com/mhagger/git-when-merged>.
> However, if you look at the actual code, there's only one source file
> and it has a proper GNU GPLv2+ copyright notice at the top.
>
>   https://github.com/mhagger/git-when-merged/blob/master/bin/git-when-merged
>
> The only other files in the repository are README.md and COPYING.

Indeed, my bad: knowing that Git is GPLv2-only, I took it for granted
that git-when-merged was licensed similarly.

I’ll push the fix shortly, thanks for the heads-up!

Ludo’.