nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-19 23:21:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

python3Packages.marisa-trie: 1.3.1 -> 1.4.1

Browse Source 
https://github.com/pytries/marisa-trie/blob/1.4.1/CHANGES.rst
This commit is contained in:
Martin Weinelt
2026-07-13 02:40:40 +02:00
parent 103275bd4b
commit 00dfd5aa59
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/python-modules/marisa-trie/default.nix
View File

@@ -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 = [

22
pkgs/development/python-modules/marisa-trie/unvendor-marisa.patch
View File

@@ -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",