From patchwork Sat Mar 22 11:52:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Meredith Oleander X-Patchwork-Id: 40614 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 E431C27BBE9; Sat, 22 Mar 2025 15:36:38 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.5 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED,URIBL_SBL_A autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D828B27BBE2 for ; Sat, 22 Mar 2025 15:36:36 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tw0tJ-0002xd-60; Sat, 22 Mar 2025 11:36:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tw0IV-0004p5-L1 for guix-patches@gnu.org; Sat, 22 Mar 2025 10:58:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tw0IV-0007rw-Bg for guix-patches@gnu.org; Sat, 22 Mar 2025 10:58:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=kGzujQ4CZmrgbmpw0b0XHFhME6KITZFnTdGcNcN3RLw=; b=fbMzyOkTMw06Ptwg3YFBLz3yg9C3e+GDM4waCW5oBvr4kg3Yo8laykkh9QuY2xFpAJyiWpD0reI3KTb738wJuWXEr48rrGW6a8Zz+/uIWzpD501D4Vzuag2rivDM9Qm5NmgdGbpAFPC2PeQSBsGFV/6r/I20u15+OCP3JN52UjlrNPHSUvy+tuKrm3AAUmDDlV4EEWI4Apwo5TbaOCNQCTNM6aWY8kJzr7PVdh+2hfrR4cZm46kMKZMN02zIHJGeGWRg7TAROPsyRVnKGTd54469bXt0NM1rnmkovP9Xjcf9W74psIycQcwZRCM+SZ5t65Twm2zC+ND4nIwCRfwc5w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tw0IU-0005Ar-Fu; Sat, 22 Mar 2025 10:58:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77178] [PATCH] gnu: zig-zls: Update to 0.14.0. Resent-From: Meredith Oleander Original-Sender: "Debbugs-submit" Resent-CC: ekaitz@elenq.tech, guix-patches@gnu.org Resent-Date: Sat, 22 Mar 2025 14:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 77178 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77178@debbugs.gnu.org Cc: Meredith Oleander , Ekaitz Zarraga X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Ekaitz Zarraga Received: via spool by submit@debbugs.gnu.org id=B.174265547219856 (code B ref -1); Sat, 22 Mar 2025 14:58:02 +0000 Received: (at submit) by debbugs.gnu.org; 22 Mar 2025 14:57:52 +0000 Received: from localhost ([127.0.0.1]:44549 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tw0II-0005A3-Iw for submit@debbugs.gnu.org; Sat, 22 Mar 2025 10:57:52 -0400 Received: from lists.gnu.org ([2001:470:142::17]:46184) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tvxRG-0006LE-3R for submit@debbugs.gnu.org; Sat, 22 Mar 2025 07:54:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tvxR8-0006iL-H2 for guix-patches@gnu.org; Sat, 22 Mar 2025 07:54:46 -0400 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tvxR6-000360-5m for guix-patches@gnu.org; Sat, 22 Mar 2025 07:54:46 -0400 Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-224171d6826so29471605ad.3 for ; Sat, 22 Mar 2025 04:54:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742644481; x=1743249281; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=kGzujQ4CZmrgbmpw0b0XHFhME6KITZFnTdGcNcN3RLw=; b=YTfDxfPHoJjM0nBm//yFqTES2KbXHn3w+RLxClvrZM3IQVIuA5SMNZAYSAlSVpKV5h CfGwc83kk3vHIKFwvjm18kOo5BVERl2SNmV67EJCW3t+zdWorx47Hn65NNnBP5bSMUXJ ihNicfPkcnkjvPHQ81zhHoI3MvP2kkJ/juCo6z0TyT2noilTMkZZWkR7n+K3hwwrdmWA qPbQdyv8uyf/bPhvYEmaSJ5K38tUSgWX2rvFUfzuKZ4V6/LUtTntWDG4Ag7s1cq6RXqx duPEqUPM04MJ1wh68lUTTbnf+R2qFTXFTIm3DRT9dtgiChH7MDqwtn8bOis/6FAmFqRF fSEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742644481; x=1743249281; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=kGzujQ4CZmrgbmpw0b0XHFhME6KITZFnTdGcNcN3RLw=; b=mA2h2gkPNN0wIfS91Nn8la/jXGDmt0dEZDJ2n/LxLYEzM6/PCFOFRoLmEwYj6hjaib 5SinDk0+p74Zy7IGp/OD/a6kgfAhDMU9h4ess1QsYt9wKSOUJVAqyc2VVWjcfnxCiWzT yHNQwBAFl6NcptTRrYHOVXwtR5X8IZ2eAJDrHDlxv/vE3atnLrtv9MFVIQx+P+lqqYIL 5tShNafcSZwqwkxfU3+0u5AM/F2VAVsUzuF1cFGf1+hH8/F13s4bopJktoylspuBd6Dm l455ggHorik33IMHlrLjJimhBCntYprwJjUfcrN7m3eVanbkutZ/0Ed3Xr45ZAilnEZG 0gkA== X-Gm-Message-State: AOJu0Yy9IhusRFyVtHNTCMsWNXjpSXBRmf/k3DUhXm+uXkc7rSmlH7Ss 6z+cO3eoN3VujyqP5iwem1WoeAKvurXrfh7x9AvJ3Io3KfjPrWMGxO+/+w== X-Gm-Gg: ASbGncuSw4UBIAxIcY9pnSsiXuE8MmwrByogfAeYCJngJKJS7S9st8t0PJhovHZaUHH gR5fSxt533SMtk0ZQkIDx2oOxQwpyhaQAlKXNFO8UqHJrpcF1yPMpN/J1Ra9rg+w0vw6KaSpvaD 57w5o8KhN+94CKDWao3ZM7QD555ikFwa1CybsEIB5ZcPZesfTB5SOBu9r62cDI2GwVr4QU2dFat hdj4zPE4jACGWnfyo+Qz1iXMULMpBSGjlAiEYjwfJz7hK2Gs5lo8dxSbSRDWZoulrmLVff4WXHe EOQy6Q5cETDEM6Cvo1dhEjUjCJ6yk1TU1kKnBsAg1+xPmNtDkqF+XKAqF3v1dSvyh/tl X-Google-Smtp-Source: AGHT+IFyNOu0bcfCHecs9tcHaddP3F6ISVh3RI0Ah1xwuWPtVHS2BD1+t74FGue/KpPnLaMH3E6vXQ== X-Received: by 2002:a17:903:320d:b0:220:bd61:a337 with SMTP id d9443c01a7336-22780d8ceb5mr111440625ad.23.1742644481294; Sat, 22 Mar 2025 04:54:41 -0700 (PDT) Received: from localhost.localdomain ([124.168.223.194]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-227811b8080sm33950055ad.116.2025.03.22.04.54.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Mar 2025 04:54:40 -0700 (PDT) From: Meredith Oleander Date: Sat, 22 Mar 2025 22:52:37 +1100 Message-ID: X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62f; envelope-from=mereditholeander@gmail.com; helo=mail-pl1-x62f.google.com X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_SBL_A=0.1 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Sat, 22 Mar 2025 10:57:48 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Sat, 22 Mar 2025 11:36:04 -0400 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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(-) base-commit: 8b9ddfbe511f3a06b542d5fd62f9ca12d5248585 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 ;;; Copyright © 2023 Felix Lechner ;;; Copyright © 2024 Justin Veilleux +;;; Copyright © 2025 Meredith Oleander ;;; ;;; 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))))))