From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:59405) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gwoBs-0007FV-Oo for guix-patches@gnu.org; Thu, 21 Feb 2019 08:15:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gwo2C-0007Rv-7A for guix-patches@gnu.org; Thu, 21 Feb 2019 08:05:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58255) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gwo2A-0007RO-Dy for guix-patches@gnu.org; Thu, 21 Feb 2019 08:05:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gwo2A-0000NO-7H for guix-patches@gnu.org; Thu, 21 Feb 2019 08:05:02 -0500 Subject: [bug#34497] Add odamex References: Resent-Message-ID: MIME-Version: 1.0 From: Date: Thu, 21 Feb 2019 13:04:51 +0000 (GMT) In-Reply-To: <87bm365gsb.fsf@elephly.net> Content-Type: multipart/mixed; boundary="----------=_1550754291-24321-0" Message-Id: List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Ricardo Wurmus Cc: 34497 <34497@debbugs.gnu.org> This is a multi-part message in MIME format... ------------=_1550754291-24321-0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Here is an updated patch. On Wed, 20 Feb 2019 21:47:00 +0100, Ricardo Wurmus wro= te: >=20 > Hi pkill9, >=20 > > * gnu/packages/games.scm (odamex): New variable. > [=E2=80=A6] > > + (uri (string-append > > + "mirror://sourceforge/odamex/Odamex/" > > + version > > + "/odamex-src-" > > + version > > + ".tar.gz")) >=20 > Please put this on fewer lines. >=20 > > + (sha256 > > + (base32 > > + "1sh6lqj7vsdmnqz17hw0b6vy7xx6dp41k2sdw99ympsfa2xd1d2j")))) > > + (build-system cmake-build-system) > > + (arguments `(#:tests? #f)) ;; No tests >=20 > Please use just one semicolon. >=20 > > + (inputs > > + `(("sdl" ,(@ (gnu packages sdl) sdl)) > > + ("sdl-mixer" ,(@ (gnu packages sdl) sdl-mixer)) > > + ("zlib" ,(@ (gnu packages compression) zlib)) > > + ("libpng" ,(@ (gnu packages image) libpng)) > > + ("alsa-lib" ,(@ (gnu packages linux) alsa-lib)))) >=20 > This is not okay. Please just use the plain variable names. >=20 > > + (home-page "https://odamex.net/") > > + (synopsis "Multiplayer Doom port") > > + (description "Odamex is a free, cross-platform modification of the= Doom > > +engine that allows players to easily join servers dedicated to playing= Doom > > +online.") >=20 > Please remove =E2=80=9Cfree=E2=80=9D =E2=80=94 all software in Guix is Fr= ee Software. >=20 > > + (license license:gpl2))) >=20 > Looks like this is actually gpl2+ as evidenced by files like this: >=20 > https://github.com/odamex/odamex/blob/master/server/src/d_netinfo.cpp= #L12 >=20 > Could you please send an updated patch? >=20 > --=20 > Ricardo ------------=_1550754291-24321-0 Content-Type: text/x-patch; name="=?UTF-8?Q?0001-gnu-Add-odamex.patch?=" Content-Disposition: attachment; filename="=?UTF-8?Q?0001-gnu-Add-odamex.patch?=" Content-Transfer-Encoding: base64 Content-ID: RnJvbSAzNTNmOTQ0NGNkNzFjMWU5Mzk3OGNmOWIxMTNlM2Y4NzQzZjM4NWE4 IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQa2lsbCAtOSA8cGtp bGw5QHJ1bmJveC5jb20+CkRhdGU6IFRodSwgMjEgRmViIDIwMTkgMTM6MDI6 MDcgKzAwMDAKU3ViamVjdDogW1BBVENIXSBnbnU6IEFkZCBvZGFtZXguCgoq IGdudS9wYWNrYWdlcy9nYW1lcy5zY20gKG9kYW1leCk6IE5ldyB2YXJpYWJs ZS4KLS0tCiBnbnUvcGFja2FnZXMvZ2FtZXMuc2NtIHwgMjggKysrKysrKysr KysrKysrKysrKysrKysrKysrKwogMSBmaWxlIGNoYW5nZWQsIDI4IGluc2Vy dGlvbnMoKykKCmRpZmYgLS1naXQgYS9nbnUvcGFja2FnZXMvZ2FtZXMuc2Nt IGIvZ251L3BhY2thZ2VzL2dhbWVzLnNjbQppbmRleCA2ZDllNjNjNGUuLmJl YzM4ZGQ0MSAxMDA2NDQKLS0tIGEvZ251L3BhY2thZ2VzL2dhbWVzLnNjbQor KysgYi9nbnUvcGFja2FnZXMvZ2FtZXMuc2NtCkBAIC01Mzc4LDYgKzUzNzgs MzQgQEAgU3RyaWZlLCBDaGV4IFF1ZXN0LCBhbmQgZmFuLWNyZWF0ZWQgZ2Ft ZXMgbGlrZSBIYXJtb255LCBIYWN4IGFuZCBGcmVlZG9vbS4iKQogICAgICAg ICAgICAgICAgICAgICAiZmlsZTovL2R1bWIvbGljZW5jZS50eHQiCiAgICAg ICAgICAgICAgICAgICAgICJEdW1iIGxpY2Vuc2UsIGV4cGxpY2l0bHkgR1BM IGNvbXBhdGlibGUuIikpKSkpCiAKKyhkZWZpbmUtcHVibGljIG9kYW1leAor ICAocGFja2FnZQorICAgIChuYW1lICJvZGFtZXgiKQorICAgICh2ZXJzaW9u ICIwLjguMCIpCisgICAgKHNvdXJjZQorICAgICAob3JpZ2luCisgICAgICAg KG1ldGhvZCB1cmwtZmV0Y2gpCisgICAgICAgKHVyaSAoc3RyaW5nLWFwcGVu ZAorICAgICAgICAgICAgICJtaXJyb3I6Ly9zb3VyY2Vmb3JnZS9vZGFtZXgv T2RhbWV4LyIgdmVyc2lvbiAiLyIKKyAgICAgICAgICAgICAib2RhbWV4LXNy Yy0iIHZlcnNpb24gIi50YXIuZ3oiKSkKKyAgICAgICAoc2hhMjU2CisgICAg ICAgIChiYXNlMzIKKyAgICAgICAgICIxc2g2bHFqN3ZzZG1ucXoxN2h3MGI2 dnk3eHg2ZHA0MWsyc2R3OTl5bXBzZmEyeGQxZDJqIikpKSkKKyAgICAoYnVp bGQtc3lzdGVtIGNtYWtlLWJ1aWxkLXN5c3RlbSkKKyAgICAoYXJndW1lbnRz IGAoIzp0ZXN0cz8gI2YpKSA7IG5vIHRlc3RzLgorICAgIChpbnB1dHMKKyAg ICAgYCgoInNkbCIgLHNkbCkKKyAgICAgICAoInNkbC1taXhlciIgLHNkbC1t aXhlcikKKyAgICAgICAoInpsaWIiICx6bGliKQorICAgICAgICgibGlicG5n IiAsbGlicG5nKQorICAgICAgICgiYWxzYS1saWIiICxhbHNhLWxpYikpKQor ICAgIChob21lLXBhZ2UgImh0dHBzOi8vb2RhbWV4Lm5ldC8iKQorICAgIChz eW5vcHNpcyAiTXVsdGlwbGF5ZXIgRG9vbSBwb3J0IikKKyAgICAoZGVzY3Jp cHRpb24gIk9kYW1leCBpcyBhIG1vZGlmaWNhdGlvbiBvZiB0aGUgRG9vbSBl bmdpbmUgdGhhdAorYWxsb3dzIHBsYXllcnMgdG8gZWFzaWx5IGpvaW4gc2Vy dmVycyBkZWRpY2F0ZWQgdG8gcGxheWluZyBEb29tCitvbmxpbmUuIikKKyAg ICAobGljZW5zZSBsaWNlbnNlOmdwbDIrKSkpCisKIChkZWZpbmUtcHVibGlj IGZvcnR1bmUtbW9kCiAgIChwYWNrYWdlCiAgICAgKG5hbWUgImZvcnR1bmUt bW9kIikKLS0gCjIuMjAuMQoK ------------=_1550754291-24321-0--