From 4e75c1da8cb267164d175368f6f97e923a16212f Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Thu, 12 Mar 2026 10:39:31 +0000 Subject: [PATCH 1/3] python3Packages.magic-wormhole-mailbox-server: modernize --- .../magic-wormhole-mailbox-server/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix b/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix index 189a94dbf726..cb6e32f70867 100644 --- a/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix +++ b/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix @@ -12,13 +12,13 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "magic-wormhole-mailbox-server"; version = "0.5.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-oAegNnIpMgRldoHb9QIEXW1YF8V/mq4vIibm6hoAjKE="; }; @@ -52,8 +52,8 @@ buildPythonPackage rec { meta = { description = "Securely transfer data between computers"; homepage = "https://github.com/magic-wormhole/magic-wormhole-mailbox-server"; - changelog = "https://github.com/magic-wormhole/magic-wormhole-mailbox-server/blob/${version}/NEWS.md"; + changelog = "https://github.com/magic-wormhole/magic-wormhole-mailbox-server/blob/refs/tags/${finalAttrs.version}/NEWS.md"; license = lib.licenses.mit; maintainers = [ lib.maintainers.mjoerg ]; }; -} +}) From 1951e2e747ddb07e9177d59550b69988d4741c09 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Thu, 12 Mar 2026 10:39:31 +0000 Subject: [PATCH 2/3] python3Packages.magic-wormhole-mailbox-server: use fetchFromGitHub --- .../magic-wormhole-mailbox-server/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix b/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix index cb6e32f70867..d82ff16ecbd1 100644 --- a/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix +++ b/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix @@ -2,7 +2,7 @@ lib, stdenv, buildPythonPackage, - fetchPypi, + fetchFromGitHub, setuptools, attrs, twisted, @@ -17,9 +17,11 @@ buildPythonPackage (finalAttrs: { version = "0.5.1"; pyproject = true; - src = fetchPypi { - inherit (finalAttrs) pname version; - hash = "sha256-oAegNnIpMgRldoHb9QIEXW1YF8V/mq4vIibm6hoAjKE="; + src = fetchFromGitHub { + owner = "magic-wormhole"; + repo = "magic-wormhole-mailbox-server"; + tag = finalAttrs.version; + hash = "sha256-z0iJDUE0LL/PbAYGAHnNJ4wizuB4qA4nFk3uLNuTNWg="; }; build-system = [ setuptools ]; @@ -52,7 +54,7 @@ buildPythonPackage (finalAttrs: { meta = { description = "Securely transfer data between computers"; homepage = "https://github.com/magic-wormhole/magic-wormhole-mailbox-server"; - changelog = "https://github.com/magic-wormhole/magic-wormhole-mailbox-server/blob/refs/tags/${finalAttrs.version}/NEWS.md"; + changelog = "https://github.com/magic-wormhole/magic-wormhole-mailbox-server/blob/${finalAttrs.src.rev}/NEWS.md"; license = lib.licenses.mit; maintainers = [ lib.maintainers.mjoerg ]; }; From 78099582b69e72a09ec00bb46facbe1b278e9f7c Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Thu, 12 Mar 2026 10:39:31 +0000 Subject: [PATCH 3/3] python3Packages.magic-wormhole-mailbox-server: 0.5.1 -> 0.6.0 https://github.com/magic-wormhole/magic-wormhole-mailbox-server/compare/refs/tags/0.5.1...refs/tags/0.6.0 https://github.com/magic-wormhole/magic-wormhole-mailbox-server/blob/refs/tags/0.6.0/NEWS.md --- .../python-modules/magic-wormhole-mailbox-server/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix b/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix index d82ff16ecbd1..1b5d0ea173a1 100644 --- a/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix +++ b/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix @@ -14,14 +14,14 @@ buildPythonPackage (finalAttrs: { pname = "magic-wormhole-mailbox-server"; - version = "0.5.1"; + version = "0.6.0"; pyproject = true; src = fetchFromGitHub { owner = "magic-wormhole"; repo = "magic-wormhole-mailbox-server"; tag = finalAttrs.version; - hash = "sha256-z0iJDUE0LL/PbAYGAHnNJ4wizuB4qA4nFk3uLNuTNWg="; + hash = "sha256-Ckwkvw4pMEGUTarfzg1GOodHMwM5hVix2bPCZTI6hxU="; }; build-system = [ setuptools ]; @@ -29,7 +29,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ attrs autobahn - setuptools # pkg_resources is referenced at runtime twisted ] ++ autobahn.optional-dependencies.twisted