From patchwork Sat Dec 17 11:41:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maya Tomasek X-Patchwork-Id: 8428 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 06C0B27BBED; Sat, 17 Dec 2022 11:42: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=-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=ham 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 95C3327BBEB for ; Sat, 17 Dec 2022 11:42:34 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6VZu-00017h-88; Sat, 17 Dec 2022 06:42:06 -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 1p6VZr-00015z-BQ for guix-patches@gnu.org; Sat, 17 Dec 2022 06:42:03 -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 1p6VZr-0007xT-2Y for guix-patches@gnu.org; Sat, 17 Dec 2022 06:42:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p6VZq-0003NM-VT for guix-patches@gnu.org; Sat, 17 Dec 2022 06:42:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59688] [PATCH] gnu: Add zls References: <87k03da8a6.fsf@disroot.org> In-Reply-To: <87k03da8a6.fsf@disroot.org> Resent-From: Maya Tomasek Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Dec 2022 11:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59688 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59688@debbugs.gnu.org Cc: Maya Tomasek Received: via spool by 59688-submit@debbugs.gnu.org id=B59688.167127731912956 (code B ref 59688); Sat, 17 Dec 2022 11:42:02 +0000 Received: (at 59688) by debbugs.gnu.org; 17 Dec 2022 11:41:59 +0000 Received: from localhost ([127.0.0.1]:55413 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6VZm-0003Mu-Op for submit@debbugs.gnu.org; Sat, 17 Dec 2022 06:41:59 -0500 Received: from knopi.disroot.org ([178.21.23.139]:46432) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6VZh-0003Mo-4r for 59688@debbugs.gnu.org; Sat, 17 Dec 2022 06:41:56 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id BE327412FC; Sat, 17 Dec 2022 12:41:51 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id inCO2TorOwAy; Sat, 17 Dec 2022 12:41:50 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1671277310; bh=/8y6aubCwGlc4vsS61q+UDn3qJKcXbFmcPaPFdrwiJA=; h=From:To:Cc:Subject:Date; b=Hy7rX1DKohCHYyVqgKBPastBwbSEIEcbHKNUymSZPNL0E006PCVQU+G1Gk0dC6PMp eeyVGwvd9yMUL9PAi64p1MHTJBjQRBAm7cLLPi07qLbVoeDG3ftHjQfg61Mme6Bt5w SC2bHNLg6oLTlbtbBW1a/9Z5uKFWhh5e5vIk1VRtZtppcCNXv+GgftskTyeJzOBbvl tvNNYoNvKCI9XA45xANTNU2SXUafQi21fujVqYvy8fg9c7jun4vzfWigCLIOVD+1Dz hFlxknFZTwEjnS6E1AeetqDcpfFxzl0waKnLYE7bzIbJsD0gxOKEJ8a+412RLljDMd 11WTsXu4FOu0A== Date: Sat, 17 Dec 2022 12:41:48 +0100 Message-Id: <20221217114148.21781-1-maya.tomasek@disroot.org> 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: , Reply-to: Maya Tomasek X-ACL-Warn: , Maya Tomasek via Guix-patches X-Patchwork-Original-From: Maya Tomasek via Guix-patches via From: Maya Tomasek 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 From: Maya Tomasek --- gnu/local.mk | 1 + gnu/packages/zig-xyz.scm | 68 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 gnu/packages/zig-xyz.scm diff --git a/gnu/local.mk b/gnu/local.mk index 9120d7a263..ad47fcd216 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -641,6 +641,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/xorg.scm \ %D%/packages/xfce.scm \ %D%/packages/zig.scm \ + %D%/packages/zig-xyz.scm \ %D%/packages/zile.scm \ %D%/packages/zwave.scm \ \ diff --git a/gnu/packages/zig-xyz.scm b/gnu/packages/zig-xyz.scm new file mode 100644 index 0000000000..131d200ec7 --- /dev/null +++ b/gnu/packages/zig-xyz.scm @@ -0,0 +1,68 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2022 Maya Tomasek +;;; +;;; 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 . + +(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 implementing the Language Server Protocol (LSP) for the @code{zig} programming language.") + (home-page "https://github.com/zigtools/zls") + (license license:expat)))