From patchwork Sun Feb 14 18:57:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alexandru-Sergiu Marton X-Patchwork-Id: 27056 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 D14F627BC45; Sun, 14 Feb 2021 19:25:09 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 421F027BC2E for ; Sun, 14 Feb 2021 19:25:09 +0000 (GMT) Received: from localhost ([::1]:54042 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lBN12-00065f-FI for patchwork@mira.cbaines.net; Sun, 14 Feb 2021 14:25:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46684) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lBMaq-0002Rx-BG for guix-patches@gnu.org; Sun, 14 Feb 2021 13:58:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53416) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lBMaq-0000JU-2o for guix-patches@gnu.org; Sun, 14 Feb 2021 13:58:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lBMaq-0003wT-2N for guix-patches@gnu.org; Sun, 14 Feb 2021 13:58:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46513] [PATCH 1/6] gnu: Add rust-rustls-0.19. Resent-From: Alexandru-Sergiu Marton Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 14 Feb 2021 18:58:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46513 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46513@debbugs.gnu.org Cc: Alexandru-Sergiu Marton Received: via spool by 46513-submit@debbugs.gnu.org id=B46513.161332907415102 (code B ref 46513); Sun, 14 Feb 2021 18:58:04 +0000 Received: (at 46513) by debbugs.gnu.org; 14 Feb 2021 18:57:54 +0000 Received: from localhost ([127.0.0.1]:36722 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lBMag-0003vQ-AY for submit@debbugs.gnu.org; Sun, 14 Feb 2021 13:57:54 -0500 Received: from mout02.posteo.de ([185.67.36.66]:60355) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lBMaV-0003uF-P3 for 46513@debbugs.gnu.org; Sun, 14 Feb 2021 13:57:47 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id C314A2400FC for <46513@debbugs.gnu.org>; Sun, 14 Feb 2021 19:57:37 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.ro; s=2017; t=1613329057; bh=JAf6RlxMc+zaxJqu9tyk7UD87wwUIb/gN1DSRI8IBBY=; h=From:To:Cc:Subject:Date:From; b=Djeauvs2gVWAQ0XnJYar4OoMmVWDOSMkYUcy2hXQ+eTTK+VRawPeohVwnBfpC25n8 cYDsJHY7yWqPSF4rGc7GHSjZ/FTMqhEoEvRrAskjzvygRjHw6tkpvhD85RJhd+QKlg R8UcFXSIoIZ3xy75ygA67IdsjEwY8lbdnN95rAFbFukNpIm9zysLWgCbxR92wM4q3D SQWFQaDYN7fLmGXFk54/m8NeN83mrhhyfxSgJvPHxp+3z1B+e1ZNUW0S8WEou4NP1W +NVTQim2jbCxYDmZ9C3gT/R5GxfUUuZDkj9I+t1IVV2M952kBc7bwPj/VnAxDftQOa rrz2RX4UOVaQg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4DdxLn1J0Gz9rxR; Sun, 14 Feb 2021 19:57:36 +0100 (CET) From: Alexandru-Sergiu Marton Date: Sun, 14 Feb 2021 20:57:26 +0200 Message-Id: <20210214185731.31197-1-brown121407@posteo.ro> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210214185104.30887-1-brown121407@posteo.ro> References: <20210214185104.30887-1-brown121407@posteo.ro> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/crates-io.scm (rust-rustls-0.19): New variable. --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a5ea75a594..124a607e86 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2020 Antoine Côté ;;; Copyright © 2021 aecepoglu ;;; Copyright @ 2021 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2021 Alexandru-Sergiu Marton ;;; ;;; This file is part of GNU Guix. ;;; @@ -33794,6 +33795,36 @@ rustc compiler.") "Automatically apply the suggestions made by rustc.") (license (list license:expat license:asl2.0)))) +(define-public rust-rustls-0.19 + (package + (name "rust-rustls") + (version "0.19.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rustls" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "02wqas2pcxk75s9l9c9f1r5am7258bmqprh68pnqfvkwz0gx4kq6")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-base64" ,rust-base64-0.13) + ("rust-log" ,rust-log-0.4) + ("rust-ring" ,rust-ring-0.16) + ("rust-sct" ,rust-sct-0.6) + ("rust-webpki" ,rust-webpki-0.21)))) + (home-page "https://github.com/ctz/rustls") + (synopsis + "Modern TLS library written in Rust") + (description + "This package provides a modern TLS library written in Rust.") + (license + (list license:asl2.0 license:isc license:expat)))) + (define-public rust-rustls-0.18 (package (name "rust-rustls") From patchwork Sun Feb 14 18:57:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru-Sergiu Marton X-Patchwork-Id: 27053 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 4B1DE27BC45; Sun, 14 Feb 2021 19:24:27 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E3E9927BC2E for ; Sun, 14 Feb 2021 19:24:26 +0000 (GMT) Received: from localhost ([::1]:52602 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lBN0M-0005TE-4i for patchwork@mira.cbaines.net; Sun, 14 Feb 2021 14:24:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46672) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lBMao-0002Nv-Q3 for guix-patches@gnu.org; Sun, 14 Feb 2021 13:58:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53413) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lBMao-0000Iz-IU for guix-patches@gnu.org; Sun, 14 Feb 2021 13:58:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lBMao-0003w7-1y for guix-patches@gnu.org; Sun, 14 Feb 2021 13:58:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46513] [PATCH 2/6] gnu: rust-tokio-macros-1: Update to 1.1.0. Resent-From: Alexandru-Sergiu Marton Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 14 Feb 2021 18:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46513 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46513@debbugs.gnu.org Cc: Alexandru-Sergiu Marton Received: via spool by 46513-submit@debbugs.gnu.org id=B46513.161332906715050 (code B ref 46513); Sun, 14 Feb 2021 18:58:02 +0000 Received: (at 46513) by debbugs.gnu.org; 14 Feb 2021 18:57:47 +0000 Received: from localhost ([127.0.0.1]:36713 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lBMaY-0003ug-NI for submit@debbugs.gnu.org; Sun, 14 Feb 2021 13:57:46 -0500 Received: from mout02.posteo.de ([185.67.36.66]:47063) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lBMaW-0003uH-Q4 for 46513@debbugs.gnu.org; Sun, 14 Feb 2021 13:57:45 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 19806240100 for <46513@debbugs.gnu.org>; Sun, 14 Feb 2021 19:57:39 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.ro; s=2017; t=1613329059; bh=agiQkB3ahifk8CwAlBqRlRjbj2MAvpOpGnVN6irbomw=; h=From:To:Cc:Subject:Date:From; b=GNcLNauFOQQtDC1Jc7kqj7CDDQ0Nc8G1jtDJNPXqSdNNh2L1ZQBu53GqXsFCS7dRn zLL7jzCSo35oVehRLqcRCZvc9VE7ypYyAGa13qPuAILUsBv00KR9YYxkuGv3e4s2ni bOog+YlZBU+gs3mEsfIeVebSMD0Vg3NJL4qXN8cWdKcL+2V1RVR1B9KPU5rPipzSjP 3Z+3JMWK3xFyKRT+uD8gUVTLIhr8tnEq17gMF1iA9LH+hQIxV76OxbSO6ZqfoIBSDT h2lFLq0OA8fPQgXUCJLeGCfRCy5tHvqTQjbZ86bfGo+OqWi9u8aUsehbJq0D+8J+N0 K+8wJ4j1T6ByA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4DdxLp4vbQz9rxR; Sun, 14 Feb 2021 19:57:38 +0100 (CET) From: Alexandru-Sergiu Marton Date: Sun, 14 Feb 2021 20:57:27 +0200 Message-Id: <20210214185731.31197-2-brown121407@posteo.ro> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210214185731.31197-1-brown121407@posteo.ro> References: <20210214185104.30887-1-brown121407@posteo.ro> <20210214185731.31197-1-brown121407@posteo.ro> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/crates-io.scm (rust-tokio-macros-1): Update to 1.1.0. --- gnu/packages/crates-io.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 124a607e86..63346f835d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -41944,17 +41944,18 @@ futures efficiently") (define-public rust-tokio-macros-1 (package (name "rust-tokio-macros") - (version "1.0.0") + (version "1.1.0") (source (origin (method url-fetch) (uri (crate-uri "tokio-macros" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "150l6wfcqw2rcjaf22qk3z6ca794x0s2c68n5ar18cfafllpsla2")))) + (base32 + "0mys5zm2gcdgc0iq8nqipzn703q26x1bpw59m04shikgacdb3xya")))) (build-system cargo-build-system) (arguments - `(#:tests? #false ;FIXME: undeclared type `tokio` + `(#:skip-build? #t #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) From patchwork Sun Feb 14 18:57:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru-Sergiu Marton X-Patchwork-Id: 27055 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 DB00F27BC45; Sun, 14 Feb 2021 19:24:58 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6C35227BC2E for ; Sun, 14 Feb 2021 19:24:58 +0000 (GMT) Received: from localhost ([::1]:53580 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lBN0r-0005u2-Hy for patchwork@mira.cbaines.net; Sun, 14 Feb 2021 14:24:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46682) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lBMap-0002Qx-UM for guix-patches@gnu.org; Sun, 14 Feb 2021 13:58:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53415) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lBMap-0000JO-M8 for guix-patches@gnu.org; Sun, 14 Feb 2021 13:58:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lBMap-0003wM-M8 for guix-patches@gnu.org; Sun, 14 Feb 2021 13:58:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46513] [PATCH 3/6] gnu: rust-tokio-1: Update to 1.2.0. Resent-From: Alexandru-Sergiu Marton Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 14 Feb 2021 18:58:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46513 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46513@debbugs.gnu.org Cc: Alexandru-Sergiu Marton Received: via spool by 46513-submit@debbugs.gnu.org id=B46513.161332907415095 (code B ref 46513); Sun, 14 Feb 2021 18:58:03 +0000 Received: (at 46513) by debbugs.gnu.org; 14 Feb 2021 18:57:54 +0000 Received: from localhost ([127.0.0.1]:36720 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lBMaf-0003vI-RF for submit@debbugs.gnu.org; Sun, 14 Feb 2021 13:57:54 -0500 Received: from mout01.posteo.de ([185.67.36.65]:52808) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lBMaY-0003uJ-Oo for 46513@debbugs.gnu.org; Sun, 14 Feb 2021 13:57:47 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 25306160064 for <46513@debbugs.gnu.org>; Sun, 14 Feb 2021 19:57:39 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.ro; s=2017; t=1613329060; bh=JrfuV7YFrSLPEwfr2K/VTe5wW/eAqv8C44VsrZtxASA=; h=From:To:Cc:Subject:Date:From; b=XpyJRJK3oMVxhWNMOcDRL+q3ZFi5kc4AVWxt7XREW3rQGXt+6Mm756EsQrnV70Mxs rzpao61uTCeBfP9n/dr8oaMAXxifzgHfAp9Sp5pXf1FLeHWmhg2DABNnL3w9vlcl8j s//zGaQ821LKC+Kfk9xbtdqvG4KczS6oYwmtsm7JJsC9r8yuRsEra/uaNTzkH8NwwU WUyuIEEVcdHscUaI6o4OuQhh7neDhzgz4Wh7CrX86xAc3tJmV3pVvXgGY6KKExvEYy ABtBErWsQw+2U/vCecqxUWI3cpg3xKHyMOHzRK/rDuWEplGSUlTdDpBgSPQd3Z9eE2 bpLANUC9CDynQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4DdxLq3jPbz9rxR; Sun, 14 Feb 2021 19:57:39 +0100 (CET) From: Alexandru-Sergiu Marton Date: Sun, 14 Feb 2021 20:57:28 +0200 Message-Id: <20210214185731.31197-3-brown121407@posteo.ro> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210214185731.31197-1-brown121407@posteo.ro> References: <20210214185104.30887-1-brown121407@posteo.ro> <20210214185731.31197-1-brown121407@posteo.ro> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/crates-io.scm (rust-tokio-1): Update to 1.2.0. --- gnu/packages/crates-io.scm | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 63346f835d..c3d44fd1b1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -41504,17 +41504,18 @@ Fireball''.") (define-public rust-tokio-1 (package (name "rust-tokio") - (version "1.0.1") + (version "1.2.0") (source (origin (method url-fetch) (uri (crate-uri "tokio" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1gd6qc9xvm568kicbkch40kjn5w0q2nsn527gcy80v3baqgj4n6j")))) + (base32 + "0fmfykdp29hjq5264mp6sa4c0wp5mlimbi0dd9mrxsk5qq20s6g8")))) (build-system cargo-build-system) (arguments - `(#:tests? #false ;FIXME: unresolved import + `(#:skip-build? #t #:cargo-inputs (("rust-autocfg" ,rust-autocfg-1) ("rust-bytes" ,rust-bytes-1) @@ -41528,15 +41529,7 @@ Fireball''.") ("rust-signal-hook-registry" ,rust-signal-hook-registry-1) ("rust-tokio-macros" ,rust-tokio-macros-1) ("rust-tracing" ,rust-tracing-0.1) - ("rust-winapi" ,rust-winapi-0.3)) - #:cargo-development-inputs - (("rust-async-stream" ,rust-async-stream-0.3) - ("rust-futures" ,rust-futures-0.3) - ("rust-loom" ,rust-loom-0.4) - ("rust-nix" ,rust-nix-0.19) - ("rust-proptest" ,rust-proptest-0.10) - ("rust-tokio-stream" ,rust-tokio-stream-0.1) - ("rust-tokio-test" ,rust-tokio-test-0.4)))) + ("rust-winapi" ,rust-winapi-0.3)))) (home-page "https://tokio.rs") (synopsis "Event-driven, non-blocking I/O platform") (description From patchwork Sun Feb 14 18:57:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru-Sergiu Marton X-Patchwork-Id: 27054 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 7F06927BC45; Sun, 14 Feb 2021 19:24:52 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 38E4B27BC2E for ; Sun, 14 Feb 2021 19:24:51 +0000 (GMT) Received: from localhost ([::1]:53128 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lBN0k-0005ga-E4 for patchwork@mira.cbaines.net; Sun, 14 Feb 2021 14:24:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46678) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lBMap-0002Pk-HZ for guix-patches@gnu.org; Sun, 14 Feb 2021 13:58:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53414) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lBMap-0000JF-8e for guix-patches@gnu.org; Sun, 14 Feb 2021 13:58:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lBMao-0003wE-U3 for guix-patches@gnu.org; Sun, 14 Feb 2021 13:58:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46513] [PATCH 4/6] gnu: Add rust-tokio-rustls-0.22. Resent-From: Alexandru-Sergiu Marton Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 14 Feb 2021 18:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46513 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46513@debbugs.gnu.org Cc: Alexandru-Sergiu Marton Received: via spool by 46513-submit@debbugs.gnu.org id=B46513.161332907415087 (code B ref 46513); Sun, 14 Feb 2021 18:58:02 +0000 Received: (at 46513) by debbugs.gnu.org; 14 Feb 2021 18:57:54 +0000 Received: from localhost ([127.0.0.1]:36718 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lBMab-0003vB-US for submit@debbugs.gnu.org; Sun, 14 Feb 2021 13:57:53 -0500 Received: from mout02.posteo.de ([185.67.36.66]:47473) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lBMaY-0003uL-Aj for 46513@debbugs.gnu.org; Sun, 14 Feb 2021 13:57:46 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id A0E2C2400FB for <46513@debbugs.gnu.org>; Sun, 14 Feb 2021 19:57:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.ro; s=2017; t=1613329060; bh=TsDWPRTVxNj5naYSXG8pi2PZM7QJMfUwne7m3riMFEs=; h=From:To:Cc:Subject:Date:From; b=EwybG94icTdQKm74oQjVTZIxJ/tgT3FUDKympg5zWQDBynZaRQVayZHbKO88qC2pN DpMmCkoq1ewcGCNFcrW5x+ebnQC2I/aUSnNwmIY6g3w4+8vvMUPDvqMWKJpRQTfPQP IccRwha9H/0UX8irYbtrclK6X+7zjxg/zB2GkUGw3OAzMZ0S9de1IbS/qlkXz0BEcv PDt73R+DWFCK9XMABqrt9x7CjX8jyfY2cRtucL41eEs7O4BlUN8J/iG29cWS2z6LVX wSWO2F1gZ1tzC8oocOx2yAXk7MFKfsGkJsvgXcqtjaqZJCAV/9WerdQnCFmaWRFHx4 T+0qVSIAr0rtA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4DdxLr1rC8z9rxR; Sun, 14 Feb 2021 19:57:40 +0100 (CET) From: Alexandru-Sergiu Marton Date: Sun, 14 Feb 2021 20:57:29 +0200 Message-Id: <20210214185731.31197-4-brown121407@posteo.ro> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210214185731.31197-1-brown121407@posteo.ro> References: <20210214185104.30887-1-brown121407@posteo.ro> <20210214185731.31197-1-brown121407@posteo.ro> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/crates-io.scm (rust-tokio-rustls-0.22): New variable. --- gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c3d44fd1b1..adb588a5ef 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -42302,6 +42302,34 @@ servers.") "Event loop that drives Tokio I/O resources.") (license license:expat))) +(define-public rust-tokio-rustls-0.22 + (package + (name "rust-tokio-rustls") + (version "0.22.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "tokio-rustls" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1dp1s2kai081f3fn9gjq92x2lw7lm7iqpcsl02cg2zg5fbg48s5w")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-rustls" ,rust-rustls-0.19) + ("rust-tokio" ,rust-tokio-1) + ("rust-webpki" ,rust-webpki-0.21)))) + (home-page "https://github.com/tokio-rs/tls") + (synopsis + "Asynchronous TLS/SSL streams for Tokio") + (description + "This package provides asynchronous TLS/SSL streams for Tokio using +Rustls.") + (license (list license:expat license:asl2.0)))) + (define-public rust-tokio-rustls-0.14 (package (name "rust-tokio-rustls") From patchwork Sun Feb 14 18:57:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alexandru-Sergiu Marton X-Patchwork-Id: 27052 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 5804227BC45; Sun, 14 Feb 2021 18:59:20 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A866E27BC2E for ; Sun, 14 Feb 2021 18:59:19 +0000 (GMT) Received: from localhost ([::1]:39078 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lBMc2-0003UX-Rz for patchwork@mira.cbaines.net; Sun, 14 Feb 2021 13:59:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46692) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lBMaq-0002Sw-NE for guix-patches@gnu.org; Sun, 14 Feb 2021 13:58:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53417) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lBMaq-0000Jv-Ez for guix-patches@gnu.org; Sun, 14 Feb 2021 13:58:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lBMaq-0003wb-Eh for guix-patches@gnu.org; Sun, 14 Feb 2021 13:58:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46513] [PATCH 5/6] gnu: Add agate. Resent-From: Alexandru-Sergiu Marton Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 14 Feb 2021 18:58:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46513 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46513@debbugs.gnu.org Cc: Alexandru-Sergiu Marton Received: via spool by 46513-submit@debbugs.gnu.org id=B46513.161332907515109 (code B ref 46513); Sun, 14 Feb 2021 18:58:04 +0000 Received: (at 46513) by debbugs.gnu.org; 14 Feb 2021 18:57:55 +0000 Received: from localhost ([127.0.0.1]:36724 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lBMag-0003vX-Np for submit@debbugs.gnu.org; Sun, 14 Feb 2021 13:57:55 -0500 Received: from mout02.posteo.de ([185.67.36.66]:33281) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lBMaZ-0003uM-2J for 46513@debbugs.gnu.org; Sun, 14 Feb 2021 13:57:47 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 5F0E12400FB for <46513@debbugs.gnu.org>; Sun, 14 Feb 2021 19:57:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.ro; s=2017; t=1613329061; bh=1+nI8xVYLPOXFA2Rily3taktQGDK8C7OyNjmTCRQdJA=; h=From:To:Cc:Subject:Date:From; b=ijL6aIy0JFuqIiU40oY5MTwm/Mx43cWvJ2neRt1wJtASs+MrMSaHBH0kECFeRh6rR SVZfusKTig6TXFz9QGec9089KxRSdM74td8b8PpP8x3FXlUkAJf30BOXE6puthCNcD fxaa7FlxJP71xSIp+5M+Hr0kzOkVVbFlaFGiuvx9WVNUiETtY985owqdi+4RyZggs0 6Kkemymo5SnNpEtcUt4//kB+IffUz3fVcKgv6RedwUZyelc8ysYGMH8b7+g/miCMCG seuQj71XvBPPt63432GsNJO1CDMnCawsPkaWggj0rR+82+syQo4OXlPWSs9Q8KGAJh TJHHUrlKw1j+w== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4DdxLr732Mz9rxR; Sun, 14 Feb 2021 19:57:40 +0100 (CET) From: Alexandru-Sergiu Marton Date: Sun, 14 Feb 2021 20:57:30 +0200 Message-Id: <20210214185731.31197-5-brown121407@posteo.ro> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210214185731.31197-1-brown121407@posteo.ro> References: <20210214185104.30887-1-brown121407@posteo.ro> <20210214185731.31197-1-brown121407@posteo.ro> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/rust-apps.scm (agate): New variable. --- gnu/packages/rust-apps.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 9511cbf308..b832bd4453 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2021 Tobias Geerinckx-Rice ;;; Copyright © 2021 Sharlatan Hellseher ;;; Copyright © 2021 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2021 Alexandru-Sergiu Marton ;;; ;;; This file is part of GNU Guix. ;;; @@ -43,6 +44,43 @@ #:use-module (gnu packages tls) #:use-module (gnu packages version-control)) +(define-public agate + (package + (name "agate") + (version "2.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "agate" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "19szg91l4r76vrc44hifrqvk38c5q21hbycgi62bcb52rswgwgdk")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-env-logger" ,rust-env-logger-0.8) + ("rust-getopts" ,rust-getopts-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-mime-guess" ,rust-mime-guess-2) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-percent-encoding" + ,rust-percent-encoding-2) + ("rust-rustls" ,rust-rustls-0.19) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-rustls" ,rust-tokio-rustls-0.22) + ("rust-url" ,rust-url-2)))) + (home-page "gemini://qwertqwefsday.eu/agate.gmi") + (synopsis + "Very simple server for the Gemini hypertext protocol") + (description + "Agate is a server for the Gemini network protocol, built with the Rust +programming language. It has very few features, and can only serve static +files. It uses async I/O, and should be quite efficient even when running on +low-end hardware and serving many concurrent requests.") + (license (list license:expat license:asl2.0)))) + (define-public bat (package (name "bat") From patchwork Sun Feb 14 18:57:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alexandru-Sergiu Marton X-Patchwork-Id: 27057 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 6F89327BC45; Sun, 14 Feb 2021 19:25:54 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 47BDD27BC2E for ; Sun, 14 Feb 2021 19:25:53 +0000 (GMT) Received: from localhost ([::1]:54488 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lBN1k-0006HJ-F1 for patchwork@mira.cbaines.net; Sun, 14 Feb 2021 14:25:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46696) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lBMar-0002UH-6B for guix-patches@gnu.org; Sun, 14 Feb 2021 13:58:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53418) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lBMaq-0000KK-Sc for guix-patches@gnu.org; Sun, 14 Feb 2021 13:58:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lBMaq-0003wi-SA for guix-patches@gnu.org; Sun, 14 Feb 2021 13:58:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46513] [PATCH 6/6] services: Add agate web service. Resent-From: Alexandru-Sergiu Marton Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 14 Feb 2021 18:58:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46513 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46513@debbugs.gnu.org Cc: Alexandru-Sergiu Marton Received: via spool by 46513-submit@debbugs.gnu.org id=B46513.161332907515116 (code B ref 46513); Sun, 14 Feb 2021 18:58:04 +0000 Received: (at 46513) by debbugs.gnu.org; 14 Feb 2021 18:57:55 +0000 Received: from localhost ([127.0.0.1]:36726 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lBMah-0003ve-4o for submit@debbugs.gnu.org; Sun, 14 Feb 2021 13:57:55 -0500 Received: from mout02.posteo.de ([185.67.36.66]:46949) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lBMaZ-0003uQ-S8 for 46513@debbugs.gnu.org; Sun, 14 Feb 2021 13:57:48 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 18E402400FB for <46513@debbugs.gnu.org>; Sun, 14 Feb 2021 19:57:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.ro; s=2017; t=1613329062; bh=4qCcdPtLwa0iOgfOMMnNmmIg2GKFBn3Sn65khFfEjt8=; h=From:To:Cc:Subject:Date:From; b=TuqMmUdMEG5vggoG30HrCZwXwcVgcdcih+2s7/QB+IjO+YCpS+az0Q7O5wrdHMzAj vRJ0DT9ws2POTuoHFdConwgVyLUitBpn/EcfEAGk2uXpAKhFwBYLTUxafyl66+5DEj md8fYqzgs2D5XyKXFtlvU8mamaVxcVvYxwGgWnbIhzz1zP7mHy22qLBqNUA9ZqcoPj AIbXBZmefYtIoeh3QwTMxoZ7F5oeuaQMQhupKniJ0C8lbLHyfogW3eBuKYs+VdpZlS wpGTvmXyaWO0+I2scpAn9Xy05TAoBjjt/ihB2THI0EIDuExd0PihiH3wy15FpJUoUi tdBL2UKa/weaQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4DdxLs4m6pz9rxR; Sun, 14 Feb 2021 19:57:41 +0100 (CET) From: Alexandru-Sergiu Marton Date: Sun, 14 Feb 2021 20:57:31 +0200 Message-Id: <20210214185731.31197-6-brown121407@posteo.ro> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210214185731.31197-1-brown121407@posteo.ro> References: <20210214185104.30887-1-brown121407@posteo.ro> <20210214185731.31197-1-brown121407@posteo.ro> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/services/web.scm (): New record type. (agate-accounts, agate-shepherd-service): New procedures. (agate-service-type): New variable. * doc/guix.texi (Web Services): Document it. --- doc/guix.texi | 89 +++++++++++++++++++++++++++++++++- gnu/services/web.scm | 112 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 198 insertions(+), 3 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 68abb968b0..c10d6877e2 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -81,7 +81,7 @@ Copyright @copyright{} 2020 R Veera Kumar@* Copyright @copyright{} 2020 Pierre Langlois@* Copyright @copyright{} 2020 pinoaffe@* Copyright @copyright{} 2020 André Batista@* -Copyright @copyright{} 2020 Alexandru-Sergiu Marton@* +Copyright @copyright{} 2020, 2021 Alexandru-Sergiu Marton@* Copyright @copyright{} 2020 raingloom@* Copyright @copyright{} 2020 Daniel Brooks@* Copyright @copyright{} 2020 John Soo@* @@ -25316,6 +25316,93 @@ gmnisrv} and @command{man gmnisrv.ini}. @end table @end deftp +@subsubheading agate + +@cindex agate +The @uref{gemini://qwertqwefsday.eu/agate.gmi, Agate} +(@uref{https://github.com/mbrubeck/agate, GitHub page over HTTPS}) +program is a simple @uref{https://gemini.circumlunar.space/, Gemini} +protocol server written in Rust. + +@deffn {Scheme Variable} agate-service-type +This is the type of the agate service, whose value should be an +@code{agate-service-type} object, as in this example: + +@lisp +(service agate-service-type + (agate-configuration + (content "/srv/gemini") + (cert "/srv/cert.pem") + (key "/srv/key.rsa"))) +@end lisp + +The example above represents the minimal tweaking necessary to get Agate +up and running. Specifying the path to the certificate and key is always +necessary, as the Gemini protocol requires TLS by default. + +To obtain a certificate and a key, you could, for example, use OpenSSL, +running a command similar to the following example: + +@example +openssl req -x509 -newkey rsa:4096 -keyout key.rsa -out cert.pem \ + -days 3650 -nodes -subj "/CN=example.com" +@end example + +Of course, you'll have to replace @i{example.com} with your own domain +name, and then point the Agate configuration towards the path of the +generated key and certificate. + +@end deffn + +@deftp {Data Type} agate-configuration +Data type representing the configuration of Agate. + +@table @asis +@item @code{package} (default: @var{agate}) +The package object of the Agate server. + +@item @code{content} (default: @code{"/srv/gemini"}) +The path of the directory from which Agate will serve files. + +@item @code{cert} (default: @code{#f}) +The path to the TLS certificate PEM file to be used for encrypted +connections. Must be filled in with a value from the user. + +@item @code{key} (default: @code{#f}) +The path to the PKCS8 private key file to be used for encrypted +connections. Must be filled in with a value from the user. + +@item @code{addr} (default: @code{'("0.0.0.0:1965" "[::]:1965")}) +A list of the addresses to listen on. + +@item @code{hostname} (default: @code{#f}) +The domain name of this Gemini server. Optional. + +@item @code{lang} (default: @code{#f}) +RFC 4646 Language code(s) for text/gemini documents. Optional. + +@item @code{silent?} (default: @code{#f}) +Set to @code{#t} to disable logging output. + +@item @code{serve-secret?} (default: @code{#f}) +Set to @code{#t} to serve secret files (files/directories starting with +a dot). + +@item @code{log-ip?} (default: @code{#t}) +Whether or not to output IP addresses when logging. + +@item @code{user} (default: @code{"agate"}) +Owner of the @code{agate} process. + +@item @code{group} (default: @code{"agate"}) +Owner's group of the @code{agate} process. + +@item @code{log-file} (default: @code{"/var/log/agate.log"}) +The path of the file which should store the logging output of Agate. + +@end table +@end deftp + @node Certificate Services @subsection Certificate Services diff --git a/gnu/services/web.scm b/gnu/services/web.scm index ff7b262b6a..aa688a4328 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -14,7 +14,7 @@ ;;; Copyright © 2020 Tobias Geerinckx-Rice ;;; Copyright © 2020 Arun Isaac ;;; Copyright © 2020 Oleg Pykhalov -;;; Copyright © 2020 Alexandru-Sergiu Marton +;;; Copyright © 2020, 2021 Alexandru-Sergiu Marton ;;; ;;; This file is part of GNU Guix. ;;; @@ -50,6 +50,7 @@ #:use-module (gnu packages guile) #:use-module (gnu packages logging) #:use-module (gnu packages mail) + #:use-module (gnu packages rust-apps) #:use-module (guix packages) #:use-module (guix records) #:use-module (guix modules) @@ -263,7 +264,25 @@ gmnisrv-configuration-package gmnisrv-configuration-config-file - gmnisrv-service-type)) + gmnisrv-service-type + + agate-configuration + agate-configuration? + agate-configuration-package + agate-configuration-content + agate-configuration-cert + agate-configuration-key + agate-configuration-addr + agate-configuration-hostname + agate-configuration-lang + agate-configuration-silent + agate-configuration-serve-secret + agate-configuration-log-ip + agate-configuration-user + agate-configuration-group + agate-configuration-log-file + + agate-service-type)) ;;; Commentary: ;;; @@ -1885,3 +1904,92 @@ root=/srv/gemini "Run the gmnisrv Gemini server.") (default-value (gmnisrv-configuration)))) + +(define-record-type* + agate-configuration make-agate-configuration + agate-configuration? + (package agate-configuration-package + (default agate)) + (content agate-configuration-content + (default "/srv/gemini")) + (cert agate-configuration-cert + (default #f)) + (key agate-configuration-key + (default #f)) + (addr agate-configuration-addr + (default '("0.0.0.0:1965" "[::]:1965"))) + (hostname agate-configuration-hostname + (default #f)) + (lang agate-configuration-lang + (default #f)) + (silent? agate-configuration-silent + (default #f)) + (serve-secret? agate-configuration-serve-secret + (default #f)) + (log-ip? agate-configuration-log-ip + (default #t)) + (user agate-configuration-user + (default "agate")) + (group agate-configuration-group + (default "agate")) + (log-file agate-configuration-log + (default "/var/log/agate.log"))) + +(define agate-shepherd-service + (match-lambda + (($ package content cert key addr + hostname lang silent? serve-secret? + log-ip? user group log-file) + (list (shepherd-service + (provision '(agate)) + (requirement '(networking)) + (documentation "Run the agate Gemini server.") + (start (let ((agate (file-append package "/bin/agate"))) + #~(make-forkexec-constructor + (list #$agate + "--content" #$content + "--cert" #$cert + "--key" #$key + "--addr" #$@addr + #$@(if lang + (list "--lang" lang) + '()) + #$@(if hostname + (list "--hostname" hostname) + '()) + #$@(if silent? '("--silent") '()) + #$@(if serve-secret? '("--serve-secret") '()) + #$@(if log-ip? '("--log-ip") '())) + #:user #$user #:group #$group + #:log-file #$log-file))) + (stop #~(make-kill-destructor))))))) + +(define agate-accounts + (match-lambda + (($ _ _ _ _ _ + _ _ _ _ + _ user group _) + `(,@(if (equal? group "agate") + '() + (list (user-group (name "agate") (system? #t)))) + ,(user-group + (name group) + (system? #t)) + ,(user-account + (name user) + (group group) + (supplementary-groups '("agate")) + (system? #t) + (comment "agate server user") + (home-directory "/var/empty") + (shell (file-append shadow "/sbin/nologin"))))))) + +(define agate-service-type + (service-type + (name 'guix) + (extensions + (list (service-extension account-service-type + agate-accounts) + (service-extension shepherd-root-service-type + agate-shepherd-service))) + (default-value (agate-configuration))))