From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43851) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQcdp-0001z5-SH for guix-patches@gnu.org; Thu, 29 Jun 2017 12:50:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dQcdm-0003u2-6V for guix-patches@gnu.org; Thu, 29 Jun 2017 12:50:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:42222) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dQcdm-0003tp-1m for guix-patches@gnu.org; Thu, 29 Jun 2017 12:50:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dQcdl-0002rM-S0 for guix-patches@gnu.org; Thu, 29 Jun 2017 12:50:01 -0400 Subject: [bug#27533] Update open-adventure + dependent linenoise update. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:43446) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQccZ-0001SS-8D for guix-patches@gnu.org; Thu, 29 Jun 2017 12:48:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dQccV-0001pb-Hq for guix-patches@gnu.org; Thu, 29 Jun 2017 12:48:47 -0400 Received: from aibo.runbox.com ([91.220.196.211]:60266) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dQccV-0001pJ-5y for guix-patches@gnu.org; Thu, 29 Jun 2017 12:48:43 -0400 Received: from [10.9.9.210] (helo=mailfront10.runbox.com) by mailtransmit02.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1dQccT-0008NP-CP for guix-patches@gnu.org; Thu, 29 Jun 2017 18:48:41 +0200 Received: from 195-154-251-209.rev.poneytelecom.eu ([195.154.251.209] helo=localhost) by mailfront10.runbox.com with esmtpsa (uid:892961 ) (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) id 1dQcc7-0003j6-Li for guix-patches@gnu.org; Thu, 29 Jun 2017 18:48:20 +0200 Date: Thu, 29 Jun 2017 16:48:17 +0000 From: ng0 Message-ID: <20170629164817.k7v32imb6dpe5qrj@abyayala> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="xywxpf54ha4wdtmb" Content-Disposition: inline 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: 27533@debbugs.gnu.org --xywxpf54ha4wdtmb Content-Type: multipart/mixed; boundary="y2agpnbueycoprva" Content-Disposition: inline --y2agpnbueycoprva Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Patch 1: Updates linenoise to a more recent commit. Patch 2: Updates open-adventure to the newest commit which makes use of thi= s newer linenoise. Patch 3: mailmap. I sort of hope that changing my email address doesn't become a run= ning joke and unique trait of mine. According to friends it already is unique. I hope it stops at the = current content of my GnuPG key. --=20 ng0 GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588 GnuPG: https://n0is.noblogs.org/my-keys https://www.infotropique.org https://krosos.org --y2agpnbueycoprva Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0001-gnu-linenoise-Update-to-commit-2105ce445821381cf1bca.patch" Content-Transfer-Encoding: quoted-printable =46rom 8be6a634f5876ace5a82553e16a22f0e229eb42d Mon Sep 17 00:00:00 2001 =46rom: ng0 Date: Thu, 29 Jun 2017 15:52:15 +0000 Subject: [PATCH 1/3] gnu: linenoise: Update to commit 2105ce445821381cf1bca87b6d386d4ea88ee20d. * gnu/packages/shells.scm (linenoise): Update to commit 2105ce445821381cf1b= ca87b6d386d4ea88ee20d. (source): change to git. Fix intendation. --- gnu/packages/shells.scm | 69 ++++++++++++++++++++++++++-------------------= ---- 1 file changed, 36 insertions(+), 33 deletions(-) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 65e0eda50..89c79f506 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -460,38 +460,41 @@ operating system.") (license bsd-3)))) =20 (define-public linenoise - (package - (name "linenoise") - (version "1.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/antirez/linenoise/" - "archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "05006hd56xcvxjdpll4x720bpfan7vwqmxbw8a2kvm10w57ll1gm")))) - (build-system gnu-build-system) - (arguments - `(#:tests? #f ;No tests are included - #:make-flags (list "CC=3Dgcc") - #:phases - (modify-phases %standard-phases - (delete 'configure) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - ;; At the moment there is no 'make install' in upstream. - (let* ((out (assoc-ref outputs "out"))) - (install-file "linenoise.h" - (string-append out "/include/linenoise")) - (install-file "linenoise.c" - (string-append out "/include/linenoise")) - #t)))))) - (home-page "https://github.com/antirez/linenoise") - (synopsis "Minimal zero-config readline replacement") - (description - "Linenoise is a minimal, zero-config, readline replacement. + (let ((commit "2105ce445821381cf1bca87b6d386d4ea88ee20d") + (revision "1")) + (package + (name "linenoise") + (version (string-append "1.0-" revision "." (string-take commit 7))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/antirez/linenoise") + (commit commit))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "1z16qwix8z6a40fskdgxsibkqgdrp4q6ncp4n6hnv4r9iihy2d8r")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ;No tests are included + #:make-flags (list "CC=3Dgcc") + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + ;; At the moment there is no 'make install' in upstream. + (let* ((out (assoc-ref outputs "out"))) + (install-file "linenoise.h" + (string-append out "/include/linenoise")) + (install-file "linenoise.c" + (string-append out "/include/linenoise")) + #t)))))) + (home-page "https://github.com/antirez/linenoise") + (synopsis "Minimal zero-config readline replacement") + (description + "Linenoise is a minimal, zero-config, readline replacement. Its features include: =20 @enumerate @@ -501,7 +504,7 @@ Its features include: @item Hints (suggestions at the right of the prompt as you type) @item A subset of VT100 escapes, ANSI.SYS compatible @end enumerate\n") - (license bsd-2))) + (license bsd-2)))) =20 (define-public s-shell (let ((commit "6604341edb3a775ff94415762af3ee9bd86bfb3c") --=20 2.13.2 --y2agpnbueycoprva Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0002-gnu-Update-open-adventure-to-d43854f0f6bb8e9eea7fbce.patch" Content-Transfer-Encoding: quoted-printable =46rom 780a1a98f15782c9b9461d15209046a2e23465c3 Mon Sep 17 00:00:00 2001 =46rom: ng0 Date: Thu, 29 Jun 2017 15:32:27 +0000 Subject: [PATCH 2/3] gnu: Update open-adventure to d43854f0f6bb8e9eea7fbce80348150e7e7fc34d. * gnu/packages/games.scm (open-adventure): Update to d43854f0f6bb8e9eea7fbc= e80348150e7e7fc34d. --- gnu/packages/games.scm | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 603687d08..46b9a0999 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -17,7 +17,7 @@ ;;; Copyright =C2=A9 2015 Taylan Ulrich Bay=C4=B1rl=C4=B1/Kammer ;;; Copyright =C2=A9 2016, 2017 Rodger Fox ;;; Copyright =C2=A9 2016 Manolis Fragkiskos Ragkousis -;;; Copyright =C2=A9 2016, 2017 ng0 +;;; Copyright =C2=A9 2016, 2017 ng0 ;;; Copyright =C2=A9 2016 Albin S=C3=B6derqvist ;;; Copyright =C2=A9 2016, 2017 Kei Kebreau ;;; Copyright =C2=A9 2016 Alex Griffin @@ -99,6 +99,7 @@ #:use-module (gnu packages xorg) #:use-module (gnu packages pkg-config) #:use-module (gnu packages databases) + #:use-module (gnu packages shells) #:use-module (gnu packages sdl) #:use-module (gnu packages swig) #:use-module (gnu packages texinfo) @@ -4524,8 +4525,8 @@ at their peak of economic growth and military prowess. =20 ;; There have been no official releases. (define-public open-adventure - (let* ((commit "2483a23690d205f01ecb66165cf4522b541cd991") - (revision "1")) + (let* ((commit "d43854f0f6bb8e9eea7fbce80348150e7e7fc34d") + (revision "2")) (package (name "open-adventure") (version (string-append "2.5-" revision "." (string-take commit 7))) @@ -4537,14 +4538,23 @@ at their peak of economic growth and military prowe= ss. (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1gkvkwbq5cl3llfc7nl41van8awn4myx782pg33bxpbx5l9scwb4"))= )) + "08bwrvf4axb1rsfd6ia1fddsky9pc1p350vjskhaakg2czc6dsk0"))= )) (build-system gnu-build-system) (arguments `(#:make-flags (list "CC=3Dgcc") #:parallel-build? #f ; not supported #:phases (modify-phases %standard-phases - (delete 'configure) + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; At this point linenoise is meant to be included, + ;; so we have to really copy it into the working directory + ;; of s. + (let* ((linenoise (assoc-ref inputs "linenoise")) + (noisepath (string-append linenoise "/include/lineno= ise")) + (out (assoc-ref outputs "out"))) + (copy-recursively noisepath "linenoise")) + #t)) (add-before 'build 'use-echo (lambda _ (substitute* "tests/Makefile" @@ -4554,9 +4564,9 @@ at their peak of economic growth and military prowess. (lambda _ ;; This target is missing a dependency (substitute* "Makefile" - ((".asc.6:" line) - (string-append line " advent.txt"))) - (zero? (system* "make" ".asc.6")))) + ((".adoc.6:" line) + (string-append line " advent.adoc"))) + (zero? (system* "make" ".adoc.6")))) ;; There is no install target (replace 'install (lambda* (#:key outputs #:allow-other-keys) @@ -4567,7 +4577,10 @@ at their peak of economic growth and military prowes= s. (install-file "advent.6" man)) #t))))) (native-inputs - `(("asciidoc" ,asciidoc))) + `(("asciidoc" ,asciidoc) + ("linenoise" ,linenoise) + ("python" ,python) + ("python-pyyaml" ,python-pyyaml))) (home-page "https://gitlab.com/esr/open-adventure") (synopsis "Colossal Cave Adventure") (description "The original Colossal Cave Adventure from 1976 was the --=20 2.13.2 --y2agpnbueycoprva Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0003-mailmap-fix-entries-for-ng0.patch" Content-Transfer-Encoding: quoted-printable =46rom aea9a80f6815b0cae14d0eb391aedeaad8febabf Mon Sep 17 00:00:00 2001 =46rom: ng0 Date: Thu, 29 Jun 2017 16:03:03 +0000 Subject: [PATCH 3/3] mailmap: fix entries for ng0. --- .mailmap | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/.mailmap b/.mailmap index 618bc5011..9c10b8468 100644 --- a/.mailmap +++ b/.mailmap @@ -42,15 +42,16 @@ Mathieu Lirzin Mathieu Lirzin Mathieu Othacehe Nikita Karetnikov -ng0 -ng0 -ng0 -ng0 -ng0 -ng0 -ng0 -ng0 -ng0 +ng0 +ng0 +ng0 +ng0 +ng0 +ng0 +ng0 +ng0 +ng0 +ng0 Pjotr Prins Pjotr Prins Pjotr Prins --=20 2.13.2 --y2agpnbueycoprva-- --xywxpf54ha4wdtmb Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEqIyK3RKYKNfqwC5S4i+bv+40hYgFAllVL1EACgkQ4i+bv+40 hYjf/w/+PbS6f8gIBOMm5uWaBhlP2w5W6piiNytV4JFeVPh5k6StE42fyvOrHd2t IemoBCkFHqJ/qePfTHaFORjIqEVlY5XBHFemLY9n+wSCZuBKG7vH03Ox9nTIk7/2 dQMyee7+z+0hdp1UPyw1r3t66pvlrfexKCLWC9AR1bOWMym9dmDUnyWQkY7IAy/J 894trcNhMRJoD+ndgCYo17/kF8rGlY8krp+oGfsosAwWPdl1kmgZBfGQp99zGBCQ g6srZqFGPt+wwoMCQG0pgFJbpOLWjks3Vy8Nm/fXtKXhY0BPxxrHU6UQhN9KAlMP 9Zg85dAoh3bogVH5eWfuPCwOwv3BCMbUU+AfWdbsYdxf3KMaMYL42wU7Dtrf+bwl +6wwW4trP9u7qazyZPNn7kJRELDsleMBADoBcqGsTiEFKyQ73PwiTZPBnKRhPxK2 EvpQu0WlQhAdkUM6Xgi5wu9nlpdumR0rrSdExeeNJhw5DW1ZYrEmB6OH06+HA8zW GjMsaAmHaNOLm/uzfsRggOVIwoBsDQwGoKZ1L0kWPPxOI368PAkc4n+tEMcdirYe UOGCnSiwOq/Z1SmXHu7+G/tN0EfHj7SRUVxdYfBXBCsjNju+M/vA16AsQMiNRCzD Ovsez+iSRJT1y2auEpMu6TiWRH3jYwVSusMI5BeejXxRkZnmunE= =jNrV -----END PGP SIGNATURE----- --xywxpf54ha4wdtmb--