Package: guix-patches;
Reported by: Meredith Oleander <mereditholeander <at> gmail.com>
Date: Sat, 22 Mar 2025 14:58:02 UTC
Severity: normal
Tags: patch
Done: Hilton Chain <hako <at> ultrarare.space>
Bug is archived. No further changes may be made.
View this message in rfc822 format
From: Meredith Oleander <mereditholeander <at> gmail.com> To: 77178 <at> debbugs.gnu.org Cc: Meredith Oleander <mereditholeander <at> gmail.com>, Ekaitz Zarraga <ekaitz <at> elenq.tech> Subject: [bug#77178] [PATCH] gnu: zig-zls: Update to 0.14.0. Date: Sat, 22 Mar 2025 22:52:37 +1100
* gnu/packages/zig-xyz.scm (zig-zls-0.14): Update to 0.14.0.
(zig-known-folders, zig-diffz): Rename based on hashes, alias old names.
(zig-known-folders-aa24df4, zig-diffz-ef45c00): Update to new commits.
Change-Id: Ia284836d32ee807763312aafd06fbbd21d76c265
---
gnu/packages/zig-xyz.scm | 116 +++++++++++++++++++++++++++++++++++++--
1 file changed, 110 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/zig-xyz.scm b/gnu/packages/zig-xyz.scm
index a76dbb0..d7a62e7 100644
--- a/gnu/packages/zig-xyz.scm
+++ b/gnu/packages/zig-xyz.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2023 Ekaitz Zarraga <ekaitz <at> elenq.tech>
;;; Copyright © 2023 Felix Lechner <felix.lechner <at> lease-up.com>
;;; Copyright © 2024 Justin Veilleux <terramorpha <at> cock.li>
+;;; Copyright © 2025 Meredith Oleander <mereditholeander <at> gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -141,7 +142,7 @@ (define-public waylock
@code{ext-session-lock-v1} protocol.")
(license license:expat)))
-(define-public zig-diffz
+(define-public zig-diffz-420fcb2
(let ((commit "420fcb22306ffd4c9c3c761863dfbb6bdbb18a73")
(revision "0"))
(package
@@ -165,7 +166,27 @@ (define-public zig-diffz
(home-page "https://github.com/ziglibs/diffz")
(license license:expat))))
-(define-public zig-known-folders
+(define-public zig-diffz zig-diffz-420fcb2)
+
+(define-public zig-diffz-ef45c00
+ (let ((commit "ef45c00d655e5e40faf35afbbde81a1fa5ed7ffb")
+ (revision "0")
+ (base zig-diffz-420fcb2))
+ (package
+ (inherit base)
+ (name "zig-diffz")
+ (version (git-version "0.0.1" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ziglibs/diffz")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0ah1m8mjqjc2szl5lx62zqj69irkbb3y245z14pknikxgg8xdzg7")))))))
+
+(define-public zig-known-folders-1cceeb7
(let ((commit "1cceeb70e77dec941a4178160ff6c8d05a74de6f")
(revision "0"))
(package
@@ -188,6 +209,56 @@ (define-public zig-known-folders
(home-page "https://github.com/ziglibs/known-folders")
(license license:expat))))
+(define-public zig-known-folders zig-known-folders-1cceeb7)
+
+(define-public zig-known-folders-aa24df4
+ (let ((commit "aa24df42183ad415d10bc0a33e6238c437fc0f59")
+ (revision "0")
+ (base zig-known-folders-1cceeb7))
+ (package
+ (inherit base)
+ (name "zig-known-folders")
+ (version (git-version "0.7.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ziglibs/known-folders")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1ilq3hqprrwpbz7ckp01g4ksl41jq57rd7zf622w3immy6apc8k2"))))
+ (arguments
+ (list
+ #:zig zig-0.14
+ #:skip-build? #t)))))
+
+(define-public zig-lsp-codegen-063a98c
+ (let ((commit "063a98c13a2293d8654086140813bdd1de6501bc")
+ (revision "0"))
+ (package
+ (name "zig-lsp-codegen")
+ (version (git-version "0.1.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/zigtools/zig-lsp-codegen")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "041lk25x050pz7yc781fn8bfpzci4kdrz8mw69sjs2f5mpyn4d1b"))))
+ (build-system zig-build-system)
+ (arguments
+ (list
+ #:zig zig-0.14
+ #:skip-build? #t))
+ (synopsis "LSP codegen based on the MetaModel")
+ (description "Generates @code{std.json} compatible Zig code based on the
+official @acronym{LSP,Language Server Protocol} MetaModel.")
+ (home-page "https://zigtools.github.io/zig-lsp-codegen/")
+ (license license:expat))))
+
(define-public zig-pixman
(package
(name "zig-pixman")
@@ -347,8 +418,8 @@ (define-public zig-zls-0.12
"1ini1ifa9b0v2ika3sqsiiv2p7v9npfslss45280yxwn2pjqmn7n"))
(snippet
(rename-zig-dependencies
- '(("diffz" . "zig-diffz")
- ("known_folders" . "zig-known-folders"))))))
+ '(("diffz" . "zig-diffz-420fcb2")
+ ("known_folders" . "zig-known-folders-1cceeb7"))))))
(build-system zig-build-system)
(arguments
(let ((version-data-path
@@ -363,7 +434,7 @@ (define-public zig-zls-0.12
#~(list #$version-data-path "-Dpie")
#:zig-test-flags
#~(list #$version-data-path))))
- (inputs (list zig-diffz zig-known-folders))
+ (inputs (list zig-diffz-420fcb2 zig-known-folders-1cceeb7))
(native-inputs (list zig-0.12))))
(define-public zig-zls-0.13
@@ -386,4 +457,37 @@ (define-public zig-zls-0.13
(modify-inputs (package-native-inputs base)
(replace "zig" zig-0.13))))))
-(define-public zig-zls zig-zls-0.13)
+(define-public zig-zls
+ zig-zls-0.13)
+
+(define-public zig-zls-0.14
+ (let ((base zig-zls-0.13))
+ (package
+ (inherit base)
+ (name "zig-zls")
+ (version "0.14.0")
+ (source
+ (origin
+ (inherit (package-source base))
+ (uri (git-reference
+ (url "https://github.com/zigtools/zls")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1al4ry22y56v1jbph3vb6la2ln8dxc8hb3g7byng6yf8czx2g4q3"))
+ (snippet
+ (rename-zig-dependencies
+ '(("diffz" . "zig-diffz-ef45c00")
+ ("known_folders" . "zig-known-folders-aa24df4")
+ ("lsp-codegen" . "zig-lsp-codegen-063a98c"))))))
+ (build-system zig-build-system)
+ (arguments
+ (list
+ #:zig (this-package-native-input "zig")
+ #:install-source? #f
+ #:zig-release-type "safe"
+ #:zig-build-flags
+ #~(list "-Dpie")))
+ (inputs (list zig-diffz-ef45c00 zig-known-folders-aa24df4 zig-lsp-codegen-063a98c))
+ (native-inputs (modify-inputs (package-native-inputs base)
+ (replace "zig" zig-0.14))))))
base-commit: 8b9ddfbe511f3a06b542d5fd62f9ca12d5248585
--
2.48.1
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.