From patchwork Mon Apr 19 08:17:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 28652 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 85F0A27BC77; Mon, 19 Apr 2021 09:18:23 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4F01D27BC6C for ; Mon, 19 Apr 2021 09:18:23 +0100 (BST) Received: from localhost ([::1]:34840 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lYP6s-00064G-BL for patchwork@mira.cbaines.net; Mon, 19 Apr 2021 04:18:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34186) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lYP6Y-000642-MP for guix-patches@gnu.org; Mon, 19 Apr 2021 04:18:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36787) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lYP6Y-0003Yy-FV for guix-patches@gnu.org; Mon, 19 Apr 2021 04:18:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lYP6Y-0001Jo-A9 for guix-patches@gnu.org; Mon, 19 Apr 2021 04:18:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47824] [PATCH v2 1/3] gnu: guile-sdl2: Update to 0.6.0. References: <20210416110511.9812-1-leo.prikler@student.tugraz.at> In-Reply-To: <20210416110511.9812-1-leo.prikler@student.tugraz.at> Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 19 Apr 2021 08:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47824 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47824@debbugs.gnu.org Cc: efraim@flashner.co.il Received: via spool by 47824-submit@debbugs.gnu.org id=B47824.16188202785047 (code B ref 47824); Mon, 19 Apr 2021 08:18:02 +0000 Received: (at 47824) by debbugs.gnu.org; 19 Apr 2021 08:17:58 +0000 Received: from localhost ([127.0.0.1]:48330 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lYP6U-0001JJ-3h for submit@debbugs.gnu.org; Mon, 19 Apr 2021 04:17:58 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:49307) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lYP6R-0001J3-KG for 47824@debbugs.gnu.org; Mon, 19 Apr 2021 04:17:56 -0400 Received: from localhost.localdomain (194-96-9-9.adsl.highway.telekom.at [194.96.9.9]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FP074042Xz1LB1y; Mon, 19 Apr 2021 10:17:51 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FP074042Xz1LB1y DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1618820272; bh=VpSQMnyV7q2z74aTR8v+hyF3UThz1fLENhLms3tI0tE=; h=From:To:Cc:Subject:Date:From; b=NfNHVyMawcZdsca29Zx3et03u3youusIRs8u+VOShZESgperawETTcCCsd1evONPq Pomv9SlqFFbcD/STmRhmSolk1Qq7FZHSr3/dIabR9Iq/UCVX1UquKHpVDR8rXbc39Z t9uZUm/prsAJ0STWZPwUwv/0F7GR1mI5EtL9l9nM= From: Leo Prikler Date: Mon, 19 Apr 2021 10:17:42 +0200 Message-Id: <20210419081744.7247-1-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/sdl.scm (guile-sdl2): Update to 0.6.0. --- gnu/packages/sdl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 8db731bbc4..128bd95af8 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -620,14 +620,14 @@ sound and device input (keyboards, joysticks, mice, etc.).") (define-public guile-sdl2 (package (name "guile-sdl2") - (version "0.5.0") + (version "0.6.0") (source (origin (method url-fetch) (uri (string-append "https://files.dthompson.us/guile-sdl2/" "guile-sdl2-" version ".tar.gz")) (sha256 (base32 - "118x0cg7fzbsyrfhy5f9ab7dqp9czgia0ycgzp6sn3nlsdrcnr4m")))) + "06vrknn4iz0ag932rb4almyhi9cvdkn081shvsi0h4skd6ry8bdl")))) (build-system gnu-build-system) (arguments '(#:make-flags '("GUILE_AUTO_COMPILE=0"))) From patchwork Mon Apr 19 08:17:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 28653 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D67E927BC77; Mon, 19 Apr 2021 09:18:23 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 92D5C27BC6C for ; Mon, 19 Apr 2021 09:18:23 +0100 (BST) Received: from localhost ([::1]:34846 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lYP6s-00064U-Q4 for patchwork@mira.cbaines.net; Mon, 19 Apr 2021 04:18:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34190) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lYP6Z-000648-3s for guix-patches@gnu.org; Mon, 19 Apr 2021 04:18:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36790) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lYP6Y-0003ZL-RX for guix-patches@gnu.org; Mon, 19 Apr 2021 04:18:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lYP6Y-0001Jx-Mt for guix-patches@gnu.org; Mon, 19 Apr 2021 04:18:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47824] [PATCH v2 2/3] gnu: guile-chickadee: Update to 0.7.0. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 19 Apr 2021 08:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47824 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47824@debbugs.gnu.org Cc: efraim@flashner.co.il Received: via spool by 47824-submit@debbugs.gnu.org id=B47824.16188202785053 (code B ref 47824); Mon, 19 Apr 2021 08:18:02 +0000 Received: (at 47824) by debbugs.gnu.org; 19 Apr 2021 08:17:58 +0000 Received: from localhost ([127.0.0.1]:48332 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lYP6U-0001JM-AN for submit@debbugs.gnu.org; Mon, 19 Apr 2021 04:17:58 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:48747) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lYP6S-0001J6-C8 for 47824@debbugs.gnu.org; Mon, 19 Apr 2021 04:17:56 -0400 Received: from localhost.localdomain (194-96-9-9.adsl.highway.telekom.at [194.96.9.9]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FP0756ksrz1LB20; Mon, 19 Apr 2021 10:17:53 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FP0756ksrz1LB20 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1618820274; bh=CHVPUwDSH9/0Ek73Tt3jImicT1DbAAInMltNjl9Ddqk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VheAnIrZiz+/98stjF7xDsciP22F4443mz4DE+pKUi+lHv1Ulkq8O+mOzQS0QxPlf tC1XKOjYKnhacWz+Ct6UEQJfXD8b/fHxyDqvLpHVY6vpL6aXCTxUONXm4jqesqDYfD bUUfcUw80UPvj+N84iaa6ZzMZcJJgCysJUsC2M2I= From: Leo Prikler Date: Mon, 19 Apr 2021 10:17:43 +0200 Message-Id: <20210419081744.7247-2-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210419081744.7247-1-leo.prikler@student.tugraz.at> References: <20210419081744.7247-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/game-development.scm (guile-chickadee): Update to 0.7.0. --- gnu/packages/game-development.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 679da99e63..0d4855d275 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1856,14 +1856,14 @@ a 2D editor view.") (define-public guile-chickadee (package (name "guile-chickadee") - (version "0.6.0") + (version "0.7.0") (source (origin (method url-fetch) (uri (string-append "https://files.dthompson.us/chickadee/" "chickadee-" version ".tar.gz")) (sha256 (base32 - "1jv4jkc35b7rizz8iflh74hhk9qy665isn1xa6gqz0qp9grwb019")))) + "199y4kc28va6klfs19h998sfh7vx9spnrvjw7p92i47q5a7jdcp6")))) (build-system gnu-build-system) (arguments '(#:make-flags '("GUILE_AUTO_COMPILE=0"))) From patchwork Mon Apr 19 08:17:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 28654 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A554A27BC77; Mon, 19 Apr 2021 09:19:08 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3AB1D27BC6C for ; Mon, 19 Apr 2021 09:19:08 +0100 (BST) Received: from localhost ([::1]:36066 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lYP7b-0006au-Fq for patchwork@mira.cbaines.net; Mon, 19 Apr 2021 04:19:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34334) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lYP7W-0006ao-D6 for guix-patches@gnu.org; Mon, 19 Apr 2021 04:19:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36791) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lYP7W-0004BL-5v for guix-patches@gnu.org; Mon, 19 Apr 2021 04:19:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lYP7W-0001LX-1d for guix-patches@gnu.org; Mon, 19 Apr 2021 04:19:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47824] [PATCH v2 3/3] gnu: tsukundere: Update to 0.3.0. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 19 Apr 2021 08:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47824 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47824@debbugs.gnu.org Cc: efraim@flashner.co.il Received: via spool by 47824-submit@debbugs.gnu.org id=B47824.16188202865104 (code B ref 47824); Mon, 19 Apr 2021 08:19:02 +0000 Received: (at 47824) by debbugs.gnu.org; 19 Apr 2021 08:18:06 +0000 Received: from localhost ([127.0.0.1]:48336 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lYP6Y-0001Jw-Ip for submit@debbugs.gnu.org; Mon, 19 Apr 2021 04:18:06 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:64527) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lYP6U-0001JK-Oo for 47824@debbugs.gnu.org; Mon, 19 Apr 2021 04:17:59 -0400 Received: from localhost.localdomain (194-96-9-9.adsl.highway.telekom.at [194.96.9.9]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FP0776mdKz1LB21; Mon, 19 Apr 2021 10:17:55 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FP0776mdKz1LB21 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1618820276; bh=SrdbEl70xMPkpfMP7S0/2c+KqGjtad6l/Ajbd5G2jnI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UwVLYV7GHn/tAuJVp0U/LahQnMPdSMlxffAotiZc4rVTD31nIcdXLvpTplFQtd6zk ajFj407O4pFoTnpysiumQwl5uHCH3oG08yuaidQI+ME5oO7jDlgTcK3e6919RqQzP8 NAbbnMB/kHjIT8yWCTMTlXTVa+3FPJgQnERHSj7A= From: Leo Prikler Date: Mon, 19 Apr 2021 10:17:44 +0200 Message-Id: <20210419081744.7247-3-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210419081744.7247-1-leo.prikler@student.tugraz.at> References: <20210419081744.7247-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/game-development.scm (tsukundere): Update to 0.3.0. [patch-command]: Patch path to guile. Construct load paths directly from inputs. [propagated-inputs]: Remove. [inputs]: Add guile (as guile-runtime) and guile-sdl2. --- gnu/packages/game-development.scm | 51 +++++++++++++++++++------------ 1 file changed, 32 insertions(+), 19 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 0d4855d275..ccf1fbdc5d 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -493,7 +493,7 @@ clone.") (define-public tsukundere (package (name "tsukundere") - (version "0.2.3") + (version "0.3.0") (source (origin (method git-fetch) (uri (git-reference @@ -502,10 +502,12 @@ clone.") (file-name (git-file-name name version)) (sha256 (base32 - "05ckds2df810441wfavllx9lsw5jsc9h3nb7m31df01nsj56azdw")))) + "06jiaylbnx8khicsaq2gwnd8wspjhjymbb5z6x5445krklk0jx18")))) (build-system gnu-build-system) (arguments - `(#:modules (((guix build guile-build-system) + `(#:modules ((ice-9 match) + (srfi srfi-1) + ((guix build guile-build-system) #:select (target-guile-effective-version)) ,@%gnu-build-system-modules) #:imported-modules ((guix build guile-build-system) @@ -513,22 +515,32 @@ clone.") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-command - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (version (target-guile-effective-version)) - (scm (string-append out "/share/guile/site/" - version)) - (go (string-append out "/lib/guile/" - version "/site-ccache"))) - + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((scm (lambda (in) + (string-append in "/share/guile/site/" + (target-guile-effective-version)))) + (ccache (lambda (in) + (string-append in "/lib/guile/" + (target-guile-effective-version) + "/site-ccache"))) + (pkgs + (cons + (assoc-ref outputs "out") + (filter-map + (match-lambda + ((label . pkg) + (and (string-prefix? "guile-" label) pkg))) + inputs)))) (substitute* "bin/tsukundere" - (("exec guile .*" all) + (("exec guile (.*)" _ args) (string-append - (format #f "export GUILE_LOAD_PATH=~@?~%" - "\"~a:~a\"" scm (getenv "GUILE_LOAD_PATH")) - (format #f "export GUILE_LOAD_COMPILED_PATH=~@?~%" - "\"~a:~a\"" go (getenv "GUILE_LOAD_COMPILED_PATH")) - all))) + (format #f "export GUILE_LOAD_PATH=\"~@?\"~%" + "\"~{~a~^:~}\"" (map scm pkgs)) + (format #f "export GUILE_LOAD_COMPILED_PATH=\"~@?\"~%" + "\"~{~a~^:~}\"" (map ccache pkgs)) + "exec " + (assoc-ref inputs "guile-runtime") + "/bin/guile " args))) #t)))))) (native-inputs `(("autoconf" ,autoconf) @@ -536,8 +548,9 @@ clone.") ("guile" ,guile-3.0) ("pkg-config" ,pkg-config) ("texinfo" ,texinfo))) - (propagated-inputs - `(("guile-sdl2" ,guile3.0-sdl2))) + (inputs + `(("guile-sdl2" ,guile3.0-sdl2) + ("guile-runtime" ,guile-3.0))) (home-page "https://gitlab.com/leoprikler/tsukundere") (synopsis "Visual novel engine") (description "Tsukundere is a game engine geared heavily towards the