From patchwork Mon Feb 19 21:44:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Carlo Zancanaro X-Patchwork-Id: 60797 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 6BEC027BBE9; Mon, 19 Feb 2024 21:48:11 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, 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 B846627BBE2 for ; Mon, 19 Feb 2024 21:48:09 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rcBUE-0003Zy-I7; Mon, 19 Feb 2024 16:47:42 -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 1rcBUD-0003Za-OA for guix-patches@gnu.org; Mon, 19 Feb 2024 16:47:41 -0500 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 1rcBUD-00083b-Fh for guix-patches@gnu.org; Mon, 19 Feb 2024 16:47:41 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rcBUY-0005qj-Cm for guix-patches@gnu.org; Mon, 19 Feb 2024 16:48:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69272] [PATCH v2 1/4] gnu: Extract prosody-module from existing prosody modules. Resent-From: Carlo Zancanaro Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 19 Feb 2024 21:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69272 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69272@debbugs.gnu.org Received: via spool by 69272-submit@debbugs.gnu.org id=B69272.170837924422416 (code B ref 69272); Mon, 19 Feb 2024 21:48:02 +0000 Received: (at 69272) by debbugs.gnu.org; 19 Feb 2024 21:47:24 +0000 Received: from localhost ([127.0.0.1]:43694 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rcBTv-0005pN-K5 for submit@debbugs.gnu.org; Mon, 19 Feb 2024 16:47:24 -0500 Received: from voltorb.zancanaro.id.au ([45.77.50.64]:47840) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rcBTr-0005og-DV for 69272@debbugs.gnu.org; Mon, 19 Feb 2024 16:47:20 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=k1; bh=4sr8/oL5m/iPkFM cLbVRp/d1DhcMhgosDKJ4+SVfLXk=; h=references:in-reply-to:date:subject: to:from; d=zancanaro.id.au; b=o6Ic/RHSIbvEqurgRpVCgJrbruMen3p8r1C5vMKm 9ep9SHjcrH2LQD6iHk+p3PAMVE2gQq8YSl64ky7NLoFr2/fJBr2jLcKpgYsaDTna9XJ182 XHe/zpBXnotfoBGlcokKDIzdFbVgutjS4JlggAxuPNiZD0ZgG5synP8pX9wKY= Received: by voltorb.zancanaro.id.au (OpenSMTPD) with ESMTPSA id bf5397f4 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <69272@debbugs.gnu.org>; Mon, 19 Feb 2024 21:46:44 +0000 (UTC) From: Carlo Zancanaro Date: Tue, 20 Feb 2024 08:44:16 +1100 Message-ID: <55c015b018c39d59922c916574eb59de27f9a353.1708379059.git.carlo@zancanaro.id.au> 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: , 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/messaging.scm (prosody-module): New procedure. (prosody-http-upload, prosody-smacks): Use it. Change-Id: I55c69104460adbbd89c491b18f9f22681aefb92a --- The only change from v1 is to properly define home-page in prosody-module. gnu/packages/messaging.scm | 70 ++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 40 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 98c1c9bf67..d06cd74177 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -40,6 +40,7 @@ ;;; Copyright © 2023 Giacomo Leidi ;;; Copyright © 2023 Yovan Naumovski ;;; Copyright © 2023 gemmaro +;;; Copyright © 2024 Carlo Zancanaro ;;; ;;; This file is part of GNU Guix. ;;; @@ -1577,11 +1578,18 @@ (define-public prosody protocols.") (license license:x11))) -(define-public prosody-http-upload +(define (prosody-module module-name) (let ((changeset "765735bb590b") - (revision "1")) + (revision "1") + (package-name (string-append + "prosody-" + (string-replace-substring + (if (string-prefix? "mod_" module-name) + (substring module-name 4) + module-name) + "_" "-")))) (package - (name "prosody-http-upload") + (name package-name) (version (string-append "0-" revision "." (string-take changeset 7))) (source (origin (method hg-fetch) @@ -1600,47 +1608,29 @@ (define-public prosody-http-upload (use-modules (guix build utils)) (let ((out (assoc-ref %outputs "out")) (source (assoc-ref %build-inputs "source"))) - (with-directory-excursion (in-vicinity source "mod_http_upload") - (install-file "mod_http_upload.lua" out)) + (with-directory-excursion (in-vicinity source module-name) + (install-file (string-append module-name ".lua") out)) #t)))) - (home-page "https://modules.prosody.im/mod_http_upload.html") - (synopsis "XEP-0363: Allow clients to upload files over HTTP") - (description "This module implements XEP-0363: it allows clients to -upload files over HTTP.") + (home-page (string-append "https://modules.prosody.im/" + module-name ".html")) + (synopsis #f) + (description #f) (license (package-license prosody))))) -(define-public prosody-smacks - (let ((changeset "67f1d1f22625") - (revision "1")) - (package - (name "prosody-smacks") - (version (string-append "0-" revision "." (string-take changeset 7))) - (source (origin - (method hg-fetch) - (uri (hg-reference - (url "https://hg.prosody.im/prosody-modules/") - (changeset changeset))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "020ngpax30fgarah98yvlj0ni8rcdwq60if03a9hqdw8mic0nxxs")))) - (build-system trivial-build-system) - (arguments - '(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let ((out (assoc-ref %outputs "out")) - (source (assoc-ref %build-inputs "source"))) - (with-directory-excursion (in-vicinity source "mod_smacks") - (install-file "mod_smacks.lua" out)) - #t)))) - (home-page "https://modules.prosody.im/mod_smacks.html") - (synopsis "XEP-0198: Reliability and fast reconnects for XMPP") - (description "This module implements XEP-0198: when supported by both +(define-public prosody-http-upload + (package + (inherit (prosody-module "mod_http_upload")) + (synopsis "XEP-0363: Allow clients to upload files over HTTP") + (description "This module implements XEP-0363: it allows clients to +upload files over HTTP."))) + +(define-public prosody-smack + (package + (inherit (prosody-module "mod_smacks")) + (synopsis "XEP-0198: Reliability and fast reconnects for XMPP") + (description "This module implements XEP-0198: when supported by both the client and server, it can allow clients to resume a disconnected session, -and prevent message loss.") - (license (package-license prosody))))) +and prevent message loss."))) (define-public libtoxcore (let ((revision "2")