commit 878e80c5962b42b7b10a20a98f98319a72cb5031 · pyrox.dev/nixpkgs

+29

pkgs/servers/mautrix-telegram/0001-Re-add-entrypoint.patch

···

       1
       1
       +
       From f4a612e1c8501d2a1683003bb121daa6d46155ca Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Maximilian Bosch <maximilian@mbosch.me>

     

       3
       3
       +
       Date: Sun, 29 Nov 2020 20:45:16 +0100

     

       4
       4
       +
       Subject: [PATCH 1/2] Re-add entrypoint

     

       5
       5
       +
       

     

       6
       6
       +
       ---

     

       7
       7
       +
        setup.py | 6 ++++++

     

       8
       8
       +
        1 file changed, 6 insertions(+)

     

       9
       9
       +
       

     

       10
       10
       +
       diff --git a/setup.py b/setup.py

     

       11
       11
       +
       index 068c351..95dbf89 100644

     

       12
       12
       +
       --- a/setup.py

     

       13
       13
       +
       +++ b/setup.py

     

       14
       14
       +
       @@ -51,6 +51,12 @@ setuptools.setup(

     

       15
       15
       +
            extras_require=extras_require,

     

       16
       16
       +
            python_requires="~=3.6",

     

       17
       17
       +
        

     

       18
       18
       +
       +    entry_points={

     

       19
       19
       +
       +        'console_scripts': [

     

       20
       20
       +
       +            'mautrix-telegram=mautrix_telegram.__main__:main'

     

       21
       21
       +
       +        ]

     

       22
       22
       +
       +    },

     

       23
       23
       +
       +

     

       24
       24
       +
            setup_requires=["pytest-runner"],

     

       25
       25
       +
            tests_require=["pytest", "pytest-asyncio", "pytest-mock"],

     

       26
       26
       +
        

     

       27
       27
       +
       -- 

     

       28
       28
       +
       2.28.0

     

       29
       29
       +

+24

pkgs/servers/mautrix-telegram/0002-Don-t-depend-on-pytest-runner.patch

···

       1
       1
       +
       From eb39954acf73096d65ba1e9575cbeb3d4307d5df Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Maximilian Bosch <maximilian@mbosch.me>

     

       3
       3
       +
       Date: Sun, 29 Nov 2020 20:55:17 +0100

     

       4
       4
       +
       Subject: [PATCH 2/2] Don't depend on pytest-runner

     

       5
       5
       +
       

     

       6
       6
       +
       ---

     

       7
       7
       +
        setup.py | 1 -

     

       8
       8
       +
        1 file changed, 1 deletion(-)

     

       9
       9
       +
       

     

       10
       10
       +
       diff --git a/setup.py b/setup.py

     

       11
       11
       +
       index 95dbf89..89ea2a7 100644

     

       12
       12
       +
       --- a/setup.py

     

       13
       13
       +
       +++ b/setup.py

     

       14
       14
       +
       @@ -57,7 +57,6 @@ setuptools.setup(

     

       15
       15
       +
                ]

     

       16
       16
       +
            },

     

       17
       17
       +
        

     

       18
       18
       +
       -    setup_requires=["pytest-runner"],

     

       19
       19
       +
            tests_require=["pytest", "pytest-asyncio", "pytest-mock"],

     

       20
       20
       +
        

     

       21
       21
       +
            classifiers=[

     

       22
       22
       +
       -- 

     

       23
       23
       +
       2.28.0

     

       24
       24
       +

+4 -5

pkgs/servers/mautrix-telegram/default.nix

···

       21
       21
        
           sha256 = "1543ljjl3jg3ayid7ifi4bamqh4gq85pmlbs3m8i7phjbbm7g9dn";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
       +
         patches = [ ./0001-Re-add-entrypoint.patch ./0002-Don-t-depend-on-pytest-runner.patch ];

     

       24
       25
        
         postPatch = ''

     

       25
       26
        
           sed -i -e '/alembic>/d' requirements.txt

     

       26
       27
        
         '';

     

       27
       27
       -
       

     

       28
       28
       -
         nativeBuildInputs = [

     

       29
       29
       -
           pytestrunner

     

       30
       30
       -
         ];

     

       31
       28
        
       

     

       32
       29
        
         propagatedBuildInputs = [

     

       33
       30
        
           Mako

     
···

       58
       55
        
       

     

       59
       56
        
         # Tests are broken and throw the following for every test:

     

       60
       57
        
         #   TypeError: 'Mock' object is not subscriptable

     

       58
       58
       +
         #

     

       59
       59
       +
         # The tests were touched the last time in 2019 and upstream CI doesn't even build

     

       60
       60
       +
         # those, so it's safe to assume that this part of the software is abandoned.

     

       61
       61
        
         doCheck = false;

     

       62
       62
       -
       

     

       63
       62
        
         checkInputs = [

     

       64
       63
        
           pytest

     

       65
       64
        
           pytest-mock