From patchwork Thu Jan 5 21:37:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 45873 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 E3BF227BBEB; Thu, 5 Jan 2023 21:38:29 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED 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 6EDE627BBE9 for ; Thu, 5 Jan 2023 21:38:28 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pDXw4-0000lj-9q; Thu, 05 Jan 2023 16:38:04 -0500 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 1pDXw2-0000lQ-Jz for guix-patches@gnu.org; Thu, 05 Jan 2023 16:38:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pDXw2-0007BN-Ai for guix-patches@gnu.org; Thu, 05 Jan 2023 16:38:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pDXw1-00021H-QP for guix-patches@gnu.org; Thu, 05 Jan 2023 16:38:01 -0500 Subject: bug#59688: [PATCH] gnu: Add zls Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Thu, 05 Jan 2023 21:38:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 59688 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maya Tomasek Cc: Maya Tomasek , 59688-done@debbugs.gnu.org Mail-Followup-To: 59688@debbugs.gnu.org, ludo@gnu.org, maya.tomasek@disroot.org Received: via spool by 59688-done@debbugs.gnu.org id=D59688.16729546577726 (code D ref 59688); Thu, 05 Jan 2023 21:38:01 +0000 Received: (at 59688-done) by debbugs.gnu.org; 5 Jan 2023 21:37:37 +0000 Received: from localhost ([127.0.0.1]:53151 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDXvd-00020X-DS for submit@debbugs.gnu.org; Thu, 05 Jan 2023 16:37:37 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55020) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDXva-00020K-KN for 59688-done@debbugs.gnu.org; Thu, 05 Jan 2023 16:37:35 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pDXvV-00076n-AR; Thu, 05 Jan 2023 16:37:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=sDpibf44Z65Ds1PnbANobiefYwhfXN0F3enVTOIh/y4=; b=JYgMd4PCqXmjplzibszp tY2uQofM+13a74de+F1NdPtX5l9FedjPeMEnRtRzGZlstbWHirv+mtSWcjrpK5u6gunMh2vFvROoe f7Dob8O230qOGjOFVnlK1D4uISV9QHpiCUAA/vx2CfXupJpirClShJL8Ag8X5eua1OqadTYrp5BuO WkkjZuJDj36GGTn8mric4ZBTML0+WSR5b5QIuCX8L5ZEx1nIRCPXs1vcnNBUCLtRnjChPeX5BMHmo TwKQQQeoHfeBjqCPEZz7mpXmhjaspbHDvnCx9QgmDf+ZFtrxV0r/rDQGTDl/u6r93hZQXg0JxRGqb Z+CCWR2oPkzDmA==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pDXvU-00036E-NG; Thu, 05 Jan 2023 16:37:28 -0500 From: Ludovic =?utf-8?q?Court=C3=A8s?= References: <87k03da8a6.fsf@disroot.org> <20221217114148.21781-1-maya.tomasek@disroot.org> Date: Thu, 05 Jan 2023 22:37:26 +0100 In-Reply-To: <20221217114148.21781-1-maya.tomasek@disroot.org> (Maya Tomasek's message of "Sat, 17 Dec 2022 12:41:48 +0100") Message-ID: <87a62w3bop.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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 Hi, Maya Tomasek skribis: > From: Maya Tomasek > > --- > 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)))