From patchwork Wed Apr 12 20:44:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: paul X-Patchwork-Id: 49115 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 8D8DE174EE; Wed, 12 Apr 2023 21:45:42 +0100 (BST) 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 839B6174BB for ; Wed, 12 Apr 2023 21:45:41 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pmhKy-0000jn-Gt; Wed, 12 Apr 2023 16:45:04 -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 1pmhKw-0000jA-Rh for guix-patches@gnu.org; Wed, 12 Apr 2023 16:45:03 -0400 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 1pmhKw-0002qb-Hl for guix-patches@gnu.org; Wed, 12 Apr 2023 16:45:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pmhKw-0008SS-E0 for guix-patches@gnu.org; Wed, 12 Apr 2023 16:45:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#60286] [v3 1/2] gnu: Add guile-scheme-json-rpc. References: <15ea32667d93bab6b4a785253538cdb5@autistici.org> In-Reply-To: <15ea32667d93bab6b4a785253538cdb5@autistici.org> Resent-From: Giacomo Leidi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 12 Apr 2023 20:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60286 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60286@debbugs.gnu.org Cc: Giacomo Leidi Received: via spool by 60286-submit@debbugs.gnu.org id=B60286.168133226432425 (code B ref 60286); Wed, 12 Apr 2023 20:45:02 +0000 Received: (at 60286) by debbugs.gnu.org; 12 Apr 2023 20:44:24 +0000 Received: from localhost ([127.0.0.1]:41901 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pmhKJ-0008Qu-Pk for submit@debbugs.gnu.org; Wed, 12 Apr 2023 16:44:24 -0400 Received: from confino.investici.org ([93.190.126.19]:57777) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pmhKE-0008QV-Ho for 60286@debbugs.gnu.org; Wed, 12 Apr 2023 16:44:20 -0400 Received: from mx1.investici.org (unknown [127.0.0.1]) by confino.investici.org (Postfix) with ESMTP id 4PxZSf0ZDqz110j; Wed, 12 Apr 2023 20:44:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1681332258; bh=8aOrcCpW5u3xTTJ+IuZ2uvAzzaOU/6wstW8jFj8VL8k=; h=From:To:Cc:Subject:Date:From; b=FHEIu01iDnmz6k8nlJ+ckL8r21rBnJSj7JYNIfXEKbe1/7TauG8vbfYrcuc9TItz8 xrW/oQoVk3HsyQgm3odoHVnzFC8y4b74oSfaM1Ff5wFG/JjwgZXPR33jV24rO0vTio gPrgcBOY94aQ0BNt0e3NvU6rIY/+cvlg0OAYCuTM= Received: from [93.190.126.19] (mx1.investici.org [93.190.126.19]) (Authenticated sender: goodoldpaul@autistici.org) by localhost (Postfix) with ESMTPSA id 4PxZSf00gfz110h; Wed, 12 Apr 2023 20:44:17 +0000 (UTC) Date: Wed, 12 Apr 2023 22:44:01 +0200 Message-Id: <20230412204402.14774-1-goodoldpaul@autistici.org> X-Mailer: git-send-email 2.39.2 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: Giacomo Leidi X-ACL-Warn: , Giacomo Leidi via Guix-patches X-Patchwork-Original-From: Giacomo Leidi via Guix-patches via From: paul 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/scheme-xyz.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. --- gnu/local.mk | 1 + gnu/packages/scheme-xyz.scm | 68 +++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 gnu/packages/scheme-xyz.scm base-commit: dd3e5e71104a2bcbad80e52e062a144ea96b8c6a diff --git a/gnu/local.mk b/gnu/local.mk index 8088e8170b..7f6cfc4158 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -556,6 +556,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/sawfish.scm \ %D%/packages/scanner.scm \ %D%/packages/scheme.scm \ + %D%/packages/scheme-xyz.scm \ %D%/packages/spreadsheet.scm \ %D%/packages/screen.scm \ %D%/packages/scribus.scm \ diff --git a/gnu/packages/scheme-xyz.scm b/gnu/packages/scheme-xyz.scm new file mode 100644 index 0000000000..91ba1e7f5b --- /dev/null +++ b/gnu/packages/scheme-xyz.scm @@ -0,0 +1,68 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2022 Giacomo Leidi +;;; +;;; 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 scheme-xyz) + #:use-module (gnu packages autotools) + #:use-module (gnu packages guile) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages texinfo) + #:use-module (guix gexp) + #:use-module (guix git-download) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix build-system gnu)) + +(define (scheme-json-rpc-origin name version hash) + (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/rgherdt/scheme-json-rpc.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + hash)))) + +(define-public guile-scheme-json-rpc + (package + (name "guile-scheme-json-rpc") + (version "0.2.11") + (source + (scheme-json-rpc-origin + name + version + "0w4m8xx8yyj0rv0q57mjr8ja87l7yikscj33i3ck26wg7230ppa5")) + (build-system gnu-build-system) + (arguments + (list #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'move-to-guile-directory + (lambda _ + (chdir "./guile")))))) + (native-inputs (list pkg-config)) + (inputs (list guile-3.0-latest)) + (synopsis "Implementation of the JSON-RPC for Scheme") + (description + "@code{scheme-json-rpc} allows calling procedures +on remote servers by exchanging JSON objects. It implements the +@url{jsonrpc specifications, https://www.jsonrpc.org/specification}. +The low-level API strives to be R7RS compliant, relying on some SRFI's +when needed. So far it was only tested under CHICKEN 5 and Guile 3. + +This package delivers Guile's bytecode for @code{scheme-json-rpc}.") + (home-page "https://codeberg.org/rgherdt/scheme-json-rpc") + (license license:expat))) From patchwork Wed Apr 12 20:44:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: paul X-Patchwork-Id: 49114 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 D4433174EE; Wed, 12 Apr 2023 21:45:32 +0100 (BST) 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 B9C00174BB for ; Wed, 12 Apr 2023 21:45:31 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pmhKy-0000jm-F6; Wed, 12 Apr 2023 16:45:04 -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 1pmhKw-0000j2-Fw for guix-patches@gnu.org; Wed, 12 Apr 2023 16:45:02 -0400 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 1pmhKw-0002qW-6T for guix-patches@gnu.org; Wed, 12 Apr 2023 16:45:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pmhKw-0008SE-1v for guix-patches@gnu.org; Wed, 12 Apr 2023 16:45:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#60286] [v3 2/2] gnu: Add guile-scheme-lsp-server. Resent-From: Giacomo Leidi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 12 Apr 2023 20:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60286 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60286@debbugs.gnu.org Cc: Giacomo Leidi Received: via spool by 60286-submit@debbugs.gnu.org id=B60286.168133226032409 (code B ref 60286); Wed, 12 Apr 2023 20:45:02 +0000 Received: (at 60286) by debbugs.gnu.org; 12 Apr 2023 20:44:20 +0000 Received: from localhost ([127.0.0.1]:41899 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pmhKG-0008Qe-9e for submit@debbugs.gnu.org; Wed, 12 Apr 2023 16:44:20 -0400 Received: from confino.investici.org ([93.190.126.19]:47825) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pmhKE-0008QW-ME for 60286@debbugs.gnu.org; Wed, 12 Apr 2023 16:44:19 -0400 Received: from mx1.investici.org (unknown [127.0.0.1]) by confino.investici.org (Postfix) with ESMTP id 4PxZSf1QMnz110l; Wed, 12 Apr 2023 20:44:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1681332258; bh=R7aBhXIXNIyVQ6HscR/C+47OtpD06hP4mG9HsTmADL4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RdfUtaWmi8u4EJDNhIS3qy7Ha27BUQlxuhvImMWQfe2Q9ubuaF+BBqMXPFLjaO5uD JkwfeOaYHNsMME7q9r47vzysL/r21PA+ylLPDgJqWLvuo8MyAlZBG7ArO23Tq/FlSv YCIhfXSNmjybUh1RUk+SN0dRJOWek5G/C/maz/5k= Received: from [93.190.126.19] (mx1.investici.org [93.190.126.19]) (Authenticated sender: goodoldpaul@autistici.org) by localhost (Postfix) with ESMTPSA id 4PxZSf0qWCz110h; Wed, 12 Apr 2023 20:44:18 +0000 (UTC) Date: Wed, 12 Apr 2023 22:44:02 +0200 Message-Id: <20230412204402.14774-2-goodoldpaul@autistici.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230412204402.14774-1-goodoldpaul@autistici.org> References: <20230412204402.14774-1-goodoldpaul@autistici.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: Giacomo Leidi X-ACL-Warn: , Giacomo Leidi via Guix-patches X-Patchwork-Original-From: Giacomo Leidi via Guix-patches via From: paul 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/scheme-xyz.scm (guile-scheme-lsp-server): New variable. --- gnu/packages/scheme-xyz.scm | 85 +++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/gnu/packages/scheme-xyz.scm b/gnu/packages/scheme-xyz.scm index 91ba1e7f5b..3947bf4f92 100644 --- a/gnu/packages/scheme-xyz.scm +++ b/gnu/packages/scheme-xyz.scm @@ -18,6 +18,7 @@ (define-module (gnu packages scheme-xyz) #:use-module (gnu packages autotools) + #:use-module (gnu packages bash) #:use-module (gnu packages guile) #:use-module (gnu packages pkg-config) #:use-module (gnu packages texinfo) @@ -66,3 +67,87 @@ (define-public guile-scheme-json-rpc This package delivers Guile's bytecode for @code{scheme-json-rpc}.") (home-page "https://codeberg.org/rgherdt/scheme-json-rpc") (license license:expat))) + +(define (scheme-lsp-server-origin name version hash) + (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/rgherdt/scheme-lsp-server.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + hash)))) + +(define-public guile-scheme-lsp-server + (package + (name "guile-scheme-lsp-server") + (version "0.2.2") + (source + (scheme-lsp-server-origin + name + version + "0lb359gw00w149h5yq2brfrcpybdwdj6ndbl7k1ms88l653r5l2g")) + (build-system gnu-build-system) + (arguments + (list #:modules `((ice-9 match) + (ice-9 ftw) + ,@%gnu-build-system-modules) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'move-to-guile-directory + (lambda _ + (chdir "./guile"))) + (add-after 'install 'wrap-entrypoint + (lambda _ + (let* ((bin (string-append #$output "/bin")) + (site (string-append #$output + "/share/guile/site")) + (deps (list #$guile-scheme-json-rpc))) + (match (scandir site) + (("." ".." version) + (let ((modules (string-append site "/" + version)) + (compiled-modules (string-append #$output + "/lib/guile/" + version + "/site-ccache"))) + (wrap-program (string-append bin + "/guile-lsp-server") + `("GUILE_LOAD_PATH" ":" + prefix + (,modules + ,@(map (lambda (dep) + (string-append + dep + "/share/guile/site/" + version)) + deps))) + `("GUILE_LOAD_COMPILED_PATH" + ":" prefix + (,compiled-modules + ,@(map (lambda (dep) + (string-append + dep + "/lib/guile/" + version + "/site-ccache")) + deps)))) + #t))))))))) + (native-inputs (list pkg-config)) + (inputs + ;; Depend on the latest Guile to avoid bytecode compatibility issues when + ;; using modules built against the latest version. + (list bash-minimal + guile-3.0-latest)) + (propagated-inputs (list guile-scheme-json-rpc)) + (synopsis "LSP (Language Server Protocol) server for Scheme") + (description + "@code{guile-lsp-server} is an implementation for Guile of the LSP +specification. This software aims to support several Scheme implementations. +To achieve this, the code is designed to contain as much logic as possible in +R7RS Scheme, separating implementation-specific code in different modules. + +This package delivers Guile's implementation for @code{scheme-lsp-server}.") + (home-page "https://codeberg.org/rgherdt/scheme-lsp-server") + (license license:expat)))