Let's see if these patches get accepted now! I think I've taken into
account
every single detail.
These patches add three packages: vis, lua and libtermkey. vis depends
on lua
and libtermkey, so add them before adding vis.
vis is being added in a new file, gnu/text-editors.scm , as requested
here
<https://lists.gnu.org/archive/html/guix-devel/2016-12/msg00242.html>
--
José Miguel Sánchez García
From ce03e4d1418580d353cdb58233550ece380ff2ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Miguel=20S=C3=A1nchez=20Garc=C3=ADa?=
<jm...@openmailbox.org>
Date: Wed, 7 Dec 2016 18:03:09 +0100
Subject: [PATCH] gnu: Add libtermkey.
---
gnu/packages/terminals.scm | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index e1076c7..907fc7b 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2016 Alex Griffin <a...@ajgrf.com>
;;; Copyright © 2016 David Craven <da...@craven.ch>
;;; Copyright © 2016 Ludovic Courtès <l...@gnu.org>
+;;; Copyright © 2016 José Miguel Sánchez GarcÃa <jm...@openmailbox.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -261,6 +262,35 @@ multi-seat support, a replacement for @command{mingetty}, and more.")
(supported-systems (filter (cut string-suffix? "-linux" <>)
%supported-systems))))
+(define-public libtermkey
+ (package
+ (name "libtermkey")
+ (version "0.18")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "http://www.leonerd.org.uk/code/"
+ name "/" name "-" version ".tar.gz"))
+ (sha256
+ (base32 "09ir16kaarv55mnc4jn2sqnjjhzpb1aha51wpd9ayif887g4d5r3"))))
+ (build-system gnu-build-system)
+ (arguments
+ '(#:make-flags (list
+ "CC=gcc"
+ (string-append "PREFIX=" (assoc-ref %outputs "out")))
+ #:phases (modify-phases %standard-phases
+ (delete 'configure))
+ ;; `make test` isn't available
+ #:tests? #f))
+ (inputs `(("ncurses", ncurses)))
+ (native-inputs `(("libtool", libtool)
+ ("pkg-config", pkg-config)))
+ (synopsis "Keyboard entry processing library for terminal-based programs")
+ (description
+ "Libtermkey handles all the necessary logic to recognise special keys, UTF-8
+combining, and so on, with a simple interface.")
+ (home-page "http://www.leonerd.org.uk/code/libtermkey")
+ (license license:expat)))
+
(define-public picocom
(package
(name "picocom")
--
2.9.2
From d3903d74e6ff21afcfd401ed99c7957b3d7dbf16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Miguel=20S=C3=A1nchez=20Garc=C3=ADa?=
<jm...@openmailbox.org>
Date: Wed, 7 Dec 2016 18:06:22 +0100
Subject: [PATCH] gnu: Add lua-lpeg.
---
gnu/packages/lua.scm | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm
index f95da35..222e655 100644
--- a/gnu/packages/lua.scm
+++ b/gnu/packages/lua.scm
@@ -7,6 +7,7 @@
;;; Copyright © 2016 Ricardo Wurmus <rek...@elephly.net>
;;; Copyright © 2016 doncatnip <gno...@gmail.com>
;;; Copyright © 2016 Clément Lassieur <clem...@lassieur.org>
+;;; Copyright © 2016 José Miguel Sánchez GarcÃa <jm...@openmailbox.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -365,3 +366,32 @@ secure session between the peers.")
based libraries. It allows using GObject-based libraries directly from Lua.
Notable examples are GTK+, GStreamer and Webkit.")
(license license:expat)))
+
+(define-public lua-lpeg
+ (package
+ (name "lua-lpeg")
+ (version "1.0.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-"
+ version ".tar.gz"))
+ (sha256
+ (base32 "13mz18s359wlkwm9d9iqlyyrrwjc6iqfpa99ai0icam2b3khl68h"))))
+ (build-system gnu-build-system)
+ (arguments
+ '(#:phases (modify-phases %standard-phases
+ (delete 'configure)
+ ;; `make install` isn't available, so we have to do it manually
+ (replace 'install (lambda _
+ (let ((out (assoc-ref %outputs "out")))
+ (install-file "lpeg.so" (string-append out "/lib/lua/5.3"))
+ (install-file "re.lua" (string-append out "/share/lua/5.3"))))))
+ ;; `make test` isn't available
+ #:tests? #f))
+ (inputs `(("lua", lua)))
+ (synopsis "Pattern-matching library for Lua")
+ (description
+ "LPeg is a pattern-matching library for Lua, based on Parsing Expression
+Grammars (PEGs).")
+ (home-page "http://www.inf.puc-rio.br/~roberto/lpeg")
+ (license license:expat)))
--
2.9.2
From dc0b71eb1b13ef26240165536bdcb33a089cfb2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Miguel=20S=C3=A1nchez=20Garc=C3=ADa?=
<jm...@openmailbox.org>
Date: Wed, 7 Dec 2016 17:53:22 +0100
Subject: [PATCH] gnu: Add vis.
* gnu/packages/text-editors.scm: New file.
* gnu/local.mk (text-editors.scm): Add it.
---
gnu/local.mk | 1 +
gnu/packages/text-editors.scm | 57 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 58 insertions(+)
create mode 100644 gnu/packages/text-editors.scm
diff --git a/gnu/local.mk b/gnu/local.mk
index bc9b06d..974f867 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -358,6 +358,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/texinfo.scm \
%D%/packages/tex.scm \
%D%/packages/textutils.scm \
+ %D%/packages/text-editors.scm \
%D%/packages/time.scm \
%D%/packages/tls.scm \
%D%/packages/tmux.scm \
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
new file mode 100644
index 0000000..0d9e7f9
--- /dev/null
+++ b/gnu/packages/text-editors.scm
@@ -0,0 +1,57 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2016 José Miguel Sánchez GarcÃa <jm...@openmailbox.org>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages text-editors)
+ #:use-module (guix packages)
+ #:use-module (guix download)
+ #:use-module (guix build-system gnu)
+ #:use-module (guix licenses)
+ #:use-module (gnu packages ncurses)
+ #:use-module (gnu packages terminals)
+ #:use-module (gnu packages lua)
+ #:use-module (gnu packages lua-lpeg))
+
+(define-public vis
+ ;; TODO: Installation succeeds, but vis complains about not finding
+ ;; themes/default-16
+ (package
+ (name "vis")
+ (version "0.2")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/martanne/"
+ name "/archive/v" version ".tar.gz"))
+ (sha256
+ (base32 "0bbmkblpndc53pvr8xcfywdn8g351yxfj8c46zp5d744c3bq2nry"))))
+ (build-system gnu-build-system)
+ (arguments
+ '(#:make-flags '("CFLAGS=-pie")
+ ;; `make test` isn't available
+ #:tests? #f))
+ (inputs `(("lua", lua)
+ ("ncurses", ncurses)
+ ("libtermkey", libtermkey)
+ ("lua-lpeg", lua-lpeg)))
+ (synopsis "Vim-like text editor")
+ (description
+ "Vis aims to be a modern, legacy free, simple yet efficient vim-like text
+editor. It extends vim's modal editing with built-in support for multiple
+cursors/selecctions and combines it with sam's structural regular expression
+based command language.")
+ (home-page "https://github.com/martanne/vis")
+ (license isc)))
--
2.9.2