commit 780c25a31c54caec59fd09cd5475144c29b2af2f · pyrox.dev/nixpkgs

+16 -13

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

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         buildPythonPackage,

     

       4
       4
       -
         fetchPypi,

     

       5
       5
       -
         pythonAtLeast,

     

       6
       6
       -
         flake8,

     

       4
       4
       +
         fetchFromGitHub,

     

       7
       5
        
         orderedmultidict,

     

       8
       6
        
         pytestCheckHook,

     

       7
       7
       +
         setuptools,

     

       9
       8
        
         six,

     

       10
       9
        
       }:

     

       11
       10
        
       

     

       12
       11
        
       buildPythonPackage rec {

     

       13
       12
        
         pname = "furl";

     

       14
       13
        
         version = "2.1.4";

     

       15
       15
       -
         format = "setuptools";

     

       14
       14
       +
         pyproject = true;

     

       16
       15
        
       

     

       17
       17
       -
         src = fetchPypi {

     

       18
       18
       -
           inherit pname version;

     

       19
       19
       -
           sha256 = "sha256-h3ZXUBJmySkmlzn7X1mAU0pBq9a7q8s2fBNtHTsqYBU=";

     

       16
       16
       +
         src = fetchFromGitHub {

     

       17
       17
       +
           owner = "gruns";

     

       18
       18
       +
           repo = "furl";

     

       19
       19
       +
           tag = "v${version}";

     

       20
       20
       +
           hash = "sha256-NRkOJlluZjscM4ZhxHoXIzV2A0+mrkaw7rcxfklGCHs=";

     

       20
       21
        
         };

     

       21
       22
        
       

     

       22
       23
        
         # With python 3.11.4, invalid IPv6 address does throw ValueError

     

       23
       24
        
         # https://github.com/gruns/furl/issues/164#issuecomment-1595637359

     

       24
       25
        
         postPatch = ''

     

       25
       26
        
           substituteInPlace tests/test_furl.py \

     

       26
       26
       -
             --replace '[0:0:0:0:0:0:0:1:1:1:1:1:1:1:1:9999999999999]' '[2001:db8::9999]'

     

       27
       27
       +
             --replace-fail '[0:0:0:0:0:0:0:1:1:1:1:1:1:1:1:9999999999999]' '[2001:db8::9999]'

     

       27
       28
        
         '';

     

       28
       29
        
       

     

       29
       29
       -
         propagatedBuildInputs = [

     

       30
       30
       +
         build-system = [ setuptools ];

     

       31
       31
       +
       

     

       32
       32
       +
         dependencies = [

     

       30
       33
        
           orderedmultidict

     

       31
       34
        
           six

     

       32
       35
        
         ];

     

       33
       36
        
       

     

       34
       37
        
         nativeCheckInputs = [

     

       35
       35
       -
           flake8

     

       36
       38
        
           pytestCheckHook

     

       37
       39
        
         ];

     

       38
       40
        
       

     
···

       44
       46
        
       

     

       45
       47
        
         pythonImportsCheck = [ "furl" ];

     

       46
       48
        
       

     

       47
       47
       -
         meta = with lib; {

     

       49
       49
       +
         meta = {

     

       50
       50
       +
           changelog = "https://github.com/gruns/furl/releases/tag/${src.tag}";

     

       48
       51
        
           description = "Python library that makes parsing and manipulating URLs easy";

     

       49
       52
        
           homepage = "https://github.com/gruns/furl";

     

       50
       50
       -
           license = licenses.unlicense;

     

       51
       51
       -
           maintainers = with maintainers; [ vanzef ];

     

       53
       53
       +
           license = lib.licenses.unlicense;

     

       54
       54
       +
           maintainers = with lib.maintainers; [ vanzef ];

     

       52
       55
        
         };

     

       53
       56
        
       }

+13 -9

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

···

       3
       3
        
         buildPythonPackage,

     

       4
       4
        
         fetchPypi,

     

       5
       5
        
         flake8,

     

       6
       6
       +
         pytestCheckHook,

     

       7
       7
       +
         setuptools,

     

       6
       8
        
         six,

     

       7
       7
       -
         pythonOlder,

     

       8
       8
       -
         importlib-metadata,

     

       9
       9
        
       }:

     

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "orderedmultidict";

     

       13
       13
        
         version = "1.0.1";

     

       14
       14
       -
         format = "setuptools";

     

       14
       14
       +
         pyproject = true;

     

       15
       15
        
       

     

       16
       16
        
         src = fetchPypi {

     

       17
       17
        
           inherit pname version;

     

       18
       18
       -
           sha256 = "1bc2v0yflsxjyyjx4q9wqx0j3bvzcw9z87d5pz4iqac7bsxhn1q4";

     

       18
       18
       +
           hash = "sha256-BAcLu16HKRzJv6Ud9BNnf68hQcc8YdKl97Jr6jzYgq0=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
       -
         nativeCheckInputs = [ flake8 ];

     

       21
       21
       +
         build-system = [ setuptools ];

     

       22
       22
        
       

     

       23
       23
       -
         propagatedBuildInputs = [ six ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];

     

       23
       23
       +
         dependencies = [ six ];

     

       24
       24
        
       

     

       25
       25
       -
         meta = with lib; {

     

       25
       25
       +
         pythonImportsCheck = [ "orderedmultidict" ];

     

       26
       26
       +
       

     

       27
       27
       +
         nativeCheckInputs = [ pytestCheckHook ];

     

       28
       28
       +
       

     

       29
       29
       +
         meta = {

     

       26
       30
        
           description = "Ordered Multivalue Dictionary";

     

       27
       31
        
           homepage = "https://github.com/gruns/orderedmultidict";

     

       28
       28
       -
           license = licenses.publicDomain;

     

       29
       29
       -
           maintainers = with maintainers; [ vanzef ];

     

       32
       32
       +
           license = lib.licenses.unlicense;

     

       33
       33
       +
           maintainers = with lib.maintainers; [ vanzef ];

     

       30
       34
        
         };

     

       31
       35
        
       }