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

python3Packages.ebcdic: 1.1.1 -> 2.0.0 (#499235)

parents 7d26b236 bb925604

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

+8 −8
Original line number Diff line number Diff line
@@ -2,25 +2,25 @@ 
  lib,

  buildPythonPackage,

  fetchFromGitHub,

  setuptools,

  flit-core,

  pytestCheckHook,

}:



buildPythonPackage rec {

buildPythonPackage (finalAttrs: {

  pname = "ebcdic";

  version = "1.1.1";

  version = "2.0.0";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "roskakori";

    repo = "CodecMapper";

    tag = "v${version}";

    hash = "sha256-gRyZychcF3wYocgVbdF255cSuZh/cl8X0WH/Iplkmxc=";

    tag = "v${finalAttrs.version}";

    hash = "sha256-71EMWUGoJrsc3EOVHeV4xqSJRKoA7Sz2dvmZJ1sjQCg=";

  };



  sourceRoot = "${src.name}/${pname}";

  sourceRoot = "${finalAttrs.src.name}/${finalAttrs.pname}";



  nativeBuildInputs = [ setuptools ];

  build-system = [ flit-core ];



  nativeCheckInputs = [ pytestCheckHook ];
@@ -40,4 +40,4 @@ buildPythonPackage rec { 
    license = lib.licenses.bsd2;

    maintainers = with lib.maintainers; [ fab ];

  };

}
 
})

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

+4 −4
Original line number Diff line number Diff line
@@ -31,13 +31,13 @@ buildPythonPackage (finalAttrs: { 
    hash = "sha256-n/v3ubgzWlWqLXZfy1O7+FvTJoLMtgL7DFPL39SZnfM=";

  };



  build-system = [

    setuptools

  ];



  pythonRelaxDeps = [

    "beautifulsoup4"

    "ebcdic"

  ];



  build-system = [ setuptools ];



  dependencies = [

    beautifulsoup4

    compressed-rtf

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

+14 −9
Original line number Diff line number Diff line
@@ -7,11 +7,12 @@ 
  msoffcrypto-tool,

  olefile,

  pcodedmp,

  setuptools,

  pyparsing,

  pytestCheckHook,

}:



buildPythonPackage rec {

buildPythonPackage (finalAttrs: {

  pname = "oletools";

  version = "0.60.2";

  format = "setuptools";
@@ -19,11 +20,15 @@ buildPythonPackage rec { 
  src = fetchFromGitHub {

    owner = "decalage2";

    repo = "oletools";

    rev = "v${version}";

    tag = "v${finalAttrs.version}";

    hash = "sha256-ons1VeWStxUZw2CPpnX9p5I3Q7cMhi34JU8TeuUDt+Y=";

  };



  propagatedBuildInputs = [

  pythonRelaxDeps = [ "pyparsing" ];



  build-system = [ setuptools ];



  dependencies = [

    colorclass

    easygui

    msoffcrypto-tool
@@ -34,15 +39,14 @@ buildPythonPackage rec { 


  nativeCheckInputs = [ pytestCheckHook ];



  postPatch = ''

    substituteInPlace setup.py \

      --replace "pyparsing>=2.1.0,<3" "pyparsing>=2.1.0"

  '';



  disabledTests = [

    # Test fails with AssertionError: Tuples differ: ('MS Word 2007+...

    "test_all"

    "test_xlm"

    # AssertionError: Found "warn" in output...

    "test_empty_behaviour"

    "test_rtf_behaviour"

    "test_text_behaviour"

  ];



  pythonImportsCheck = [ "oletools" ];
@@ -50,10 +54,11 @@ buildPythonPackage rec { 
  meta = {

    description = "Module to analyze MS OLE2 files and MS Office documents";

    homepage = "https://github.com/decalage2/oletools";

    changelog = "https://github.com/decalage2/oletools/releases/tag/${finalAttrs.src.tag}";

    license = with lib.licenses; [

      bsd2 # and

      mit

    ];

    maintainers = with lib.maintainers; [ fab ];

  };

}
 
})