commit db90c553f0db36ca24538f096b3e885d8b759cfc · pyrox.dev/nixpkgs

+21 -15

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

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
       -
       , fetchPypi

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
        
       , pyasn1

     

       5
       5
       -
       , pytest

     

       5
       5
       +
       , pytestCheckHook

     

       6
       6
       +
       , pythonOlder

     

       6
       7
        
       }:

     

       7
       8
        
       

     

       8
       9
        
       buildPythonPackage rec {

     

       9
       10
        
         pname = "pyasn1-modules";

     

       10
       10
       -
         version = "0.2.8";

     

       11
       11
       +
         version = "0.3.0";

     

       11
       12
        
       

     

       12
       12
       -
         src = fetchPypi {

     

       13
       13
       -
           inherit pname version;

     

       14
       14
       -
           sha256 = "905f84c712230b2c592c19470d3ca8d552de726050d1d1716282a1f6146be65e";

     

       13
       13
       +
         disabled = pythonOlder "3.7";

     

       14
       14
       +
       

     

       15
       15
       +
         src = fetchFromGitHub {

     

       16
       16
       +
           owner = "pyasn1";

     

       17
       17
       +
           repo = pname;

     

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

     

       19
       19
       +
           hash = "sha256-AAS1VuppCIxgswpLSHFAc6q9cyJBLpdDuU9D1KU13vg=";

     

       15
       20
        
         };

     

       16
       21
        
       

     

       17
       17
       -
         propagatedBuildInputs = [ pyasn1 ];

     

       22
       22
       +
         propagatedBuildInputs = [

     

       23
       23
       +
           pyasn1

     

       24
       24
       +
         ];

     

       18
       25
        
       

     

       19
       26
        
         nativeCheckInputs = [

     

       20
       20
       -
           pytest

     

       27
       27
       +
           pytestCheckHook

     

       21
       28
        
         ];

     

       22
       29
        
       

     

       23
       23
       -
         # running tests through setup.py fails only for python2 for some reason:

     

       24
       24
       -
         # AttributeError: 'module' object has no attribute 'suitetests'

     

       25
       25
       -
         checkPhase = ''

     

       26
       26
       -
           py.test

     

       27
       27
       -
         '';

     

       30
       30
       +
         pythonImportsCheck = [

     

       31
       31
       +
           "pyasn1_modules"

     

       32
       32
       +
         ];

     

       28
       33
        
       

     

       29
       34
        
         meta = with lib; {

     

       30
       35
        
           description = "A collection of ASN.1-based protocols modules";

     

       31
       31
       -
           homepage = "https://pypi.python.org/pypi/pyasn1-modules";

     

       36
       36
       +
           homepage = "https://github.com/pyasn1/pyasn1-modules";

     

       37
       37
       +
           changelog = "https://github.com/pyasn1/pyasn1-modules/releases/tag/v${version}";

     

       32
       38
        
           license = licenses.bsd3;

     

       33
       33
       -
           platforms = platforms.unix;  # same as pyasn1

     

       39
       39
       +
           maintainers = with maintainers; [ ];

     

       34
       40
        
         };

     

       35
       41
        
       }

+15 -5

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

···

       1
       1
       -
       { lib, buildPythonPackage, fetchPypi, }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , pythonOlder

     

       5
       5
       +
       }:

     

       2
       6
        
       

     

       3
       7
        
       buildPythonPackage rec {

     

       4
       8
        
         pname = "pyasn1";

     

       5
       5
       -
         version = "0.4.8";

     

       9
       9
       +
         version = "0.5.0";

     

       10
       10
       +
         format = "setuptools";

     

       11
       11
       +
       

     

       12
       12
       +
         disabled = pythonOlder "3.7";

     

       6
       13
        
       

     

       7
       14
        
         src = fetchPypi {

     

       8
       15
        
           inherit pname version;

     

       9
       9
       -
           sha256 = "aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba";

     

       16
       16
       +
           hash = "sha256-l7cpDKaOYqgyVY7Dl28Vy/kRv118cDnYuGHCoOzmn94=";

     

       10
       17
        
         };

     

       11
       18
        
       

     

       12
       12
       -
         pythonImportsCheck = [ "pyasn1" ];

     

       19
       19
       +
         pythonImportsCheck = [

     

       20
       20
       +
           "pyasn1"

     

       21
       21
       +
         ];

     

       13
       22
        
       

     

       14
       23
        
         meta = with lib; {

     

       15
       24
        
           description = "Generic ASN.1 library for Python";

     

       16
       16
       -
           homepage = "https://github.com/etingof/pyasn1";

     

       25
       25
       +
           homepage = "https://pyasn1.readthedocs.io";

     

       26
       26
       +
           changelog = "https://github.com/etingof/pyasn1/blob/master/CHANGES.rst";

     

       17
       27
        
           license = licenses.bsd2;

     

       18
       28
        
           maintainers = with maintainers; [ SuperSandro2000 ];

     

       19
       29
        
         };