python313Packages.acquire: 3.20.1 -> 3.21 (#465706)

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

@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "acquire";
-  version = "3.20.1";
+  version = "3.21";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "acquire";
     tag = version;
-    hash = "sha256-QX7rPoJJqBPdvN2LzSBw8kGDSsIHLm65TJ0uXuhwB4Q=";
+    hash = "sha256-CVwPMMQFGqvyxm5tK7JMEX8/dgiF25wwRNaLNfLLWto=";
   };
 
   build-system = [

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

@@ -0,0 +1,56 @@
+{
+  lib,
+  asn1crypto,
+  buildPythonPackage,
+  dissect-cstruct,
+  dissect-fve,
+  dissect-util,
+  fetchFromGitHub,
+  pycryptodome,
+  pytestCheckHook,
+  setuptools-scm,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "dissect-apfs";
+  version = "1.0.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "fox-it";
+    repo = "dissect.apfs";
+    tag = version;
+    hash = "sha256-w8R8hoj3pqP0cKCd2S8jz8IRwxRp6eVN0xb0/6E2aKw=";
+  };
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [
+    asn1crypto
+    dissect-fve
+    dissect-cstruct
+    dissect-util
+    pycryptodome
+  ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "dissect.apfs" ];
+
+  disabledTestPaths = [
+    # Bad file
+    "tests/test_apfs.py"
+  ];
+
+  meta = with lib; {
+    description = "Dissect module implementing a parser for APFS";
+    homepage = "https://github.com/fox-it/dissect.apfs";
+    changelog = "https://github.com/fox-it/dissect.apfs/releases/tag/${src.tag}";
+    license = licenses.agpl3Only;
+    maintainers = with maintainers; [ fab ];
+  };
+}

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

@@ -4,23 +4,21 @@
   dissect-cstruct,
   dissect-util,
   fetchFromGitHub,
-  pythonOlder,
+  pytestCheckHook,
   setuptools,
   setuptools-scm,
 }:
 
 buildPythonPackage rec {
   pname = "dissect-archive";
-  version = "1.6";
+  version = "1.8";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "dissect.archive";
     tag = version;
-    hash = "sha256-TaNSgUL9Ia7Qz9qy+I+4vRFn5gGnsYxAgbsrI6iYrlo=";
+    hash = "sha256-HNbnluJPn275BYEdfBQdGtXlXlvZKFvDkJTpe0zgpdc=";
   };
 
   build-system = [
@@ -33,8 +31,17 @@ buildPythonPackage rec {
     dissect-util
   ];
 
+  nativeCheckInputs = [ pytestCheckHook ];
+
   pythonImportsCheck = [ "dissect.archive" ];
 
+  disabledTests = [
+    # Issue with archives
+    "test_vbk"
+    "test_vma"
+    "test_wim"
+  ];
+
   meta = with lib; {
     description = "Dissect module implementing parsers for various archive and backup formats";
     homepage = "https://github.com/fox-it/dissect.archive";

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

@@ -6,7 +6,6 @@
   fetchFromGitHub,
   google-crc32c,
   python-lzo,
-  pythonOlder,
   setuptools,
   setuptools-scm,
   zstandard,
@@ -14,16 +13,14 @@
 
 buildPythonPackage rec {
   pname = "dissect-btrfs";
-  version = "1.7";
+  version = "1.9";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "dissect.btrfs";
     tag = version;
-    hash = "sha256-BREkGrQ1khz+uPahHeMwD0V8JytQY1K/oYa7nxP+bR0=";
+    hash = "sha256-qOyPMDZtudrvZNlyiL16gv513zuTCd2O14Q4QwHMmoc=";
   };
 
   nativeBuildInputs = [

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

@@ -13,7 +13,6 @@
   pyshark,
   pytest-httpserver,
   pytestCheckHook,
-  pythonOlder,
   rich,
 }:
 
@@ -22,8 +21,6 @@ buildPythonPackage rec {
   version = "1.2.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "dissect.cobaltstrike";
@@ -73,6 +70,12 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "dissect.cobaltstrike" ];
 
+  disabledTests = [
+    # Don't run tests with a beacon
+    "test_c2profile_beacon_gate"
+    "test_beacon_dump_guardrails"
+  ];
+
   meta = with lib; {
     description = "Dissect module implementing a parser for Cobalt Strike related data";
     homepage = "https://github.com/fox-it/dissect.cobaltstrike";

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

@@ -5,21 +5,18 @@
   setuptools,
   setuptools-scm,
   pytestCheckHook,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "dissect-cstruct";
-  version = "4.5";
+  version = "4.7";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "dissect.cstruct";
     tag = version;
-    hash = "sha256-2n7y6nHt7gJtJeJIKpobiC7A+dnD6O/o+psinfOnvT8=";
+    hash = "sha256-eEaKGFpArg0p3+/I2dH3mQ+eNIVJ8KsUbRcw4Ecrl7g=";
   };
 
   build-system = [

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

@@ -0,0 +1,48 @@
+{
+  lib,
+  buildPythonPackage,
+  dissect-cstruct,
+  dissect-util,
+  fetchFromGitHub,
+  pytestCheckHook,
+  setuptools-scm,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "dissect-database";
+  version = "1.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "fox-it";
+    repo = "dissect.database";
+    tag = version;
+    hash = "sha256-ZMiYPAiumPg9nd7+OAnrVAwrnx0I5reClRgIerStpfE=";
+  };
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [
+    dissect-cstruct
+    dissect-util
+  ];
+
+  # Test files are not ready
+  doCheck = false;
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "dissect.database" ];
+
+  meta = with lib; {
+    description = "Dissect module implementing a parser for various database formats";
+    homepage = "https://github.com/fox-it/dissect.database";
+    changelog = "https://github.com/fox-it/dissect.database/releases/tag/${src.tag}";
+    license = licenses.agpl3Only;
+    maintainers = with maintainers; [ fab ];
+  };
+}

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

@@ -5,7 +5,6 @@
   dissect-util,
   fetchFromGitHub,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
   setuptools-scm,
 }:
@@ -15,8 +14,6 @@ buildPythonPackage rec {
   version = "3.18";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "dissect.esedb";

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

@@ -8,21 +8,18 @@
   setuptools,
   setuptools-scm,
   pytestCheckHook,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "dissect-etl";
-  version = "3.11";
+  version = "3.14";
   pyproject = true;
 
-  disabled = pythonOlder "3.10";
-
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "dissect.etl";
     tag = version;
-    hash = "sha256-soJH7kx/029yXyOjv6OsWjWAMMHXKx711GLPBClDAK0=";
+    hash = "sha256-QmtFkzO57jLTQg16MawAgU7Vq8vgo7DkEDq+FEjnObs=";
   };
 
   build-system = [

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

@@ -6,21 +6,18 @@
   fetchFromGitHub,
   setuptools,
   setuptools-scm,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "dissect-executable";
-  version = "1.8";
+  version = "1.11";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "dissect.executable";
     tag = version;
-    hash = "sha256-6fEaXZTkygd0ZLPFWbtzWadA9VEsp3cd4/he0LxqhMw=";
+    hash = "sha256-TbygZJjdTfNvwEHmquiXfalu73XgNPZpar50YpxP6NA=";
   };
 
   build-system = [

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

@@ -7,7 +7,6 @@
   dissect-target,
   fetchFromGitHub,
   pycryptodome,
-  pythonOlder,
   rich,
   setuptools-scm,
   setuptools,
@@ -15,22 +14,16 @@
 
 buildPythonPackage rec {
   pname = "dissect-fve";
-  version = "4.2";
+  version = "4.5";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "dissect.fve";
     tag = version;
-    hash = "sha256-OgagTnt4y6Fzd7jbsCgbkTzcsdnozImfdKI9ew9JaqI=";
+    hash = "sha256-Lg29WJfXvjdhGtkZowzXgH9zzockoGkei1s9hgLr/gg=";
   };
 
-  pythonRelaxDeps = [
-    "pycryptodome"
-  ];
-
   build-system = [
     setuptools
     setuptools-scm

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

@@ -7,21 +7,18 @@
   setuptools,
   setuptools-scm,
   pytestCheckHook,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "dissect-ntfs";
-  version = "3.14";
+  version = "3.15";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "dissect.ntfs";
     tag = version;
-    hash = "sha256-C2tve1RVR8Q7t1Xz7Of1xRZH6IuLP9nL2l1cHbycFQ4=";
+    hash = "sha256-dd0AGkOXd+7VB6RIGiLoq1AFi4Uns1axW4V8MN8W7ao=";
   };
 
   build-system = [
@@ -43,6 +40,14 @@ buildPythonPackage rec {
     "tests/test_index.py"
   ];
 
+  disabledTests = [
+    # Issue with archive
+    "test_mft"
+    "test_ntfs"
+    "test_secure"
+    "test_fragmented_mft"
+  ];
+
   meta = with lib; {
     description = "Dissect module implementing a parser for the NTFS file system";
     homepage = "https://github.com/fox-it/dissect.ntfs";

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

@@ -8,6 +8,7 @@
   dissect-cim,
   dissect-clfs,
   dissect-cstruct,
+  dissect-database,
   dissect-esedb,
   dissect-etl,
   dissect-eventlog,
@@ -33,28 +34,24 @@
   paho-mqtt,
   pycryptodome,
   pytestCheckHook,
-  pythonOlder,
   ruamel-yaml,
   setuptools,
   setuptools-scm,
   structlog,
-  tomli,
   yara-python,
   zstandard,
 }:
 
 buildPythonPackage rec {
   pname = "dissect-target";
-  version = "3.23.1";
+  version = "3.24";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "dissect.target";
     tag = version;
-    hash = "sha256-WOFtDFCN3OfhEjfhEgwtJN/tQVRGvd2RMQzcKtf0atU=";
+    hash = "sha256-i1oA7UVo880dHJkf19YRcmPV3Lwp1a8RokfRNDZ9gG0=";
     fetchLFS = true;
   };
 
@@ -71,6 +68,7 @@ buildPythonPackage rec {
   dependencies = [
     defusedxml
     dissect-cstruct
+    dissect-database
     dissect-eventlog
     dissect-evidence
     dissect-hypervisor
@@ -88,6 +86,7 @@ buildPythonPackage rec {
       dissect-btrfs
       dissect-cim
       dissect-clfs
+      dissect-database
       dissect-esedb
       dissect-etl
       dissect-extfs
@@ -103,8 +102,7 @@ buildPythonPackage rec {
       ruamel-yaml
       yara-python
       zstandard
-    ]
-    ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+    ];
     yara = [ yara-python ] ++ optional-dependencies.full;
     smb = [ impacket ] ++ optional-dependencies.full;
     mqtt = [ paho-mqtt ] ++ optional-dependencies.full;

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

@@ -5,24 +5,21 @@
   setuptools,
   setuptools-scm,
   pytestCheckHook,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "dissect-util";
-  version = "3.21";
-  format = "pyproject";
-
-  disabled = pythonOlder "3.9";
+  version = "3.23";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "dissect.util";
     tag = version;
-    hash = "sha256-DCe1V3ZQxr2uQ5L4Lucqu0E1jVo7P6cEwC+4tuBmmqI=";
+    hash = "sha256-dHP5nyumuQxAS3hkw4XRaLR3DMFn+WEFkLRbKBODIFo=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     setuptools
     setuptools-scm
   ];
@@ -38,10 +35,10 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Dissect module implementing various utility functions for the other Dissect modules";
-    mainProgram = "dump-nskeyedarchiver";
     homepage = "https://github.com/fox-it/dissect.util";
-    changelog = "https://github.com/fox-it/dissect.util/releases/tag/${version}";
+    changelog = "https://github.com/fox-it/dissect.util/releases/tag/${src.tag}";
     license = licenses.agpl3Only;
     maintainers = with maintainers; [ fab ];
+    mainProgram = "dump-nskeyedarchiver";
   };
 }

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

@@ -4,32 +4,29 @@
   dissect-cstruct,
   dissect-util,
   fetchFromGitHub,
-  setuptools,
-  setuptools-scm,
   pytestCheckHook,
-  pythonOlder,
+  setuptools-scm,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "dissect-vmfs";
-  version = "3.11";
-  format = "pyproject";
-
-  disabled = pythonOlder "3.10";
+  version = "3.13";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "dissect.vmfs";
     tag = version;
-    hash = "sha256-jGPHZ26DDIcblgx4hP6L2BLHYY8YeIBcbxNR7bN/49g=";
+    hash = "sha256-4c3JVbQidGvXurWaO+/E0OehGgiY5shE5BiIBwMrCWM=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     setuptools
     setuptools-scm
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     dissect-cstruct
     dissect-util
   ];
@@ -38,6 +35,17 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "dissect.vmfs" ];
 
+  disabledTests = [
+    # Archive not present
+    "test_huge"
+    "test_lvm_basic"
+    "test_lvm_span"
+    "test_sparse"
+    "test_vmfs_basic"
+    "test_vmfs_content"
+    "test_vmfs_jbosf"
+  ];
+
   meta = with lib; {
     description = "Dissect module implementing a parser for the VMFS file system";
     homepage = "https://github.com/fox-it/dissect.vmfs";

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

@@ -7,7 +7,6 @@
   setuptools,
   setuptools-scm,
   pytestCheckHook,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
@@ -15,8 +14,6 @@ buildPythonPackage rec {
   version = "3.17";
   pyproject = true;
 
-  disabled = pythonOlder "3.13";
-
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "dissect.volume";

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

@@ -1,6 +1,7 @@
 {
   lib,
   buildPythonPackage,
+  dissect-apfs,
   dissect-archive,
   dissect-btrfs,
   dissect-cim,
@@ -31,23 +32,20 @@
   dissect-volume,
   dissect-xfs,
   fetchFromGitHub,
-  pythonOlder,
   setuptools,
   setuptools-scm,
 }:
 
 buildPythonPackage rec {
   pname = "dissect";
-  version = "3.20.1";
+  version = "3.21";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "dissect";
     tag = version;
-    hash = "sha256-Zc9NBrRDbSP5Yk3gJoMG+6nAGFxBHiPKvvfQLMcu+tk=";
+    hash = "sha256-INqZwN3x5MzrACyaUOa2A7mrKvld9reN1PJVxkq837o=";
   };
 
   pythonRelaxDeps = true;
@@ -58,6 +56,7 @@ buildPythonPackage rec {
   ];
 
   dependencies = [
+    dissect-apfs
     dissect-archive
     dissect-btrfs
     dissect-cim

pkgs/development/python-modules/flow-record/default.nix

@@ -11,25 +11,24 @@
   maxminddb,
   msgpack,
   pytest7CheckHook,
-  pythonOlder,
   pytz,
   setuptools-scm,
   setuptools,
+  structlog,
+  tqdm,
   zstandard,
 }:
 
 buildPythonPackage rec {
   pname = "flow-record";
-  version = "3.20";
+  version = "3.21";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "flow.record";
     tag = version;
-    hash = "sha256-3jXxKA+MHjKfzKqOuP0EJxVD5QPvwjWE3N4qhIEFNvM=";
+    hash = "sha256-hJZCWF81pMeHOZGc6zTA046hV1J0PNQGMlPD3mgyrRI=";
   };
 
   build-system = [
@@ -52,6 +51,12 @@ buildPythonPackage rec {
     geoip = [ maxminddb ];
     avro = [ fastavro ] ++ fastavro.optional-dependencies.snappy;
     splunk = [ httpx ];
+    # xlsx = [ openpyxl ]; # Not available
+    full = [
+      structlog
+      tqdm
+    ]
+    ++ optional-dependencies.compression;
   };
 
   nativeCheckInputs = [
@@ -63,8 +68,10 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "flow.record" ];
 
   disabledTestPaths = [
-    # Test requires rdump
-    "tests/test_rdump.py"
+    # Input not available
+    "tests/adapter/test_xlsx.py"
+    # Requires rdump
+    "tests/tools/test_rdump.py"
   ];
 
   disabledTests = [ "test_rdump_fieldtype_path_json" ];

pkgs/top-level/python-packages.nix

@@ -3839,6 +3839,8 @@ self: super: with self; {
 
   dissect = callPackage ../development/python-modules/dissect { };
 
+  dissect-apfs = callPackage ../development/python-modules/dissect-apfs { };
+
   dissect-archive = callPackage ../development/python-modules/dissect-archive { };
 
   dissect-btrfs = callPackage ../development/python-modules/dissect-btrfs { };
@@ -3853,6 +3855,8 @@ self: super: with self; {
 
   dissect-cstruct = callPackage ../development/python-modules/dissect-cstruct { };
 
+  dissect-database = callPackage ../development/python-modules/dissect-database { };
+
   dissect-esedb = callPackage ../development/python-modules/dissect-esedb { };
 
   dissect-etl = callPackage ../development/python-modules/dissect-etl { };