commit 0afba0d517208e36cdef92eddbd4f24056bd72ea · pyrox.dev/nixpkgs

+1 -1

nixos/modules/services/networking/magic-wormhole-mailbox-server.nix

···

       9
       9
        
         cfg = config.services.magic-wormhole-mailbox-server;

     

       10
       10
        
         # keep semicolon in dataDir for backward compatibility

     

       11
       11
        
         dataDir = "/var/lib/magic-wormhole-mailbox-server;";

     

       12
       12
       -
         python = pkgs.python311.withPackages (

     

       12
       12
       +
         python = pkgs.python3.withPackages (

     

       13
       13
        
           py: with py; [

     

       14
       14
        
             magic-wormhole-mailbox-server

     

       15
       15
        
             twisted

+2 -20

pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix

···

       3
       3
        
         stdenv,

     

       4
       4
        
         buildPythonPackage,

     

       5
       5
        
         fetchPypi,

     

       6
       6
       -
         fetchpatch,

     

       7
       6
        
         setuptools,

     

       8
       8
       -
         six,

     

       9
       7
        
         attrs,

     

       10
       8
        
         twisted,

     

       11
       9
        
         autobahn,

     

       12
       10
        
         treq,

     

       13
       13
       -
         mock,

     

       14
       11
        
         nixosTests,

     

       15
       15
       -
         pythonOlder,

     

       16
       16
       -
         pythonAtLeast,

     

       17
       12
        
         pytestCheckHook,

     

       18
       13
        
       }:

     

       19
       14
        
       

     

       20
       15
        
       buildPythonPackage rec {

     

       21
       16
        
         pname = "magic-wormhole-mailbox-server";

     

       22
       22
       -
         version = "0.4.1";

     

       17
       17
       +
         version = "0.5.1";

     

       23
       18
        
         pyproject = true;

     

       24
       19
        
       

     

       25
       20
        
         src = fetchPypi {

     

       26
       21
        
           inherit pname version;

     

       27
       27
       -
           hash = "sha256-GvEFkpCcqvUZwA5wbqyELF53+NQ1YhX+nGHHsiWKiPs=";

     

       22
       22
       +
           hash = "sha256-oAegNnIpMgRldoHb9QIEXW1YF8V/mq4vIibm6hoAjKE=";

     

       28
       23
        
         };

     

       29
       24
        
       

     

       30
       30
       -
         patches = [

     

       31
       31
       -
           (fetchpatch {

     

       32
       32
       -
             # Remove the 'U' open mode removed, https://github.com/magic-wormhole/magic-wormhole-mailbox-server/pull/34

     

       33
       33
       -
             name = "fix-for-python-3.11.patch";

     

       34
       34
       -
             url = "https://github.com/magic-wormhole/magic-wormhole-mailbox-server/commit/4b358859ba80de37c3dc0a5f67ec36909fd48234.patch";

     

       35
       35
       -
             hash = "sha256-RzZ5kD+xhmFYusVzAbGE+CODXtJVR1zN2rZ+VGApXiQ=";

     

       36
       36
       -
           })

     

       37
       37
       -
         ];

     

       38
       38
       -
       

     

       39
       25
        
         build-system = [ setuptools ];

     

       40
       26
        
       

     

       41
       27
        
         dependencies = [

     

       42
       28
        
           attrs

     

       43
       29
        
           autobahn

     

       44
       30
        
           setuptools # pkg_resources is referenced at runtime

     

       45
       45
       -
           six

     

       46
       31
        
           twisted

     

       47
       32
        
         ] ++ autobahn.optional-dependencies.twisted ++ twisted.optional-dependencies.tls;

     

       48
       33
        
       

     
···

       51
       36
        
         nativeCheckInputs = [

     

       52
       37
        
           pytestCheckHook

     

       53
       38
        
           treq

     

       54
       54
       -
           mock

     

       55
       39
        
         ];

     

       56
       40
        
       

     

       57
       41
        
         disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [

     
···

       69
       53
        
           changelog = "https://github.com/magic-wormhole/magic-wormhole-mailbox-server/blob/${version}/NEWS.md";

     

       70
       54
        
           license = lib.licenses.mit;

     

       71
       55
        
           maintainers = [ lib.maintainers.mjoerg ];

     

       72
       72
       -
           # Python 3.12 support: https://github.com/magic-wormhole/magic-wormhole-mailbox-server/issues/41

     

       73
       73
       -
           broken = pythonOlder "3.7" || pythonAtLeast "3.12";

     

       74
       56
        
         };

     

       75
       57
        
       }

+3 -25

pkgs/development/python-modules/magic-wormhole/default.nix

···

       28
       28
        
         # tests

     

       29
       29
        
         nettools,

     

       30
       30
        
         unixtools,

     

       31
       31
       -
         mock,

     

       32
       31
        
         magic-wormhole-transit-relay,

     

       33
       32
        
         magic-wormhole-mailbox-server,

     

       34
       33
        
         pytestCheckHook,

     
···

       81
       80
        
         };

     

       82
       81
        
       

     

       83
       82
        
         nativeCheckInputs =

     

       84
       84
       -
           # For Python 3.12, remove magic-wormhole-mailbox-server and magic-wormhole-transit-relay from test dependencies,

     

       85
       85
       -
           # which are not yet supported with this version.

     

       86
       86
       -
           lib.optionals

     

       87
       87
       -
             (!magic-wormhole-mailbox-server.meta.broken && !magic-wormhole-transit-relay.meta.broken)

     

       88
       88
       -
             [

     

       89
       89
       -
               magic-wormhole-mailbox-server

     

       90
       90
       -
               magic-wormhole-transit-relay

     

       91
       91
       -
             ]

     

       92
       92
       -
           ++ [

     

       93
       93
       -
             mock

     

       83
       83
       +
           [

     

       84
       84
       +
             magic-wormhole-mailbox-server

     

       85
       85
       +
             magic-wormhole-transit-relay

     

       94
       86
        
             pytestCheckHook

     

       95
       87
        
           ]

     

       96
       88
        
           ++ optional-dependencies.dilation

     

       97
       89
        
           ++ lib.optionals stdenv.hostPlatform.isDarwin [ unixtools.locale ];

     

       98
       90
        
       

     

       99
       91
        
         __darwinAllowLocalNetworking = true;

     

       100
       100
       -
       

     

       101
       101
       -
         disabledTestPaths =

     

       102
       102
       -
           # For Python 3.12, remove the tests depending on magic-wormhole-mailbox-server and magic-wormhole-transit-relay,

     

       103
       103
       -
           # which are not yet supported with this version.

     

       104
       104
       -
           lib.optionals

     

       105
       105
       -
             (magic-wormhole-mailbox-server.meta.broken || magic-wormhole-transit-relay.meta.broken)

     

       106
       106
       -
             [

     

       107
       107
       -
               "src/wormhole/test/dilate/test_full.py"

     

       108
       108
       -
               "src/wormhole/test/test_args.py"

     

       109
       109
       -
               "src/wormhole/test/test_cli.py"

     

       110
       110
       -
               "src/wormhole/test/test_transit.py"

     

       111
       111
       -
               "src/wormhole/test/test_wormhole.py"

     

       112
       112
       -
               "src/wormhole/test/test_xfer_util.py"

     

       113
       113
       -
             ];

     

       114
       92
        
       

     

       115
       93
        
         postInstall = ''

     

       116
       94
        
           install -Dm644 docs/wormhole.1 $out/share/man/man1/wormhole.1