Unverified Commit 7687f55d authored by dotlambda's avatar dotlambda Committed by GitHub
Browse files

python3Packages.marisa-trie: 1.2.1 -> 1.3.1 (#458246)

parents 5cd0e0f9 82afaae8

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

+2 −6
Original line number Diff line number Diff line
@@ -12,14 +12,14 @@ 


buildPythonPackage rec {

  pname = "marisa-trie";

  version = "1.2.1";

  version = "1.3.1";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "pytries";

    repo = "marisa-trie";

    tag = version;

    hash = "sha256-aWfm13nrASAaD+bcMpv85emXnCFyVtZTdhl79yJuOss=";

    hash = "sha256-7T0V5levh9xjWmjJdFix0p8L3lZhfurikSWMI7Hotbs=";

  };



  patches = [
@@ -42,10 +42,6 @@ buildPythonPackage rec { 
    hypothesis

  ];



  preBuild = ''

    ./update_cpp.sh

  '';



  disabledTestPaths = [

    # Don't test packaging

    "tests/test_packaging.py"

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

+15 −19
Original line number Diff line number Diff line 
diff --git a/setup.py b/setup.py

index c0c5c03..6373a2a 100755

index 133ba37..1026947 100755

--- a/setup.py

+++ b/setup.py

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

     license=LICENSE,

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

     classifiers=CLASSIFIERS,

@@ -26,19 +26,11 @@ extensions = [

         "marisa_trie",

         sources=["src/*.pyx"],

         language="c++",

-        include_dirs=[str(MARISA_INCLUDE_DIR)],

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

+        libraries=["marisa"],

     ),

 ]

 

 setup(

-    libraries=[

-        (

-            "libmarisa-trie",

-            {

-                "sources": MARISA_FILES,

-                "include_dirs": [MARISA_SOURCE_DIR, MARISA_INCLUDE_DIR],

-                "include_dirs": [str(MARISA_SOURCE_DIR), str(MARISA_INCLUDE_DIR)],

-            },

-        )

-    ],

     ext_modules=[

         Extension(

             "marisa_trie",

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

                 "src/std_iostream.cpp",

                 "src/trie.cpp",

             ],

-            include_dirs=[MARISA_INCLUDE_DIR],

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

+            libraries=["marisa"],

     ext_modules=cythonize(extensions, language_level="3"),

 )
 
     ],

     python_requires=">=3.8",