GNU bug report logs - #59688
[PATCH] gnu: Add zls

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#59688: closed ([PATCH] gnu: Add zls)
Date: Thu, 05 Jan 2023 21:38:01 +0000

[Message part 1 (text/plain, inline)]

Your message dated Thu, 05 Jan 2023 22:37:26 +0100
with message-id <87a62w3bop.fsf_-_ <at> gnu.org>
and subject line Re: bug#59688: [PATCH] gnu: Add zls
has caused the debbugs.gnu.org bug report #59688,
regarding [PATCH] gnu: Add zls
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)


-- 
59688: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=59688
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

From: Mája Tomášek <maya.tomasek <at> disroot.org>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: Add zls
Date: Tue, 29 Nov 2022 20:08:01 +0100

[Message part 3 (text/plain, inline)]

Hi,

this is a patch that adds the zls - zig language server. It is not currently
the most recent version, as the project follows versions of zig itself, which
is in guix one version behind. (as zig became self hosted)

Kind regards,
Maya

[0001-gnu-Add-zls.patch (text/x-patch, attachment)]

[Message part 5 (message/rfc822, inline)]

From: Ludovic Courtès <ludo <at> gnu.org>
To: Maya Tomasek <maya.tomasek <at> disroot.org>
Cc: Maya Tomasek <maya.omase <at> protonmail.com>, 59688-done <at> debbugs.gnu.org
Subject: Re: bug#59688: [PATCH] gnu: Add zls
Date: Thu, 05 Jan 2023 22:37:26 +0100

[Message part 6 (text/plain, inline)]

Hi,

Maya Tomasek <maya.tomasek <at> disroot.org> skribis:

> From: Maya Tomasek <maya.omase <at> 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’.

[Message part 7 (text/x-patch, inline)]

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)))

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.