From patchwork Mon Jan 13 10:48:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arjan Adriaanse X-Patchwork-Id: 37042 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 EB44427BBE2; Mon, 13 Jan 2025 10:52:27 +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 09B6727BBE9 for ; Mon, 13 Jan 2025 10:52:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tXI3C-0004tu-32; Mon, 13 Jan 2025 05:52:06 -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 1tXI38-0004tf-Mt for guix-patches@gnu.org; Mon, 13 Jan 2025 05:52:03 -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 1tXI38-0006bZ-BM for guix-patches@gnu.org; Mon, 13 Jan 2025 05:52:02 -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=6kerFtN+yRK/fGDjFhnoSxVMd4nEFlltLKoQzUH1dLs=; b=cNO9K8qIJvFfV4AV0QKR4NkeP8hI3IRH2A4hd/bNby7VN1kvquat3tcFcVzUiBcYxY8wsyxFFYsMUZBPPLD0vo+daosGjVMKEILlXKRcrbfyyGUEYdlBMuEBpaQVH75tPflsMa3D57NGEIu5NepSCW/2L0EahtgPIgyx2iGx6l5ufD8Jbn3pU8BgXlxofgWpFey4wSOdOcrjvk1PVPn6VmOT5DvcDiv5UCM8WGymt1xXs+0I6odKKr5PcH4M6UqJgggvh79uY4gy4eh4OGinOJ9u/ZcoaT/Y7Gj3VbxpTnQ8U+Nu6iVdsnLbw8vsSD78uB5BZHcM7jK0kF1INcNPKQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tXI37-0007m1-Nd; Mon, 13 Jan 2025 05:52:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75420] [PATCH python-team v2] 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 10:52:01 +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.173676550429852 (code B ref 75420); Mon, 13 Jan 2025 10:52:01 +0000 Received: (at 75420) by debbugs.gnu.org; 13 Jan 2025 10:51:44 +0000 Received: from localhost ([127.0.0.1]:50471 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tXI2p-0007lQ-QE for submit@debbugs.gnu.org; Mon, 13 Jan 2025 05:51:44 -0500 Received: from dane.soverin.net ([2a10:de80:1:4091:b9e9:2219:0:1]:54931) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tXI2n-0007l8-9d for 75420@debbugs.gnu.org; Mon, 13 Jan 2025 05:51:42 -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 4YWpwN5hDyzyr6; Mon, 13 Jan 2025 10:51:32 +0000 (UTC) Received: from smtp.freedom.nl (smtp.freedom.nl [10.10.4.107]) by freedom.nl (Postfix) with ESMTPSA id 4YWpwN2GZgz4r; Mon, 13 Jan 2025 10:51:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=adriaan.se; s=soverin; t=1736765492; bh=+w5ZVQ/u6pR3yLOutaZEcj5IX4ldqSpRJgmU3wV6mgs=; h=From:To:Cc:Subject:Date:From; b=AANcs7Ee9UHz37iBhlzpFEqDLENFtWDgX9vjbFR4KNNy0zUv8luAJkZZkP+4iIIBl nzD0UovsfykcX1CSU8ANltMAaRxkavgBixHbSF0b89akGuneEMyO/XvUicKwlm4u61 Cm1nt6dAq/QYKDJAkE3O6ivd0ptlb2uBki7eQeTyY6Ujx5cu9liBm4F8SkHmr0wnHa UjvHml0VxoqihBqBpOF7YGn3ey4D9SnOHsuF1TLAHpGfTZcHp2IdUpJIbqcCZwWj8a iKeGMF/IRn0j7FAE4/e34yTw3hgI8JEsp+OsR+rxBdq6068w/RRrKdZvFt9SWu5uyF TK4yxMB9sipfA== X-CM-Analysis: v=2.4 cv=UsCZN/wB c=1 sm=1 tr=0 ts=6784f034 a=fD/rzi2Tphj41Sc3CkWoTA==:617 a=xqWC_Br6kY4A:10 a=NEAV23lmAAAA:8 a=pcnwQ0x5S5UUzerwc2QA:9 X-CM-Envelope: MS4xfFphOPdHaTm+GEjkfEtrQ0OpUtrYc/3YI6kR7/7lTw+Rf+sSMQlYygw/ax9j9m7y4OnfN9elXbf/kDlfk5AtFxdSGUb6bU5y26qsEmjxRbfe1K80FbBs XmBZ/pEcG6FH5jf4bwD81pdxfLVkR2bwm4tlp2COsm3PfduL7xs8bFlDuFGUs1eHtOPTDx+JByRwp+Ueaw6dLDzpyqKYGZZIagJ7aU2xKfdibEBfxQarKO+5 SnJPG/VXJ7YdLcohxKgCzjAxR5W4BMjEtfDH4o/zNik= From: Arjan Adriaanse Date: Mon, 13 Jan 2025 11:48:38 +0100 Message-ID: <7c5dfb498ae1b5807a55aeb4202857cf97f74cd2.1736765318.git.arjan@adriaan.se> 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 --- The previous version was based on an outdated revision, but all of the dependendies have already been updated. This version only consists of the pantalaimon update. gnu/packages/matrix.scm | 130 +++++++++++++++++++++------------------- 1 file changed, 67 insertions(+), 63 deletions(-) base-commit: 7da088166d03859ccc69d65748c708caa0cbd2e8 diff --git a/gnu/packages/matrix.scm b/gnu/packages/matrix.scm index 8d1aca4b2e..ef86c038ce 100644 --- a/gnu/packages/matrix.scm +++ b/gnu/packages/matrix.scm @@ -226,69 +226,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))))