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 ms5.migadu.com with LMTPS id cGC7BQGbrGKtfQEAbAwnHQ (envelope-from ) for ; Fri, 17 Jun 2022 17:17:21 +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 +KLOBAGbrGJybgAAG6o9tA (envelope-from ) for ; Fri, 17 Jun 2022 17:17:21 +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 A3CA021EC7 for ; Fri, 17 Jun 2022 17:17:20 +0200 (CEST) Received: from localhost ([::1]:33782 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o2Dip-0006a5-FU for larch@yhetil.org; Fri, 17 Jun 2022 11:17:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46276) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o2DiZ-00066P-CC for guix-patches@gnu.org; Fri, 17 Jun 2022 11:17:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52781) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o2DiZ-0003Z4-4Y for guix-patches@gnu.org; Fri, 17 Jun 2022 11:17:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o2DiZ-0002O0-19 for guix-patches@gnu.org; Fri, 17 Jun 2022 11:17:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55424] [PATCH v2 4/6] gnu: renpy: Update to 7.99.99-0-3e854bc. References: <20220515044412.6697-1-maxim.cournoyer@gmail.com> In-Reply-To: <20220515044412.6697-1-maxim.cournoyer@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 17 Jun 2022 15:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55424 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxim Cournoyer Cc: 55424@debbugs.gnu.org Received: via spool by 55424-submit@debbugs.gnu.org id=B55424.16554790099110 (code B ref 55424); Fri, 17 Jun 2022 15:17:02 +0000 Received: (at 55424) by debbugs.gnu.org; 17 Jun 2022 15:16:49 +0000 Received: from localhost ([127.0.0.1]:46671 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o2DiL-0002Mm-76 for submit@debbugs.gnu.org; Fri, 17 Jun 2022 11:16:49 -0400 Received: from mail-ed1-f67.google.com ([209.85.208.67]:42672) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o2DiF-0002Lp-BS for 55424@debbugs.gnu.org; Fri, 17 Jun 2022 11:16:44 -0400 Received: by mail-ed1-f67.google.com with SMTP id z11so444436edp.9 for <55424@debbugs.gnu.org>; Fri, 17 Jun 2022 08:16:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:to:cc:content-transfer-encoding:message-id :mime-version; bh=9Tl1GF7K1EISYQ4I72n+PR2DvTL8RqMQkxeECkX4j4Q=; b=eq0yTaEnr4gm9ZfvjInPQCq7CPhTrtBTvgZ633tP7Z8+3HsJAdXaF/ZaA7CyfvjCHM oGzJny5HUU7WaM6sExsEUQTmcY4sE3P8y6SxQ5GdB727wcGhMnGynlXdllSjnOtLgZ0S 10HjdOwSAmiBKDn8uqNyiL6378uXiqSt5GgB+rp5iEq7hfcGdMXO9jony0dQ2VHqYP6I irWpskj1Ylo2mCkEJdx1FW2tb8aoBJc18E9CEkG9+jr0YIXc2euhRPrUziIKhNSDg5le B7rtIhEAZAX0EDqi2cgKGk9c/Pw3KoUl4pYiSBkupAdpYnkdbGNIVy7PPc3x6Gnz1LnL KtVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:to:cc :content-transfer-encoding:message-id:mime-version; bh=9Tl1GF7K1EISYQ4I72n+PR2DvTL8RqMQkxeECkX4j4Q=; b=QdtFjuIb5MWY84ULmsj/H/FWjrR/CkSjXOYJgdtPW2RtXZTpFB8cw/aU1TMPLEUrOF IMJ/Au+A0WTRfVB7AaS2KnJrK6QK6Crf/ojiVMtjiEdkrmxchVurhIt9U8weQyjs4qbU Z8CywZbZpIzJtPyH8NUeI6yPSi7QT7SvxKyo1OYgRYXtKFbfVbhn9cOcLDuzLmqvkHa3 SqYhKM/u390UqGfzICixE04eLWcMMDkeQPfgEJbOigkLGDAseVypaT5u4IfWdYnmnT24 ug7Dd7+7f7dPvi/AI9scnyZgL8qpZrOxeLRJy0vuvwiOu1VEiibgaw3sGXt4JgDn4APV ES2w== X-Gm-Message-State: AJIora8grYrxexv5g/ExleuBSzlCYiTGccqXAJgS0r7REqQ2ElhN++P0 elSVHpzVKuQFM2Tmq4C8dhU= X-Google-Smtp-Source: AGRyM1uN4vncS94rKzhJA/bsJej5pLCmlLMK0rF3F74OlsqGDNFBG+9LI0O3D0xVJEiRPA6CuOdAEw== X-Received: by 2002:a50:d097:0:b0:42d:d158:4e61 with SMTP id v23-20020a50d097000000b0042dd1584e61mr13131866edd.42.1655478997723; Fri, 17 Jun 2022 08:16:37 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id u20-20020aa7d554000000b0042a2d9af0f8sm3801083edr.79.2022.06.17.08.16.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jun 2022 08:16:37 -0700 (PDT) From: Liliana Marie Prikler Date: Fri, 17 Jun 2022 10:27:59 +0200 Content-Transfer-Encoding: 8bit Message-ID: <05c4d1a7039b3cdde5043a7445052171d8b6a7a1.camel@gmail.com> 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" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1655479040; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: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=9Tl1GF7K1EISYQ4I72n+PR2DvTL8RqMQkxeECkX4j4Q=; b=Leavg4Gbpwxl3QY4t+ZLXqCiCTCe5tyQ6wPq+soNC6gaiyxLAPbTWUKFqDh22fz3UJKJ1t uzNiwgv3kc1xbJJEuCTpENrLJdp8MMbpktMQqTd1mgAPA0ZowPYULAENB6e0p9N+UXdraZ JsIyiXbCh9lyhtA/mVBOspYzBrzpuSXLhLIAZllxFCBJhbGQkWgxjXSmFtDgKLtGnZJM1e VF2wpBkOgfALLpA/nEI1aWd+tr0AiykbgMyNYzfuBoYCxk0eXszC755eFOMVTQC+o4RSra tX3BcWpJ7tzbAHrvtZgKXHZyEdrEc514EBCFjR2Jot9ET6Fy6JgNiP5WYYKd1w== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1655479040; a=rsa-sha256; cv=none; b=AUy6XhsIWjV9njnnB/AnRDN5Zc+QySv9zwQL9ek3DrDueVxVJ+D9tk0HMor1r+j/mebHvq SnICzFYC9jdWLuDdQ1tKM7pvt3eAhUhUM20So9Abgh96XMyREQXiHT678hAIm5MvqRmYX2 YPaqkd/xA9kpjUEJlSbbciRwoEMyWEGsYWqQbqBuBETTxg/gYHQ1Fo0C5qccRpAsZG2rjs 0ZkRQ5mj/KNu0rlbxZnIhwzzu/Jtb3QCt2aFnppotJsHQaOipvYG6apFzQMzLT3z7XLZEj hzpWHGqLp6f3/xfgJmgTEblep+DbfluSdYXVcXTv0Q7rmsTcwAJx9ei0Wx3OTQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=eq0yTaEn; 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.21 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=eq0yTaEn; 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-Queue-Id: A3CA021EC7 X-Spam-Score: 7.21 X-Migadu-Scanner: scn0.migadu.com X-TUID: yuqu/tQOaLZs * gnu/packages/aux-files/renpy/renpy.in (__renpy_files, path_to_gamedir): New procedures. * gnu/packages/game-development.scm (python-renpy): Update to 7.99.99-0-3e854bc. (renpy): Likewise. [inputs]: Add python-pefile, python-requests and python-six. --- Hi Maxim, regarding the revision field, I don't plan on doing too many nightlies, given that I went two weeks without trying to invoke the renpy binary. For the future reviewer who has to read through all of this again when version 8 hits, I think not indenting the package description makes more sense (particularly as I anticipate possible changes in the phases due to renpy build weirdness). The other suggestions should be applied (sans G-Expressions which are in the next patch). Cheers gnu/packages/aux-files/renpy/renpy.in | 21 +++++++++++++++++++-- gnu/packages/game-development.scm | 19 ++++++++++++++----- 2 files changed, 33 insertions(+), 7 deletions(-) diff --git a/gnu/packages/aux-files/renpy/renpy.in b/gnu/packages/aux-files/renpy/renpy.in index 914a735fa4..9115d9aee3 100644 --- a/gnu/packages/aux-files/renpy/renpy.in +++ b/gnu/packages/aux-files/renpy/renpy.in @@ -1,12 +1,29 @@ #! @PYTHON@ # -*- mode: python -*- -from __future__ import print_function - +import glob import os import sys import warnings +def __renpy_files(directory): + for pattern in ['*.rpa', '*.rpyc', '*.rpy']: + for file in glob.iglob(pattern, root_dir=directory): + yield file + +def path_to_gamedir(basedir, name): + candidates = [name, 'game', 'data', 'launcher/game'] + + if __renpy_files(basedir): + return basedir + + for candidate in candidates: + gamedir = os.path.join(basedir, candidate) + if __renpy_files(gamedir): + return gamedir + + return basedir + def path_to_common(renpy_base): return renpy_base + "/common" diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index f69088324a..4377654f8f 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -94,6 +94,7 @@ (define-module (gnu packages game-development) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) + #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages readline) #:use-module (gnu packages qt) @@ -1255,16 +1256,21 @@ (define-public python-pygame-sdl2 developed mainly for Ren'py.") (license (list license:lgpl2.1 license:zlib))))) +;; 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)) (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 @@ -1484,8 +1490,11 @@ (define* (install-renpy-game #:key output game name (renpy renpy) (inputs `(("bash-minimal" ,bash-minimal) ("renpy.in" ,(search-auxiliary-file "renpy/renpy.in")) + ("python-pefile" ,python-pefile) + ("python-requests" ,python-requests) ("python-renpy" ,python-renpy) ("python:tk" ,python "tk") + ("python-six" ,python-six) ("python" ,python) ; for ‘fix-commands’ and ‘wrap’ ("xdg-utils" ,xdg-utils))) (propagated-inputs '()) -- 2.36.1