From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id aDEVOPuarGK50AAAbAwnHQ (envelope-from ) for ; Fri, 17 Jun 2022 17:17:16 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id gN8nN/uarGKrcAAAG6o9tA (envelope-from ) for ; Fri, 17 Jun 2022 17:17:15 +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 7D26B17858 for ; Fri, 17 Jun 2022 17:17:15 +0200 (CEST) Received: from localhost ([::1]:33118 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o2Dik-00068H-Dk for larch@yhetil.org; Fri, 17 Jun 2022 11:17:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46268) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o2DiZ-00066F-0R for guix-patches@gnu.org; Fri, 17 Jun 2022 11:17:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52780) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o2DiY-0003Yw-O5 for guix-patches@gnu.org; Fri, 17 Jun 2022 11:17:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o2DiY-0002Nt-K4 for guix-patches@gnu.org; Fri, 17 Jun 2022 11:17:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55424] [PATCH v2 3/6] gnu: python-pygame-sdl2: Update to 2.1.0-0-1705c6e. 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.16554790099103 (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]:46669 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o2DiK-0002Me-T6 for submit@debbugs.gnu.org; Fri, 17 Jun 2022 11:16:49 -0400 Received: from mail-ej1-f65.google.com ([209.85.218.65]:41829) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o2DiE-0002Ln-TN for 55424@debbugs.gnu.org; Fri, 17 Jun 2022 11:16:43 -0400 Received: by mail-ej1-f65.google.com with SMTP id u12so9372985eja.8 for <55424@debbugs.gnu.org>; Fri, 17 Jun 2022 08:16:42 -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=c13WK2MXY59epqpgq5IeYue9YD53OS24eOhipHCCVT8=; b=hSyycb2uge0ColjravlCN0uGQ+Xf4JxvoxFqOWHuSUV/eRYW+OJ4Dnnko6su+/u1fw Rw/un3WO9DE2v3Rwh5DokYeakTZqYWpCBPbPn+h8r1nhe1+Zm2xklyS0U8Fc1WQJDHX/ ILwyVXbtFed9P1Hi2JkrP9M/DGe2XVJ6shY/fGMa/7D+d+HXhpjXqA4mXXzGmdOBFwd8 PycA7sxQrxXIX8v+baDSLWtG866JghdVJ4tJlqujdZ2eN15WWOx7AkIxctbFi8emkaPa zvdDgu5HfMF+sqYXfvKFdMs+a3ffFZ3dSzFf3ELrc/kCDQW4DBD3Jb2ewPlz9m1zZHIf aPvw== 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=c13WK2MXY59epqpgq5IeYue9YD53OS24eOhipHCCVT8=; b=INfFCo5t5MwCpe/sQdEmzQHMKnyQtXf9XRr4iqGLbVbBDt5oKR95BeKoI9vUm86ewB eHS8PejmsFvVQkO2AF+vPnt5xGdK3OWyJ4Z2qAUbUGTyzJDv6ly5H6v9Z9vLA4IWxkwQ JMtBpa6UjKUfKl5jIgzkX89Yj0rlnmww/9kcL6ZIgP2lNCclLqZeZoSVq685Bz/VhZIp ZUoxxcE3nA3ejTgN+R9KjhzHS4K3jmtXqB0HfhHdGzy8uaIcrhihQ5wu61NVmgXKpwDv JHhUv1fElGH8wfi2JWjDYM1xSJny2c9p3NTvqoMcyE2ATtdxCArrYAMmrqD1mnLLJon+ TJ+Q== X-Gm-Message-State: AJIora8RN/jfl4r/BbzTrP8bTzRUxpaN24iZXOEymsw3OPQ9Ez7u9IO6 mw9aa6HJf0ChifYYYJ109Tin7sOYI+0= X-Google-Smtp-Source: AGRyM1sj5JnePh3UPoMVsSmSGAzLs0tMejlV50zu3u8EjrP6hSn2n+ercCDuQikgZxHd9Fou9ZD8Rw== X-Received: by 2002:a17:906:6a1a:b0:711:ec13:b7bc with SMTP id qw26-20020a1709066a1a00b00711ec13b7bcmr9727381ejc.688.1655478997260; 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.36 (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:26:57 +0200 Content-Transfer-Encoding: 7bit Message-ID: <76e01030d3e95b34ed86bf2f9697411f6b7280c8.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=1655479035; 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=c13WK2MXY59epqpgq5IeYue9YD53OS24eOhipHCCVT8=; b=qYX8UDPQ0m3ehiAMRF1n3EaEqXgbv6ygnW5l3fIBXm29oHgznrqT2gUqfyohGOvfZsiaQK 4WvnrUUjy5RzFZYrap9jRGTfRthPr6/FztIjExq2YsBmIJDzHe7gASdl7MLTl/d1UMTUoy tkrXQHZvhUsNrPwV1Tqf0viiaKJSMiGhZ32wimmcZfnF1Gg7HyaHpk+OXRsH+F+XynggEb S170qsaQEthwm/RQkTVPrXUFEaxQ1r+FU0O4MRt4uzSZ1/e4B7YMPjHy4iDhf0/IjOb4lv PX+YAjm+1y9+vZq28s/gbXTJdfPexJC8TfCk/8xLXgBVmB+ZztsZwSWDdlEnVg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1655479035; a=rsa-sha256; cv=none; b=VuxSqUb5lBzZnXNPM+g92cSgcLJvz5AhgCyQXtHBrvToEnAbuUfkQOg8nlCWOyOc2ld0Ui PkWu6QRNUfnJNy+rFaMubFrrM2lmduRLC3DOxGOBQBFDvhVs6fzOtXMQ8X7orTr52Alqne xT7zhBWCprL7jYp7M3xdEIUTqwHATGqYQrs7U6tdZOE2HbsTVB2ebHm0gCQjLHVU7cqMgn XLeBqoFsqFDPvp9V8A1Ct4CK37M6D0H+v6aj8hz2aM6nfetJT1ReZVk/7U4gD5fkwyaT7c JeVVRyHAH7WBGogTSqFeBSNoCkT/J6znF38db4rk6JKbcTO5gE2PZpfVS82aew== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=hSyycb2u; 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: 5.21 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=hSyycb2u; 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: 7D26B17858 X-Spam-Score: 5.21 X-Migadu-Scanner: scn0.migadu.com X-TUID: pBqrVAqXhpGo * gnu/packages/game-development.scm (python-pygame-sdl2): Update to 2.1.0-0-1705c6e. --- Hi Maxim (and others reading), the comment for this one was actually wrong and I adjusted it. Hopefully it's clearer now why I don't go with "for-renpy-8" in the version. As for why I can't pick up the correct commit for the nightly build... well, renpy has it that all of the nightlies reference the renpy commit hash, including pygame-sdl2. Cheers gnu/packages/game-development.scm | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 099268d58c..f69088324a 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1207,26 +1207,24 @@ (define-public python-pygame license:lgpl2.1+)))) (define-public python-pygame-sdl2 + ;; Using latest git commit as of 2022-06-17, because there is no tagged + ;; release for renpy 8. + ;; Revert back to URLs once renpy 8 is released! (let ((real-version "2.1.0") - (renpy-version "7.4.11")) + ;;(renpy-version "8.0.0") + (commit "1705c6e3004dcb1daf859560bcd52eb093e97d45")) (package (inherit python-pygame) (name "python-pygame-sdl2") - (version (string-append real-version "-for-renpy-" renpy-version)) + (version (git-version real-version "0" commit)) (source (origin - (method url-fetch) - (uri (string-append "https://www.renpy.org/dl/" renpy-version - "/pygame_sdl2-" version ".tar.gz")) - (sha256 (base32 "0nxvca16299jx6sp0ys29rqixcs21ymhqwjfkbchhss0yar7qjgz")) - (modules '((guix build utils))) - (snippet - '(begin - ;; drop generated sources - (delete-file-recursively "gen") - (delete-file-recursively "gen3") - (delete-file-recursively "gen-static") - #t)))) + (method git-fetch) + (uri (git-reference + (url "https://github.com/renpy/pygame_sdl2") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 (base32 "1g0arhpd59zypspk36sgajf1kzavppfkv766vifvxar60968rrjn")))) (build-system python-build-system) (arguments `(#:tests? #f ; tests require pygame to be installed first -- 2.36.1