From 5613ea79fccc5a5befafea313cb81010c5f5a8dd Mon Sep 17 00:00:00 2001 From: Carlo Zancanaro Date: Fri, 30 Dec 2016 02:15:59 +1100 Subject: gnu: Add kakoune. * gnu/packages/text-editors.scm (kakoune): New variable. Signed-off-by: Marius Bakke --- gnu/packages/text-editors.scm | 73 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 72 insertions(+), 1 deletion(-) (limited to 'gnu/packages/text-editors.scm') diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 4e2324dbea..3b61d538c4 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 José Miguel Sánchez García +;;; Copyright © 2016 Carlo Zancanaro ;;; ;;; This file is part of GNU Guix. ;;; @@ -19,13 +20,18 @@ (define-module (gnu packages text-editors) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages) + #:use-module (gnu packages boost) + #:use-module (gnu packages documentation) + #:use-module (gnu packages gcc) #:use-module (gnu packages lua) #:use-module (gnu packages ncurses) - #:use-module (gnu packages terminals)) + #:use-module (gnu packages ruby) + #:use-module (gnu packages xml)) (define-public vis (package @@ -75,3 +81,68 @@ based command language.") (license (list license:isc ; Main distribution. license:public-domain ; map.[ch] license:expat)))) ; lexers and libutf.[ch] + +(define-public kakoune + (let ((commit "125c8b7e80995732e0d8c87b82040025748f1b4f") + (revision "1")) + (package + (name "kakoune") + (version (string-append "0.0.0-" revision "." (string-take commit 7))) + (source + (origin + (file-name (string-append "kakoune-" version "-checkout")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/mawww/kakoune.git") + (commit commit))) + (sha256 + (base32 + "19qs99l8r9p1vi5pxxx9an22fvi7xx40qw3jh2cnh2mbacawvdyb")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) + ;; Boost is compiled with the older ABI, so we can't use + ;; the new ABI if we want to link againt it. + "CPPFLAGS=-D_GLIBCXX_USE_CXX11_ABI=0") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda _ + ;; kakoune uses confstr with _CS_PATH to find out where to find + ;; a posix shell, but this doesn't work in the build + ;; environment. This substitution just replaces that result + ;; with the "sh" path. + (substitute* "src/shell_manager.cc" + (("if \\(m_shell.empty\\(\\)\\)" line) + (string-append "m_shell = \"" (which "sh") + "\";\n " line))) + ;; Kakoune uses 'gzip' to compress its manpages. Make sure + ;; timestamps are not preserved for reproducibility. + (substitute* "src/Makefile" + (("gzip -f") "gzip -f --no-name")) + #t)) + (delete 'configure) + ;; kakoune requires us to be in the src/ directory to build + (add-before 'build 'chdir + (lambda _ (chdir "src") #t)) + (add-before 'check 'fix-test-permissions + (lambda _ + ;; Out git downloader doesn't give us write permissions, but + ;; without them the tests fail. + (zero? (system* "chmod" "-R" "u+w" "../test"))))))) + (native-inputs `(("gcc" ,gcc-5) + ("libxslt" ,libxslt) + ("asciidoc" ,asciidoc) + ("ruby" ,ruby))) + (inputs `(("gcc:lib" ,gcc-5 "lib") + ("ncurses" ,ncurses) + ("boost" ,boost))) + (synopsis "Vim-inspired code editor") + (description + "Kakoune is a code editor heavily inspired by Vim, as such most of its +commands are similar to Vi's ones, and it shares Vi's \"keystrokes as a text +editing language\" model. Kakoune has a strong focus on interactivity, most +commands provide immediate and incremental results, while still being +competitive (as in keystroke count) with Vim.") + (home-page "http://kakoune.org/") + (license license:unlicense)))) -- cgit v1.2.3 From 264ccbb31e0cffb2d71a465bec32adbdf7e20d06 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 26 Jan 2017 22:11:08 +0100 Subject: gnu: text-editors.scm: Fix imports. This is a followup to 5613ea79fccc5a5befafea313cb81010c5f5a8dd. * gnu/packages/text-editors.scm: Import (gnu packages terminals). --- gnu/packages/text-editors.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/text-editors.scm') diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 3b61d538c4..cb4855860d 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -31,6 +31,7 @@ #:use-module (gnu packages lua) #:use-module (gnu packages ncurses) #:use-module (gnu packages ruby) + #:use-module (gnu packages terminals) #:use-module (gnu packages xml)) (define-public vis -- cgit v1.2.3 From 95757d899907ee7352acdecf0962d665804ceccd Mon Sep 17 00:00:00 2001 From: Carlo Zancanaro Date: Fri, 27 Jan 2017 10:48:12 +1100 Subject: gnu: kakoune: Move reproducibility substitution to source snippet. * gnu/packages/text-editors.scm (kakoune)[arguments]: Move substitution to ... [source]: ... here. Signed-off-by: Marius Bakke --- gnu/packages/text-editors.scm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'gnu/packages/text-editors.scm') diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index cb4855860d..5b20d1d515 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -98,7 +98,15 @@ based command language.") (commit commit))) (sha256 (base32 - "19qs99l8r9p1vi5pxxx9an22fvi7xx40qw3jh2cnh2mbacawvdyb")))) + "19qs99l8r9p1vi5pxxx9an22fvi7xx40qw3jh2cnh2mbacawvdyb")) + (modules '((guix build utils))) + (snippet + ;; Kakoune uses 'gzip' to compress its manpages. Make sure + ;; timestamps are not preserved for reproducibility. + '(begin + (substitute* "src/Makefile" + (("gzip -f") "gzip -f --no-name")) + #t)))) (build-system gnu-build-system) (arguments `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) @@ -117,10 +125,6 @@ based command language.") (("if \\(m_shell.empty\\(\\)\\)" line) (string-append "m_shell = \"" (which "sh") "\";\n " line))) - ;; Kakoune uses 'gzip' to compress its manpages. Make sure - ;; timestamps are not preserved for reproducibility. - (substitute* "src/Makefile" - (("gzip -f") "gzip -f --no-name")) #t)) (delete 'configure) ;; kakoune requires us to be in the src/ directory to build -- cgit v1.2.3 From f255a6db17f7bb446e9538cf466ef311b63a8fbf Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 31 Jan 2017 20:26:20 -0600 Subject: gnu: Add JOE. * gnu/packages/text-editors.scm (joe): New variable. --- gnu/packages/text-editors.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages/text-editors.scm') diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 5b20d1d515..d80128186c 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 José Miguel Sánchez García ;;; Copyright © 2016 Carlo Zancanaro +;;; Copyright © 2016 Eric Bavier ;;; ;;; This file is part of GNU Guix. ;;; @@ -151,3 +152,28 @@ commands provide immediate and incremental results, while still being competitive (as in keystroke count) with Vim.") (home-page "http://kakoune.org/") (license license:unlicense)))) + +(define-public joe + (package + (name "joe") + (version "4.4") + (source + (origin + (method url-fetch) + (uri (string-append "https://sourceforge.net/projects/joe-editor/" + "files/JOE sources/joe-" version "/" + "joe-" version ".tar.gz")) + (sha256 + (base32 + "0y898r1xlrv75m00y598rvwwsricabplyh80wawsqafapcl4hw55")))) + (build-system gnu-build-system) + (inputs `(("ncurses" ,ncurses))) + (home-page "http://joe-editor.sourceforge.net/") + (synopsis "Console screen editor") + (description + "JOE is a blending of MicroPro's microcomputer word processor WordStar +and Richard Stallman's LISP-based text editor GNU Emacs. Most of the basic +editing keys and the overall feel of the editor are the same as in WordStar. +JOE also has some of the key bindings and many of the powerful features of GNU +Emacs.") + (license license:gpl3+))) -- cgit v1.2.3 From 7904f18af206ab9116ade83d370b7186df458fb5 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 1 Feb 2017 19:08:39 -0600 Subject: gnu: joe: remove reference to WordStar. * gnu/packages/text-editors.scm (joe)[description]: Remove WordStar reference. --- gnu/packages/text-editors.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'gnu/packages/text-editors.scm') diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index d80128186c..4b6aa07ee8 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 José Miguel Sánchez García ;;; Copyright © 2016 Carlo Zancanaro -;;; Copyright © 2016 Eric Bavier +;;; Copyright © 2017 Eric Bavier ;;; ;;; This file is part of GNU Guix. ;;; @@ -171,9 +171,7 @@ competitive (as in keystroke count) with Vim.") (home-page "http://joe-editor.sourceforge.net/") (synopsis "Console screen editor") (description - "JOE is a blending of MicroPro's microcomputer word processor WordStar -and Richard Stallman's LISP-based text editor GNU Emacs. Most of the basic -editing keys and the overall feel of the editor are the same as in WordStar. -JOE also has some of the key bindings and many of the powerful features of GNU -Emacs.") + "JOE is a powerful console screen editor with a \"mode-less\" user +interface similar to many user-friendly editors. JOE has some of the key +bindings and many of the powerful features of GNU Emacs.") (license license:gpl3+))) -- cgit v1.2.3