about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFabian Affolter <fabian@affolter-engineering.ch>2024-03-28 19:00:52 +0100
committerGitHub <noreply@github.com>2024-03-28 19:00:52 +0100
commitb0dc996a606919d2762e427296c902ca476b6470 (patch)
tree4f1c30fe4ca06b1457b2ade677d73e4cdad33934
parenta2cecca47b3d926df315a8fc77cf6bfaf6a240a5 (diff)
parent0c39588cff2377e24655c252456673ca8a2a2f0f (diff)
downloadnixlib-b0dc996a606919d2762e427296c902ca476b6470.tar
nixlib-b0dc996a606919d2762e427296c902ca476b6470.tar.gz
nixlib-b0dc996a606919d2762e427296c902ca476b6470.tar.bz2
nixlib-b0dc996a606919d2762e427296c902ca476b6470.tar.lz
nixlib-b0dc996a606919d2762e427296c902ca476b6470.tar.xz
nixlib-b0dc996a606919d2762e427296c902ca476b6470.tar.zst
nixlib-b0dc996a606919d2762e427296c902ca476b6470.zip
Merge pull request #299722 from fabaff/rtfde-fix
python312Packages.extract-msg: 0.48.3 -> 0.48.4, python312Packages.rtfde: relax lark
-rw-r--r--pkgs/development/python-modules/extract-msg/default.nix8
-rw-r--r--pkgs/development/python-modules/rtfde/default.nix10
2 files changed, 12 insertions, 6 deletions
diff --git a/pkgs/development/python-modules/extract-msg/default.nix b/pkgs/development/python-modules/extract-msg/default.nix
index 592172fc3d25..6c6e23370261 100644
--- a/pkgs/development/python-modules/extract-msg/default.nix
+++ b/pkgs/development/python-modules/extract-msg/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "extract-msg";
-  version = "0.48.3";
+  version = "0.48.4";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "TeamMsgExtractor";
     repo = "msg-extractor";
     rev = "refs/tags/v${version}";
-    hash = "sha256-oN5blYU8LR2O1LEb6naL33UXjBk9xpINl4h6HSaN7PQ=";
+    hash = "sha256-xX25RVtkUFn+j9rALOHQOTRzqJXiEMn7i9pxCJ8so4U=";
   };
 
   pythonRelaxDeps = [
@@ -33,12 +33,12 @@ buildPythonPackage rec {
     "red-black-tree-mod"
   ];
 
-  nativeBuildInputs = [
+  build-system = [
     pythonRelaxDepsHook
     setuptools
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     beautifulsoup4
     compressed-rtf
     ebcdic
diff --git a/pkgs/development/python-modules/rtfde/default.nix b/pkgs/development/python-modules/rtfde/default.nix
index c986d7b0c5e3..3b11adc34a1a 100644
--- a/pkgs/development/python-modules/rtfde/default.nix
+++ b/pkgs/development/python-modules/rtfde/default.nix
@@ -23,11 +23,17 @@ buildPythonPackage rec {
     hash = "sha256-ai9JQ3gphY/IievBNdHiblIpc0IPS9wp7CVvBIRzG/4=";
   };
 
-  nativeBuildInputs = [
+  postPatch = ''
+    # https://github.com/seamustuohy/RTFDE/issues/31
+    substituteInPlace setup.py \
+      --replace-fail "==" ">="
+  '';
+
+  build-system = [
     setuptools
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     lark
     oletools
   ];