From patchwork Mon Jan 13 10:57:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arjan Adriaanse X-Patchwork-Id: 37043 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 725DE27BBE9; Mon, 13 Jan 2025 11:00:41 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 18F6427BBE2 for ; Mon, 13 Jan 2025 11:00:38 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tXIB9-0006oU-KH; Mon, 13 Jan 2025 06:00:19 -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 1tXIB3-0006kz-JT for guix-patches@gnu.org; Mon, 13 Jan 2025 06:00:15 -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 1tXIAt-0007BA-En for guix-patches@gnu.org; Mon, 13 Jan 2025 06:00:11 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=evac1WHrUzK8s89spVK3gMQUcNmht89nPFaVanBXGjA=; b=Lw+cdCZrDBvSQeGi3iTcarNjiBygSyd50hkpqFYUfXuK31h3JzfSWBnyzkFFTydEVIXBpGw15uWdCGd9+MM+U8J94Inzc30Fi+ZB95kW7dnoZ8PkN6pywkSvHEmpb1Gf5ghb+bIGFJ0P14Gu2Ssby49Yt410dwEpxM0QlMhNa+YGeiaIR7tCQHzRKpRnGjbh9f6xgMarNGsU4NcupZ6sPSgbFNS53c9bBDd5akpE1C8fKcH35eBu2L/cTBDCnqB0PYcgyCQj0IHFnXYw6IDpTx6StTXMvI9o2NRsCBWLoQC2FCNZ8qn/U6vRxZuE90ru8Hhc/WSXl75jnuvosHTx5Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tXIAs-00085Z-OV; Mon, 13 Jan 2025 06:00:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75420] [PATCH python-team v3] gnu: pantalaimon: Update to 0.10.5-0.257ef6a. References: In-Reply-To: Resent-From: Arjan Adriaanse Original-Sender: "Debbugs-submit" Resent-CC: arjan@adriaan.se, guix-patches@gnu.org Resent-Date: Mon, 13 Jan 2025 11:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75420 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75420@debbugs.gnu.org Cc: Arjan Adriaanse , Arjan Adriaanse X-Debbugs-Original-Xcc: Arjan Adriaanse Received: via spool by 75420-submit@debbugs.gnu.org id=B75420.173676596430996 (code B ref 75420); Mon, 13 Jan 2025 11:00:02 +0000 Received: (at 75420) by debbugs.gnu.org; 13 Jan 2025 10:59:24 +0000 Received: from localhost ([127.0.0.1]:50492 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tXIAF-00083s-OW for submit@debbugs.gnu.org; Mon, 13 Jan 2025 05:59:24 -0500 Received: from dane.soverin.net ([185.233.34.21]:56173) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tXIA4-00083P-VP for 75420@debbugs.gnu.org; Mon, 13 Jan 2025 05:59:22 -0500 Received: from smtp.freedom.nl (c04smtp-lb01.int.sover.in [10.10.4.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by dane.soverin.net (Postfix) with ESMTPS id 4YWq561RxhzST; Mon, 13 Jan 2025 10:59:06 +0000 (UTC) Received: from smtp.freedom.nl (smtp.freedom.nl [10.10.4.108]) by freedom.nl (Postfix) with ESMTPSA id 4YWq553PvMz2xGy; Mon, 13 Jan 2025 10:59:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=adriaan.se; s=soverin; t=1736765946; bh=pZT23+4svufefCGaw2QHyf6XpF15nprxn//MvoXVmrs=; h=From:To:Cc:Subject:Date:From; b=bBOKKJhSgm5q+dsAubPxyFZeu5EBNlsTpgJbcGT4SXTs4vajfMdnzezs+NpR4BfWh G7S+dBXSWmqTsMEZvPGmIeQUEibjeoj28MKBl/URNlfarePInkDOZApYgV0ELG9CjC RvJYUESnO8Ec9DtlLXzq6jxGAugBR0kfwuj8CtuyJgMOEe9Qwp5lmIcCyNYPF/TNwc cY7djn3z+o7R43lXFb86VIPSiWrbVOOeoD9lXIX361VRsGTWkTZijzfUeWObsGE9S1 HDxIJ1Q3f2WYBPiP9ACFHLEfuDwZYwq7XV9hjYQhRcB+p59aUa21F29Grr9jmdrfd0 frEhZ456h/BUg== X-CM-Analysis: v=2.4 cv=WMmFXmsR c=1 sm=1 tr=0 ts=6784f1f9 a=fD/rzi2Tphj41Sc3CkWoTA==:617 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=NEAV23lmAAAA:8 a=8O_u1QrtAAAA:8 a=UqCG9HQmAAAA:8 a=1cBlP2KbAAAA:8 a=pcnwQ0x5S5UUzerwc2QA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=gKTPqCehHAPHH_QMXq4j:22 a=sVIR2NZf5ZpJ0KoDd6yV:22 X-CM-Envelope: MS4xfHrxmx09uq8QL81FfjruSSOgKtzTAp2es7mJUEeRNRbiibjbeLN17tvshUN4RNXbRfq/AL7vM7+EjJg+by4i7sf/XBf/ClhPsynxf5QEAQeYCwALZWVC qHUCqdXNp4oPfnAG8GiGHLL7/dFb8U7EgffuW+SmQ7FMuQSOnE4I18sGP2vvWD5JIdpue+F9+hc+zVUcsmqFWXOUK04+p5d36u8HVODFDPzquZwplumVVwNa R58+RyfC5KTpDkS4vBvoEXo8R6ryld8bnmwphJMjlZY= From: Arjan Adriaanse Date: Mon, 13 Jan 2025 11:57:47 +0100 Message-ID: MIME-Version: 1.0 X-Spampanel-Class: ham 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/matrix.scm (pantalaimon): Update to 0.10.5-0.257ef6a. [arguments]<#:phases>: Change requirements, skip hanging tests. [native-inputs]: Add python-pytest-asyncio. [propagated-inputs]: Replace python-appdirs with python-platformdirs. Change-Id: Ie2ccb3263f41193e504184157d3a4be301ddacbf --- I forgot to include the copyright notice from the initial version. gnu/packages/matrix.scm | 131 +++++++++++++++++++++------------------- 1 file changed, 68 insertions(+), 63 deletions(-) base-commit: 7da088166d03859ccc69d65748c708caa0cbd2e8 diff --git a/gnu/packages/matrix.scm b/gnu/packages/matrix.scm index 8d1aca4b2e..be3edae0dc 100644 --- a/gnu/packages/matrix.scm +++ b/gnu/packages/matrix.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2022 Aleksandr Vityazev ;;; Copyright © 2022 Morgan Smith ;;; Copyright © 2025 Ricardo Wurmus +;;; Copyright © 2025 Arjan Adriaanse ;;; ;;; This file is part of GNU Guix. ;;; @@ -226,69 +227,73 @@ (define-public python-matrix-nio (license license:isc))) (define-public pantalaimon - (package - (name "pantalaimon") - (version "0.10.5") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/matrix-org/pantalaimon") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "16ask8v00654q307c55q5gnm8hrj40gibpab5zl52v4i0bgl9j68")))) - (build-system python-build-system) - (arguments - (list - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'downgrade-appdirs-requirement - (lambda _ - (substitute* "setup.py" - ;; FIXME: Remove this once appdirs is updated. - ;; Upgrading python-appdirs requires rebuilting 3000+ packages, - ;; when 1.4.4 is a simple maintenance fix from 1.4.3. - (("appdirs >= 1.4.4") "appdirs >= 1.4.3")))) - (add-after 'install 'install-doc - (lambda _ - (with-directory-excursion "docs/man" - (let ((man (string-append #$output "/share/man"))) - (install-file "panctl.1" (string-append man "/man1")) - (install-file "pantalaimon.5" (string-append man "/man5")) - (install-file "pantalaimon.8" (string-append man "/man8")))))) - (replace 'check - (lambda* (#:key tests? inputs outputs #:allow-other-keys) - (when tests? - (add-installed-pythonpath inputs outputs) - (invoke "pytest" "-vv" "tests"))))))) - (native-inputs - (list python-aioresponses - python-faker - python-pytest - python-pytest-aiohttp)) - (propagated-inputs - (list python-aiohttp - python-appdirs - python-attrs - python-cachetools - python-click - python-dbus - python-janus - python-keyring - python-logbook - python-matrix-nio - python-notify2 - python-peewee - python-prompt-toolkit - python-pydbus - python-pygobject)) - (home-page "https://github.com/matrix-org/pantalaimon") - (synopsis "Matrix proxy daemon that adds E2E encryption capabilities") - (description - "Pantalaimon is an end-to-end encryption aware Matrix reverse proxy + (let ((commit "257ef6a2e5e5668cd43347037c09ba036f91d997") + (revision "0")) + (package + (name "pantalaimon") + (version (git-version "0.10.5" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/matrix-org/pantalaimon") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1i18mjlc143d2xwlha09i5ny06vipmy8fii05427zq5vjz8rysgx")))) + (build-system python-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'relax-requirements + (lambda _ + (substitute* "setup.py" + ;; Newer version is packaged. + (("\"matrix-nio\\[e2e\\] >= 0\\.24, < 0\\.25\\.2\"") + "\"matrix-nio[e2e] >= 0.24, <= 0.25.2\"")))) + (add-after 'install 'install-doc + (lambda _ + (with-directory-excursion "docs/man" + (let ((man (string-append #$output "/share/man"))) + (install-file "panctl.1" (string-append man "/man1")) + (install-file "pantalaimon.5" (string-append man "/man5")) + (install-file "pantalaimon.8" (string-append man "/man8")))))) + (replace 'check + (lambda* (#:key tests? inputs outputs #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "pytest" "-vv" "tests" + ;; These tests hang. + "--ignore=tests/proxy_test.py" + "-k" "not test_start_loop"))))))) + (native-inputs + (list python-aioresponses + python-faker + python-pytest + python-pytest-aiohttp + python-pytest-asyncio)) + (propagated-inputs + (list python-aiohttp + python-attrs + python-cachetools + python-click + python-dbus + python-janus + python-keyring + python-logbook + python-matrix-nio + python-notify2 + python-peewee + python-platformdirs + python-prompt-toolkit + python-pydbus + python-pygobject)) + (home-page "https://github.com/matrix-org/pantalaimon") + (synopsis "Matrix proxy daemon that adds E2E encryption capabilities") + (description + "Pantalaimon is an end-to-end encryption aware Matrix reverse proxy daemon. Pantalaimon acts as a good man in the middle that handles the encryption for you. Messages are transparently encrypted and decrypted for clients inside of pantalaimon.") - (license license:asl2.0))) + (license license:asl2.0))))