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

Previous Next

Full log

Message #373 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 1/4] gnu: Add back the distinction between python-renpy
 and renpy.
Date: Fri, 17 Jun 2022 09:14:09 -0400

Hello Liliana,

Thanks for doing this!

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

> This partially reverts commit 9f1bd63fb5b6916f07d454ffde27cd3a66c95bb5.
> Note, that with this patch renpy fails to build due to incompatibilities with
> Python 3.
>
> * gnu/packages/game-development.scm (renpy): Split into ‘python-renpy’ for the
> python modules and ‘renpy’ for the games and binaries.
> ---
>  gnu/packages/game-development.scm | 171 +++++++++++++++++++++++++++++-
>  1 file changed, 169 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
> index 4c1b97f041..44f8ca57fc 100644
> --- a/gnu/packages/game-development.scm
> +++ b/gnu/packages/game-development.scm
> @@ -1257,9 +1257,9 @@ (define-public python-pygame-sdl2
>  developed mainly for Ren'py.")
>        (license (list license:lgpl2.1 license:zlib)))))
>  
> -(define-public renpy
> +(define-public python-renpy
>    (package
> -    (name "renpy")
> +    (name "python-renpy")
>      (version "7.4.11")
>      (source
>       (origin
> @@ -1342,6 +1342,173 @@ (define-public renpy
>  are only used to bootstrap it.")
>      (license license:expat)))
>  
> +(define-public renpy
> +  (package
> +    (inherit python-renpy)
> +    (name "renpy")
> +    (build-system python-build-system)
> +    (arguments
> +     `(#:tests? #f ; see python2-renpy

The comment should mention 'python-renpy' instead, right?  Also, the
arguments could use gexps...

> +       #:modules ((srfi srfi-1)
> +                  (guix build python-build-system)
> +                  (guix build utils))
> +       #:imported-modules ((srfi srfi-1) ,@%python-build-system-modules)
> +       #:phases
> +       (modify-phases %standard-phases
> +         (add-after 'unpack 'fix-commands
> +           (lambda* (#:key inputs outputs #:allow-other-keys)
> +             (substitute* "launcher/game/choose_directory.rpy"
> +               (("/usr/bin/python")
> +                (search-input-file inputs "/bin/python3")))
> +             (substitute* "launcher/game/front_page.rpy"
> +               (("xdg-open")
> +                (search-input-file inputs "/bin/xdg-open")))
> +             (substitute* "launcher/game/project.rpy"
> +               (("cmd = \\[ executable, \"-EO\", sys.argv\\[0\\] \\]")
> +                (string-append "cmd = [ \"" (assoc-ref outputs "out")
> +                               "/bin/renpy\" ]"))
> +               ;; Projects are still created in the usual style, so we need
> +               ;; to adjust the path.
> +               (("cmd.append\\(self.path\\)")
> +                "cmd.append(self.path + \"/game\")"))
> +             #t))

And the trailing #t can be removed.

> +         (add-after 'unpack 'drop-game-from-paths
> +           (lambda _
> +             (substitute* (list "launcher/game/gui7.rpy"
> +                                "launcher/game/gui7/images.py")
> +               ((", \"game\",") ","))
> +             #t))
> +         (add-before 'build 'start-xserver
> +           (lambda* (#:key inputs native-inputs #:allow-other-keys)
> +             (let ((Xvfb (search-input-file (or native-inputs inputs)
> +                                            "/bin/Xvfb")))
> +               (setenv "HOME" (getcwd))
> +               (system (format #f "~a :1 &" Xvfb))
> +               (setenv "DISPLAY" ":1")
> +               #t)))
> +         (replace 'build
> +           (lambda _
> +             (invoke "python" "renpy.py" "launcher" "quit")
> +             (invoke "python" "renpy.py" "the_question" "quit")
> +             (invoke "python" "renpy.py" "tutorial" "quit")
> +             #t))
> +         (replace 'install
> +           (lambda* (#:key inputs outputs #:allow-other-keys)
> +             ;; Here we install our custom renpy program.
> +             ;; After finishing this step, "out" will have the following:
> +             ;; |-- bin/renpy
> +             ;; `-- share/renpy ; i.e. path_to_renpy_base()
> +             ;;     |-- common
> +             ;;     `-- gui
> +             ;;
> +             ;; Note that common shares the source files that would be installed
> +             ;; by python2-renpy (which are instead deleted from that package),
> +             ;; but also contains their byte-compiled versions.
> +             ;; On other systems, renpy_base would point to site-packages or
> +             ;; even somewhere in /opt.
> +             ;; The former approach is not as straightforward as it seems
> +             ;; -- it causes renpy to load files twice for some weird reason --
> +             ;; and the latter is impossible on Guix. Hence the detour through
> +             ;; share/renpy and the custom renpy program.
> +             ;;
> +             ;; As a convention, other games should be installed as
> +             ;; subdirectories of share/renpy in their respective outputs as
> +             ;; well. This differs from the traditional layout, which is
> +             ;; roughly the following:
> +             ;; `-- Super Awesome Game
> +             ;;     |-- game       ; <- the folder we actually want
> +             ;;     |-- lib        ; compiled renpy module and dependencies
> +             ;;     |-- renpy      ; yet another copy of Ren'py's code
> +             ;;     |   |-- common ; the common folder from above
> +             ;;     |   `-- ...    ; Python code (source + compiled)
> +             ;;     |-- Super Awesome Game.py
> +             ;;     `-- Super Awesome Game.sh
> +             (let* ((out (assoc-ref outputs "out"))
> +                    (bin/renpy (string-append out "/bin/renpy")))
> +               (copy-recursively "renpy/common"
> +                                 (string-append out "/share/renpy/common"))
> +               (copy-recursively "gui"
> +                                 (string-append out "/share/renpy/gui"))
> +
> +               (mkdir-p (string-append out "/bin"))
> +               (copy-file (assoc-ref inputs "renpy.in") bin/renpy)
> +               (substitute* bin/renpy
> +                 (("@PYTHON@") (search-input-file inputs "bin/python3"))
> +                 (("@RENPY_BASE@") (string-append out "/share/renpy")))
> +               (chmod bin/renpy #o755))))
> +
> +         (add-after 'install 'install-games
> +           (lambda* (#:key outputs #:allow-other-keys)
> +             (define renpy (assoc-ref outputs "out"))
> +             ;; TODO: We should offer a renpy-build-system to make the
> +             ;; installation of Ren'py games easier.
> +             (define* (install-renpy-game #:key output game name (renpy renpy)
> +                                          #:allow-other-keys)
> +               (let* ((name (or name (basename game)))
> +                      (launcher (string-append output "/bin/renpy-" name))
> +                      (share (string-append output "/share/renpy/" name)))
> +                 (copy-recursively (string-append game "/game") share)
> +                 (mkdir-p (string-append output "/bin"))
> +                 (with-output-to-file launcher
> +                   (lambda ()
> +                     (format #t
> +                             "#!~a~%~a ~a \"$@\""
> +                             (which "bash")
> +                             (string-append renpy "/bin/renpy")
> +                             share)))
> +                 (chmod launcher #o755)))
> +
> +             (install-renpy-game #:output (assoc-ref outputs "out")
> +                                 #:game "launcher")
> +
> +             (install-renpy-game #:output (assoc-ref outputs "the-question")
> +                                 #:game "the_question"
> +                                 #:name "the-question")
> +
> +             (install-renpy-game #:output (assoc-ref outputs "tutorial")
> +                                 #:game "tutorial")
> +             #t))
> +         (replace 'wrap
> +           (lambda* (#:key inputs outputs #:allow-other-keys)
> +             (let ((out (assoc-ref outputs "out"))
> +                   (site (string-append "/lib/python"
> +                                        (python-version
> +                                         (assoc-ref inputs "python"))
> +                                        "/site-packages")))
> +               (wrap-program (string-append out "/bin/renpy")
> +                 `("GUIX_PYTHONPATH" =
> +                   (,@(delete-duplicates
> +                       (map
> +                        (lambda (store-path)
> +                          (string-append store-path site))
> +                        (cons (assoc-ref outputs "out")
> +                              (map cdr
> +                                   (filter
> +                                    (lambda (input)
> +                                      (string-prefix? "python" (car input)))
> +                                    inputs))))))))
> +               #t))))))
> +    (inputs
> +     `(("renpy.in" ,(search-auxiliary-file "renpy/renpy.in"))
> +       ("python-renpy" ,python-renpy)
> +       ("python-tkinter" ,python "tk")
> +       ("python" ,python) ; for ‘fix-commands’ and ‘wrap’
> +       ("xdg-utils" ,xdg-utils)))
> +    (propagated-inputs '())
> +    (native-inputs
> +     (list xorg-server-for-tests))
> +    (outputs
> +     (list "out" "tutorial" "the-question"))

Can we use new style inputs here?

Otherwise it LGTM.

Previous Next

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