From 10c516b2b6c9e388c56937dec7fc34526c5cb631 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 31 Jan 2023 03:20:33 +0100 Subject: [PATCH 1/2] python3Packages.magic-wormhole-mailbox-server: add patch for Python 3.11 --- .../magic-wormhole-mailbox-server/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) 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 3e4f31dff60a..849f8362e788 100644 --- a/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix +++ b/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , six , attrs , twisted @@ -20,6 +21,14 @@ buildPythonPackage rec { sha256 = "1af10592909caaf519c00e706eac842c5e77f8d4356215fe9c61c7b2258a88fb"; }; + patches = [ + (fetchpatch { + name = "fix-for-python-3.11.patch"; + url = "https://github.com/magic-wormhole/magic-wormhole-mailbox-server/commit/4b358859ba80de37c3dc0a5f67ec36909fd48234.patch"; + hash = "sha256-RzZ5kD+xhmFYusVzAbGE+CODXtJVR1zN2rZ+VGApXiQ="; + }) + ]; + propagatedBuildInputs = [ attrs six From fc218da605f878999379751cc68d7e64abebfe05 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 31 Jan 2023 09:08:38 +0100 Subject: [PATCH 2/2] python310Packages.magic-wormhole-mailbox-server: add changelog to meta - add comment to patch - update ordering --- .../magic-wormhole-mailbox-server/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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 849f8362e788..0a9e26771c4a 100644 --- a/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix +++ b/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix @@ -10,11 +10,15 @@ , autobahn , treq , mock +, pythonOlder }: buildPythonPackage rec { - version = "0.4.1"; pname = "magic-wormhole-mailbox-server"; + version = "0.4.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; @@ -23,6 +27,7 @@ buildPythonPackage rec { patches = [ (fetchpatch { + # Remove the 'U' open mode removed, https://github.com/magic-wormhole/magic-wormhole-mailbox-server/pull/34 name = "fix-for-python-3.11.patch"; url = "https://github.com/magic-wormhole/magic-wormhole-mailbox-server/commit/4b358859ba80de37c3dc0a5f67ec36909fd48234.patch"; hash = "sha256-RzZ5kD+xhmFYusVzAbGE+CODXtJVR1zN2rZ+VGApXiQ="; @@ -42,6 +47,7 @@ buildPythonPackage rec { mock twisted ]; + checkPhase = '' trial -j$NIX_BUILD_CORES wormhole_mailbox_server ''; @@ -49,6 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Securely transfer data between computers"; homepage = "https://github.com/warner/magic-wormhole-mailbox-server"; + changelog = "https://github.com/magic-wormhole/magic-wormhole-mailbox-server/blob/${version}/NEWS.md"; license = licenses.mit; maintainers = with maintainers; [ SuperSandro2000 ]; };