From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 2O7uKw84fWBCEAAAgWs5BA (envelope-from ) for ; Mon, 19 Apr 2021 09:58:07 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id kCbiJQ84fWCQIQAA1q6Kng (envelope-from ) for ; Mon, 19 Apr 2021 07:58:07 +0000 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 2B68C2D51D for ; Mon, 19 Apr 2021 09:58:07 +0200 (CEST) Received: from localhost ([::1]:52892 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lYOnG-0000bV-9I for larch@yhetil.org; Mon, 19 Apr 2021 03:58:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58932) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lYOnC-0000bO-IW for guix-patches@gnu.org; Mon, 19 Apr 2021 03:58:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36773) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lYOnC-0000Q3-B7 for guix-patches@gnu.org; Mon, 19 Apr 2021 03:58:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lYOnC-00079k-74 for guix-patches@gnu.org; Mon, 19 Apr 2021 03:58:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47824] [PATCH 3/3] gnu: tsukundere: Update to 0.3.0. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 19 Apr 2021 07:58: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: Leo Prikler Cc: 47824@debbugs.gnu.org Received: via spool by 47824-submit@debbugs.gnu.org id=B47824.161881905727475 (code B ref 47824); Mon, 19 Apr 2021 07:58:02 +0000 Received: (at 47824) by debbugs.gnu.org; 19 Apr 2021 07:57:37 +0000 Received: from localhost ([127.0.0.1]:48319 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lYOmm-000795-Ur for submit@debbugs.gnu.org; Mon, 19 Apr 2021 03:57:37 -0400 Received: from flashner.co.il ([178.62.234.194]:56774) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lYOmk-00078r-LV for 47824@debbugs.gnu.org; Mon, 19 Apr 2021 03:57:35 -0400 Received: from localhost (unknown [31.210.177.125]) by flashner.co.il (Postfix) with ESMTPSA id 3914440262; Mon, 19 Apr 2021 07:57:28 +0000 (UTC) Date: Mon, 19 Apr 2021 10:56:55 +0300 From: Efraim Flashner Message-ID: Mail-Followup-To: Efraim Flashner , Leo Prikler , 47824@debbugs.gnu.org References: <20210416110723.9938-1-leo.prikler@student.tugraz.at> <20210416110723.9938-3-leo.prikler@student.tugraz.at> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="m/bZtfBgkyZx6DXa" Content-Disposition: inline In-Reply-To: <20210416110723.9938-3-leo.prikler@student.tugraz.at> X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 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 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1618819087; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: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; bh=/4K4Oap+1RYU/DXIGIw5GSwZ8qqoHtvTHZoxIyUY4uw=; b=AaW8SuVT729XnwwtZAs6yKiZFlQs6/l8yyuz1AbmGqxgYqZomW1Unoo8twvkMGWdx1BB2Z z44ufmNrQvnRmzXM3bxymB+oW9MvswIRVq6okcUO+IhuC18yRfbvD0ESOtUsRY83YLJ2SU Vx+8fQEzhf35AkoGm0YXTDe1Pa7hXdUBqQs7swGMPUb4Cn34GOd3WwSGKNcvI1BNQ9kdsP GsxhxueUFskvpRhq4NBihslnuCcaP+Yr6mJHlbHJDlViZIptNE8vsxyfdOi+C5DKMFyHG4 P9fRFS9wjT713XFjWRk9IWCti6ti503928XlpPy7jP9nZua6d3FktKB7QE0t3Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1618819087; a=rsa-sha256; cv=none; b=NL/0ybv+cQzgLc7ZPoVTAW7m8xJGmPmOF4NGeOu/atyv+Q4uruYhax5iP3lQzS4WrQeWIE iV6/Sxy7GRc9mc00oj3GJuigo5vpA7qX5hHOJ296okbfvLa/lA59/PKTRri5wSHEUB9zex Ih6XvsZXNoPxiC5f0pckVcsj4fhlJbWnXrPuOpw0BbJlntdciJxIH5S8cNzZpMiwSFuoJP KlYEN2BGQpWxNmzEWwv0wDxIUnT4xGTsP1q5pzuWFxQIenf2Hrccatagazfk7YKYeobi02 mFIHYEU8nhAHQUC3KFT97wecj7wdSpdTnohaAyTkYQP7SBuW1RM9+oRcoukDTA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -4.04 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 2B68C2D51D X-Spam-Score: -4.04 X-Migadu-Scanner: scn0.migadu.com X-TUID: 2GM4nKPflRuG --m/bZtfBgkyZx6DXa Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Apr 16, 2021 at 01:07:23PM +0200, Leo Prikler wrote: > * 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 | 45 +++++++++++++++++++------------ > 1 file changed, 28 insertions(+), 17 deletions(-) >=20 > diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-develo= pment.scm > index 0d4855d275..98ef88971a 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,11 @@ 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 ((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 +514,31 @@ 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* ((version (target-guile-effective-version)) I see that the code before uses version but I wouldn't overwrite the version variable which normally points to the package's version. I suggest guile-version or something similar. > + (scm (lambda (in) > + (string-append in "/share/guile/site/" > + version))) > + (go (lambda (in) Perhaps go-cache would be more descriptive (I see that it was also 'go' before) > + (string-append in "/lib/guile/" version > + "/site-ccache"))) > + (pkgs > + (cons > + (assoc-ref outputs "out") > + (filter-map > + (lambda (input) > + (and (string-prefix? "guile-" (car input)) (cdr= input))) I'm not in love with this, I personally find it a bit hard to parse. I'm not really sure what the (cdr input) is there for. (without testing it myself) I'd suggest borrowing the filter-map code from guile-studio in (gnu packages guile-xyz) where it searches for emacs packages. > + inputs)))) > (substitute* "bin/tsukundere" > - (("exec guile .*" all) > + (("exec guile (.*)" _ args) > (string-append > (format #f "export GUILE_LOAD_PATH=3D~@?~%" > - "\"~a:~a\"" scm (getenv "GUILE_LOAD_PATH")) > + "\"~{~a~^:~}\"" (map scm pkgs)) > (format #f "export GUILE_LOAD_COMPILED_PATH=3D~@?~%" > - "\"~a:~a\"" go (getenv "GUILE_LOAD_COMPILED_P= ATH")) > - all))) > + "\"~{~a~^:~}\"" (map go pkgs)) > + "exec " > + (assoc-ref inputs "guile-runtime") > + "/bin/guile " args))) > #t)))))) (Again without really testing it) Perhaps it would be better to remove this whole phase and to replace it with wrap-script. Actually, forget all of that. There's a comment in (guix build utils) saying that Guile scripts are not supported. > (native-inputs > `(("autoconf" ,autoconf) > @@ -536,8 +546,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 > --=20 > 2.31.1 >=20 >=20 >=20 >=20 --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --m/bZtfBgkyZx6DXa Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmB9N8UACgkQQarn3Mo9 g1ENLQ/+Kd2XpH93QnltLOYttlPuWg0agPrAi4WN171Z+mvAFiq/rMkAZdpF6XFU fNU2Q8PMRwep41G63d2V9Vsho7fycT4TtOwtFKDcKGMXmzv7SzlVPFEaQsJdhgar uXoiWz0XQVzBhItdGX0uxaaRc0M0qw/3t1w2iIjsOWTTbyxTwYbWKdmvPjdi8cGF q+uIA1eEJ3kCcOwCyy+XoTDCSFTu+Ofx3cz7awHCM4ZeS+Nc5sSvox1xn9WtEtjp IOLOelpx8LBXmq16qTqAqvhFSTyTKHnQtK3J5d80DH8F9s1JXY8UyHAVYWu03krj OxcAsobiYzjq34r2C7Qkra22o+aLw3rkhcUrxJBB526B9p7xbDKrQtNOag6WW+RA /blhtYd4S6Po14UM9Gj82oR3NCmb43f0jiOLv3T/bfaaMxGslhAJaqmGOfn5kBy5 Uldgk5muWcyRVLGrX3IPgYeOnAHTngGi7URSKeF+Kp3sDe8AAeXspN9cPdOsiFaq XI3lMAsLWqjXosdh/5h6YKxQBQCEigafX+CvoTxZbxj4cC9FcWFjTnS99g/0Nwcd TpU1dZsgPqd3RRDRCps3zuSUElcyXLhJmxHnv8fPnXH5iHmmxsmr4Wgaxc7CZMk8 XIKPNi9r/ledQgScNm9oY2aFBypdjkRxFZCh0w4PMmsOi6evmG4= =H1Nu -----END PGP SIGNATURE----- --m/bZtfBgkyZx6DXa--