Merge pull request #299722 from fabaff/rtfde-fix

python312Packages.extract-msg: 0.48.3 -> 0.48.4, python312Packages.rtfde: relax lark
This commit is contained in:
Fabian Affolter 2024-03-28 19:00:52 +01:00 committed by GitHub
commit b0dc996a60
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 6 deletions

View File

@ -16,7 +16,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "extract-msg"; pname = "extract-msg";
version = "0.48.3"; version = "0.48.4";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "TeamMsgExtractor"; owner = "TeamMsgExtractor";
repo = "msg-extractor"; repo = "msg-extractor";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-oN5blYU8LR2O1LEb6naL33UXjBk9xpINl4h6HSaN7PQ="; hash = "sha256-xX25RVtkUFn+j9rALOHQOTRzqJXiEMn7i9pxCJ8so4U=";
}; };
pythonRelaxDeps = [ pythonRelaxDeps = [
@ -33,12 +33,12 @@ buildPythonPackage rec {
"red-black-tree-mod" "red-black-tree-mod"
]; ];
nativeBuildInputs = [ build-system = [
pythonRelaxDepsHook pythonRelaxDepsHook
setuptools setuptools
]; ];
propagatedBuildInputs = [ dependencies = [
beautifulsoup4 beautifulsoup4
compressed-rtf compressed-rtf
ebcdic ebcdic

View File

@ -23,11 +23,17 @@ buildPythonPackage rec {
hash = "sha256-ai9JQ3gphY/IievBNdHiblIpc0IPS9wp7CVvBIRzG/4="; hash = "sha256-ai9JQ3gphY/IievBNdHiblIpc0IPS9wp7CVvBIRzG/4=";
}; };
nativeBuildInputs = [ postPatch = ''
# https://github.com/seamustuohy/RTFDE/issues/31
substituteInPlace setup.py \
--replace-fail "==" ">="
'';
build-system = [
setuptools setuptools
]; ];
propagatedBuildInputs = [ dependencies = [
lark lark
oletools oletools
]; ];