From patchwork Sun Sep 26 10:12:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Xinglu Chen X-Patchwork-Id: 33307 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CCE3D27BBE3; Sun, 26 Sep 2021 11:14:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4410F27BBE1 for ; Sun, 26 Sep 2021 11:14:11 +0100 (BST) Received: from localhost ([::1]:50926 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mURAg-0003CX-70 for patchwork@mira.cbaines.net; Sun, 26 Sep 2021 06:14:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59434) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mURAY-0003CO-KK for guix-patches@gnu.org; Sun, 26 Sep 2021 06:14:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52653) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mURAY-0008Vr-Cf for guix-patches@gnu.org; Sun, 26 Sep 2021 06:14:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mURAY-0006x4-5s for guix-patches@gnu.org; Sun, 26 Sep 2021 06:14:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50709] [PATCH] gnu: Add zsh-syntax-highlighting. Resent-From: Xinglu Chen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 26 Sep 2021 10:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50709 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Alexandr Vityazev , 50709@debbugs.gnu.org Received: via spool by 50709-submit@debbugs.gnu.org id=B50709.163265119626659 (code B ref 50709); Sun, 26 Sep 2021 10:14:02 +0000 Received: (at 50709) by debbugs.gnu.org; 26 Sep 2021 10:13:16 +0000 Received: from localhost ([127.0.0.1]:35966 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mUR9h-0006vp-HV for submit@debbugs.gnu.org; Sun, 26 Sep 2021 06:13:16 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:45112 helo=mail.yoctocell.xyz) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mUR9e-0006vI-H0 for 50709@debbugs.gnu.org; Sun, 26 Sep 2021 06:13:08 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1632651176; bh=eBBqjYpk41bnHKOZPn7Ziy4DUGZi+Rz4rlYKufu6aFs=; h=From:To:Subject:In-Reply-To:References:Date; b=NZX8+rVAGXx79vZk81LiEbcJ1ogK5Huua00BNwkCsVgW7REE2XU5FQkQ2kctrRh6r ddbHOoez+R7WH+vAswLSvyPZZiYT8jyZz5Rll6ulUGLF8ier6vLplUXDyEfg/M+K+b N0hPXMjsa/fSSJ9Xt56bh4rucBIhL7hvZvDVzKtU= In-Reply-To: <87sfxy4zpa.fsf@posteo.org> References: <87sfxy4zpa.fsf@posteo.org> Date: Sun, 26 Sep 2021 12:12:51 +0200 Message-ID: <8735prk5lo.fsf@yoctocell.xyz> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches On Mon, Sep 20 2021, Alexandr Vityazev wrote: > * gnu/packages/shellutils.scm (zsh-syntax-highlighting): New variable. > --- > gnu/packages/shellutils.scm | 55 +++++++++++++++++++++++++++++++++++++ > 1 file changed, 55 insertions(+) > > diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm > index 94b5536df7..69e1d0d069 100644 > --- a/gnu/packages/shellutils.scm > +++ b/gnu/packages/shellutils.scm > @@ -138,6 +138,61 @@ text.") > as you type.") > (license license:expat))) > > +(define-public zsh-syntax-highlighting > + (package > + (name "zsh-syntax-highlighting") > + (version "0.7.1") > + (source (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/zsh-users/zsh-syntax-highlighting") > + (commit version))) > + (file-name (git-file-name name version)) > + (sha256 > + (base32 > + "039g3n59drk818ylcyvkciv8k9mf739cv6v4vis1h9fv9whbcmwl")))) > + (build-system gnu-build-system) > + (native-inputs > + `(("zsh" ,zsh))) > + (arguments > + ;; FIXME: Tests fail when running test regexp > + ;; there is no pcre module in the Guix zsh package > + `(#:tests? #f > + #:phases > + (modify-phases %standard-phases > + (delete 'configure) > + (add-before 'build 'add-all-md > + (lambda _ > + (copy-file "docs/highlighters.md" "docs/all.md") > + (make-file-writable "docs/all.md") > + #t)) Why not just invoke ‘make all’? Also, phases no longer have to return #t > + (replace 'check > + (lambda* (#:key tests? #:allow-other-keys) > + (when tests? > + (invoke "make" "test") > + (invoke "make" "perf")) > + #t)) > + (replace 'install > + (lambda* (#:key outputs #:allow-other-keys) > + (let* ((out (assoc-ref outputs "out")) > + (zsh-plugins > + (string-append out "/share/zsh/plugins/zsh-syntax-highlighting")) > + (highlighters-dir (string-append zsh-plugins "/highlighters"))) > + (invoke "make" "all") Why is ‘make all’ invoked in the ‘install’ phase? > + (install-file "zsh-syntax-highlighting.zsh" zsh-plugins) > + (install-file ".version" zsh-plugins) > + (install-file ".revision-hash" zsh-plugins) > + (copy-recursively "highlighters" highlighters-dir) Wouldn’t these things be handled by ‘make install’, assuming that ‘PREFIX’ and ‘SHARE_DIR’ are set correctly. > + #t)))))) > + (home-page "https://github.com/zsh-users/zsh-syntax-highlighting") > + (synopsis "Fish shell-like syntax highlighting for zsh") “Zsh” should be capitalized. > + (description > + "This package provides syntax highlighting for the shell zsh. “This package provides syntax highlighting for Zsh.” > +It enables highlighting of commands whilst they are typed at a zsh Capitalize “Zsh”. > +prompt into an interactive terminal. This helps in reviewing commands > +before running them, particularly in catching syntax errors.") > + (license license:expat))) ‘COPYING.md’ says BSD-3. And I couldn’t resist, so I just went ahead and made those changes… :-) From 2cb00a93974f7efc7891e8f77fff1a3d96c7f692 Mon Sep 17 00:00:00 2001 Message-Id: <2cb00a93974f7efc7891e8f77fff1a3d96c7f692.1632651051.git.public@yoctocell.xyz> From: Alexandr Vityazev Date: Mon, 20 Sep 2021 23:03:29 +0000 Subject: [PATCH] gnu: Add zsh-syntax-highlighting. * gnu/packages/shellutils.scm (zsh-syntax-highlighting): New variable. Co-authored-by: Xinglu Chen --- gnu/packages/shellutils.scm | 56 ++++++++++++++++++++++++++++++++++++- 1 file changed, 55 insertions(+), 1 deletion(-) diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index 94b5536df7..8726020ab3 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -10,6 +10,8 @@ ;;; Copyright © 2020 aecepoglu ;;; Copyright © 2020 Dion Mendel ;;; Copyright © 2021 Brice Waegeneire +;;; Copyright © 2021 Alexandr Vityazev +;;; Copyright © 2021 Xinglu Chen ;;; ;;; This file is part of GNU Guix. ;;; @@ -46,7 +48,8 @@ (define-module (gnu packages shellutils) #:use-module (gnu packages readline) #:use-module (gnu packages ruby) #:use-module (gnu packages shells) - #:use-module (gnu packages tmux)) + #:use-module (gnu packages tmux) + #:use-module (ice-9 regex)) (define-public boxes (package @@ -138,6 +141,57 @@ (define-public zsh-autosuggestions as you type.") (license license:expat))) +(define-public zsh-syntax-highlighting + (package + (name "zsh-syntax-highlighting") + (version "0.7.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/zsh-users/zsh-syntax-highlighting") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "039g3n59drk818ylcyvkciv8k9mf739cv6v4vis1h9fv9whbcmwl")))) + (build-system gnu-build-system) + (native-inputs + `(("zsh" ,zsh))) + (arguments + ;; FIXME: Tests fail when running test regexp + ;; there is no pcre module in the Guix zsh package + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'patch-paths + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "Makefile" + (("/usr/local") out) + ((,(regexp-quote "share/$(NAME)")) "share/zsh/plugins/$(NAME)"))))) + (add-after 'patch-paths 'make-writable + (lambda _ + (for-each make-file-writable + '("docs/highlighters.md" + "README.md")))) + (add-before 'build 'add-all-md + (lambda _ + (invoke "make" "all"))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "make" "test") + (invoke "make" "perf"))))))) + (home-page "https://github.com/zsh-users/zsh-syntax-highlighting") + (synopsis "Fish shell-like syntax highlighting for Zsh") + (description + "This package provides syntax highlighting for Zsh. It enables +highlighting of commands whilst they are typed at a Zsh prompt into an +interactive terminal. This helps in reviewing commands before running them, +particularly in catching syntax errors.") + (license license:bsd-3))) + (define-public sh-z (package (name "sh-z") base-commit: c1bc2a43200d6c6016c2a4154799c73c86a54021 -- 2.33.0