From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id uKKcCH76QmHYEwEAgWs5BA (envelope-from ) for ; Thu, 16 Sep 2021 10:04:14 +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 UIhaBH76QmEnJQAA1q6Kng (envelope-from ) for ; Thu, 16 Sep 2021 08:04:14 +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 B5C8618D1D for ; Thu, 16 Sep 2021 10:04:13 +0200 (CEST) Received: from localhost ([::1]:51062 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQmNQ-0000EQ-T5 for larch@yhetil.org; Thu, 16 Sep 2021 04:04:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40374) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQmNG-0000E0-SU for guix-patches@gnu.org; Thu, 16 Sep 2021 04:04:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42192) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQmNG-0005x4-L2 for guix-patches@gnu.org; Thu, 16 Sep 2021 04:04:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mQmNG-0001UG-HB for guix-patches@gnu.org; Thu, 16 Sep 2021 04:04:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50425] [PATCH] gnu: Add minetest-advtrains. Resent-From: Xinglu Chen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 16 Sep 2021 08:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50425 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Vivien Kraus , Maxime Devos , 50425@debbugs.gnu.org Received: via spool by 50425-submit@debbugs.gnu.org id=B50425.16317794265694 (code B ref 50425); Thu, 16 Sep 2021 08:04:02 +0000 Received: (at 50425) by debbugs.gnu.org; 16 Sep 2021 08:03:46 +0000 Received: from localhost ([127.0.0.1]:53738 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mQmMz-0001Tl-Es for submit@debbugs.gnu.org; Thu, 16 Sep 2021 04:03:45 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:55498 helo=mail.yoctocell.xyz) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mQmMw-0001TV-NB for 50425@debbugs.gnu.org; Thu, 16 Sep 2021 04:03:43 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1631779413; bh=szg+/PiNBaqOqGKkKgIbT6KzFXqhh20JHHKZjyD/vxc=; h=From:To:Subject:In-Reply-To:References:Date; b=XUo9sYOUZz1JwLFzIlObVPwfpcIWqCAWWONt/TUAeU2dI02jGO/taLDwvkjYvYJFt GV1LD1IGpKOfuqqohficMvk74jDEmiZFg1+FNGe4lHl1ypHwNWnYlzX9FFmXBoHxHf jkqrcPIx9BSAvO8g/J5ZwFJhUwsIzCjrEllHM5R8= In-Reply-To: References: <87a6kqm6f3.fsf@planete-kraus.eu> <031b52f03cac2218f9250882e5b8d3fe56cc7f49.camel@telenet.be> <4e2998599854e1f51347800600c97bf840bf97ba.camel@telenet.be> Date: Thu, 16 Sep 2021 10:03:27 +0200 Message-ID: <87y27xq75c.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" 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=1631779453; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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: dkim-signature; bh=Mhcr4EU3va7qI+9PCu7iNx7EqQKqEhs0FIwLtyNnpn4=; b=YnvgM8Av8AkOcHIDZkZ4i2oIG4O1NPh6mHnTWDTAm2JG46UzjLpDbM0M0QbAl/gJhMWu4r q/THj2g1Mc4v3w9/J1/rcH69uni111o0clwWHTQl57KogoYiWTWapEHMSEvwKOI1gpaxTi aeKUEH1Er+idXiAJ19sHMMzhNV6VjGz+uc1W0QyKlv3XPiOwXGwCHeaBLUm3oTKl5nJag5 xmoHZyEA4uV83ZmFhCqT8v6fhuIixBj9zldVHQgFjsuFhKMMvmfmvjzOSKhGspUuVlb6PX BZ+Bu9xJp4HJD/uvaMsPtnhNoJFXmn0+carlcfqHs1IPiJ5me767b8xV/K96cw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1631779453; a=rsa-sha256; cv=none; b=O4uHUO3K39UwqcttyxuWW1CLNi0dlRCp95r3fQdPl8BRrwvpezGrSF2u5edlOhCWJ+AZ3G vKZBlqICW+/Hyr/vC9xIXSBvhbl25fB3cFE9Vva7qgKWbpoQ4+Kujf3oUncmv2k6mSTM9U Q+F8eGtcX1SoHavzGhhZnONI16H6Rinwe7f9RAz5w7RRPCbURXBSHvug2iwrkCQH6mVX30 /T6JNgOjaOGJe4Zz4myt/t6hnZkpLroH4sJ5E9+OZqyhZZEtt7Y5ucg27FKMxquW1JfwTL lWkCFlrEBv40gHxUsq/1VmWLwvonX3H/J0WyWhVqq/DgKO0z4jscvCzbIWdz1A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=yoctocell.xyz header.s=mail header.b=XUo9sYOU; dmarc=fail reason="SPF not aligned (relaxed)" header.from=yoctocell.xyz (policy=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: -3.40 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=yoctocell.xyz header.s=mail header.b=XUo9sYOU; dmarc=fail reason="SPF not aligned (relaxed)" header.from=yoctocell.xyz (policy=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: B5C8618D1D X-Spam-Score: -3.40 X-Migadu-Scanner: scn0.migadu.com X-TUID: jFv0XTCkfgVk --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On Fri, Sep 10 2021, Vivien Kraus via Guix-patches via wrote: > Hello Maxime, > > Le vendredi 10 septembre 2021 =C3=A0 12:25 +0200, Maxime Devos a =C3=A9cr= it : >> minetest-advtrains and minetest-basic-trains are separate packages >> that >> can be added separately, so theoretically, they should be added in >> separate >> patches: > It seems like the least surprising thing to do, so let=E2=80=99s go with = the > split patch. > >> Maybe replace =E2=80=98realistic trains=E2=80=99 -> =E2=80=98realistic t= rain system=E2=80=99, > I=E2=80=99m not sure. Upstream really likes to use "train" as a general t= erm, > like in share/minetest/mods/advtrains/modpack.conf, the official > description, the wiki, ... so I think it=E2=80=99s better to use that. > >> and note that minetest-basic-trains contains the actual train models. > This sentence was missing, and I added it. > >> I think a linter will have something to say about long lines here >> (try "./pre-inst-env guix lint minetest-advtrains minetest-basic- >> trains"). > You=E2=80=99re right, I fixed the long lines and other warnings. However,= I > don=E2=80=99t know how to fix "no updater for minetest-xxx" for both mine= test- > advtrains and minetest-basic-trains. I can=E2=80=99t see a meaningful > difference between my packages and the others. > > Vivien > From fbe39d93acb01fbef9f7f497e9bb5814fdf3f6b5 Mon Sep 17 00:00:00 2001 > From: Vivien Kraus > Date: Fri, 10 Sep 2021 14:21:47 +0200 > Subject: [PATCH 4/4] gnu: add minetest-basic-trains > > * gnu/packages/minetest.scm (minetest-basic-trains): New variable. > --- > gnu/packages/minetest.scm | 32 ++++++++++++++++++++++++++++++++ > 1 file changed, 32 insertions(+) > > diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm > index 0b0e7ace96..c218fb827f 100644 > --- a/gnu/packages/minetest.scm > +++ b/gnu/packages/minetest.scm > @@ -668,3 +668,35 @@ stopping before signals. > (list license:cc-by-sa3.0 license:agpl3+)) > (properties > `((upstream-name . "orwell/advtrains"))))) > + > +(define-public minetest-basic-trains > + (package > + (name "minetest-basic-trains") > + (version "1.0.1") > + (source > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "http://git.bananach.space/basic_trains.git/") > + (commit > + "d44c410f7c2a7202ee68b66fc50febae89e0c5dc"))) > + (sha256 > + (base32 > + "0vvzndj48kgdz2bfgivfm217sbmc2lmxpp2mispcy7byn4i26prx")) > + (file-name (git-file-name name version)))) > + (build-system minetest-mod-build-system) > + (propagated-inputs > + `(("minetest-advtrains" ,minetest-advtrains))) > + (home-page > + "http://advtrains.de/wiki/doku.php?id=3Dusage:trains:basic_trains") > + (synopsis > + "\ > +Collection of basic trains for the Advanced Trains mod") > + (description > + "\ > +This modpack contains the trains which were the \"default\" trains in > +advtrains up to version 2.2.1.") I would use ``default'', which is the correct Texinfo syntax, instead of "default". See the Texinfo manual for more details: > + (license > + (list license:cc-by-sa3.0 license:agpl3+)) > + (properties > + `((upstream-name . "orwell/basic_trains"))))) > --=20 > 2.33.0 > > From 9675601acba125905877f30b5bc47053db3b652d Mon Sep 17 00:00:00 2001 > From: Vivien Kraus > Date: Sun, 5 Sep 2021 15:21:35 +0200 > Subject: [PATCH 3/4] gnu: add minetest-advtrains > > * gnu/packages/minetest.scm (minetest-advtrains): New variable. > --- > gnu/packages/minetest.scm | 44 +++++++++++++++++++++++++++++++++++++++ > 1 file changed, 44 insertions(+) > > diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm > index 9e48d5c69c..0b0e7ace96 100644 > --- a/gnu/packages/minetest.scm > +++ b/gnu/packages/minetest.scm > @@ -624,3 +624,47 @@ track of important locations.") > license:cc-by4.0 license:cc-by-sa3.0 license:public-d= omain > license:cc0 license:fdl1.2+)) > (properties `((upstream-name . "RealBadAngel/unified_inventory"))))) > + > +(define-public minetest-advtrains > + (package > + (name "minetest-advtrains") > + (version "2.3.1") > + (source > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://git.bananach.space/advtrains.git") > + (commit "release-2.3.1"))) This would preferably be (commit (string-append "release-" version)), that means that you only have to update the =E2=80=98version=E2=80=99 field= and the hash when updating the package (assuming it doesn=E2=80=99t need additional dependencies or change build system, etc.). Otherwise, LGTM! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJJBAEBCAAzFiEEAVhh4yyK5+SEykIzrPUJmaL7XHkFAmFC+k8VHHB1YmxpY0B5 b2N0b2NlbGwueHl6AAoJEKz1CZmi+1x5lHEP/j+anO+qMszBNGigpi86eKwLB5x4 B4bC4mqSv0jx8BRgq4OZjGh4WRaTiGGj5KiDrl5I6j9os3i0RBlyMfCFQKKFRG9j YVDBenA4B8pInV3Ab2qIdtzO4AvuisGnT1fRq9hls7+vUrDiDMajnXMNer+izvmJ 5cklsISu+z9ACzNOnlajDJ3CTL+VqdopqQPYLrTfTGn9KQBgv/JuuSCNsjjqL1y1 Ah0fbSMZEo1PC+X3Y9GSShjsuHw9j+O6eAjQoyuVbnXZP2WlPDoGyOpsmDgGqTZr PIWMssSIsIYivYNtPezyxK8u9uOs3QY5z6LAiA1cJ5ZKY7qV6vsfJkypQNle6ZBB ags+c6C0L9bI5V4Y3upn78mtsPBDX2mkAh11A23q1PVae9vMbCHq3b+RhkZe78rK FWdvnC4TfTTSEFYKghaJlH2VeMB84DOP6eNw5AQ4XIOrGb5c3CLfFeOBkhlu32HP rQb1qgXoH/F7greZ8PZLXJSlYSau8LOeENtnN3zc+cAVejT1frW3b51yluVaPKmI a+KMBv9TQGC+4K6KKupPr7WGkfv34ut7GPTK90MbXLtCCHCkllo7Ob6DNgxEY5/H qbMfrzxXaLd1m0O4IdYMHFertJcCKwPPbWPC9xVsGqNK4wKkGPGwKOqHTkJeuakK 2t7+LUQkuOVNfWmf =n9w7 -----END PGP SIGNATURE----- --=-=-=--