Subject: bug#59688: closed (Re: bug#59688: [PATCH] gnu: Add zls)

From: [email-masked] (GNU bug Tracking System)
Date: Thu, 05 Jan 2023 21:38:01 +0000

Your bug report

#59688: [PATCH] gnu: Add zls

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
59688: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=59688
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: bug#59688: [PATCH] gnu: Add zls
From: Ludovic Courtès <[email-masked]>
To: Maya Tomasek <[email-masked]>
Cc: Maya Tomasek <[email-masked]>, [email-masked]
Date: Thu, 05 Jan 2023 22:37:26 +0100
List-Id: <debbugs-submit.debbugs.gnu.org>

Hi,

Maya Tomasek <[email-masked]> skribis:

> From: Maya Tomasek <[email-masked]>
>
> ---
>  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’.

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

Subject: [PATCH] gnu: Add zls
From: Mája Tomášek <[email-masked]>
To: [email-masked]
Date: Tue, 29 Nov 2022 20:08:01 +0100
List-Id: <debbugs-submit.debbugs.gnu.org>

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

---
 gnu/packages/zig-xyz.scm | 70 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 gnu/packages/zig-xyz.scm

diff --git a/gnu/packages/zig-xyz.scm b/gnu/packages/zig-xyz.scm
new file mode 100644
index 0000000000..ff778003cb
--- /dev/null
+++ b/gnu/packages/zig-xyz.scm
@@ -0,0 +1,70 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2022 Maya Tomasek <[email-masked]>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages zig-xyz)
+  #:use-module (guix packages)
+  #:use-module (guix git-download)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix gexp)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages zig)
+  #:use-module (gnu packages python))
+
+(define-public zig-zls
+  (package
+    (name "zig-zls")
+    (version "0.9.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/zigtools/zls")
+                    (commit version)
+                    (recursive? #t)))
+              (sha256
+               (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")))))))
+    (synopsis "Zig language server")
+    (description "Zig Language Server is a language server for the @code{zig} programming language.")
+    (home-page "https://github.com/zigtools/zls")
+    (license license:expat)))
+
+zig-zls
-- 
2.38.1