From 5ef23936ccdce842b68e8c510deab53d168180ff Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 21 May 2025 00:41:55 +0200 Subject: [PATCH 1/7] python313Packages.dissect-shellitem: 3.10 -> 3.11 Changelog: https://github.com/fox-it/dissect.shellitem/releases/tag/3.11 --- .../python-modules/dissect-shellitem/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/dissect-shellitem/default.nix b/pkgs/development/python-modules/dissect-shellitem/default.nix index 53d848aeefa3..77381c9cd3dc 100644 --- a/pkgs/development/python-modules/dissect-shellitem/default.nix +++ b/pkgs/development/python-modules/dissect-shellitem/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "dissect-shellitem"; - version = "3.10"; + version = "3.11"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.shellitem"; tag = version; - hash = "sha256-BS+c9QbMMsaoZHyuv6jMxbQFQNJeLt3da8Fq/wwXesQ="; + hash = "sha256-mHcH6lgTyv1DlEccYRitfby7WMJc3/71ef/OurW3EEw="; }; build-system = [ @@ -38,12 +38,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "dissect.shellitem" ]; - disabledTests = [ - # Windows-specific tests - "test_xp_remote_lnk_file" - "test_xp_remote_lnk_dir" - "test_win7_local_lnk_dir" - ]; + # Windows-specific tests + doCheck = false; meta = with lib; { description = "Dissect module implementing a parser for the Shellitem structures"; From 25564eeade99f1f67e7ce419274ba9a6eb3dc871 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 20 May 2025 23:47:31 +0200 Subject: [PATCH 2/7] python313Packages.dissect-regf: 3.12 -> 3.13 Diff: https://github.com/fox-it/dissect.regf/compare/refs/tags/3.12...refs/tags/3.13 Changelog: https://github.com/fox-it/dissect.regf/releases/tag/3.13 --- pkgs/development/python-modules/dissect-regf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-regf/default.nix b/pkgs/development/python-modules/dissect-regf/default.nix index 3f69195edce7..c63cf3ce0916 100644 --- a/pkgs/development/python-modules/dissect-regf/default.nix +++ b/pkgs/development/python-modules/dissect-regf/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "dissect-regf"; - version = "3.12"; + version = "3.13"; pyproject = true; disabled = pythonOlder "3.11"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.regf"; tag = version; - hash = "sha256-ONE8dX2AHSboDzSFQ+7ZkIqVmQW3J8QyeOr8ZKrlvqI="; + hash = "sha256-O2BKOzv0nFQ8rCgTCgYowQTptR1asuJBroqTNeDIIak="; }; nativeBuildInputs = [ From c65bf443f899e9d600ed127c9a871b803e8c766f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 21 May 2025 00:09:00 +0200 Subject: [PATCH 3/7] python313Packages.dissect-cim: 3.10 -> 3.12 Changelog: https://github.com/fox-it/dissect.cim/releases/tag/3.12 --- pkgs/development/python-modules/dissect-cim/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-cim/default.nix b/pkgs/development/python-modules/dissect-cim/default.nix index 2556d1a5f944..4a2cd54aaf45 100644 --- a/pkgs/development/python-modules/dissect-cim/default.nix +++ b/pkgs/development/python-modules/dissect-cim/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "dissect-cim"; - version = "3.10"; + version = "3.12"; pyproject = true; disabled = pythonOlder "3.10"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.cim"; tag = version; - hash = "sha256-7Mv8yiWEs/mj/JKDrD1BxT75tQr13VgGj0yHdRltcYM="; + hash = "sha256-e1G4642QeIhtKWvtfiQs3eOl+dFP/8VWZJGvO8dFWxY="; }; build-system = [ @@ -38,6 +38,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "dissect.cim" ]; + # gzip.BadGzipFile: Not a gzipped file + doCheck = false; + meta = with lib; { description = "Dissect module implementing a parser for the Windows Common Information Model (CIM) database"; homepage = "https://github.com/fox-it/dissect.cim"; From f88435d01a84e67a9f39de51459c272c56e6c038 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 26 Jun 2025 20:00:36 +0200 Subject: [PATCH 4/7] python313Packages.dissect-target: 3.20.1 -> 3.22 Changelog: https://github.com/fox-it/dissect.target/releases/tag/3.22 --- .../python-modules/dissect-target/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/dissect-target/default.nix b/pkgs/development/python-modules/dissect-target/default.nix index b1b4cd6fa460..962c5f8c2f9f 100644 --- a/pkgs/development/python-modules/dissect-target/default.nix +++ b/pkgs/development/python-modules/dissect-target/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { pname = "dissect-target"; - version = "3.20.1"; + version = "3.22"; pyproject = true; disabled = pythonOlder "3.9"; @@ -54,7 +54,8 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.target"; tag = version; - hash = "sha256-kB1RhLnmsK77V5uI/GesRQX//awWKVAtWUGgtj38URM="; + hash = "sha256-N7GxaXQj7mrTOsNGek4ZZlVF9GH/rm5CFKpYFMLJw8k="; + fetchLFS = true; }; postPatch = '' @@ -117,12 +118,15 @@ buildPythonPackage rec { disabledTests = [ - "test_cpio" - "test_env_parser" "test_cp_directory" "test_cp_subdirectories" + "test_cpio" + "test_env_parser" + "test_list_json" + "test_list" "test_shell_cli" "test_shell_cmd" + "test_shell_prompt_tab_autocomplete" # Test requires rdump "test_exec_target_command" # Issue with tar file @@ -163,7 +167,6 @@ buildPythonPackage rec { "tests/plugins/os/" "tests/test_container.py" "tests/plugins/filesystem/" - "tests/test_registration.py" "tests/filesystems/" "tests/test_filesystem.py" "tests/loaders/" From 1bf169c386785cad70ac3e17eca5d2082766bd44 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 26 Jun 2025 20:02:13 +0200 Subject: [PATCH 5/7] python313Packages.acquire: 3.18 -> 3.19 Diff: https://github.com/fox-it/acquire/compare/refs/tags/3.18...refs/tags/3.19 Changelog: https://github.com/fox-it/acquire/releases/tag/3.19 --- pkgs/development/python-modules/acquire/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/acquire/default.nix b/pkgs/development/python-modules/acquire/default.nix index 515d60a8a918..9bc47aa4a518 100644 --- a/pkgs/development/python-modules/acquire/default.nix +++ b/pkgs/development/python-modules/acquire/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "acquire"; - version = "3.18"; + version = "3.19"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "acquire"; tag = version; - hash = "sha256-kDoDPeMvpctNnB+e2LnCZ7fw9AP+AjPYDXwVqKedJ88="; + hash = "sha256-0aqngfv2ZyVw1ymotz1PmXKUZeTHUVL9ICL6cyEn/wk="; }; build-system = [ From 30a9441ffaa8a3ea781a9b4e32bad3e96225db2c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 26 Jun 2025 21:17:14 +0200 Subject: [PATCH 6/7] python313Packages.dissect-qnxfs: init at 1.0 Dissect module implementing a parser for the QNX4 and QNX6 file systems https://github.com/fox-it/dissect.qnxfs --- .../python-modules/dissect-qnxfs/default.nix | 49 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/development/python-modules/dissect-qnxfs/default.nix diff --git a/pkgs/development/python-modules/dissect-qnxfs/default.nix b/pkgs/development/python-modules/dissect-qnxfs/default.nix new file mode 100644 index 000000000000..fede97c6eef9 --- /dev/null +++ b/pkgs/development/python-modules/dissect-qnxfs/default.nix @@ -0,0 +1,49 @@ +{ + lib, + buildPythonPackage, + dissect-cstruct, + dissect-util, + fetchFromGitHub, + setuptools-scm, + setuptools, +}: + +buildPythonPackage rec { + pname = "dissect-qnxfs"; + version = "1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "fox-it"; + repo = "dissect.qnxfs"; + tag = version; + hash = "sha256-UnEwBcaBP64qIWVYWcsxxjWuiAM9yOCGWevnNonQn+8="; + }; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + dissect-cstruct + dissect-util + ]; + + optional-dependencies = { + dev = [ + dissect-cstruct + dissect-util + ]; + }; + + pythonImportsCheck = [ "dissect.qnxfs" ]; + + meta = { + description = "Dissect module implementing a parser for the QNX4 and QNX6 file systems"; + homepage = "https://github.com/fox-it/dissect.qnxfs"; + changelog = "https://github.com/fox-it/dissect.qnxfs/releases/tag/${src.tag}"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e31c98e68a3e..3acdbeaaeaeb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3645,6 +3645,8 @@ self: super: with self; { dissect-ole = callPackage ../development/python-modules/dissect-ole { }; + dissect-qnxfs = callPackage ../development/python-modules/dissect-qnxfs { }; + dissect-regf = callPackage ../development/python-modules/dissect-regf { }; dissect-shellitem = callPackage ../development/python-modules/dissect-shellitem { }; From 4574b7412829bf08e0e33a415dfc326259d1c1ca Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 26 Jun 2025 21:18:53 +0200 Subject: [PATCH 7/7] python313Packages.dissect: 3.18 -> 3.19 Changelog: https://github.com/fox-it/dissect/releases/tag/3.19 --- pkgs/development/python-modules/dissect/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dissect/default.nix b/pkgs/development/python-modules/dissect/default.nix index 9bc99f3c1615..3f02b6906971 100644 --- a/pkgs/development/python-modules/dissect/default.nix +++ b/pkgs/development/python-modules/dissect/default.nix @@ -19,6 +19,7 @@ dissect-jffs, dissect-ntfs, dissect-ole, + dissect-qnxfs, dissect-regf, dissect-shellitem, dissect-sql, @@ -36,16 +37,16 @@ buildPythonPackage rec { pname = "dissect"; - version = "3.18"; + version = "3.19"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect"; tag = version; - hash = "sha256-3yy7BA6FJgAdn2lMSJgyFeVDxJg0f0RWsekkqiqxd7M="; + hash = "sha256-eEiWKblhJPkZuxJvwJnHtxwvJ9uhXIkS56CeRtmEfkU="; }; pythonRelaxDeps = true; @@ -74,6 +75,7 @@ buildPythonPackage rec { dissect-jffs dissect-ntfs dissect-ole + dissect-qnxfs dissect-regf dissect-shellitem dissect-sql