diff --git a/pkgs/development/python-modules/marisa-trie/default.nix b/pkgs/development/python-modules/marisa-trie/default.nix index c7a9c123b044..d7d9fb0a63e1 100644 --- a/pkgs/development/python-modules/marisa-trie/default.nix +++ b/pkgs/development/python-modules/marisa-trie/default.nix @@ -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" diff --git a/pkgs/development/python-modules/marisa-trie/unvendor-marisa.patch b/pkgs/development/python-modules/marisa-trie/unvendor-marisa.patch index 26ac8156a06b..69c0ee46678b 100644 --- a/pkgs/development/python-modules/marisa-trie/unvendor-marisa.patch +++ b/pkgs/development/python-modules/marisa-trie/unvendor-marisa.patch @@ -1,30 +1,26 @@ 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"], - ) - ], - python_requires=">=3.8", + ext_modules=cythonize(extensions, language_level="3"), + )