commit c33668e2d3c63f3ef1c503938dc72e175d307d85 · pyrox.dev/nixpkgs

+13 -8

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

···

       4
       4
        
         cachetools,

     

       5
       5
        
         fetchPypi,

     

       6
       6
        
         nixosTests,

     

       7
       7
       -
         pytestCheckHook,

     

       8
       8
       -
         pythonOlder,

     

       9
       7
        
         setuptools,

     

       10
       8
        
         twisted,

     

       11
       9
        
         txamqp,

     
···

       18
       16
        
         version = "1.1.10";

     

       19
       17
        
         pyproject = true;

     

       20
       18
        
       

     

       21
       21
       -
         disabled = pythonOlder "3.10";

     

       22
       22
       -
       

     

       23
       19
        
         src = fetchPypi {

     

       24
       20
        
           inherit pname version;

     

       25
       21
        
           hash = "sha256-wTtbqRHMWBcM2iFN95yzwCf/BQ+EK0vp5MXT4mKX3lw=";

     

       26
       22
        
         };

     

       23
       23
       +
       

     

       24
       24
       +
         patches = [

     

       25
       25
       +
           # imp has been removed from python since version 3.12

     

       26
       26
       +
           # This patch replaces it with distutils.utils

     

       27
       27
       +
           ./replace-imp.patch

     

       28
       28
       +
         ];

     

       27
       29
        
       

     

       28
       30
        
         # Carbon-s default installation is /opt/graphite. This env variable ensures

     

       29
       31
        
         # carbon is installed as a regular Python module.

     
···

       51
       53
        
           inherit (nixosTests) graphite;

     

       52
       54
        
         };

     

       53
       55
        
       

     

       54
       54
       -
         pythonImportsCheck = [ "carbon" ];

     

       56
       56
       +
         pythonImportsCheck = [

     

       57
       57
       +
           "carbon"

     

       58
       58
       +
           "carbon.routers"

     

       59
       59
       +
         ];

     

       55
       60
        
       

     

       56
       56
       -
         meta = with lib; {

     

       61
       61
       +
         meta = {

     

       57
       62
        
           description = "Backend data caching and persistence daemon for Graphite";

     

       58
       63
        
           homepage = "https://github.com/graphite-project/carbon";

     

       59
       64
        
           changelog = "https://github.com/graphite-project/carbon/releases/tag/${version}";

     

       60
       60
       -
           license = licenses.asl20;

     

       61
       61
       -
           maintainers = with maintainers; [

     

       65
       65
       +
           license = lib.licenses.asl20;

     

       66
       66
       +
           maintainers = with lib.maintainers; [

     

       62
       67
        
             offline

     

       63
       68
        
             basvandijk

     

       64
       69
        
           ];

+22

pkgs/development/python-modules/carbon/replace-imp.patch

···

       1
       1
       +
       diff --git a/lib/carbon/routers.py b/lib/carbon/routers.py

     

       2
       2
       +
       index d1c47b7..1a70d7e 100644

     

       3
       3
       +
       --- a/lib/carbon/routers.py

     

       4
       4
       +
       +++ b/lib/carbon/routers.py

     

       5
       5
       +
       @@ -1,4 +1,4 @@

     

       6
       6
       +
       -import imp

     

       7
       7
       +
       +import importlib.util

     

       8
       8
       +
        from carbon.hashing import ConsistentHashRing, carbonHash

     

       9
       9
       +
        from carbon.util import PluginRegistrar

     

       10
       10
       +
        from six import with_metaclass

     

       11
       11
       +
       @@ -130,9 +130,8 @@ class ConsistentHashingRouter(DatapointRouter):

     

       12
       12
       +
        

     

       13
       13
       +
          def setKeyFunctionFromModule(self, keyfunc_spec):

     

       14
       14
       +
            module_path, func_name = keyfunc_spec.rsplit(':', 1)

     

       15
       15
       +
       -    module_file = open(module_path, 'U')

     

       16
       16
       +
       -    description = ('.py', 'U', imp.PY_SOURCE)

     

       17
       17
       +
       -    module = imp.load_module('keyfunc_module', module_file, module_path, description)

     

       18
       18
       +
       +    spec = importlib.util.spec_from_file_location("keyfunc_module", module_path)

     

       19
       19
       +
       +    module = importlib.util.module_from_spec(spec)

     

       20
       20
       +
            keyfunc = getattr(module, func_name)

     

       21
       21
       +
            self.setKeyFunction(keyfunc)

     

       22
       22
       +