Unverified Commit b0dc996a authored by Fabian Affolter's avatar Fabian Affolter Committed by GitHub
Browse files

Merge pull request #299722 from fabaff/rtfde-fix 

python312Packages.extract-msg: 0.48.3 -> 0.48.4, python312Packages.rtfde: relax lark
parents a2cecca4 0c39588c

pkgs/development/python-modules/extract-msg/default.nix

+4 −4
Original line number Diff line number Diff line
@@ -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

pkgs/development/python-modules/rtfde/default.nix

+8 −2
Original line number Diff line number Diff line
@@ -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

  ];