From ff94827d4f4a3b6e0946b9ad9aa9d1deb0eea8c9 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Thu, 12 Mar 2026 10:22:44 +0000 Subject: [PATCH 1/3] python3Packages.magic-wormhole-transit-relay: modernize --- .../magic-wormhole-transit-relay/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix b/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix index 3c3e46f92c0e..d858a0902155 100644 --- a/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix +++ b/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix @@ -10,13 +10,13 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "magic-wormhole-transit-relay"; version = "0.4.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-kS2DXaIbESZsdxEdybXlgAJj/AuY8KF5liJn30GBnow="; }; @@ -61,8 +61,8 @@ buildPythonPackage rec { meta = { description = "Transit Relay server for Magic-Wormhole"; homepage = "https://github.com/magic-wormhole/magic-wormhole-transit-relay"; - changelog = "https://github.com/magic-wormhole/magic-wormhole-transit-relay/blob/${version}/NEWS.md"; + changelog = "https://github.com/magic-wormhole/magic-wormhole-transit-relay/blob/refs/tags/${finalAttrs.version}/NEWS.md"; license = lib.licenses.mit; maintainers = [ lib.maintainers.mjoerg ]; }; -} +}) From a351a0427fc2ac2f7c3dc21de86679ea0ab2f585 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Thu, 12 Mar 2026 10:22:44 +0000 Subject: [PATCH 2/3] python3Packages.magic-wormhole-transit-relay: use fetchFromGitHub --- .../magic-wormhole-transit-relay/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix b/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix index d858a0902155..e92d2b0ec273 100644 --- a/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix +++ b/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, fetchpatch, setuptools, autobahn, @@ -15,9 +15,11 @@ buildPythonPackage (finalAttrs: { version = "0.4.0"; pyproject = true; - src = fetchPypi { - inherit (finalAttrs) pname version; - hash = "sha256-kS2DXaIbESZsdxEdybXlgAJj/AuY8KF5liJn30GBnow="; + src = fetchFromGitHub { + owner = "magic-wormhole"; + repo = "magic-wormhole-transit-relay"; + tag = finalAttrs.version; + hash = "sha256-AKLmiOlxNDd8rxNeWTDTPxtSoEyTGZ5PMLgyVxcIHcg="; }; patches = [ @@ -61,7 +63,7 @@ buildPythonPackage (finalAttrs: { meta = { description = "Transit Relay server for Magic-Wormhole"; homepage = "https://github.com/magic-wormhole/magic-wormhole-transit-relay"; - changelog = "https://github.com/magic-wormhole/magic-wormhole-transit-relay/blob/refs/tags/${finalAttrs.version}/NEWS.md"; + changelog = "https://github.com/magic-wormhole/magic-wormhole-transit-relay/blob/${finalAttrs.src.rev}/NEWS.md"; license = lib.licenses.mit; maintainers = [ lib.maintainers.mjoerg ]; }; From 175c8303930386dadc2d447f005f19bc296a7b33 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Thu, 12 Mar 2026 10:22:44 +0000 Subject: [PATCH 3/3] python3Packages.magic-wormhole-transit-relay: 0.4.0 -> 0.5.0 https://github.com/magic-wormhole/magic-wormhole-transit-relay/compare/refs/tags/0.4.0...refs/tags/0.5.0 https://github.com/magic-wormhole/magic-wormhole-transit-relay/blob/refs/tags/0.5.0/NEWS.md --- .../magic-wormhole-transit-relay/default.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix b/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix index e92d2b0ec273..c58017f7bf77 100644 --- a/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix +++ b/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, setuptools, autobahn, twisted, @@ -12,25 +11,16 @@ buildPythonPackage (finalAttrs: { pname = "magic-wormhole-transit-relay"; - version = "0.4.0"; + version = "0.5.0"; pyproject = true; src = fetchFromGitHub { owner = "magic-wormhole"; repo = "magic-wormhole-transit-relay"; tag = finalAttrs.version; - hash = "sha256-AKLmiOlxNDd8rxNeWTDTPxtSoEyTGZ5PMLgyVxcIHcg="; + hash = "sha256-UhV0M8Nl9Y850PQcJoDyIvIPRyBS8gyF2Ub9qF3aq0U="; }; - patches = [ - # TODO: drop when updating beyond version 0.4.0 - (fetchpatch { - name = "stock-Twisted-testing-reactor-seems-to-work.patch"; - url = "https://github.com/magic-wormhole/magic-wormhole-transit-relay/commit/3abb80fd5e55bd0ba8ee66278ccf76be5f904622.patch"; - hash = "sha256-qMaJ58kPWvEfnSZiFzxO6GlkBiyVMsgGDEa1deITZco="; - }) - ]; - postPatch = '' # Passing the environment to twistd is necessary to preserve Python's site path. substituteInPlace src/wormhole_transit_relay/test/test_backpressure.py --replace-fail \ @@ -42,7 +32,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ autobahn - setuptools # pkg_resources is referenced at runtime twisted ];