From df33329e82e8bdc89acbfe1d4db3ae3147a3ccf5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Nov 2023 13:18:02 +0100 Subject: [PATCH 01/13] python311Packages.flow-record: 3.12 -> 3.13 Diff: fox-it/flow.record@refs/tags/3.12...3.13 Changelog: https://github.com/fox-it/flow.record/releases/tag/3.13 --- pkgs/development/python-modules/flow-record/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/flow-record/default.nix b/pkgs/development/python-modules/flow-record/default.nix index 3479f3b3d57b..1562600a231f 100644 --- a/pkgs/development/python-modules/flow-record/default.nix +++ b/pkgs/development/python-modules/flow-record/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { version = "3.12"; format = "pyproject"; - disabled = pythonOlder "3.12"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "fox-it"; From 40aa4e9613a52e3b9dd54156693ada93d45216cf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Nov 2023 13:19:41 +0100 Subject: [PATCH 02/13] python311Packages.dissect-fat: 3.6 -> 3.7 Diff: fox-it/dissect.fat@refs/tags/3.6...3.7 Changelog: https://github.com/fox-it/dissect.fat/releases/tag/3.7 --- pkgs/development/python-modules/dissect-fat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-fat/default.nix b/pkgs/development/python-modules/dissect-fat/default.nix index 0fd868f4835f..9fa9457b2848 100644 --- a/pkgs/development/python-modules/dissect-fat/default.nix +++ b/pkgs/development/python-modules/dissect-fat/default.nix @@ -11,9 +11,9 @@ buildPythonPackage rec { pname = "dissect-fat"; version = "3.6"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fox-it"; From dabcb70841040bc0dbe47ec03d4080b1dbacca79 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Nov 2023 13:21:27 +0100 Subject: [PATCH 03/13] python311Packages.dissect-hypervisor: 3.9 -> 3.10 Diff: fox-it/dissect.hypervisor@refs/tags/3.9...3.10 Changelog: https://github.com/fox-it/dissect.hypervisor/releases/tag/3.10 --- .../development/python-modules/dissect-hypervisor/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dissect-hypervisor/default.nix b/pkgs/development/python-modules/dissect-hypervisor/default.nix index ff1395b932cb..55ce876fe216 100644 --- a/pkgs/development/python-modules/dissect-hypervisor/default.nix +++ b/pkgs/development/python-modules/dissect-hypervisor/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, defusedxml , dissect-cstruct , dissect-util , fetchFromGitHub @@ -14,7 +15,7 @@ buildPythonPackage rec { pname = "dissect-hypervisor"; version = "3.9"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -33,6 +34,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + defusedxml dissect-cstruct dissect-util ]; From 79686f1b97683feb244b1b9a24af2b90d06d7c45 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Nov 2023 13:23:01 +0100 Subject: [PATCH 04/13] python311Packages.dissect-regf: 3.7 -> 3.8 Diff: fox-it/dissect.regf@refs/tags/3.7...3.8 Changelog: https://github.com/fox-it/dissect.regf/releases/tag/3.8 --- 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 bc0d8798255f..9671bb33c8ab 100644 --- a/pkgs/development/python-modules/dissect-regf/default.nix +++ b/pkgs/development/python-modules/dissect-regf/default.nix @@ -12,9 +12,9 @@ buildPythonPackage rec { pname = "dissect-regf"; version = "3.7"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fox-it"; From 5b8b2141c1e79a0df820867dc993cffd4260dc4b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Nov 2023 13:24:27 +0100 Subject: [PATCH 05/13] python311Packages.acquire: 3.9 -> 3.10 Diff: fox-it/acquire@refs/tags/3.9...3.10 Changelog: https://github.com/fox-it/acquire/releases/tag/3.10 --- pkgs/development/python-modules/acquire/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/acquire/default.nix b/pkgs/development/python-modules/acquire/default.nix index 13297b0cd6d3..4426f930b0d8 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.9"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.9"; From 1566048c082ff5675deeef3e619c0cd90829f2f4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Nov 2023 13:27:44 +0100 Subject: [PATCH 06/13] python311Packages.dissect-target: 3.12 -> 3.13 Diff: fox-it/dissect.target@refs/tags/3.12...3.13 Changelog: https://github.com/fox-it/dissect.target/releases/tag/3.13 --- pkgs/development/python-modules/dissect-target/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dissect-target/default.nix b/pkgs/development/python-modules/dissect-target/default.nix index 7704766d4342..1b816948895b 100644 --- a/pkgs/development/python-modules/dissect-target/default.nix +++ b/pkgs/development/python-modules/dissect-target/default.nix @@ -39,16 +39,16 @@ buildPythonPackage rec { pname = "dissect-target"; - version = "3.12"; + version = "3.13"; format = "pyproject"; - disabled = pythonOlder "3.12"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.target"; rev = "refs/tags/${version}"; - hash = "sha256-ByjeQcoDi0edum2XebF2DQ7d0xeH2nyulj6vt7bztKg="; + hash = "sha256-4dtKAFhxaS8PRoeLY6ZYrE/4P1pbcii1gWQ9RRVOBzs="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From c19b3244fbf649770588e08f1ec1fbc2864fa5c9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Nov 2023 13:29:47 +0100 Subject: [PATCH 07/13] python311Packages.dissect-util: 3.11 -> 3.12 Diff: fox-it/dissect.util@refs/tags/3.11...3.12 Changelog: https://github.com/fox-it/dissect.util/releases/tag/3.12 --- pkgs/development/python-modules/dissect-util/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dissect-util/default.nix b/pkgs/development/python-modules/dissect-util/default.nix index 735ad9820f26..bfbc76b73c92 100644 --- a/pkgs/development/python-modules/dissect-util/default.nix +++ b/pkgs/development/python-modules/dissect-util/default.nix @@ -9,16 +9,16 @@ buildPythonPackage rec { pname = "dissect-util"; - version = "3.11"; + version = "3.12"; format = "pyproject"; - disabled = pythonOlder "3.11"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.util"; rev = "refs/tags/${version}"; - hash = "sha256-PtmvXnmZ6f8YxEejqaVwtaoV7d1Oa7063ZFagH110yk="; + hash = "sha256-rso6TIw8cQnkb58KtGKOfzIzpqJLW05L9sRWIGX3teA="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From bd37b5a512a2c6f1340fb1e1c0fd58b6e438cc6b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Nov 2023 13:31:51 +0100 Subject: [PATCH 08/13] python311Packages.dissect-esedb: modernize --- pkgs/development/python-modules/dissect-esedb/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dissect-esedb/default.nix b/pkgs/development/python-modules/dissect-esedb/default.nix index 5ae671c06a7e..8c9767f6c066 100644 --- a/pkgs/development/python-modules/dissect-esedb/default.nix +++ b/pkgs/development/python-modules/dissect-esedb/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "dissect-esedb"; version = "3.9"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.9"; From b7a405feb02b17152d78f61b3095079c1d75b6e8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Nov 2023 13:33:08 +0100 Subject: [PATCH 09/13] python311Packages.dissect-evidence: update disabled --- pkgs/development/python-modules/dissect-evidence/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-evidence/default.nix b/pkgs/development/python-modules/dissect-evidence/default.nix index 7e022eb1797b..b1d8bb2b1b84 100644 --- a/pkgs/development/python-modules/dissect-evidence/default.nix +++ b/pkgs/development/python-modules/dissect-evidence/default.nix @@ -12,9 +12,9 @@ buildPythonPackage rec { pname = "dissect-evidence"; version = "3.7"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fox-it"; From 66a3c4ec5e37f9cf5dbbd7baa003381544853c67 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Nov 2023 13:34:19 +0100 Subject: [PATCH 10/13] python311Packages.dissect-thumbcache: update disabled --- .../development/python-modules/dissect-thumbcache/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-thumbcache/default.nix b/pkgs/development/python-modules/dissect-thumbcache/default.nix index a9224d0d4361..e63e7bb4ac91 100644 --- a/pkgs/development/python-modules/dissect-thumbcache/default.nix +++ b/pkgs/development/python-modules/dissect-thumbcache/default.nix @@ -12,9 +12,9 @@ buildPythonPackage rec { pname = "dissect-thumbcache"; version = "1.6"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fox-it"; From 31a6adce21db40fcd26c473ff42975912cfc1b91 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Nov 2023 13:35:39 +0100 Subject: [PATCH 11/13] python311Packages.dissect-volume: update disabled --- pkgs/development/python-modules/dissect-volume/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-volume/default.nix b/pkgs/development/python-modules/dissect-volume/default.nix index 3cf3282c0b5b..1ef6ffb44998 100644 --- a/pkgs/development/python-modules/dissect-volume/default.nix +++ b/pkgs/development/python-modules/dissect-volume/default.nix @@ -12,9 +12,9 @@ buildPythonPackage rec { pname = "dissect-volume"; version = "3.7"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fox-it"; From c3643e83a78da102d8eddb1a2fee33eb6f70dbfa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Nov 2023 13:40:57 +0100 Subject: [PATCH 12/13] python311Packages.dissect-target: disable failing tests --- pkgs/development/python-modules/dissect-target/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/dissect-target/default.nix b/pkgs/development/python-modules/dissect-target/default.nix index 1b816948895b..dfb7f7867534 100644 --- a/pkgs/development/python-modules/dissect-target/default.nix +++ b/pkgs/development/python-modules/dissect-target/default.nix @@ -108,6 +108,11 @@ buildPythonPackage rec { "test_exec_target_command" # Issue with tar file "test_tar_sensitive_drive_letter" + "test_dpapi_decrypt_blob" + "test_notifications_appdb" + "test_md" + "test_notifications_wpndatabase" + "test_nested_md_lvm" # Tests compare dates and times "yum" # Filesystem access, windows defender tests From 4e2387585983f0ee8ce958e30945fec102f149b0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Nov 2023 13:41:25 +0100 Subject: [PATCH 13/13] python311Packages.dissect: 3.9 -> 3.10 Diff: fox-it/dissect@refs/tags/3.9...3.10 Changelog: https://github.com/fox-it/dissect/releases/tag/3.10 --- pkgs/development/python-modules/dissect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect/default.nix b/pkgs/development/python-modules/dissect/default.nix index e9b1c6b46a6e..6ff492588420 100644 --- a/pkgs/development/python-modules/dissect/default.nix +++ b/pkgs/development/python-modules/dissect/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "dissect"; - version = "3.9"; + version = "3.10"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect"; rev = "refs/tags/${version}"; - hash = "sha256-lNa6GiX0hCZFVyiokBzEKGsvimSkUkgR1bkQMhxUbDw="; + hash = "sha256-AgmBU2sC3/okC7LKQC6yMEJ3u69WwAMAANILMASBIjw="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version;