From 7d6d1663c48005d795b9707a8ebb55e67b6cf041 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Sun, 12 Apr 2026 14:56:35 +0200 Subject: gnu: kakoune: Update to 2026.04.12 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/text-editors.scm (kakoune): Update to 2026.04.12. [source]: Switch to git-fetch. [arguments]<#:make-flags, #:phases>: Switch to G-Expressions. [native-inputs]: Delete ’pkg-config. Merges guix/guix!7849 Change-Id: I97133eb3b40211ace854d5bac906092fa94ceb13 Signed-off-by: Cayetano Santos Modified-by: Cayetano Santos --- gnu/packages/text-editors.scm | 59 ++++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 29 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 97790ed983..26cd89a065 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -37,7 +37,7 @@ ;;; Copyright © 2024 Murilo ;;; Copyright © 2025 Ashvith Shetty ;;; Copyright © 2025 Sharlatan Hellseher -;;; Copyright © 2025 Ashish SHUKLA +;;; Copyright © 2025, 2026 Ashish SHUKLA ;;; Copyright © 2025 Marc Coquand ;;; Copyright © 2025 Andrew Wong ;;; Copyright © 2025 Junker @@ -414,39 +414,40 @@ based command language.") (define-public kakoune (package (name "kakoune") - (version "2025.06.03") + (version "2026.04.12") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/mawww/kakoune/" - "releases/download/v" version "/" - "kakoune-" version ".tar.bz2")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/mawww/kakoune/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "16b466anx7gf1jci3gxj87xr5qw9fgyhpc3509myzf6z3cgr9mff")))) + (base32 "11c4sgb9k1iahi06i5p6m0qz1qf5hz4g2f1z80di23987bwvbjlv")))) (build-system gnu-build-system) (arguments - `(#:make-flags - (list (string-append "PREFIX=" (assoc-ref %outputs "out")) - (string-append "CXX=" ,(cxx-for-target))) - #: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))))) - (add-after 'install 'wrap-executable - (lambda* (#:key inputs outputs #:allow-other-keys) - (wrap-program (string-append (assoc-ref outputs "out") "/bin/kak") - `("PATH" ":" prefix - (,(dirname (search-input-file inputs "bin/perl"))))))) - (delete 'configure)))) ; no configure script - (native-inputs (list pkg-config)) + (list + #:make-flags + #~(list (string-append "PREFIX=" #$output) + (string-append "CXX=" #$(cxx-for-target))) + #: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))))) + (add-after 'install 'wrap-executable + (lambda* (#:key inputs #:allow-other-keys) + (wrap-program (string-append #$output "/bin/kak") + `("PATH" ":" prefix + (,(dirname (search-input-file inputs "bin/perl"))))))) + (delete 'configure)))) ; no configure script (inputs (list perl)) (native-search-paths (list (search-path-specification -- cgit v1.3