commit 31b5e605291373dfd5491b98ef9a305f07116766 · pyrox.dev/nixpkgs

+12 -5

pkgs/development/python-modules/marisa-trie/default.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         buildPythonPackage,

     

       4
       4
        
         fetchPypi,

     

       5
       5
       +
         replaceVars,

     

       6
       6
       +
         marisa-cpp,

     

       5
       7
        
         cython,

     

       6
       8
        
         setuptools,

     

       7
       9
        
         pytestCheckHook,

     
···

       23
       25
        
           hash = "sha256-OifECOKu/APg8dJbL/KvuFqsNWj2+iripTtXouh84p0=";

     

       24
       26
        
         };

     

       25
       27
        
       

     

       28
       28
       +
         patches = [

     

       29
       29
       +
           (replaceVars ./unvendor-marisa.patch {

     

       30
       30
       +
             marisa = lib.getDev marisa-cpp;

     

       31
       31
       +
           })

     

       32
       32
       +
         ];

     

       33
       33
       +
       

     

       26
       34
        
         build-system = [

     

       27
       35
        
           cython

     

       28
       36
        
           setuptools

     

       29
       37
        
         ];

     

       30
       38
        
       

     

       39
       39
       +
         buildInputs = [

     

       40
       40
       +
           marisa-cpp

     

       41
       41
       +
         ];

     

       42
       42
       +
       

     

       31
       43
        
         nativeCheckInputs = [

     

       32
       44
        
           pytestCheckHook

     

       33
       45
        
           readme-renderer

     

       34
       46
        
           hypothesis

     

       35
       47
        
         ];

     

       36
       36
       -
       

     

       37
       37
       -
         postPatch = ''

     

       38
       38
       -
           substituteInPlace setup.py \

     

       39
       39
       -
             --replace "hypothesis==" "hypothesis>="

     

       40
       40
       -
         '';

     

       41
       48
        
       

     

       42
       49
        
         preBuild = ''

     

       43
       50
        
           ./update_cpp.sh

+30

pkgs/development/python-modules/marisa-trie/unvendor-marisa.patch

···

       1
       1
       +
       diff --git a/setup.py b/setup.py

     

       2
       2
       +
       index c0c5c03..6373a2a 100755

     

       3
       3
       +
       --- a/setup.py

     

       4
       4
       +
       +++ b/setup.py

     

       5
       5
       +
       @@ -71,15 +71,6 @@ setup(

     

       6
       6
       +
            license=LICENSE,

     

       7
       7
       +
            url="https://github.com/pytries/marisa-trie",

     

       8
       8
       +
            classifiers=CLASSIFIERS,

     

       9
       9
       +
       -    libraries=[

     

       10
       10
       +
       -        (

     

       11
       11
       +
       -            "libmarisa-trie",

     

       12
       12
       +
       -            {

     

       13
       13
       +
       -                "sources": MARISA_FILES,

     

       14
       14
       +
       -                "include_dirs": [MARISA_SOURCE_DIR, MARISA_INCLUDE_DIR],

     

       15
       15
       +
       -            },

     

       16
       16
       +
       -        )

     

       17
       17
       +
       -    ],

     

       18
       18
       +
            ext_modules=[

     

       19
       19
       +
                Extension(

     

       20
       20
       +
                    "marisa_trie",

     

       21
       21
       +
       @@ -94,7 +85,8 @@ setup(

     

       22
       22
       +
                        "src/std_iostream.cpp",

     

       23
       23
       +
                        "src/trie.cpp",

     

       24
       24
       +
                    ],

     

       25
       25
       +
       -            include_dirs=[MARISA_INCLUDE_DIR],

     

       26
       26
       +
       +            include_dirs=["@marisa@/include"],

     

       27
       27
       +
       +            libraries=["marisa"],

     

       28
       28
       +
                )

     

       29
       29
       +
            ],

     

       30
       30
       +
            python_requires=">=3.8",

+3 -1

pkgs/top-level/python-packages.nix

···

       8539
       8539
        
       

     

       8540
       8540
        
         marisa = callPackage ../development/python-modules/marisa { inherit (pkgs) marisa; };

     

       8541
       8541
        
       

     

       8542
       8542
       -
         marisa-trie = callPackage ../development/python-modules/marisa-trie { };

     

       8542
       8542
       +
         marisa-trie = callPackage ../development/python-modules/marisa-trie {

     

       8543
       8543
       +
           marisa-cpp = pkgs.marisa;

     

       8544
       8544
       +
         };

     

       8543
       8545
        
       

     

       8544
       8546
        
         markdown = callPackage ../development/python-modules/markdown { };

     

       8545
       8547