From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id OAWuGWldZ2TwLwAASxT56A (envelope-from ) for ; Fri, 19 May 2023 13:28:41 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id oL+gGGldZ2T9twAAG6o9tA (envelope-from ) for ; Fri, 19 May 2023 13:28:41 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 1CA3526127 for ; Fri, 19 May 2023 13:28:41 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzyHG-0002rs-4J; Fri, 19 May 2023 07:28:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzyHE-0002qr-7N for guix-patches@gnu.org; Fri, 19 May 2023 07:28:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pzyHD-0006GC-VF for guix-patches@gnu.org; Fri, 19 May 2023 07:28:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pzyHD-0003Na-Bz; Fri, 19 May 2023 07:28:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63582] [PATCH 4/4] gnu: python-renpy: Use G-Expressions. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Fri, 19 May 2023 11:28:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63582 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63582@debbugs.gnu.org Cc: iyzsong@envs.net X-Debbugs-Original-Xcc: iyzsong@envs.net Received: via spool by 63582-submit@debbugs.gnu.org id=B63582.168449565712940 (code B ref 63582); Fri, 19 May 2023 11:28:03 +0000 Received: (at 63582) by debbugs.gnu.org; 19 May 2023 11:27:37 +0000 Received: from localhost ([127.0.0.1]:55572 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzyGm-0003Me-Kz for submit@debbugs.gnu.org; Fri, 19 May 2023 07:27:37 -0400 Received: from mail-ed1-f67.google.com ([209.85.208.67]:49427) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzyGe-0003Lj-EL for 63582@debbugs.gnu.org; Fri, 19 May 2023 07:27:29 -0400 Received: by mail-ed1-f67.google.com with SMTP id 4fb4d7f45d1cf-510b4e488e4so5656017a12.3 for <63582@debbugs.gnu.org>; Fri, 19 May 2023 04:27:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684495642; x=1687087642; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :from:to:cc:subject:date:message-id:reply-to; bh=oQEczwYGvB6Vfis/L9eXe2HXv2gcZn6+z7BNDsjL17M=; b=UbJK2lXJ+YhhcpKugc7UiRu5zL5pWOV8HyPQMVaXmmgAJCYHGApycBrXWZIHisJcPY 93Iz9/Vyj+LLLP8MdrLMq2rvqaZpaapyFC1kbmpFOIStf3R3EfkOHYSMgA2ZDx+BNBcB JeFUu17iU+NKKOBZI2aqdGErXZCwdGC5YjrnOyIDwYp198DOfKb8v/borIv/F+uLoEUT wCo1LalLtFrEDWYjmuqz6y+uFgSKXNTdJC/saRg4AZ6F3AXFsvAdtBWrP4T5hhq3fwz/ p0SlGvnZFoe6kYfLp+ht5K2MCAPtMWg6CulR94VzeXLKAMioeZq4qwOhejl9IwDfIB38 drHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684495642; x=1687087642; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=oQEczwYGvB6Vfis/L9eXe2HXv2gcZn6+z7BNDsjL17M=; b=St/ntHKwMmMmIQZJWc1YHN08l/sd2LFkEmAVeW6sZTbdUw4jMm75iYdNxI8rzpoYHw 4l4daw1UXbg5T7CYkVfF47Xtezwg2WrKd5UdYhsimbArqUtBff6HhawVWlnCKjdxNcfQ y+Jg61rqC6tTLOGO9S7oY5k9azpol6x45K3yNaUF+JRr8+THmx0sd/VaMcUTsojpQR7B 0QQ73HvxgsEOGI6uD3qcOcARmrbW3zVn7X3vASXCsiiLykD/EhEO1RVMcju+WeTu1aew IOxI8cRfNknY1MMHNbQJ6CgwAjPSS9ydQYG15ys3eFqra88/XQTD5prkBCTL3evWUzZl BOXA== X-Gm-Message-State: AC+VfDzjpcRpVmOdp4sIeCro0xokthWRLriYBeHYoQS/T1Ksw5LUFbVM VznJXu2dtg+HwnaAWc/H3GdbpHy35YGzNQ== X-Google-Smtp-Source: ACHHUZ5qA3EdZ7sIh7w+UPt5zSzQ3Xcx0o3G2e7hjvGj6YDU6iJ8QeIqIIQTkXK+/byMxAhkHG+Gvw== X-Received: by 2002:a17:907:e8c:b0:96f:678:d2e2 with SMTP id ho12-20020a1709070e8c00b0096f0678d2e2mr1378267ejc.11.1684495642632; Fri, 19 May 2023 04:27:22 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id d14-20020a170906174e00b0096b4c3489e6sm2193520eje.177.2023.05.19.04.27.22 for <63582@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 May 2023 04:27:22 -0700 (PDT) Message-Id: <8fac5ba5bd77bae12c9411c28f1ee03099ccb28f.1684493082.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Fri, 19 May 2023 12:14:28 +0200 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Seal: i=1; s=key1; d=yhetil.org; t=1684495721; a=rsa-sha256; cv=none; b=lnmA/QxxjG3XLNJV4QpB/45C2UaIbcPAkg11WzsJHxYngvu7n0p6/+zlrJyWYCrEUyd9TY kFstDGfX9BYgSxYoYUxK74ScM0+wYmQJw14Q5lIcdkwMF+RM08ozitvrdFLYGaehLgbQ4W tIur3mjiIYQ/1I6sj1ArAsegk7iWNo7SikX0QGVug/jN28/ZKa4AsGDjR1f5l39/ltg2Bu 9TbM3Btx/d5HParASdldfhZq5jZdFzYPw3nlQWjqO57FCw5OL4CAM74KLm7XGNMSVw8Fyc tcdWdQUh3hoCAZL8Mli7yeYWPJufrV28CHY+FDu3DCWjctBaCqR5oIaM4R5ITA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=UbJK2lXJ; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1684495721; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=oQEczwYGvB6Vfis/L9eXe2HXv2gcZn6+z7BNDsjL17M=; b=tdgoNcLgmZljGUFwuZvQ36D5BR9LNYA1qwKLmriH11LfGUTkyIXCecX8nog9EWALCDwEhe FA5ud81TcanA/5r9RU1DsId+FI+IGVFR7SFvTfmEzFJ8/Zu7y2lpWRVoAsidCV1vm/7Lr3 FqYWfq1RzAC4JXOHcQN3F+N6oun1a3HnI3BHLe+gyvyeO8mZ52Ytpbhw6/463QBLN6nizj jchTYtni86xlAzbiKSORb2Vpem4eQTprjm7x/URa4/Qqed0WP6DxcCIdfRk0XnnkC1dnq8 5AGjgCwUAwIS4RRO8O8P7ORwiq18k+QMyOQYy58/roXzfYrJ9T8CV5V5snevlA== X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=UbJK2lXJ; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 7.31 X-Spam-Score: 7.31 X-Migadu-Queue-Id: 1CA3526127 X-TUID: 6dFTpOiMBMSA * gnu/packages/game-development.scm (python-renpy)[arguments]: Convert to list of G-Expressions. --- gnu/packages/game-development.scm | 83 ++++++++++++++++--------------- 1 file changed, 42 insertions(+), 41 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 96a7a52b62..453196d3af 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1359,47 +1359,48 @@ (define-public python-renpy (("official = official and .*") "")))))) (build-system python-build-system) (arguments - `(#:tests? #f ; Ren'py doesn't seem to package tests - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-commands - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "renpy/editor.py" - (("xdg-open") - (string-append (assoc-ref inputs "xdg-utils") - "/bin/xdg-open"))))) - (add-after 'set-paths 'set-build-vars - (lambda* (#:key inputs native-inputs #:allow-other-keys) - (setenv "RENPY_CYTHON" - (search-input-file (or native-inputs inputs) - "/bin/cython")) - (setenv "RENPY_DEPS_INSTALL" (string-join (map cdr inputs) ":")))) - (replace 'build - (lambda* (#:key inputs outputs #:allow-other-keys #:rest args) - ;; The "module" subdirectory contains a python (really cython) - ;; project, which is built using a script, that is thankfully - ;; named "setup.py". - (with-directory-excursion "module" - (apply (assoc-ref %standard-phases 'build) args)) - ;; The above only builds the cython modules, but nothing else, - ;; so we do that here. - (invoke "python" "-m" "compileall" "renpy"))) - (replace 'install - (lambda* (#:key inputs outputs #:allow-other-keys #:rest args) - ;; Again, we have to wrap the module installation. - ;; Additionally, we want to install the python code - ;; (both source and compiled) in the same directory. - (let* ((out (assoc-ref outputs "out")) - (site (string-append "/lib/python" - (python-version - (assoc-ref inputs "python")) - "/site-packages"))) - (with-directory-excursion "module" - (apply (assoc-ref %standard-phases 'install) args)) - (copy-recursively "renpy" - (string-append out site "/renpy")) - (delete-file-recursively (string-append out site - "/renpy/common")))))))) + (list + #:tests? #f ; Ren'py doesn't seem to package tests + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-commands + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "renpy/editor.py" + (("xdg-open") + (string-append (assoc-ref inputs "xdg-utils") + "/bin/xdg-open"))))) + (add-after 'set-paths 'set-build-vars + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (setenv "RENPY_CYTHON" + (search-input-file (or native-inputs inputs) + "/bin/cython")) + (setenv "RENPY_DEPS_INSTALL" (string-join (map cdr inputs) ":")))) + (replace 'build + (lambda* (#:key inputs outputs #:allow-other-keys #:rest args) + ;; The "module" subdirectory contains a python (really cython) + ;; project, which is built using a script, that is thankfully + ;; named "setup.py". + (with-directory-excursion "module" + (apply (assoc-ref %standard-phases 'build) args)) + ;; The above only builds the cython modules, but nothing else, + ;; so we do that here. + (invoke "python" "-m" "compileall" "renpy"))) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys #:rest args) + ;; Again, we have to wrap the module installation. + ;; Additionally, we want to install the python code + ;; (both source and compiled) in the same directory. + (let* ((out (assoc-ref outputs "out")) + (site (string-append "/lib/python" + (python-version + (assoc-ref inputs "python")) + "/site-packages"))) + (with-directory-excursion "module" + (apply (assoc-ref %standard-phases 'install) args)) + (copy-recursively "renpy" + (string-append out site "/renpy")) + (delete-file-recursively (string-append out site + "/renpy/common")))))))) (native-inputs (list python-cython)) (inputs (list ffmpeg -- 2.40.1