commit 6aded65e28c8805bfb81e6b5fc1613633480eb16 · pyrox.dev/nixpkgs

+24 -6

pkgs/development/python-modules/falcon/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
       -
       , fetchPypi

     

       4
       3
        
       , pythonOlder

     

       4
       4
       +
       , fetchPypi

     

       5
       5
       +
       , pytestCheckHook

     

       5
       6
        
       , aiofiles

     

       6
       7
        
       , cbor2

     

       8
       8
       +
       , ddt

     

       9
       9
       +
       , gunicorn

     

       7
       10
        
       , httpx

     

       11
       11
       +
       , hypercorn

     

       12
       12
       +
       , jsonschema

     

       8
       13
        
       , msgpack

     

       14
       14
       +
       , mujson

     

       15
       15
       +
       , nose

     

       16
       16
       +
       , orjson

     

       9
       17
        
       , pecan

     

       10
       18
        
       , pytest-asyncio

     

       11
       11
       -
       , pytestCheckHook

     

       19
       19
       +
       , python-mimeparse

     

       12
       20
        
       , pyyaml

     

       21
       21
       +
       , rapidjson

     

       13
       22
        
       , requests

     

       14
       23
        
       , testtools

     

       24
       24
       +
       , ujson

     

       25
       25
       +
       , uvicorn

     

       15
       26
        
       , websockets

     

       16
       27
        
       }:

     

       17
       28
        
       

     
···

       29
       40
        
         checkInputs = [

     

       30
       41
        
           aiofiles

     

       31
       42
        
           cbor2

     

       43
       43
       +
           ddt

     

       44
       44
       +
           gunicorn

     

       32
       45
        
           httpx

     

       46
       46
       +
           hypercorn

     

       47
       47
       +
           jsonschema

     

       33
       48
        
           msgpack

     

       49
       49
       +
           mujson

     

       50
       50
       +
           nose

     

       51
       51
       +
           orjson

     

       34
       52
        
           pecan

     

       35
       53
        
           pytest-asyncio

     

       36
       54
        
           pytestCheckHook

     

       55
       55
       +
           python-mimeparse

     

       37
       56
        
           pyyaml

     

       57
       57
       +
           rapidjson

     

       38
       58
        
           requests

     

       39
       59
        
           testtools

     

       60
       60
       +
           ujson

     

       61
       61
       +
           uvicorn

     

       40
       62
        
           websockets

     

       41
       63
        
         ];

     

       42
       64
        
       

     

       43
       65
        
         disabledTestPaths = [

     

       44
       66
        
           # missing optional nuts package

     

       45
       67
        
           "falcon/bench/nuts/nuts/tests/test_functional.py"

     

       46
       46
       -
           # missing optional mujson package

     

       47
       47
       -
           "tests/test_media_handlers.py"

     

       48
       48
       -
           # tries to run uvicorn binary and doesn't find it

     

       49
       49
       -
           "tests/asgi/test_asgi_servers.py"

     

       50
       68
        
         ];

     

       51
       69
        
       

     

       52
       70
        
         meta = with lib; {

+2 -2

pkgs/development/python-modules/mailman-hyperkitty/default.nix

···

       12
       12
        
       

     

       13
       13
        
       buildPythonPackage rec {

     

       14
       14
        
         pname = "mailman-hyperkitty";

     

       15
       15
       -
         version = "1.1.0";

     

       15
       15
       +
         version = "1.2.0";

     

       16
       16
        
         format = "setuptools";

     

       17
       17
        
       

     

       18
       18
        
         disabled = pythonOlder "3.9";

     

       19
       19
        
       

     

       20
       20
        
         src = fetchPypi {

     

       21
       21
        
           inherit pname version;

     

       22
       22
       -
           sha256 = "1lfqa9admhvdv71f528jmz2wl0i5cv77v6l64px2pm4zqr9ckkjx";

     

       22
       22
       +
           sha256 = "sha256-EQBx1KX3z/Wv3QAHOi+s/ihLOjpiupIQBYyE6IPbJto=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         propagatedBuildInputs = [

+32

pkgs/development/python-modules/mujson/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

       6
       6
       +
       buildPythonPackage rec {

     

       7
       7
       +
         pname = "mujson";

     

       8
       8
       +
         version = "1.4";

     

       9
       9
       +
       

     

       10
       10
       +
         src = fetchPypi {

     

       11
       11
       +
           inherit pname version;

     

       12
       12
       +
           sha256 = "sha256-J9nPGxDkLQje6AkL9cewNqmQ7Z+00TXBEr3p71E2cnE=";

     

       13
       13
       +
         };

     

       14
       14
       +
       

     

       15
       15
       +
         # LICENSE file missing from src

     

       16
       16
       +
         # https://github.com/mattgiles/mujson/issues/8

     

       17
       17
       +
         postPatch = ''

     

       18
       18
       +
           substituteInPlace setup.cfg \

     

       19
       19
       +
             --replace "license_file = LICENSE" ""

     

       20
       20
       +
         '';

     

       21
       21
       +
       

     

       22
       22
       +
         # No tests

     

       23
       23
       +
         doCheck = false;

     

       24
       24
       +
         pythonImportsCheck = [ "mujson" ];

     

       25
       25
       +
       

     

       26
       26
       +
         meta = with lib; {

     

       27
       27
       +
           description = "Use the fastest JSON functions available at import time";

     

       28
       28
       +
           homepage = "https://github.com/mattgiles/mujson";

     

       29
       29
       +
           license = licenses.mit;

     

       30
       30
       +
           maintainers = with maintainers; [ artturin ];

     

       31
       31
       +
         };

     

       32
       32
       +
       }

+4 -7

pkgs/servers/mail/mailman/default.nix

···

       1
       1
       -
       { lib, python3, fetchPypi, fetchpatch, pythonOlder, postfix, lynx

     

       1
       1
       +
       { lib, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder, python3, postfix, lynx

     

       2
       2
        
       }:

     

       3
       3
        
       

     

       4
       4
        
       let

     

       5
       5
       -
         py = python3.override {

     

       5
       5
       +
         # Mailman does not support sqlalchemy >= 1.4 https://gitlab.com/mailman/mailman/-/issues/845

     

       6
       6
       +
         pythonOverride = python3.override {

     

       6
       7
        
           packageOverrides = self: super: {

     

       7
       7
       -
             # https://gitlab.com/mailman/mailman/-/issues/845

     

       8
       8
        
             sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec {

     

       9
       9
        
               version = "1.3.24";

     

       10
       10
        
               src = oldAttrs.src.override {

     
···

       14
       14
        
             });

     

       15
       15
        
           };

     

       16
       16
        
         };

     

       17
       17
       -
       

     

       18
       17
        
       in

     

       19
       19
       -
       

     

       20
       20
       -
       with py.pkgs;

     

       21
       18
        
       

     

       22
       19
        
       buildPythonPackage rec {

     

       23
       20
        
         pname = "mailman";

     
···

       29
       26
        
           sha256 = "12mgxs1ndhdjjkydx48b95na9k9h0disfqgrr6wxx7vda6dqvcwz";

     

       30
       27
        
         };

     

       31
       28
        
       

     

       32
       32
       -
         propagatedBuildInputs = [

     

       29
       29
       +
         propagatedBuildInputs = with pythonOverride.pkgs; [

     

       33
       30
        
           aiosmtpd

     

       34
       31
        
           alembic

     

       35
       32
        
           authheaders

+6 -12

pkgs/servers/mail/mailman/hyperkitty.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
       -
       , fetchFromGitLab

     

       4
       4
       -
       , isPy3k

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , pythonOlder

     

       5
       5
        
       

     

       6
       6
        
       # dependencies

     

       7
       7
        
       , defusedxml

     
···

       32
       32
        
         pname = "HyperKitty";

     

       33
       33
        
         # Note: Mailman core must be on the latest version before upgrading HyperKitty.

     

       34
       34
        
         # See: https://gitlab.com/mailman/postorius/-/issues/516#note_544571309

     

       35
       35
       -
         #

     

       36
       36
       -
         # Update to next stable version > 1.3.4 that has fixed tests, see

     

       37
       37
       -
         # https://gitlab.com/mailman/django-mailman3/-/issues/48

     

       38
       35
        
         version = "1.3.5";

     

       39
       39
       -
         disabled = !isPy3k;

     

       36
       36
       +
         disabled = pythonOlder "3.8";

     

       40
       37
        
       

     

       41
       41
       -
         src = fetchFromGitLab {

     

       42
       42
       -
           domain = "gitlab.com";

     

       43
       43
       -
           owner = "mailman";

     

       44
       44
       -
           repo = "hyperkitty";

     

       45
       45
       -
           rev = version;

     

       46
       46
       -
           sha256 = "0v70r0r6w0q56hk2hw1qp3ci0bwd9x8inf4gai6ybjqjfskqrxi4";

     

       38
       38
       +
         src = fetchPypi {

     

       39
       39
       +
           inherit pname version;

     

       40
       40
       +
           sha256 = "sha256-gmkiK8pIHfubbbxNdm/D6L2o722FptxYgINYdIUOn4Y=";

     

       47
       41
        
         };

     

       48
       42
        
       

     

       49
       43
        
         postPatch = ''

+2 -2

pkgs/servers/mail/mailman/postorius.nix

···

       6
       6
        
         pname = "postorius";

     

       7
       7
        
         # Note: Mailman core must be on the latest version before upgrading Postorious.

     

       8
       8
        
         # See: https://gitlab.com/mailman/postorius/-/issues/516#note_544571309

     

       9
       9
       -
         version = "1.3.5";

     

       9
       9
       +
         version = "1.3.6";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchPypi {

     

       12
       12
        
           inherit pname version;

     

       13
       13
       -
           sha256 = "0f23c6542bf0f6e6364d678c094ee5804acfe59ecbcc0e944bc4c13834e24e80";

     

       13
       13
       +
           sha256 = "sha256-KwzEU9IfcQ6YPZu3jPuFrd6ux/3e2pzoLfTrak/aGmg=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         propagatedBuildInputs = [ django-mailman3 readme_renderer ];

+11 -18

pkgs/servers/mail/mailman/web.nix

···

       1
       1
       -
       { buildPythonPackage, lib, fetchgit, isPy3k

     

       2
       2
       -
       , git, makeWrapper, sassc, hyperkitty, postorius, whoosh, setuptools-scm

     

       1
       1
       +
       { buildPythonPackage, lib, fetchPypi, pythonOlder

     

       2
       2
       +
       , sassc, hyperkitty, postorius, whoosh, setuptools-scm

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
        
       buildPythonPackage rec {

     

       6
       6
        
         pname = "mailman-web";

     

       7
       7
       -
         version = "unstable-2021-04-10";

     

       8
       8
       -
         disabled = !isPy3k;

     

       7
       7
       +
         version = "0.0.5";

     

       8
       8
       +
         disabled = pythonOlder "3.8";

     

       9
       9
        
       

     

       10
       10
       -
         src = fetchgit {

     

       11
       11
       -
           url = "https://gitlab.com/mailman/mailman-web";

     

       12
       12
       -
           rev = "19a7abe27dd3bc39c0250440de073f0adecd4da1";

     

       13
       13
       -
           sha256 = "0h25140n2jaisl0ri5x7gdmbypiys8vlq8dql1zmaxvq459ybxkn";

     

       14
       14
       -
           leaveDotGit = true;

     

       10
       10
       +
         src = fetchPypi {

     

       11
       11
       +
           inherit pname version;

     

       12
       12
       +
           sha256 = "sha256-9pvs/VATAsMcGNrj58b/LifysEPTNhrAP57sfp4nX6Q=";

     

       15
       13
        
         };

     

       16
       14
        
       

     

       17
       15
        
         postPatch = ''

     

       18
       18
       -
           # This is just so people installing from pip also get uwsgi

     

       19
       19
       -
           # installed, AFAICT.

     

       20
       20
       -
           sed -i '/^  uwsgi$/d' setup.cfg

     

       21
       21
       -
       

     

       22
       16
        
           # Django is depended on transitively by hyperkitty and postorius,

     

       23
       17
        
           # and mailman_web has overly restrictive version bounds on it, so

     

       24
       18
        
           # let's remove it.

     
···

       32
       26
        
               --replace /opt/mailman/web /var/lib/mailman-web

     

       33
       27
        
         '';

     

       34
       28
        
       

     

       35
       35
       -
         nativeBuildInputs = [ git makeWrapper setuptools-scm ];

     

       29
       29
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       36
       30
        
         propagatedBuildInputs = [ hyperkitty postorius whoosh ];

     

       37
       31
        
       

     

       38
       32
        
         # Tries to check runtime configuration.

     

       39
       33
        
         doCheck = false;

     

       40
       34
        
       

     

       41
       41
       -
         postInstall = ''

     

       42
       42
       -
           wrapProgram $out/bin/mailman-web \

     

       43
       43
       -
               --suffix PATH : ${lib.makeBinPath [ sassc ]}

     

       44
       44
       -
         '';

     

       35
       35
       +
         makeWrapperArgs = [

     

       36
       36
       +
           "--suffix PATH : ${lib.makeBinPath [ sassc ]}"

     

       37
       37
       +
         ];

     

       45
       38
        
       

     

       46
       39
        
         meta = with lib; {

     

       47
       40
        
           description = "Django project for Mailman 3 web interface";

+2

pkgs/top-level/python-packages.nix

···

       4978
       4978
        
       

     

       4979
       4979
        
         mutf8 = callPackage ../development/python-modules/mutf8 { };

     

       4980
       4980
        
       

     

       4981
       4981
       +
         mujson = callPackage ../development/python-modules/mujson { };

     

       4982
       4982
       +
       

     

       4981
       4983
        
         mwclient = callPackage ../development/python-modules/mwclient { };

     

       4982
       4984
        
       

     

       4983
       4985
        
         mwdblib = callPackage ../development/python-modules/mwdblib { };