From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark H Weaver Subject: Re: 03/04: gnu: Add git-when-merged. Date: Sat, 17 Nov 2018 04:38:37 -0500 Message-ID: <87pnv4vy9z.fsf@netris.org> References: <20181116221822.30957.35914@vcs0.savannah.gnu.org> <20181116221823.7F00D209C2@vcs0.savannah.gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:36347) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gNx4Y-0007G4-Au for guix-devel@gnu.org; Sat, 17 Nov 2018 04:39:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gNx4U-0004EH-8r for guix-devel@gnu.org; Sat, 17 Nov 2018 04:39:26 -0500 In-Reply-To: <20181116221823.7F00D209C2@vcs0.savannah.gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22's\?\= message of "Fri, 16 Nov 2018 17:18:23 -0500 (EST)") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Kyle Meyer , Ludovic =?utf-8?Q?Court?= =?utf-8?Q?=C3=A8s?= Cc: guix-devel@gnu.org Hi Kyle and Ludovic, ludo@gnu.org (Ludovic Court=C3=A8s) writes: > civodul pushed a commit to branch master > in repository guix. > > commit 243bdcc12e40c8dbd1129fa5b613d8f247744f31 > Author: Kyle Meyer > Date: Mon Nov 12 16:24:23 2018 -0500 > > gnu: Add git-when-merged. >=20=20=20=20=20 > * gnu/packages/version-control.scm (git-when-merged): New variable. >=20=20=20=20=20 > Signed-off-by: Ludovic Court=C3=A8s > --- > 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 . 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-cont= rol.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 broug= ht a > +given commit into the specified ref(s). It has various options that con= trol > +how information about the merge is displayed.") > + (license license:gpl2))))