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

Merge pull request #283939 from fabaff/dissect-target-fix 

python311Packages.dissect-target: relax flow-record
parents 1c4593f3 1f4fea5a

pkgs/development/python-modules/dissect-btrfs/default.nix

0 → 100644
+62 −0
Original line number Diff line number Diff line 
{ lib

, buildPythonPackage

, dissect-cstruct

, dissect-util

, fetchFromGitHub

, google-crc32c

, python-lzo

, pythonOlder

, setuptools

, setuptools-scm

, zstandard

}:



buildPythonPackage rec {

  pname = "dissect-btrfs";

  version = "1.1";

  pyproject = true;



  disabled = pythonOlder "3.7";



  src = fetchFromGitHub {

    owner = "fox-it";

    repo = "dissect.btrfs";

    rev = "refs/tags/${version}";

    hash = "sha256-3k0UUkce7bZ3mZ8Umjms4DX63QeBdRPUXpsdaK0VDyc=";

  };



  nativeBuildInputs = [

    setuptools

    setuptools-scm

  ];



  propagatedBuildInputs = [

    dissect-cstruct

    dissect-util

  ];



  passthru.optional-dependencies = {

    full = [

      python-lzo

      zstandard

    ];

    gcrc32 = [

      google-crc32c

    ];

  };



  # Issue with the test file handling

  doCheck = false;



  pythonImportsCheck = [

    "dissect.btrfs"

  ];



  meta = with lib; {

    description = "Dissect module implementing a parser for the BTRFS file system";

    homepage = "https://github.com/fox-it/dissect.btrfs";

    changelog = "https://github.com/fox-it/dissect.btrfs/releases/tag/${version}";

    license = licenses.agpl3Only;

    maintainers = with maintainers; [ fab ];

  };

}

pkgs/development/python-modules/dissect-clfs/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -11,9 +11,9 @@ 
buildPythonPackage rec {

  pname = "dissect-clfs";

  version = "1.6";

  format = "pyproject";

  pyproject = true;



  disabled = pythonOlder "3.7";

  disabled = pythonOlder "3.9";



  src = fetchFromGitHub {

    owner = "fox-it";

pkgs/development/python-modules/dissect-jffs/default.nix

0 → 100644
+49 −0
Original line number Diff line number Diff line 
{ lib

, buildPythonPackage

, dissect-cstruct

, dissect-util

, fetchFromGitHub

, pythonOlder

, setuptools

, setuptools-scm

}:



buildPythonPackage rec {

  pname = "dissect-jffs";

  version = "1.0";

  pyproject = true;



  disabled = pythonOlder "3.9";



  src = fetchFromGitHub {

    owner = "fox-it";

    repo = "dissect.jffs";

    rev = "refs/tags/${version}";

    hash = "sha256-Rj8/WRHNl2IQ6zwvLhqEIEMzk8BH1fv7KQkw1NzoDjI=";

  };



  nativeBuildInputs = [

    setuptools

    setuptools-scm

  ];



  propagatedBuildInputs = [

    dissect-cstruct

    dissect-util

  ];



  # Test file handling fails

  doCheck = true;



  pythonImportsCheck = [

    "dissect.jffs"

  ];



  meta = with lib; {

    description = "Dissect module implementing a parser for the JFFS2 file system";

    homepage = "https://github.com/fox-it/dissect.jffs";

    changelog = "https://github.com/fox-it/dissect.jffs/releases/tag/${version}";

    license = licenses.agpl3Only;

    maintainers = with maintainers; [ fab ];

  };

}

pkgs/development/python-modules/dissect-target/default.nix

+5 −0
Original line number Diff line number Diff line
@@ -51,6 +51,11 @@ buildPythonPackage rec { 
    hash = "sha256-vp1upVwohMXFKxlHy5lWmigdq9MUk1UknSsPpCXt50s=";

  };



  postPatch = ''

    substituteInPlace pyproject.toml \

      --replace "flow.record~=" "flow.record>="

  '';



  nativeBuildInputs = [

    setuptools

    setuptools-scm

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

+10 −2
Original line number Diff line number Diff line 
{ lib

, buildPythonPackage

, dissect-btrfs

, dissect-cim

, dissect-clfs

, dissect-cobaltstrike
@@ -8,11 +9,12 @@ 
, dissect-etl

, dissect-eventlog

, dissect-evidence

, dissect-executable

, dissect-extfs

, dissect-fat

, dissect-ffs

, dissect-executable

, dissect-hypervisor

, dissect-jffs

, dissect-ntfs

, dissect-ole

, dissect-regf
@@ -26,6 +28,7 @@ 
, dissect-xfs

, fetchFromGitHub

, pythonOlder

, pythonRelaxDepsHook

, setuptools

, setuptools-scm

}:
@@ -33,7 +36,7 @@ 
buildPythonPackage rec {

  pname = "dissect";

  version = "3.11";

  format = "pyproject";

  pyproject = true;



  disabled = pythonOlder "3.9";
@@ -44,12 +47,16 @@ buildPythonPackage rec { 
    hash = "sha256-6y+p+Ulc1Viu5s1AL/ecVtO4YRnmem/ZleY8xC4CJrU=";

  };



  pythonRelaxDeps = true;



  nativeBuildInputs = [

    pythonRelaxDepsHook

    setuptools

    setuptools-scm

  ];



  propagatedBuildInputs = [

    dissect-btrfs

    dissect-cim

    dissect-clfs

    dissect-cobaltstrike
@@ -63,6 +70,7 @@ buildPythonPackage rec { 
    dissect-fat

    dissect-ffs

    dissect-hypervisor

    dissect-jffs

    dissect-ntfs

    dissect-ole

    dissect-regf