From patchwork Mon May 20 08:58:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 27752 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 7195A27BBEA; Mon, 20 May 2024 10:04:06 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 C031927BBEC for ; Mon, 20 May 2024 10:04:02 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s8yv8-0001rO-L5; Mon, 20 May 2024 05:03:02 -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 1s8ytQ-0000aW-Vz for guix-patches@gnu.org; Mon, 20 May 2024 05:01:17 -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 1s8ytQ-0006rs-MU for guix-patches@gnu.org; Mon, 20 May 2024 05:01:16 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s8ytV-0007Jc-5F for guix-patches@gnu.org; Mon, 20 May 2024 05:01:21 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71076] [PATCH 30/81] gnu: Add matrix-conduit. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 May 2024 09:01:21 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71076 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71076@debbugs.gnu.org Received: via spool by 71076-submit@debbugs.gnu.org id=B71076.171619566427639 (code B ref 71076); Mon, 20 May 2024 09:01:21 +0000 Received: (at 71076) by debbugs.gnu.org; 20 May 2024 09:01:04 +0000 Received: from localhost ([127.0.0.1]:41203 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s8ytD-0007BV-DJ for submit@debbugs.gnu.org; Mon, 20 May 2024 05:01:04 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:38769 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s8ysU-00072D-10 for 71076@debbugs.gnu.org; Mon, 20 May 2024 05:00:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1716195606; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bZWpUWExU9G8JU6JgImzXtcKtqBVB7E+grMwR8aGhGk=; b=MFcuFKwTNsfowq19gfrtezVAVqTHZfxjY24cRfiVsWzmTFj85T+X45f4s7CuW2AM1Uwzk0 1jrQ65cKRd7qTDKVRNpIxjNWlZx4NfQrHRAxRYkmXBbgsRsV+SaQaUYekgsBDFmq/sMCQT CwsSkHGDHK32TkDf1sELt5K9sQp++QI15mETasQ2u19P3yeraXA9zJAkWg4Pd28UvaObqK l4LwQVMS2H8B8OXljof8s4c2nfLzCxxRtx0ozVSXsIX4IJyYfn5eGuL3hV7F7hYEbCIjXJ CLpuVvAp7v7FvQEdXtSVxmePDTx9kIYNTvcievHYcFIXcexeM2Pj62pjuqSSAQ== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id eb5309ae (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <71076@debbugs.gnu.org>; Mon, 20 May 2024 09:00:06 +0000 (UTC) Date: Mon, 20 May 2024 10:58:35 +0200 Message-ID: <10a40d011c1c802214fa7935182da58d709f875b.1716193123.git.herman@rimm.ee> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches X-Patchwork-Original-From: Herman Rimm via Guix-patches via From: Herman Rimm 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/matrix.scm (matrix-conduit): Add variable. Change-Id: Icae14162197c19fc3421147dd34cf9df8e5a56ff --- gnu/packages/matrix.scm | 84 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/gnu/packages/matrix.scm b/gnu/packages/matrix.scm index 7a29100d3f..3abbdd32e4 100644 --- a/gnu/packages/matrix.scm +++ b/gnu/packages/matrix.scm @@ -24,6 +24,7 @@ (define-module (gnu packages matrix) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages check) + #:use-module (gnu packages compression) #:use-module (gnu packages crypto) #:use-module (gnu packages crates-crypto) #:use-module (gnu packages crates-graphics) @@ -31,7 +32,9 @@ (define-module (gnu packages matrix) #:use-module (gnu packages crates-web) #:use-module (gnu packages databases) #:use-module (gnu packages glib) + #:use-module (gnu packages llvm) #:use-module (gnu packages monitoring) + #:use-module (gnu packages pkg-config) #:use-module (gnu packages python-build) #:use-module (gnu packages python-check) #:use-module (gnu packages python-crypto) @@ -183,6 +186,87 @@ (define rust-ruma-0.9-1.5495b85 matrix-conduit package.") (license license:expat)))) +(define-public matrix-conduit + (package + (name "matrix-conduit") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://gitlab.com/famedly/conduit/-/archive/v" + version "/conduit-v" version ".tar.gz")) + (sha256 + (base32 "0cgqbfh3nf7y13hn2bdgi4slchiwmxiiz3bypj9raffh3blhmnwx")) + (modules '((guix build utils))) + (snippet + '(begin (substitute* "Cargo.toml" + ;; Remove unused dependencies. + (("^lazy_static.*") "") + (("^tikv-jemalloc-ctl.*") "") + (("\"tikv-jemalloc-ctl\", ") "") + ;; Provide vendored ruma dependency. + (("git =.*, rev =.*, features") + "version = \"0.9.4-1.5495b85\", features")))))) + (build-system cargo-build-system) + (arguments + (list #:install-source? #f + #:cargo-inputs (list rust-async-trait-0.1 + rust-axum-0.6 + rust-axum-server-0.5 + rust-bytes-1 + rust-base64-0.21 + rust-clap-4 + rust-directories-4 + rust-futures-util-0.3 + rust-figment-0.10 + rust-hmac-0.12 + rust-http-0.2 + rust-hyper-0.14 + rust-image-0.24 + rust-jsonwebtoken-9 + rust-lru-cache-0.1 + rust-num-cpus-1 + rust-nix-0.28 + rust-opentelemetry-0.18 + rust-opentelemetry-jaeger-0.17 + rust-parking-lot-0.12 + rust-persy-1 + rust-rand-0.8 + rust-regex-1 + rust-reqwest-0.11 + rust-ring-0.17 + ;; Include workspace transitive closure. + rust-ruma-0.9-1.5495b85 + rust-rust-argon2-1 + rust-rust-rocksdb-0.24 + rust-rusqlite-0.29 + rust-sd-notify-0.4 + rust-serde-1 + rust-serde-html-form-0.2 + rust-serde-json-1 + rust-serde-yaml-0.9 + rust-sha-1-0.10 + rust-thiserror-1 + rust-threadpool-1 + rust-thread-local-1 + rust-tikv-jemallocator-0.5 + rust-tokio-1 + rust-tower-0.4 + rust-tower-http-0.4 + rust-tracing-0.1 + rust-tracing-flame-0.2 + rust-tracing-opentelemetry-0.18 + rust-tracing-subscriber-0.3 + rust-trust-dns-resolver-0.22))) + ;; Include workspace members. + (inputs (list rust-ruma-0.9-1.5495b85 zlib (list zstd "lib"))) + (native-inputs (list clang pkg-config)) + (home-page "https://conduit.rs") + (synopsis "Matrix homeserver written in Rust") + (description "This package provides a Matrix homeserver written in Rust.") + (license license:asl2.0))) + (define-public synapse (package (name "synapse")