From 9af83d1cf98da8353a582c5cab62c2b01d7f8dc3 Mon Sep 17 00:00:00 2001 From: calum Date: Sun, 29 Aug 2021 23:39:14 +1200 Subject: gnu: kakoune: Update to v2021.08.28 * gnu/packages/text-editors.scm (kakoune): Update to v2021.08.28 [native-inputs]: Use gcc-10. [inputs]: Remove ncurses dependancy. Signed-off-by: Lars-Dominik Braun --- gnu/packages/text-editors.scm | 10 +++++----- 1 file changed, 5 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 2074442da5..79d2ec4f68 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2021 aecepoglu ;;; Copyright © 2021 Leo Famulari ;;; Copyright © 2021 Pierre Langlois +;;; Copyright © 2021 Calum Irwin ;;; ;;; This file is part of GNU Guix. ;;; @@ -163,7 +164,7 @@ (define-public vis (define-public kakoune (package (name "kakoune") - (version "2020.09.01") + (version "2021.08.28") (source (origin (method url-fetch) @@ -171,7 +172,7 @@ (define-public kakoune "releases/download/v" version "/" "kakoune-" version ".tar.bz2")) (sha256 - (base32 "0x81rxy7bqnhd9374g5ypy4w4nxmm0vnqw6b52bf62jxdg2qj6l6")))) + (base32 "1jvn4b9rma5jjvg3xz8nf224pbq3ry570j6qvc834wn5v3gxfvkg")))) (build-system gnu-build-system) (arguments `(#:make-flags @@ -194,11 +195,10 @@ (define-public kakoune (add-before 'build 'chdir (lambda _ (chdir "src") #t))))) (native-inputs - `(("asciidoc" ,asciidoc) + `(("gcc", gcc-10) ; See https://github.com/mawww/kakoune/issues/4318 + ("asciidoc" ,asciidoc) ("pkg-config" ,pkg-config) ("ruby" ,ruby))) - (inputs - `(("ncurses" ,ncurses))) (synopsis "Vim-inspired code editor") (description "Kakoune is a code editor heavily inspired by Vim, as such most of its -- cgit v1.2.3 From 45066bc9ff55bfaafaccd8d19afdf2acb5765e96 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 5 Sep 2021 03:03:36 +0200 Subject: gnu: ne: Update to 3.3.1. * gnu/packages/text-editors.scm (ne): Update to 3.3.1. [arguments]: Add a 'patch-early-shebang phase. Don't return #t from other phases. --- gnu/packages/text-editors.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'gnu/packages/text-editors.scm') diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 79d2ec4f68..3f427d0931 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -1083,7 +1083,7 @@ (define-public fe (define-public ne (package (name "ne") - (version "3.3.0") + (version "3.3.1") (source (origin (method git-fetch) (uri (git-reference @@ -1092,7 +1092,7 @@ (define-public ne (file-name (git-file-name name version)) (sha256 (base32 - "01aglnsfljlvx0wvyvpjfn4y88jf450a06qnj9a8lgdqv1hdkq1a")))) + "0sg2f6lxq6cjkpd3dvlxxns82hvq826rjnams5in97pssmknr77g")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl) @@ -1108,11 +1108,14 @@ (define-public ne "/lib")) #:phases (modify-phases %standard-phases + (add-before 'configure 'patch-early-shebang + (lambda _ + (substitute* "version.pl" + (("/usr/bin/env .*perl") (which "perl"))))) (replace 'configure (lambda _ (substitute* "src/makefile" - (("-lcurses") "-lncurses")) - #t))))) + (("-lcurses") "-lncurses"))))))) (home-page "https://ne.di.unimi.it/") (synopsis "Text editor with menu bar") (description "This package provides a modeless text editor with menu bar. -- cgit v1.2.3