GNU bug report logs - #55424
[PATCH 000/602] Purge Python 2 packages

Previous Next

Full log

Message #382 received at 55424 <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Cc: 55424 <at> debbugs.gnu.org
Subject: Re: [PATCH 4/4] gnu: renpy: Update to 7.99.99-0-3e854bc.
Date: Fri, 17 Jun 2022 09:43:22 -0400

Hi,

Liliana Marie Prikler <liliana.prikler <at> gmail.com> writes:

[...]

> +;; Using nightly from 2022-06-16.
> +;; Revert back to URLs once renpy 8 is released!
> +(define %renpy-commit "3e854bc7cb1642ca18b061a0c6e349f168965c43")
>  (define-public python-renpy
>    (package
>      (name "python-renpy")
> -    (version "7.4.11")
> +    (version (git-version "7.99.99" "0" %renpy-commit))

I think it might be easy to overlook the "revision" field, since the
more common convention is to define the "revision" and "commit"
variables in a let; but perhaps that's just me.

>      (source
>       (origin
> -       (method url-fetch)
> -       (uri (string-append "https://www.renpy.org/dl/" version
> -                           "/renpy-" version "-source.tar.bz2"))
> -       (sha256 (base32 "0zkhg2sd2hglm9dkansf4h8sq7lm7iqslzl763ambp4kyfdvd07q"))
> +       (method git-fetch)
> +       (uri (git-reference
> +             (url "https://github.com/renpy/renpy")
> +             (commit %renpy-commit)))
> +       (file-name (git-file-name name version))
> +       (sha256 (base32 "11g7hqhw4gbkx5ib2wsawrznmjbn8r9zkgf2sg39z56h96y8wfbn"))
>         (modules '((guix build utils)))
>         (patches
>          (search-patches
> @@ -1486,8 +1492,11 @@ (define* (install-renpy-game #:key output game name (renpy renpy)
>                 #t))))))
>      (inputs
>       `(("renpy.in" ,(search-auxiliary-file "renpy/renpy.in"))
> +       ("python-pefile" ,python-pefile)
> +       ("python-requests" ,python-requests)
>         ("python-renpy" ,python-renpy)
>         ("python-tkinter" ,python "tk")
> +       ("python-six" ,python-six)
>         ("python" ,python) ; for ‘fix-commands’ and ‘wrap’
>         ("xdg-utils" ,xdg-utils)))
>      (propagated-inputs '())

It'd be nicer to use new style inputs here, that'd take care of one out
of 2 lint warnings:

--8<---------------cut here---------------start------------->8---
gnu/packages/game-development.scm:1494:5: renpy <at> 7.99.99-0.3e854bc: label 'python-tkinter' does not match package name 'python:tk'
gnu/packages/game-development.scm:1348:2: renpy <at> 7.99.99-0.3e854bc: "bash-minimal" should be in 'inputs' when 'wrap-program' is used
--8<---------------cut here---------------end--------------->8---

Please take care of the 2nd lint suggestion as well.

Other than that, it LGTM.  I've built and linted all the packages in
this series.  Feel free to push with adjustments along my comments.

Thanks again for picking that up.

Maxim

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.