diff --git a/pkgs/development/python-modules/marisa-trie/default.nix b/pkgs/development/python-modules/marisa-trie/default.nix index 4cce1653ace1..8ced31257c98 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.3.1"; + version = "1.4.1"; pyproject = true; src = fetchFromGitHub { owner = "pytries"; repo = "marisa-trie"; tag = version; - hash = "sha256-7T0V5levh9xjWmjJdFix0p8L3lZhfurikSWMI7Hotbs="; + hash = "sha256-U3gntlvJ0IaWoK+2V0OQ/XoDLfQsSbrrsSj95VR1m+4="; }; patches = [ diff --git a/pkgs/development/python-modules/marisa-trie/unvendor-marisa.patch b/pkgs/development/python-modules/marisa-trie/unvendor-marisa.patch index 69c0ee46678b..7c0b42b92c61 100644 --- a/pkgs/development/python-modules/marisa-trie/unvendor-marisa.patch +++ b/pkgs/development/python-modules/marisa-trie/unvendor-marisa.patch @@ -1,13 +1,20 @@ diff --git a/setup.py b/setup.py -index 133ba37..1026947 100755 +index 3b86748..543f5b8 100644 --- a/setup.py +++ b/setup.py -@@ -26,19 +26,11 @@ extensions = [ - "marisa_trie", +@@ -7,7 +7,7 @@ from setuptools import setup, Extension + + MARISA_ROOT_DIR = Path("marisa-trie") + MARISA_SOURCE_DIR = MARISA_ROOT_DIR / "lib" +-MARISA_INCLUDE_DIR = MARISA_ROOT_DIR / "include" ++MARISA_INCLUDE_DIR = Path("@marisa@") / "include" + MARISA_FILES = [ + "marisa/*.cc", + "marisa/grimoire.cc", +@@ -27,19 +27,11 @@ extensions = [ sources=["src/*.pyx"], language="c++", -- include_dirs=[str(MARISA_INCLUDE_DIR)], -+ include_dirs=["@marisa@/include"], + include_dirs=[str(MARISA_INCLUDE_DIR)], + libraries=["marisa"], ), ] @@ -22,5 +29,6 @@ index 133ba37..1026947 100755 - }, - ) - ], - ext_modules=cythonize(extensions, language_level="3"), - ) + ext_modules=cythonize( + extensions, + language_level="3",