Received: (at 54357) by debbugs.gnu.org; 12 Mar 2022 22:41:15 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Mar 12 17:41:14 2022
Received: from localhost ([127.0.0.1]:41056 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nTAQE-0007S0-JN
for submit <at> debbugs.gnu.org; Sat, 12 Mar 2022 17:41:14 -0500
Received: from knopi.disroot.org ([178.21.23.139]:37924)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <paren@HIDDEN>) id 1nTAQC-0007Rj-Or
for 54357 <at> debbugs.gnu.org; Sat, 12 Mar 2022 17:41:13 -0500
Received: from localhost (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id 1547D400D3;
Sat, 12 Mar 2022 23:41:12 +0100 (CET)
X-Virus-Scanned: SPAM Filter at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
with ESMTP id SxV4UFX8t6an; Sat, 12 Mar 2022 23:41:10 +0100 (CET)
From: "(unmatched-parenthesis" <paren@HIDDEN>
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1647124867; bh=3lAYWUOf+WH816sKidNp1ChCdDa2ZierZYXKqR/HquQ=;
h=From:To:Cc:Subject:Date;
b=AQHogZfuN0Tj+GYdYCh6mkmEipwVByRHEKobdqX7h2CEwcAbosY8oG+JpdanaFwqS
1yMZJ/c5sB7RRWvk5+qbKNbLdICerbHuRP/1/kzi+smy58CQx1pZ6VRuj3yonHZsmN
dd8SvdqMVkN4wx5mX6Z3hZ7rJR9Gwp9me1R+rZ5rZy4Sxe7f7l+HoO0frx4rLQ+ztW
sirvyDTFB+ZYezYNLPM9RNWrtTMdYVzRPJlwr6Ovv2as2/HYkhbSFw6WVjnM9PH7Jk
TUlGpr0vJAOMwikqQ5zqV+GOVDysz0MzEfFEcau7EVbyRtftxsE7WONjcANxoNrZN1
3lS4TdbM6HGZg==
To: 54357 <at> debbugs.gnu.org
Subject: [PATCH] gnu: Add kak-auto-pairs
Date: Sat, 12 Mar 2022 22:40:54 +0000
Message-Id: <20220312224054.24491-1-paren@HIDDEN>
Mime-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 54357
Cc: "\(unmatched-parenthesis" <paren@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/text-editors.scm (kak-auto-pairs): New variable.
---
gnu/packages/text-editors.scm | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index bbfbcdd226..d1fa1bd28a 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -269,6 +269,30 @@ (define-public kak-lsp
Rust.")
(license license:unlicense)))
+(define-public kak-auto-pairs
+ (let ((commit "d78164b7936d45438ad5e382d2c16f05494ca74a")
+ (revision "0"))
+ (package
+ (name "kak-auto-pairs")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/alexherbo2/auto-pairs.kak")
+ (commit commit)))
+ (sha256
+ (base32 "1qar4r91km5389j9byrpjimy5r083pnfpzkigvxllklj6z0xyc0d"))))
+ (build-system copy-build-system)
+ (arguments
+ `(#:install-plan
+ '(("rc" "share/kak/autoload"))))
+ (propagated-inputs (list kakoune))
+ (home-page "https://github.com/alexherbo2/auto-pairs.kak")
+ (synopsis "An auto-pair plugin for Kakoune")
+ (description "This package provides automatic pair completion for the Kakoune text editor.")
+ (license license:unlicense))))
+
(define-public parinfer-rust
(package
(name "parinfer-rust")
--
2.34.0
guix-patches@HIDDEN:bug#54357; Package guix-patches.
Full text available.Received: (at 54357) by debbugs.gnu.org; 12 Mar 2022 22:33:52 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat Mar 12 17:33:52 2022 Received: from localhost ([127.0.0.1]:41048 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1nTAJ6-0007Gv-Kf for submit <at> debbugs.gnu.org; Sat, 12 Mar 2022 17:33:52 -0500 Received: from knopi.disroot.org ([178.21.23.139]:34508) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <paren@HIDDEN>) id 1nTAJ4-0007Gk-9u for 54357 <at> debbugs.gnu.org; Sat, 12 Mar 2022 17:33:51 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 77E57400C8 for <54357 <at> debbugs.gnu.org>; Sat, 12 Mar 2022 23:33:48 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4tZ_FWzmEhXY for <54357 <at> debbugs.gnu.org>; Sat, 12 Mar 2022 23:33:47 +0100 (CET) Mime-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1647124427; bh=E9V7ao3nGj1RZXReUnteAlgJhB3Hw1aHS/mla96aFrE=; h=Date:From:Subject:To:In-Reply-To:References; b=GGSfg/X1/yCERqotTtmqX+CkPFuanIx03GETp8YXfGfwFDM550ixGnbe92h5FOu31 Fi7XZ9W/Vmg6k3YrXn59hinB+OL7h/Rf+jIodjUDiZT3aeE//mRQP0+dGANyTYzUeH cQHZeAArdmKcnXK9b0o/wFFZG7bF6eqGtwsG+TouVHSxOc+CYndizHEMsYgGA8u5MR 70vAwKtAlrIOL/nkMv1JcA7ViVXgwfviM0bXhVM8EzzCvxzHuhD9vMpZBUfkDzB30R aP1O37iTg0SUeWxTPm5SQbWauxH8nj/Hk28lfl/oV1bRxjTk2DgaRLwQF+TzwXGGAv pHbds6yuX0bbg== Date: Sat, 12 Mar 2022 22:33:47 +0000 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: paren@HIDDEN Message-ID: <8eb1e52e40e5021281cf3e34ac777f81@HIDDEN> Subject: Re: [PATCH] gnu: kakoune: Clean up, and add a search path that makes it possible to package kak plugins in guix. (Plugins incoming soon.) To: 54357 <at> debbugs.gnu.org In-Reply-To: <d119bec222e729f592d4d79f8e9c3a92@HIDDEN> References: <d119bec222e729f592d4d79f8e9c3a92@HIDDEN> <20220312210940.15397-1-paren@HIDDEN> X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54357 X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) March 12, 2022 9:10 PM, "(unmatched-parenthesis" <paren@HIDDEN> wrot= e: > I'll send in a few plugins in a moment. These will act as both examples= of the search path > working and of course useful packages in themselves. Noting the existence of #54358, which is a separate thread because it als= o adds the related vim plugin.
guix-patches@HIDDEN:bug#54357; Package guix-patches.
Full text available.
Received: (at submit) by debbugs.gnu.org; 12 Mar 2022 21:10:20 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Mar 12 16:10:20 2022
Received: from localhost ([127.0.0.1]:40935 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nT90G-0002vN-Go
for submit <at> debbugs.gnu.org; Sat, 12 Mar 2022 16:10:20 -0500
Received: from lists.gnu.org ([209.51.188.17]:49172)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <paren@HIDDEN>) id 1nT90F-0002vF-6A
for submit <at> debbugs.gnu.org; Sat, 12 Mar 2022 16:10:19 -0500
Received: from eggs.gnu.org ([209.51.188.92]:35762)
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <paren@HIDDEN>) id 1nT90E-0005MD-2O
for guix-patches@HIDDEN; Sat, 12 Mar 2022 16:10:18 -0500
Received: from knopi.disroot.org ([178.21.23.139]:55514)
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <paren@HIDDEN>) id 1nT90A-0002La-1X
for guix-patches@HIDDEN; Sat, 12 Mar 2022 16:10:16 -0500
Received: from localhost (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id ADB1740072;
Sat, 12 Mar 2022 22:10:08 +0100 (CET)
X-Virus-Scanned: SPAM Filter at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
with ESMTP id nznIvS9fP-dO; Sat, 12 Mar 2022 22:10:07 +0100 (CET)
From: "(unmatched-parenthesis" <paren@HIDDEN>
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1647119406; bh=9d/snAVl28Jg00psS2cG9FkYksB/VO4ShvJmMW44Tx8=;
h=From:To:Cc:Subject:Date;
b=f/4anuRfYuE1AVp5QPSs2rfmMjClEaeMRfPQkY53D7N+Hmvza6fWvbfp5DIRLQW5J
TyWtUU3jyS3zs/U575eDC3Mxi0ZAXBFxlTV+E343YKPA+ghhUzrx7BkSWmfwBJ0tj3
Lb+yuZeM2LrEFp9urK1cLzNTOkWUfnPL4uwt/tuEbJ6+Y5hdCL88n93oUE48OKNOG5
+sXchv+3zHD8gFpfXSmi1xiLljOvqjaR5wkqYHjpL8t0MPmPI8HE6hAKAztJ8f85w/
mg+tbHV99mLdWFMPUGt6HJFgemw6lYSDM6tO7bsPXKrGFfYyClr0mMnNE/oqKD7Jfl
l0KQW7tPuwSZg==
To: guix-patches@HIDDEN
Subject: [PATCH] gnu: kakoune: Clean up,
and add a search path that makes it possible to package kak plugins
in guix. (Plugins incoming soon.)
Date: Sat, 12 Mar 2022 21:09:40 +0000
Message-Id: <20220312210940.15397-1-paren@HIDDEN>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=178.21.23.139; envelope-from=paren@HIDDEN;
helo=knopi.disroot.org
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -1.4 (-)
X-Debbugs-Envelope-To: submit
Cc: "\(unmatched-parenthesis" <paren@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.4 (--)
* gnu/packages/text-editors.scm(kakoune): Remove the redundant `#t`s, and add a $GUIX_KAKOUNE_CONFIG_DIRS search path.
While trying to package a kak plugin, I realized that the kak package itself was missing a
search path. However, kak appears to allow only one config path, so I inject a for loop into
the default kakrc (with a hacky substitute* because i cannot be bothered preparing a path :)
which enumerates the paths in $GUIX_KAKOUNE_CONFIG_DIRS and sources all their kakfiles.
I'll send in a few plugins in a moment. These will act as both examples of the search path
working and of course useful packages in themselves.
I also took the opportunity to clean the package up a little, removing the now unneccesary
`#t`s returned at the end of each phase. I was going to change it to use git instead of
github release tarballs too (I'm told that git clones are better because of Software Heritage),
but I'm hesitant to make that change without checking first.
---
gnu/packages/text-editors.scm | 26 +++++++++++++++++++++++---
1 file changed, 23 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index 45cc61765a..6d562d0e4a 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -17,6 +17,7 @@
;;; Copyright © 2021 Leo Famulari <leo@HIDDEN>
;;; Copyright © 2021 Pierre Langlois <pierre.langlois@HIDDEN>
;;; Copyright © 2021 Calum Irwin <calumirwin1@HIDDEN>
+;;; Copyright © 2022 (unmatched parenthesis <paren@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -187,14 +188,33 @@ (define-public kakoune
(substitute* "src/shell_manager.cc"
(("if \\(m_shell.empty\\(\\)\\)" line)
(string-append "m_shell = \"" (which "sh")
- "\";\n " line)))
- #t))
+ "\";\n " line)))))
(delete 'configure) ; no configure script
;; kakoune requires us to be in the src/ directory to build.
(add-before 'build 'chdir
- (lambda _ (chdir "src") #t)))))
+ (lambda _ (chdir "src")))
+ (add-before 'install 'patch-kakrc
+ (lambda _
+ (chdir "..")
+ ;; here, we modify the default kakrc to source all the $pkg/share/kak/autoload/*.kak
+ ;; files automatically.
+ (substitute* "share/kak/kakrc"
+ (("echo \"colorscheme default\"" colorscheme-default)
+ (string-append colorscheme-default "
+for dir in $(echo ${GUIX_KAKOUNE_CONFIG_DIRS} | sed 's/:/\\/autoload /g'); do
+ if [ -d ${dir} ]; then
+ autoload_directory ${dir}
+ fi
+done
+"))))))))
(native-inputs
(list asciidoc pkg-config ruby))
+ (native-search-paths
+ (list (search-path-specification
+ ;; kakoune only supports one config dir, so we use this instead, so that we can
+ ;; modify the default kakrc to source all the autoloads.
+ (variable "GUIX_KAKOUNE_CONFIG_DIRS")
+ (files '("share/kak/")))))
(synopsis "Vim-inspired code editor")
(description
"Kakoune is a code editor heavily inspired by Vim, as such most of its
--
2.34.0
"(unmatched-parenthesis" <paren@HIDDEN>:guix-patches@HIDDEN.
Full text available.guix-patches@HIDDEN:bug#54357; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.