commit 95cd511142b3fad224e8d14760f0fcc9b43aa5e7 · pyrox.dev/nixpkgs

+3 -5

pkgs/development/python-modules/approval-utilities/default.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         buildPythonPackage,

     

       4
       4
        
         approvaltests,

     

       5
       5
       -
         pythonOlder,

     

       6
       5
        
         setuptools,

     

       7
       6
        
         typing-extensions,

     

       8
       7
        
       }:

     
···

       10
       9
        
       buildPythonPackage {

     

       11
       10
        
         pname = "approval-utilities";

     

       12
       11
        
         inherit (approvaltests) version src;

     

       13
       13
       -
         disabled = pythonOlder "3.7";

     

       14
       12
        
         pyproject = true;

     

       15
       13
        
       

     

       16
       16
       -
         postPatch = ''

     

       14
       14
       +
         postPatch = approvaltests.postPatch or "" + ''

     

       17
       15
        
           mv setup.approval_utilities.py setup.py

     

       18
       16
        
         '';

     

       19
       17
        
       

     

       20
       20
       -
         nativeBuildInputs = [ setuptools ];

     

       18
       18
       +
         build-system = [ setuptools ];

     

       21
       19
        
       

     

       22
       22
       -
         propagatedBuildInputs = [

     

       20
       20
       +
         dependencies = [

     

       23
       21
        
           # used in approval_utilities/utilities/time_utilities.py

     

       24
       22
        
           typing-extensions

     

       25
       23
        
         ];

+11 -2

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

···

       12
       12
        
         pytest,

     

       13
       13
        
         pytest-asyncio,

     

       14
       14
        
         pytestCheckHook,

     

       15
       15
       +
         pyyaml,

     

       15
       16
        
         setuptools,

     

       16
       17
        
         testfixtures,

     

       17
       18
        
         typing-extensions,

     
···

       19
       20
        
       

     

       20
       21
        
       buildPythonPackage rec {

     

       21
       22
        
         pname = "approvaltests";

     

       22
       22
       -
         version = "15.0.0";

     

       23
       23
       +
         version = "15.3.2";

     

       23
       24
        
         pyproject = true;

     

       24
       25
        
       

     

       25
       26
        
         src = fetchFromGitHub {

     

       26
       27
        
           owner = "approvals";

     

       27
       28
        
           repo = "ApprovalTests.Python";

     

       28
       29
        
           tag = "v${version}";

     

       29
       29
       -
           hash = "sha256-lXc81hQzxHxpg96OSWkkWmdmLOf4nU56dIKYVgLo+s8=";

     

       30
       30
       +
           hash = "sha256-cOaL8u5q9kx+yLB0e/ALnGYYGF5v50wsIIF1UUTPe1Y=";

     

       30
       31
        
         };

     

       31
       32
        
       

     

       33
       33
       +
         postPatch = ''

     

       34
       34
       +
           echo 'version_number = "${version}"' > version.py

     

       35
       35
       +
           mv .github approvaltests approval_utilities tests setup

     

       36
       36
       +
           cd setup

     

       37
       37
       +
           rm setup.cfg

     

       38
       38
       +
         '';

     

       39
       39
       +
       

     

       32
       40
        
         build-system = [ setuptools ];

     

       33
       41
        
       

     

       34
       42
        
         dependencies = [

     
···

       47
       55
        
           numpy

     

       48
       56
        
           pytest-asyncio

     

       49
       57
        
           pytestCheckHook

     

       58
       58
       +
           pyyaml

     

       50
       59
        
         ];

     

       51
       60
        
       

     

       52
       61
        
         disabledTests = [