From: "Ludovic Courtès" <ludo@gnu.org>
To: Maya Tomasek <maya.tomasek@disroot.org>
Cc: Maya Tomasek <maya.omase@protonmail.com>, 59688-done@debbugs.gnu.org
Subject: bug#59688: [PATCH] gnu: Add zls
Date: Thu, 05 Jan 2023 22:37:26 +0100 [thread overview]
Message-ID: <87a62w3bop.fsf_-_@gnu.org> (raw)
In-Reply-To: <20221217114148.21781-1-maya.tomasek@disroot.org> (Maya Tomasek's message of "Sat, 17 Dec 2022 12:41:48 +0100")
[-- Attachment #1: Type: text/plain, Size: 394 bytes --]
Hi,
Maya Tomasek <maya.tomasek@disroot.org> skribis:
> From: Maya Tomasek <maya.omase@protonmail.com>
>
> ---
> gnu/local.mk | 1 +
> gnu/packages/zig-xyz.scm | 68 ++++++++++++++++++++++++++++++++++++++++
Finally applied with a commit log as well as simplifications and
cosmetic changes to address the ‘guix lint’ warnings (see below).
Thanks!
Ludo’.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 2936 bytes --]
diff --git a/gnu/packages/zig-xyz.scm b/gnu/packages/zig-xyz.scm
index 131d200ec7..3812aa0125 100644
--- a/gnu/packages/zig-xyz.scm
+++ b/gnu/packages/zig-xyz.scm
@@ -36,33 +36,30 @@ (define-public zig-zls
(url "https://github.com/zigtools/zls")
(commit version)
(recursive? #t)))
+ (file-name (git-file-name name version))
(sha256
- (base32 "1hhs7dz9rpshfd1a7x5swmix2rmh53vsqskh3mzqlrj2lgb3cnii"))))
+ (base32
+ "1hhs7dz9rpshfd1a7x5swmix2rmh53vsqskh3mzqlrj2lgb3cnii"))))
(build-system gnu-build-system)
(inputs (list zig python))
(arguments
- (list
- #:modules '((guix build gnu-build-system)
- (guix build utils))
- #:phases
- #~(modify-phases %standard-phases
- (delete 'configure)
- (replace 'build
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out"))
- (zig (string-append #$zig "/bin/zig")))
- ;; zig defaults it's cache dir to subdir of $HOME, which is not defined in the build environment
- (setenv "ZIG_GLOBAL_CACHE_DIR"
- (string-append (getcwd) "/zig-cache"))
- ;; invoke the install target of the build command
- (invoke zig "build" "install" "-Drelease-safe" "--prefix" out))))
- (delete 'install)
- (replace 'check
- (lambda _
- (let ((zig (string-append #$zig "/bin/zig")))
- ;; run the test target
- (invoke zig "build" "test")))))))
+ (list #:phases #~(modify-phases %standard-phases
+ (delete 'configure)
+ (replace 'build
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (setenv "ZIG_GLOBAL_CACHE_DIR"
+ (string-append (getcwd) "/zig-cache"))
+ (invoke "zig" "build" "install"
+ "-Drelease-safe" "--prefix" out))))
+ (delete 'install)
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke "zig" "build" "test")))))))
(synopsis "Zig language server")
- (description "Zig Language Server is a language server implementing the Language Server Protocol (LSP) for the @code{zig} programming language.")
+ (description
+ "Zig Language Server is a language server implementing the @acronym{LSP,
+Language Server Protocol} for the Zig programming language.")
(home-page "https://github.com/zigtools/zls")
(license license:expat)))
prev parent reply other threads:[~2023-01-05 21:38 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-29 19:08 [bug#59688] [PATCH] gnu: Add zls guix-patches--- via
2022-12-14 11:08 ` Ludovic Courtès
2022-12-17 11:41 ` Maya Tomasek via Guix-patches via
2023-01-05 21:37 ` Ludovic Courtès [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87a62w3bop.fsf_-_@gnu.org \
--to=ludo@gnu.org \
--cc=59688-done@debbugs.gnu.org \
--cc=maya.omase@protonmail.com \
--cc=maya.tomasek@disroot.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).