commit 5d609e47fe92a0ee3cc0f5cead172f9bafe5dee8 · pyrox.dev/nixpkgs

+19 -5

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

···

       3
       3
        
       , colorama

     

       4
       4
        
       , fetchPypi

     

       5
       5
        
       , pillow

     

       6
       6
       +
       , pytestCheckHook

     

       6
       7
        
       , pythonOlder

     

       7
       8
        
       }:

     

       8
       9
        
       

     

       9
       10
        
       buildPythonPackage rec {

     

       10
       11
        
         pname = "ascii-magic";

     

       11
       11
       -
         version = "2.1.1";

     

       12
       12
       +
         version = "2.3.0";

     

       12
       13
        
         format = "setuptools";

     

       13
       14
        
       

     

       14
       15
        
         disabled = pythonOlder "3.7";

     
···

       16
       17
        
         src = fetchPypi {

     

       17
       18
        
           pname = "ascii_magic";

     

       18
       19
        
           inherit version;

     

       19
       19
       -
           hash = "sha256-YfGa+3nuqAAo69TydxO6uKNMcqZAkOEi/PMP8Frasfw=";

     

       20
       20
       +
           hash = "sha256-PtQaHLFn3u1cz8YotmnzWjoD9nvdctzBi+X/2KJkPYU=";

     

       20
       21
        
         };

     

       21
       22
        
       

     

       22
       23
        
         propagatedBuildInputs = [

     
···

       24
       25
        
           pillow

     

       25
       26
        
         ];

     

       26
       27
        
       

     

       27
       27
       -
         # Project is not tagging releases and tests are not shipped with PyPI source

     

       28
       28
       -
         # https://github.com/LeandroBarone/python-ascii_magic/issues/10

     

       29
       29
       -
         doCheck = false;

     

       28
       28
       +
         nativeCheckInputs = [

     

       29
       29
       +
           pytestCheckHook

     

       30
       30
       +
         ];

     

       30
       31
        
       

     

       31
       32
        
         pythonImportsCheck = [

     

       32
       33
        
           "ascii_magic"

     

       34
       34
       +
         ];

     

       35
       35
       +
       

     

       36
       36
       +
         preCheck = ''

     

       37
       37
       +
           cd tests

     

       38
       38
       +
         '';

     

       39
       39
       +
       

     

       40
       40
       +
         disabledTests = [

     

       41
       41
       +
           # Test requires network access

     

       42
       42
       +
           "test_from_url"

     

       43
       43
       +
           "test_quick_test"

     

       44
       44
       +
           "test_wrong_url"

     

       45
       45
       +
           # No clipboard in the sandbox

     

       46
       46
       +
           "test_from_clipboard"

     

       33
       47
        
         ];

     

       34
       48
        
       

     

       35
       49
        
         meta = with lib; {

+8 -8

pkgs/development/python-modules/weconnect-mqtt/default.nix

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "weconnect-mqtt";

     

       13
       13
       -
         version = "0.42.1";

     

       13
       13
       +
         version = "0.42.2";

     

       14
       14
        
         format = "setuptools";

     

       15
       15
        
       

     

       16
       16
        
         disabled = pythonOlder "3.8";

     
···

       19
       19
        
           owner = "tillsteinbach";

     

       20
       20
        
           repo = "WeConnect-mqtt";

     

       21
       21
        
           rev = "refs/tags/v${version}";

     

       22
       22
       -
           hash = "sha256-/YCrnDOJdKc687pRKj1gVTOTj7dEpplN49VuFJOlQIE=";

     

       22
       22
       +
           hash = "sha256-dPG714a/GPNPs7h/ubLA+KI2hB5gFf5UDNwhhMyqJlc=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
       -
         propagatedBuildInputs = [

     

       26
       26
       -
           paho-mqtt

     

       27
       27
       -
           python-dateutil

     

       28
       28
       -
           weconnect

     

       29
       29
       -
         ] ++ weconnect.optional-dependencies.Images;

     

       30
       30
       -
       

     

       31
       25
        
         postPatch = ''

     

       32
       26
        
           substituteInPlace weconnect_mqtt/__version.py \

     

       33
       27
        
             --replace "develop" "${version}"

     
···

       35
       29
        
             --replace "--cov=weconnect_mqtt --cov-config=.coveragerc --cov-report html" "" \

     

       36
       30
        
             --replace "pytest-cov" ""

     

       37
       31
        
         '';

     

       32
       32
       +
       

     

       33
       33
       +
         propagatedBuildInputs = [

     

       34
       34
       +
           paho-mqtt

     

       35
       35
       +
           python-dateutil

     

       36
       36
       +
           weconnect

     

       37
       37
       +
         ] ++ weconnect.optional-dependencies.Images;

     

       38
       38
        
       

     

       39
       39
        
         nativeCheckInputs = [

     

       40
       40
        
           pytestCheckHook

+2 -1

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

···

       48
       48
        
             --replace "setup_requires=SETUP_REQUIRED," "setup_requires=[]," \

     

       49
       49
        
             --replace "tests_require=TEST_REQUIRED," "tests_require=[],"

     

       50
       50
        
           substituteInPlace image_extra_requirements.txt \

     

       51
       51
       -
             --replace "pillow~=9.4.0" "pillow"

     

       51
       51
       +
             --replace "pillow~=" "pillow>=" \

     

       52
       52
       +
             --replace "ascii_magic~=" "ascii_magic>="

     

       52
       53
        
           substituteInPlace pytest.ini \

     

       53
       54
        
             --replace "--cov=weconnect --cov-config=.coveragerc --cov-report html" "" \

     

       54
       55
        
             --replace "pytest-cov" ""