* [bug#27533] Update open-adventure + dependent linenoise update.
@ 2017-06-29 16:48 ng0
0 siblings, 0 replies; only message in thread
From: ng0 @ 2017-06-29 16:48 UTC (permalink / raw)
To: 27533
[-- Attachment #1.1: Type: text/plain, Size: 539 bytes --]
Patch 1: Updates linenoise to a more recent commit.
Patch 2: Updates open-adventure to the newest commit which makes use of this newer linenoise.
Patch 3: mailmap.
I sort of hope that changing my email address doesn't become a running 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.
--
ng0
GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588
GnuPG: https://n0is.noblogs.org/my-keys
https://www.infotropique.org https://krosos.org
[-- Attachment #1.2: 0001-gnu-linenoise-Update-to-commit-2105ce445821381cf1bca.patch --]
[-- Type: text/plain, Size: 4014 bytes --]
From 8be6a634f5876ace5a82553e16a22f0e229eb42d Mon Sep 17 00:00:00 2001
From: ng0 <ng0@infotropique.org>
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 2105ce445821381cf1bca87b6d386d4ea88ee20d.
(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))))
(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=gcc")
- #: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=gcc")
+ #: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:
@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))))
(define-public s-shell
(let ((commit "6604341edb3a775ff94415762af3ee9bd86bfb3c")
--
2.13.2
[-- Attachment #1.3: 0002-gnu-Update-open-adventure-to-d43854f0f6bb8e9eea7fbce.patch --]
[-- Type: text/plain, Size: 4382 bytes --]
From 780a1a98f15782c9b9461d15209046a2e23465c3 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@infotropique.org>
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 d43854f0f6bb8e9eea7fbce80348150e7e7fc34d.
---
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 © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
;;; Copyright © 2016, 2017 Rodger Fox <thylakoid@openmailbox.org>
;;; Copyright © 2016 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
-;;; Copyright © 2016, 2017 ng0 <ng0@no-reply.pragmatique.xyz>
+;;; Copyright © 2016, 2017 ng0 <ng0@infotropique.org>
;;; Copyright © 2016 Albin Söderqvist <albin@fripost.org>
;;; Copyright © 2016, 2017 Kei Kebreau <kei@openmailbox.org>
;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
@@ -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.
;; 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 prowess.
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32
- "1gkvkwbq5cl3llfc7nl41van8awn4myx782pg33bxpbx5l9scwb4"))))
+ "08bwrvf4axb1rsfd6ia1fddsky9pc1p350vjskhaakg2czc6dsk0"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags (list "CC=gcc")
#: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/linenoise"))
+ (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 prowess.
(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
--
2.13.2
[-- Attachment #1.4: 0003-mailmap-fix-entries-for-ng0.patch --]
[-- Type: text/plain, Size: 1909 bytes --]
From aea9a80f6815b0cae14d0eb391aedeaad8febabf Mon Sep 17 00:00:00 2001
From: ng0 <ng0@infotropique.org>
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 <mthl@gnu.org> <mthl@openmailbox.org>
Mathieu Lirzin <mthl@gnu.org> <mathieu.lirzin@openmailbox.org>
Mathieu Othacehe <m.othacehe@gmail.com>
Nikita Karetnikov <nikita@karetnikov.org> <nikita.karetnikov@gmail.com>
-ng0 <ng0@no-reply.infotropique.org>
-ng0 <ng0@no-reply.infotropique.org> <ng0@no-reply.pragmatique.xyz>
-ng0 <ng0@no-reply.infotropique.org> <ng0@pragmatique.xyz>
-ng0 <ng0@no-reply.infotropique.org> <contact.ng0@cryptolab.net>
-ng0 <ng0@no-reply.infotropique.org> <ng0@we.make.ritual.n0.is>
-ng0 <ng0@no-reply.infotropique.org> <ngillmann@runbox.com>
-ng0 <ng0@no-reply.infotropique.org> <niasterisk@grrlz.net>
-ng0 <ng0@no-reply.infotropique.org> <ng@niasterisk.space>
-ng0 <ng0@no-reply.infotropique.org> <ng0@libertad.pw>
+ng0 <ng0@infotropique.org>
+ng0 <ng0@infotropique.org> <ng0@no-reply.infotropique.org>
+ng0 <ng0@infotropique.org> <ng0@no-reply.pragmatique.xyz>
+ng0 <ng0@infotropique.org> <ng0@pragmatique.xyz>
+ng0 <ng0@infotropique.org> <contact.ng0@cryptolab.net>
+ng0 <ng0@infotropique.org> <ng0@we.make.ritual.n0.is>
+ng0 <ng0@infotropique.org> <ngillmann@runbox.com>
+ng0 <ng0@infotropique.org> <niasterisk@grrlz.net>
+ng0 <ng0@infotropique.org> <ng@niasterisk.space>
+ng0 <ng0@infotropique.org> <ng0@libertad.pw>
Pjotr Prins <pjotr.guix@thebird.nl> <pjotr.public01@thebird.nl>
Pjotr Prins <pjotr.guix@thebird.nl> <pjotr.public12@thebird.nl>
Pjotr Prins <pjotr.guix@thebird.nl> <pjotr.public12@email>
--
2.13.2
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2017-06-29 16:50 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-06-29 16:48 [bug#27533] Update open-adventure + dependent linenoise update ng0
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.