From 89abfb9d8ac5000eb39431fc6ebfbd869665a653 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 00:12:28 +0200 Subject: [PATCH 01/70] python311Packages.flow-record: 3.14 -> 3.15 Diff: https://github.com/fox-it/flow.record/compare/refs/tags/3.14...3.15 Changelog: https://github.com/fox-it/flow.record/releases/tag/3.15 --- pkgs/development/python-modules/flow-record/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flow-record/default.nix b/pkgs/development/python-modules/flow-record/default.nix index 3e836772aa85..fa28bedafaaa 100644 --- a/pkgs/development/python-modules/flow-record/default.nix +++ b/pkgs/development/python-modules/flow-record/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "flow-record"; - version = "3.14"; + version = "3.15"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "flow.record"; rev = "refs/tags/${version}"; - hash = "sha256-8XQeXfrgTk+jHR1ABlEEIn3E/MkUkGnvkgzePws4qhQ="; + hash = "sha256-j5N66p7feB9Ae+Fu5RhVzh8XCHiq55jJMg0Fe+C6Jvg="; }; nativeBuildInputs = [ From af2568d58427e1df624a2c658aa84cff30399f69 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 00:12:33 +0200 Subject: [PATCH 02/70] python311Packages.dissect-cim: 3.8 -> 3.9 Diff: https://github.com/fox-it/dissect.cim/compare/refs/tags/3.8...3.9 Changelog: https://github.com/fox-it/dissect.cim/releases/tag/3.9 --- pkgs/development/python-modules/dissect-cim/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dissect-cim/default.nix b/pkgs/development/python-modules/dissect-cim/default.nix index c9aef3e961ec..e2bb621b8775 100644 --- a/pkgs/development/python-modules/dissect-cim/default.nix +++ b/pkgs/development/python-modules/dissect-cim/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "dissect-cim"; - version = "3.8"; + version = "3.9"; format = "pyproject"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.cim"; rev = "refs/tags/${version}"; - hash = "sha256-NbGI6d1C3X7PbTsbDSCS4AUK6ueCBOuQDTNhkULrLYc="; + hash = "sha256-UZ4mlshaKqZKoysvnGfcaoMOrMwfsN/qOJ8hrpMcQL0="; }; nativeBuildInputs = [ From fdee48a597f4eee9c9badd5571206c84a58c984b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 00:12:36 +0200 Subject: [PATCH 03/70] python311Packages.dissect-clfs: 1.7 -> 1.8 Diff: https://github.com/fox-it/dissect.clfs/compare/refs/tags/1.7...1.8 Changelog: https://github.com/fox-it/dissect.clfs/releases/tag/1.8 --- pkgs/development/python-modules/dissect-clfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-clfs/default.nix b/pkgs/development/python-modules/dissect-clfs/default.nix index 1007dcc07c62..f11eb800bc10 100644 --- a/pkgs/development/python-modules/dissect-clfs/default.nix +++ b/pkgs/development/python-modules/dissect-clfs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dissect-clfs"; - version = "1.7"; + version = "1.8"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.clfs"; rev = "refs/tags/${version}"; - hash = "sha256-DBnZlyk7rjuTpOjgFUmSNxqvIZk8OxACNqyFDcENFHM="; + hash = "sha256-C1a85OLMkj0vjnRpenfC/xyxJ1TjYSlHPOq0jIrA/Ng="; }; nativeBuildInputs = [ From 69f65113c0a39aa4b03b4cf9c14873338c88d5a2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 00:12:38 +0200 Subject: [PATCH 04/70] python311Packages.dissect-cstruct: 3.13 -> 3.14 Diff: https://github.com/fox-it/dissect.cstruct/compare/refs/tags/3.13...3.14 Changelog: https://github.com/fox-it/dissect.cstruct/releases/tag/3.14 --- pkgs/development/python-modules/dissect-cstruct/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-cstruct/default.nix b/pkgs/development/python-modules/dissect-cstruct/default.nix index a1ed699aef37..a0c88fecfadf 100644 --- a/pkgs/development/python-modules/dissect-cstruct/default.nix +++ b/pkgs/development/python-modules/dissect-cstruct/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "dissect-cstruct"; - version = "3.13"; + version = "3.14"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.cstruct"; rev = "refs/tags/${version}"; - hash = "sha256-QfnvWCI67y8GdCfXIRaehzb26IVZ8N0muUnNpr1NGJo="; + hash = "sha256-Et6Pb7iRVlxcrR4gZf+5h7mVikf7CyDd7N+q4TH18vg="; }; nativeBuildInputs = [ From 43a90aeb814a1773b2d8b05cb58c93c0fab538e3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 00:12:41 +0200 Subject: [PATCH 05/70] python311Packages.dissect-thumbcache: 1.7 -> 1.8 Diff: https://github.com/fox-it/dissect.thumbcache/compare/refs/tags/1.7...1.8 Changelog: https://github.com/fox-it/dissect.thumbcache/releases/tag/1.8 --- .../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 6c1a68b64785..e63aecaae600 100644 --- a/pkgs/development/python-modules/dissect-thumbcache/default.nix +++ b/pkgs/development/python-modules/dissect-thumbcache/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-thumbcache"; - version = "1.7"; + version = "1.8"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.thumbcache"; rev = "refs/tags/${version}"; - hash = "sha256-t5LovLS+YMWQWMCFP6jh3SNiLb/Jy9we4FX6MmsIJmY="; + hash = "sha256-LcuuRVSnZVFtht03MD8qVNNPljVUzGa8vXu9GQPOgjs="; }; nativeBuildInputs = [ From d87003a7a8b0b8ca9d321d260ea06c6c6e7561d4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 00:12:44 +0200 Subject: [PATCH 06/70] python311Packages.dissect-squashfs: 1.4 -> 1.5 Diff: https://github.com/fox-it/dissect.squashfs/compare/refs/tags/1.4...1.5 Changelog: https://github.com/fox-it/dissect.squashfs/releases/tag/1.5 --- pkgs/development/python-modules/dissect-squashfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-squashfs/default.nix b/pkgs/development/python-modules/dissect-squashfs/default.nix index 9deecad41773..f4f5e479ef84 100644 --- a/pkgs/development/python-modules/dissect-squashfs/default.nix +++ b/pkgs/development/python-modules/dissect-squashfs/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dissect-squashfs"; - version = "1.4"; + version = "1.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.squashfs"; rev = "refs/tags/${version}"; - hash = "sha256-y6RXtHJev83m7mYdNLG640TRUPEGbi6l942zlMWXky0="; + hash = "sha256-eylLBPim3dmo8h95lRmlh8O9m458K07TH2uK+hn3nKs="; }; nativeBuildInputs = [ From 9831c3b886b3140a6d3d8ad66e672e2ddf7333a7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 00:12:47 +0200 Subject: [PATCH 07/70] python311Packages.dissect-esedb: 3.12 -> 3.13 Diff: https://github.com/fox-it/dissect.esedb/compare/refs/tags/3.12...3.13 Changelog: https://github.com/fox-it/dissect.esedb/releases/tag/3.13 --- pkgs/development/python-modules/dissect-esedb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-esedb/default.nix b/pkgs/development/python-modules/dissect-esedb/default.nix index 0a6810749b6d..5784939b2ca2 100644 --- a/pkgs/development/python-modules/dissect-esedb/default.nix +++ b/pkgs/development/python-modules/dissect-esedb/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-esedb"; - version = "3.12"; + version = "3.13"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.esedb"; rev = "refs/tags/${version}"; - hash = "sha256-s3ZIK4ZtHU5B3f9ojVTC2Aqn3G7CosTvdV6U3cwEatY="; + hash = "sha256-GdHMKLO44hR+H3fQ9h3t6sL8ACMwIVeg4nrg9brYmsU="; }; nativeBuildInputs = [ From 05e6724c4e665852dceb21c5812c5fa2702ea0e6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 00:12:50 +0200 Subject: [PATCH 08/70] python311Packages.dissect-etl: 3.8 -> 3.9 Diff: https://github.com/fox-it/dissect.etl/compare/refs/tags/3.8...3.9 Changelog: https://github.com/fox-it/dissect.etl/releases/tag/3.9 --- pkgs/development/python-modules/dissect-etl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-etl/default.nix b/pkgs/development/python-modules/dissect-etl/default.nix index c7b9236c75c3..08426d7fbc87 100644 --- a/pkgs/development/python-modules/dissect-etl/default.nix +++ b/pkgs/development/python-modules/dissect-etl/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-etl"; - version = "3.8"; + version = "3.9"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.etl"; rev = "refs/tags/${version}"; - hash = "sha256-yGpDZAaw11Sr5OPWxbY/NpZAV3jJUIgtTgDykCvYDtM="; + hash = "sha256-gLxBVHhtQS4Ep64H4jvndGyjUW1cQ68f346utVI9eC4="; }; nativeBuildInputs = [ From a8155ef760f1bb1fa20af777d6b3c7a86bbe4caf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 00:12:52 +0200 Subject: [PATCH 09/70] python311Packages.dissect-eventlog: 3.7 -> 3.8 Diff: https://github.com/fox-it/dissect.eventlog/compare/refs/tags/3.7...3.8 Changelog: https://github.com/fox-it/dissect.eventlog/releases/tag/3.8 --- .../development/python-modules/dissect-eventlog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dissect-eventlog/default.nix b/pkgs/development/python-modules/dissect-eventlog/default.nix index d8ace9285434..a57ddd56cc91 100644 --- a/pkgs/development/python-modules/dissect-eventlog/default.nix +++ b/pkgs/development/python-modules/dissect-eventlog/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "dissect-eventlog"; - version = "3.7"; + version = "3.8"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.eventlog"; rev = "refs/tags/${version}"; - hash = "sha256-YiWW1olaIKoBfiZfr4TfIEsnj/C4cmn6sYosvjeiEfM="; + hash = "sha256-MvCHeeuwwE/EOK5rh5vtwTtMrSO/BtfFenQZn5VTgb0="; }; nativeBuildInputs = [ From 5b8dbdadd2a54636c8a8dd8539800a770076606d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 00:12:55 +0200 Subject: [PATCH 10/70] python311Packages.dissect-evidence: 3.8 -> 3.9 Diff: https://github.com/fox-it/dissect.evidence/compare/refs/tags/3.8...3.9 Changelog: https://github.com/fox-it/dissect.evidence/releases/tag/3.9 --- 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 d8f9823634f4..96b13909e605 100644 --- a/pkgs/development/python-modules/dissect-evidence/default.nix +++ b/pkgs/development/python-modules/dissect-evidence/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-evidence"; - version = "3.8"; + version = "3.9"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.evidence"; rev = "refs/tags/${version}"; - hash = "sha256-/zmMPSVR6F6SIU7xuotErmU2SsKEV43rs/4oTVKAWz0="; + hash = "sha256-0WLX5mD+opJoRdnk4w8mMySn41473PcRod4YxEk3S2s="; }; nativeBuildInputs = [ From 6701eb4180d96448233c5d12e71f605be8b0eba2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 00:12:58 +0200 Subject: [PATCH 11/70] python311Packages.dissect-extfs: 3.9 -> 3.10 Diff: https://github.com/fox-it/dissect.extfs/compare/refs/tags/3.9...3.10 Changelog: https://github.com/fox-it/dissect.extfs/releases/tag/3.10 --- pkgs/development/python-modules/dissect-extfs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dissect-extfs/default.nix b/pkgs/development/python-modules/dissect-extfs/default.nix index 6838350cb8de..95d31f8f7a34 100644 --- a/pkgs/development/python-modules/dissect-extfs/default.nix +++ b/pkgs/development/python-modules/dissect-extfs/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "dissect-extfs"; - version = "3.9"; + version = "3.10"; format = "pyproject"; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.extfs"; rev = "refs/tags/${version}"; - hash = "sha256-xZEULUm0I754f9MEIUZEua76SaY/WMFp4Q5BMNZ8fWU="; + hash = "sha256-EIM2kS5V2+e7/bvuB8ezBZQl3XopdlzZ7Cmwr+Ns/Us="; }; nativeBuildInputs = [ From 16428a82b19714b52492620e740f29ff040355f2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 00:13:00 +0200 Subject: [PATCH 12/70] python311Packages.dissect-fat: 3.8 -> 3.9 Diff: https://github.com/fox-it/dissect.fat/compare/refs/tags/3.8...3.9 Changelog: https://github.com/fox-it/dissect.fat/releases/tag/3.9 --- 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 636265f4129c..d0402f13394a 100644 --- a/pkgs/development/python-modules/dissect-fat/default.nix +++ b/pkgs/development/python-modules/dissect-fat/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dissect-fat"; - version = "3.8"; + version = "3.9"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.fat"; rev = "refs/tags/${version}"; - hash = "sha256-xFfB7QOZ3KjsOPQ1cPTRkqb0hgD4waOq8kkSTJStQ+E="; + hash = "sha256-U7SSLvEK6IYZjjUIGT9n1w7oLdB8Q2/msQ/EBJfatJY="; }; nativeBuildInputs = [ From b522466db1dddd4a50d6e83fda6c64d0111c0849 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 00:13:03 +0200 Subject: [PATCH 13/70] python311Packages.dissect-ffs: 3.7 -> 3.8 Diff: https://github.com/fox-it/dissect.ffs/compare/refs/tags/3.7...3.8 Changelog: https://github.com/fox-it/dissect.ffs/releases/tag/3.8 --- pkgs/development/python-modules/dissect-ffs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dissect-ffs/default.nix b/pkgs/development/python-modules/dissect-ffs/default.nix index f95319ade135..c1a061d6e331 100644 --- a/pkgs/development/python-modules/dissect-ffs/default.nix +++ b/pkgs/development/python-modules/dissect-ffs/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "dissect-ffs"; - version = "3.7"; + version = "3.8"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.ffs"; rev = "refs/tags/${version}"; - hash = "sha256-f7lXYJ2U8M+rZXrlbrAXAjizCVz6rAAZbeSg+iOmKdo="; + hash = "sha256-L2LL+Er5nSYpRBW5CO9EBkYY85vnDkuvaOP0kbkH2T4="; }; nativeBuildInputs = [ From 2cf2fdfb4c2b307b43115e445c8a31a7ba7541aa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 00:13:06 +0200 Subject: [PATCH 14/70] python311Packages.dissect-hypervisor: 3.12 -> 3.13 Diff: https://github.com/fox-it/dissect.hypervisor/compare/refs/tags/3.12...3.13 Changelog: https://github.com/fox-it/dissect.hypervisor/releases/tag/3.13 --- .../development/python-modules/dissect-hypervisor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-hypervisor/default.nix b/pkgs/development/python-modules/dissect-hypervisor/default.nix index 27bf9056e258..6e1a35e0ccf3 100644 --- a/pkgs/development/python-modules/dissect-hypervisor/default.nix +++ b/pkgs/development/python-modules/dissect-hypervisor/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dissect-hypervisor"; - version = "3.12"; + version = "3.13"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.hypervisor"; rev = "refs/tags/${version}"; - hash = "sha256-uQt+oyETjZHPa1QZfswpUX92ZCdzkR5x9deo15J+Fxo="; + hash = "sha256-6sjRkhZOmAckzu/lUA4Sw48cmKfMOGLGgB5dB6M06qQ="; }; nativeBuildInputs = [ From fad6670ba818fe2ecaf56980d3098fbec922c770 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 00:13:09 +0200 Subject: [PATCH 15/70] python311Packages.dissect-ntfs: 3.9 -> 3.10 Diff: https://github.com/fox-it/dissect.ntfs/compare/refs/tags/3.9...3.10 Changelog: https://github.com/fox-it/dissect.ntfs/releases/tag/3.10 --- pkgs/development/python-modules/dissect-ntfs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dissect-ntfs/default.nix b/pkgs/development/python-modules/dissect-ntfs/default.nix index 61f3eaa64560..19c414c74d3c 100644 --- a/pkgs/development/python-modules/dissect-ntfs/default.nix +++ b/pkgs/development/python-modules/dissect-ntfs/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "dissect-ntfs"; - version = "3.9"; + version = "3.10"; format = "pyproject"; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.ntfs"; rev = "refs/tags/${version}"; - hash = "sha256-gjmxoxz4Qf2FsCP72siEpVLeqlZfvhuFZHSGr1n+cY0="; + hash = "sha256-7D+5Btvm9fWwtVjVpKNc0VU7seyZXFxR7tEh7CAh7io="; }; nativeBuildInputs = [ From 5f99f67019d5066891c219a7082c8101e41a63bd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 00:13:11 +0200 Subject: [PATCH 16/70] python311Packages.dissect-ole: 3.7 -> 3.8 Diff: https://github.com/fox-it/dissect.ole/compare/refs/tags/3.7...3.8 Changelog: https://github.com/fox-it/dissect.ole/releases/tag/3.8 --- pkgs/development/python-modules/dissect-ole/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dissect-ole/default.nix b/pkgs/development/python-modules/dissect-ole/default.nix index 1d527d33ab08..c77725a89244 100644 --- a/pkgs/development/python-modules/dissect-ole/default.nix +++ b/pkgs/development/python-modules/dissect-ole/default.nix @@ -10,16 +10,16 @@ buildPythonPackage rec { pname = "dissect-ole"; - version = "3.7"; + version = "3.8"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.ole"; rev = "refs/tags/${version}"; - hash = "sha256-Df6OU1vVsQl7d119W8+8YmUiy2+m6Dw3LpKnMVSRRR4="; + hash = "sha256-VWbgQhKV1vJBRQROrJXbJ7qDIVOfZwvjsRwUbm7q7OQ="; }; nativeBuildInputs = [ From f8576262158e27cd945d99b1aaa349d6c198520c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 00:13:14 +0200 Subject: [PATCH 17/70] python311Packages.dissect-regf: 3.9 -> 3.10 Diff: https://github.com/fox-it/dissect.regf/compare/refs/tags/3.9...3.10 Changelog: https://github.com/fox-it/dissect.regf/releases/tag/3.10 --- pkgs/development/python-modules/dissect-regf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dissect-regf/default.nix b/pkgs/development/python-modules/dissect-regf/default.nix index 8f8ae56b383d..4e09bfb4067a 100644 --- a/pkgs/development/python-modules/dissect-regf/default.nix +++ b/pkgs/development/python-modules/dissect-regf/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "dissect-regf"; - version = "3.9"; + version = "3.10"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.regf"; rev = "refs/tags/${version}"; - hash = "sha256-NLhZnStcJCtXMBkayLjvuG7aK2aN3sWGZaPKVXIoRew="; + hash = "sha256-uMC5av4NAzDF5JRUz4L8/jTLrBv9blNMYtM6dOuHe5s="; }; nativeBuildInputs = [ From 507f84ea8cdce570763f94a3517a3e356ad7c424 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 00:13:16 +0200 Subject: [PATCH 18/70] python311Packages.dissect-shellitem: 3.7 -> 3.8 Diff: https://github.com/fox-it/dissect.shellitem/compare/refs/tags/3.7...3.8 Changelog: https://github.com/fox-it/dissect.shellitem/releases/tag/3.8 --- .../python-modules/dissect-shellitem/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dissect-shellitem/default.nix b/pkgs/development/python-modules/dissect-shellitem/default.nix index 6ee624cc4256..055871003400 100644 --- a/pkgs/development/python-modules/dissect-shellitem/default.nix +++ b/pkgs/development/python-modules/dissect-shellitem/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "dissect-shellitem"; - version = "3.7"; + version = "3.8"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.shellitem"; rev = "refs/tags/${version}"; - hash = "sha256-E5v7WuAd47X/1LSeaje4EUv+GuFq5Ksg4ndOScFreYE="; + hash = "sha256-zoq42Au2dNJTryj3GNXJrEGvE0az8psPuMXoJNc74QM="; }; nativeBuildInputs = [ From 57dd4b797ef2de46a5f501126d7f7286a5c48132 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 00:13:19 +0200 Subject: [PATCH 19/70] python311Packages.dissect-sql: 3.8 -> 3.9 Diff: https://github.com/fox-it/dissect.sql/compare/refs/tags/3.8...3.9 Changelog: https://github.com/fox-it/dissect.sql/releases/tag/3.9 --- pkgs/development/python-modules/dissect-sql/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dissect-sql/default.nix b/pkgs/development/python-modules/dissect-sql/default.nix index 275e1a2913d3..7f5764727fcf 100644 --- a/pkgs/development/python-modules/dissect-sql/default.nix +++ b/pkgs/development/python-modules/dissect-sql/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "dissect-sql"; - version = "3.8"; + version = "3.9"; format = "pyproject"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.sql"; rev = "refs/tags/${version}"; - hash = "sha256-f19l1NxIdkQRaqEAgeTIuloPY079TmnNZ/DLQEXFQIA="; + hash = "sha256-aq/p6oa+6C2BS2TV8YYXwGP580tIHYZqO455bYm0yeo="; }; nativeBuildInputs = [ From 7bc9a3c04cb0ea096f6fb06d747d8bdb90955e0b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 00:13:23 +0200 Subject: [PATCH 20/70] python311Packages.dissect-target: 3.16 -> 3.17 Diff: https://github.com/fox-it/dissect.target/compare/refs/tags/3.16...3.17 Changelog: https://github.com/fox-it/dissect.target/releases/tag/3.17 --- pkgs/development/python-modules/dissect-target/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-target/default.nix b/pkgs/development/python-modules/dissect-target/default.nix index 0e6e14be7239..8a17ff665fed 100644 --- a/pkgs/development/python-modules/dissect-target/default.nix +++ b/pkgs/development/python-modules/dissect-target/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { pname = "dissect-target"; - version = "3.16"; + version = "3.17"; pyproject = true; disabled = pythonOlder "3.9"; @@ -48,7 +48,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.target"; rev = "refs/tags/${version}"; - hash = "sha256-2c8OFwbgSc7zwbjQm2g8y1ZyiYM0KPFjTEUrk06c174="; + hash = "sha256-UIgHjSTHaxo8jCqe+R6rRxQXX8RUFKAI5+zscInAtgg="; }; postPatch = '' From 99fb2ad69dfce04d47478b4869d5c6c02fd89845 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 00:13:26 +0200 Subject: [PATCH 21/70] python311Packages.dissect-util: 3.15 -> 3.16 Diff: https://github.com/fox-it/dissect.util/compare/refs/tags/3.15...3.16 Changelog: https://github.com/fox-it/dissect.util/releases/tag/3.16 --- pkgs/development/python-modules/dissect-util/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-util/default.nix b/pkgs/development/python-modules/dissect-util/default.nix index d085d842b711..9210cc6ca774 100644 --- a/pkgs/development/python-modules/dissect-util/default.nix +++ b/pkgs/development/python-modules/dissect-util/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "dissect-util"; - version = "3.15"; + version = "3.16"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.util"; rev = "refs/tags/${version}"; - hash = "sha256-JIrk6YRuW5B30d9fNaRFesO01ajcSy8ErkpFtM1Coaw="; + hash = "sha256-OHlWOWB476KERerEo2ZYLMIIO+eIpKlNLOHMCiE5jdE="; }; nativeBuildInputs = [ From 3d0ff9438e7ae0154b78fbbebe899ce637d53db8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 00:13:28 +0200 Subject: [PATCH 22/70] python311Packages.dissect-vmfs: 3.7 -> 3.8 Diff: https://github.com/fox-it/dissect.vmfs/compare/refs/tags/3.7...3.8 Changelog: https://github.com/fox-it/dissect.vmfs/releases/tag/3.8 --- pkgs/development/python-modules/dissect-vmfs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dissect-vmfs/default.nix b/pkgs/development/python-modules/dissect-vmfs/default.nix index 147b048aee7d..95775fb18ce2 100644 --- a/pkgs/development/python-modules/dissect-vmfs/default.nix +++ b/pkgs/development/python-modules/dissect-vmfs/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "dissect-vmfs"; - version = "3.7"; + version = "3.8"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.vmfs"; rev = "refs/tags/${version}"; - hash = "sha256-HJV7cwNMFvHURt2dk/c1YbgFaHXRESREJ5ucmUsuS78="; + hash = "sha256-AcVWKUgykgTgP0haBOtWR+wNWzc/PN9qIwVJMqNg8hg="; }; nativeBuildInputs = [ From 42bc3d5c1ce8c4772d4101dd254594a4c11cc0fa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 00:13:31 +0200 Subject: [PATCH 23/70] python311Packages.dissect-volume: 3.9 -> 3.10 Diff: https://github.com/fox-it/dissect.volume/compare/refs/tags/3.9...3.10 Changelog: https://github.com/fox-it/dissect.volume/releases/tag/3.10 --- pkgs/development/python-modules/dissect-volume/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dissect-volume/default.nix b/pkgs/development/python-modules/dissect-volume/default.nix index abddcf5d1d61..a312667bb620 100644 --- a/pkgs/development/python-modules/dissect-volume/default.nix +++ b/pkgs/development/python-modules/dissect-volume/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "dissect-volume"; - version = "3.9"; + version = "3.10"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.volume"; rev = "refs/tags/${version}"; - hash = "sha256-Bhi3p0joTNx1y/yBhehhG06WmM7gUJhIJbmqZY4DzLQ="; + hash = "sha256-tQNmSnQBchj3SUq2XPsK/LWrKiCw4MFKmopHbxnzMxg="; }; nativeBuildInputs = [ From a000d4c228aa2a7777dc2d3ee16f516d5c3bccc4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 00:13:33 +0200 Subject: [PATCH 24/70] python311Packages.dissect-xfs: 3.8 -> 3.9 Diff: https://github.com/fox-it/dissect.xfs/compare/refs/tags/3.8...3.9 Changelog: https://github.com/fox-it/dissect.xfs/releases/tag/3.9 --- pkgs/development/python-modules/dissect-xfs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dissect-xfs/default.nix b/pkgs/development/python-modules/dissect-xfs/default.nix index 1843ff00f8e0..4c62683b7de5 100644 --- a/pkgs/development/python-modules/dissect-xfs/default.nix +++ b/pkgs/development/python-modules/dissect-xfs/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "dissect-xfs"; - version = "3.8"; + version = "3.9"; format = "pyproject"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.xfs"; rev = "refs/tags/${version}"; - hash = "sha256-U/VDFeCyOPlefFL/QVRVknpCBDLuVYvVHI49QSe+QFM="; + hash = "sha256-jUNstyHVPJazf4idXNe9xICpi0MKkz8q0rWUEHjk2ZA="; }; nativeBuildInputs = [ From c5e6bca3b6d5e631b5853cc42c1db394d8201c56 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 00:13:36 +0200 Subject: [PATCH 25/70] python311Packages.dissect-btrfs: 1.2 -> 1.3 Diff: https://github.com/fox-it/dissect.btrfs/compare/refs/tags/1.2...1.3 Changelog: https://github.com/fox-it/dissect.btrfs/releases/tag/1.3 --- pkgs/development/python-modules/dissect-btrfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-btrfs/default.nix b/pkgs/development/python-modules/dissect-btrfs/default.nix index 8b492ae66701..72f5fd96695b 100644 --- a/pkgs/development/python-modules/dissect-btrfs/default.nix +++ b/pkgs/development/python-modules/dissect-btrfs/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dissect-btrfs"; - version = "1.2"; + version = "1.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.btrfs"; rev = "refs/tags/${version}"; - hash = "sha256-nWgeChHHCAjD5I98h2/1HrO5688aZUM4j2PJiD1xP0g="; + hash = "sha256-Xn7y9om/IuCaPR77lSuC0peF5umIxu2BS9esMPXsv+Y="; }; nativeBuildInputs = [ From f05c55827af0df9954b403fbbca35cb7367b6066 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 00:13:38 +0200 Subject: [PATCH 26/70] python311Packages.dissect-jffs: 1.1 -> 1.2 Diff: https://github.com/fox-it/dissect.jffs/compare/refs/tags/1.1...1.2 Changelog: https://github.com/fox-it/dissect.jffs/releases/tag/1.2 --- pkgs/development/python-modules/dissect-jffs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-jffs/default.nix b/pkgs/development/python-modules/dissect-jffs/default.nix index 234f61e007e3..31edb777123c 100644 --- a/pkgs/development/python-modules/dissect-jffs/default.nix +++ b/pkgs/development/python-modules/dissect-jffs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dissect-jffs"; - version = "1.1"; + version = "1.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.jffs"; rev = "refs/tags/${version}"; - hash = "sha256-jzSPR4pkvXRQ3Q/qL7Oa3mLX3hW2IhbXuuO0jTc8Gvg="; + hash = "sha256-aElQR9QDC2110QZdk+PKkBky6FUXz9pSTJV7weTBvAE="; }; nativeBuildInputs = [ From ffdac2fe0218b44d5b9c56d0f246d4e8b9e8f8d2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 00:13:41 +0200 Subject: [PATCH 27/70] python311Packages.acquire: 3.13 -> 3.14 Diff: https://github.com/fox-it/acquire/compare/refs/tags/3.13...3.14 Changelog: https://github.com/fox-it/acquire/releases/tag/3.14 --- 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 555a60412bf4..90137001edef 100644 --- a/pkgs/development/python-modules/acquire/default.nix +++ b/pkgs/development/python-modules/acquire/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "acquire"; - version = "3.13"; + version = "3.14"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "acquire"; rev = "refs/tags/${version}"; - hash = "sha256-Z85bHM3MtS2MLX9BaKi8VqA13QjO9KdrgqhuyBzjILQ="; + hash = "sha256-QW5+npgjrIzyI2hztFovA5s6TMzgCCEiZx9aZREmYII="; }; nativeBuildInputs = [ From 3aabebff88a33a6fb18d02e52d6e64569cca86e9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 00:13:44 +0200 Subject: [PATCH 28/70] python311Packages.dissect: 3.13 -> 3.14 Diff: https://github.com/fox-it/dissect/compare/refs/tags/3.13...3.14 Changelog: https://github.com/fox-it/dissect/releases/tag/3.14 --- 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 6827b7e5f701..7f0300a63aa0 100644 --- a/pkgs/development/python-modules/dissect/default.nix +++ b/pkgs/development/python-modules/dissect/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { pname = "dissect"; - version = "3.13"; + version = "3.14"; pyproject = true; disabled = pythonOlder "3.9"; @@ -44,7 +44,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect"; rev = "refs/tags/${version}"; - hash = "sha256-cnNaqXECePP2DmLRAm/Fi9m88rYSsVVMrpcqYd0iL1E="; + hash = "sha256-wHLpysvOkJ1t0KKJXwfeRp/7mSom5WvrJ0lyRGoDwJM="; }; pythonRelaxDeps = true; From dab50b464905a09ad20f19177d453c466955ca13 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 00:24:37 +0200 Subject: [PATCH 29/70] python311Packages.dissect-target: refactor --- 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 8a17ff665fed..08013f58cee3 100644 --- a/pkgs/development/python-modules/dissect-target/default.nix +++ b/pkgs/development/python-modules/dissect-target/default.nix @@ -53,15 +53,15 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace-warn "flow.record~=" "flow.record>=" + --replace-fail "flow.record~=" "flow.record>=" ''; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ defusedxml dissect-cstruct dissect-eventlog From 795ad5648f699ece48c6837248d461502c5e5484 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 00:50:07 +0200 Subject: [PATCH 30/70] python312Packages.dissect-target: disable failing tests --- .../python-modules/dissect-target/default.nix | 44 ++++++++++++++++--- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/dissect-target/default.nix b/pkgs/development/python-modules/dissect-target/default.nix index 08013f58cee3..f5a70b531835 100644 --- a/pkgs/development/python-modules/dissect-target/default.nix +++ b/pkgs/development/python-modules/dissect-target/default.nix @@ -3,6 +3,7 @@ , asn1crypto , buildPythonPackage , defusedxml +, dissect-btrfs , dissect-cim , dissect-clfs , dissect-cstruct @@ -16,8 +17,8 @@ , dissect-hypervisor , dissect-ntfs , dissect-regf -, dissect-sql , dissect-shellitem +, dissect-sql , dissect-thumbcache , dissect-util , dissect-volume @@ -25,14 +26,17 @@ , fetchFromGitHub , flow-record , fusepy +, impacket , ipython +, paho-mqtt , pycryptodome , pytestCheckHook , pythonOlder -, pyyaml +, ruamel-yaml , setuptools , setuptools-scm , structlog +, tomli , yara-python , zstandard }: @@ -78,6 +82,7 @@ buildPythonPackage rec { passthru.optional-dependencies = { full = [ asn1crypto + dissect-btrfs dissect-cim dissect-clfs dissect-esedb @@ -92,10 +97,19 @@ buildPythonPackage rec { fusepy ipython pycryptodome - pyyaml + ruamel-yaml yara-python zstandard - ]; + ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + yara = [ + yara-python + ] ++ passthru.optional-dependencies.full; + smb = [ + impacket + ] ++ passthru.optional-dependencies.full; + mqtt = [ + paho-mqtt + ] ++ passthru.optional-dependencies.full; }; nativeCheckInputs = [ @@ -121,18 +135,34 @@ buildPythonPackage rec { # Tests compare dates and times "yum" # Filesystem access, windows defender tests + "test_config_tree_plugin" "test_defender_quarantine_recovery" + "test_execute_pipeline" + "test_keychain_register_keychain_file" + "test_plugins_child_docker" + "test_plugins_child_wsl" + "test_reg_output" + "test_regflex" + "test_systemd_basic_syntax" + "test_target_cli_unicode_argparse" + "test_target_query" ] ++ # test is broken on Darwin lib.optional stdenv.hostPlatform.isDarwin "test_fs_attrs_no_os_listxattr"; disabledTestPaths = [ - # Tests are using Windows paths - "tests/plugins/apps/browser/" + # Tests are using Windows paths, missing test files + "tests/plugins/apps/" # ValueError: Invalid Locate file magic. Expected /x00LOCATE02/x00 "tests/plugins/os/unix/locate/" # Missing plugin support - "tests/tools/test_reg.py" + "tests/tools/test_dump.py" + "tests/plugins/os/" + "tests/plugins/filesystem/" + "tests/test_registration.py" + "tests/filesystems/" + "tests/test_filesystem.py" + "tests/loaders/" ]; meta = with lib; { From b4e57332e6ed56b253d861ee8c54a873ad359b4e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 00:51:45 +0200 Subject: [PATCH 31/70] python311Packages.acquire: refactor --- 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 90137001edef..d03aa8456bec 100644 --- a/pkgs/development/python-modules/acquire/default.nix +++ b/pkgs/development/python-modules/acquire/default.nix @@ -29,12 +29,12 @@ buildPythonPackage rec { hash = "sha256-QW5+npgjrIzyI2hztFovA5s6TMzgCCEiZx9aZREmYII="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ defusedxml dissect-cstruct dissect-target From ad05b7bed344c82e098c35762b99a6628f6b2487 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 00:53:00 +0200 Subject: [PATCH 32/70] python312Packages.dissect-target: remove whitespace --- pkgs/development/python-modules/dissect-target/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dissect-target/default.nix b/pkgs/development/python-modules/dissect-target/default.nix index f5a70b531835..a8fdd93b879f 100644 --- a/pkgs/development/python-modules/dissect-target/default.nix +++ b/pkgs/development/python-modules/dissect-target/default.nix @@ -151,7 +151,7 @@ buildPythonPackage rec { lib.optional stdenv.hostPlatform.isDarwin "test_fs_attrs_no_os_listxattr"; disabledTestPaths = [ - # Tests are using Windows paths, missing test files + # Tests are using Windows paths, missing test files "tests/plugins/apps/" # ValueError: Invalid Locate file magic. Expected /x00LOCATE02/x00 "tests/plugins/os/unix/locate/" From 0676b7aea3fc7c7df66887264da7b715b80b9a49 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 00:54:02 +0200 Subject: [PATCH 33/70] python311Packages.flow-record: refactor --- pkgs/development/python-modules/flow-record/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/flow-record/default.nix b/pkgs/development/python-modules/flow-record/default.nix index fa28bedafaaa..730842f880cf 100644 --- a/pkgs/development/python-modules/flow-record/default.nix +++ b/pkgs/development/python-modules/flow-record/default.nix @@ -9,7 +9,6 @@ , pythonOlder , setuptools , setuptools-scm -, wheel , zstandard }: @@ -27,13 +26,12 @@ buildPythonPackage rec { hash = "sha256-j5N66p7feB9Ae+Fu5RhVzh8XCHiq55jJMg0Fe+C6Jvg="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm - wheel ]; - propagatedBuildInputs = [ + dependencies = [ msgpack ]; From 6457221e8840e2f05a9b9aa3fe3fd821778f105c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 00:54:17 +0200 Subject: [PATCH 34/70] python311Packages.flow-record: format with nixfmt --- .../python-modules/flow-record/default.nix | 45 ++++++++----------- 1 file changed, 18 insertions(+), 27 deletions(-) diff --git a/pkgs/development/python-modules/flow-record/default.nix b/pkgs/development/python-modules/flow-record/default.nix index 730842f880cf..d9c61a791615 100644 --- a/pkgs/development/python-modules/flow-record/default.nix +++ b/pkgs/development/python-modules/flow-record/default.nix @@ -1,15 +1,16 @@ -{ lib -, buildPythonPackage -, elasticsearch -, fastavro -, fetchFromGitHub -, lz4 -, msgpack -, pytest7CheckHook -, pythonOlder -, setuptools -, setuptools-scm -, zstandard +{ + lib, + buildPythonPackage, + elasticsearch, + fastavro, + fetchFromGitHub, + lz4, + msgpack, + pytest7CheckHook, + pythonOlder, + setuptools, + setuptools-scm, + zstandard, }: buildPythonPackage rec { @@ -31,39 +32,29 @@ buildPythonPackage rec { setuptools-scm ]; - dependencies = [ - msgpack - ]; + dependencies = [ msgpack ]; passthru.optional-dependencies = { compression = [ lz4 zstandard ]; - elastic = [ - elasticsearch - ]; - avro = [ - fastavro - ] ++ fastavro.optional-dependencies.snappy; + elastic = [ elasticsearch ]; + avro = [ fastavro ] ++ fastavro.optional-dependencies.snappy; }; nativeCheckInputs = [ pytest7CheckHook ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); - pythonImportsCheck = [ - "flow.record" - ]; + pythonImportsCheck = [ "flow.record" ]; disabledTestPaths = [ # Test requires rdump "tests/test_rdump.py" ]; - disabledTests = [ - "test_rdump_fieldtype_path_json" - ]; + disabledTests = [ "test_rdump_fieldtype_path_json" ]; meta = with lib; { description = "Library for defining and creating structured data"; From 98357667f5e85c387b7a0cfb76ee138f796e17da Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 00:55:37 +0200 Subject: [PATCH 35/70] python311Packages.dissect-cim: refactor --- pkgs/development/python-modules/dissect-cim/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dissect-cim/default.nix b/pkgs/development/python-modules/dissect-cim/default.nix index e2bb621b8775..070efa41a985 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.9"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -23,12 +23,12 @@ buildPythonPackage rec { hash = "sha256-UZ4mlshaKqZKoysvnGfcaoMOrMwfsN/qOJ8hrpMcQL0="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ dissect-cstruct dissect-util ]; From 9b01bcf0d321f3ba4ff141612c532b774685ef7e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 00:55:53 +0200 Subject: [PATCH 36/70] python311Packages.dissect-cim: format with nixfmt --- .../python-modules/dissect-cim/default.nix | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/dissect-cim/default.nix b/pkgs/development/python-modules/dissect-cim/default.nix index 070efa41a985..9073873f148d 100644 --- a/pkgs/development/python-modules/dissect-cim/default.nix +++ b/pkgs/development/python-modules/dissect-cim/default.nix @@ -1,12 +1,13 @@ -{ lib -, buildPythonPackage -, dissect-cstruct -, dissect-util -, fetchFromGitHub -, setuptools -, setuptools-scm -, pytestCheckHook -, pythonOlder +{ + lib, + buildPythonPackage, + dissect-cstruct, + dissect-util, + fetchFromGitHub, + setuptools, + setuptools-scm, + pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { @@ -33,13 +34,9 @@ buildPythonPackage rec { dissect-util ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "dissect.cim" - ]; + pythonImportsCheck = [ "dissect.cim" ]; meta = with lib; { description = "Dissect module implementing a parser for the Windows Common Information Model (CIM) database"; From 66fe750f5ce9d4237898fd195995d965285522e5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 00:56:53 +0200 Subject: [PATCH 37/70] python311Packages.dissect-clfs: refactor --- pkgs/development/python-modules/dissect-clfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-clfs/default.nix b/pkgs/development/python-modules/dissect-clfs/default.nix index f11eb800bc10..c81ba85cf089 100644 --- a/pkgs/development/python-modules/dissect-clfs/default.nix +++ b/pkgs/development/python-modules/dissect-clfs/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { hash = "sha256-C1a85OLMkj0vjnRpenfC/xyxJ1TjYSlHPOq0jIrA/Ng="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ dissect-cstruct ]; From 557f5eaf7fd5d6534c2f7da2ae2d045bf35843d2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 00:57:18 +0200 Subject: [PATCH 38/70] python311Packages.dissect-clfs: format with nixfmt --- .../python-modules/dissect-clfs/default.nix | 29 ++++++++----------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/dissect-clfs/default.nix b/pkgs/development/python-modules/dissect-clfs/default.nix index c81ba85cf089..287896b2448d 100644 --- a/pkgs/development/python-modules/dissect-clfs/default.nix +++ b/pkgs/development/python-modules/dissect-clfs/default.nix @@ -1,11 +1,12 @@ -{ lib -, buildPythonPackage -, dissect-cstruct -, fetchFromGitHub -, setuptools -, setuptools-scm -, pytestCheckHook -, pythonOlder +{ + lib, + buildPythonPackage, + dissect-cstruct, + fetchFromGitHub, + setuptools, + setuptools-scm, + pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { @@ -27,17 +28,11 @@ buildPythonPackage rec { setuptools-scm ]; - dependencies = [ - dissect-cstruct - ]; + dependencies = [ dissect-cstruct ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "dissect.clfs" - ]; + pythonImportsCheck = [ "dissect.clfs" ]; meta = with lib; { description = "Dissect module implementing a parser for the CLFS (Common Log File System) file system"; From fabbc7b417bae2b04d8e0f892dbef5faecc40239 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 00:58:36 +0200 Subject: [PATCH 39/70] python311Packages.dissect-cstruct: refactor --- pkgs/development/python-modules/dissect-cstruct/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dissect-cstruct/default.nix b/pkgs/development/python-modules/dissect-cstruct/default.nix index a0c88fecfadf..ba494a06031d 100644 --- a/pkgs/development/python-modules/dissect-cstruct/default.nix +++ b/pkgs/development/python-modules/dissect-cstruct/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { hash = "sha256-Et6Pb7iRVlxcrR4gZf+5h7mVikf7CyDd7N+q4TH18vg="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; From da555de3a35c2583e60dd59a8a8f8bc60d8d0d82 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 00:58:50 +0200 Subject: [PATCH 40/70] python311Packages.dissect-cstruct: format with nixfmt --- .../dissect-cstruct/default.nix | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/dissect-cstruct/default.nix b/pkgs/development/python-modules/dissect-cstruct/default.nix index ba494a06031d..04a64d8a9e7b 100644 --- a/pkgs/development/python-modules/dissect-cstruct/default.nix +++ b/pkgs/development/python-modules/dissect-cstruct/default.nix @@ -1,10 +1,11 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, setuptools -, setuptools-scm -, pytestCheckHook -, pythonOlder +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + setuptools-scm, + pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { @@ -26,13 +27,9 @@ buildPythonPackage rec { setuptools-scm ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "dissect.cstruct" - ]; + pythonImportsCheck = [ "dissect.cstruct" ]; meta = with lib; { description = "Dissect module implementing a parser for C-like structures"; From d189a9c8a19a8341bd1f9b1c1454ebea572f9529 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 01:04:47 +0200 Subject: [PATCH 41/70] python312Packages.dissect-xfs: refactor --- pkgs/development/python-modules/dissect-xfs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dissect-xfs/default.nix b/pkgs/development/python-modules/dissect-xfs/default.nix index 4c62683b7de5..982c02dd6f13 100644 --- a/pkgs/development/python-modules/dissect-xfs/default.nix +++ b/pkgs/development/python-modules/dissect-xfs/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "dissect-xfs"; version = "3.9"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -23,12 +23,12 @@ buildPythonPackage rec { hash = "sha256-jUNstyHVPJazf4idXNe9xICpi0MKkz8q0rWUEHjk2ZA="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ dissect-cstruct dissect-util ]; From 8eba29e8ef10c9bef42e085e172a7882bc27dec6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 01:05:21 +0200 Subject: [PATCH 42/70] python311Packages.dissect-thumbcache: refactor --- .../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 e63aecaae600..1edd71288670 100644 --- a/pkgs/development/python-modules/dissect-thumbcache/default.nix +++ b/pkgs/development/python-modules/dissect-thumbcache/default.nix @@ -23,12 +23,12 @@ buildPythonPackage rec { hash = "sha256-LcuuRVSnZVFtht03MD8qVNNPljVUzGa8vXu9GQPOgjs="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ dissect-cstruct dissect-util ]; From e7b448afadd5b56365c5041267b5851fd6a934dd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 01:05:40 +0200 Subject: [PATCH 43/70] python312Packages.dissect-xfs: format with nixfmt --- .../python-modules/dissect-xfs/default.nix | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/dissect-xfs/default.nix b/pkgs/development/python-modules/dissect-xfs/default.nix index 982c02dd6f13..cc137632f7d7 100644 --- a/pkgs/development/python-modules/dissect-xfs/default.nix +++ b/pkgs/development/python-modules/dissect-xfs/default.nix @@ -1,12 +1,13 @@ -{ lib -, buildPythonPackage -, dissect-cstruct -, dissect-util -, fetchFromGitHub -, setuptools -, setuptools-scm -, pytestCheckHook -, pythonOlder +{ + lib, + buildPythonPackage, + dissect-cstruct, + dissect-util, + fetchFromGitHub, + setuptools, + setuptools-scm, + pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { @@ -33,13 +34,9 @@ buildPythonPackage rec { dissect-util ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "dissect.xfs" - ]; + pythonImportsCheck = [ "dissect.xfs" ]; # Archive files seems to be corrupt doCheck = false; From 6a80592c0dec412d07bb7ffea15c7cd60636bbcb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 01:06:17 +0200 Subject: [PATCH 44/70] python312Packages.dissect-thumbcache: format with nixfmt --- .../dissect-thumbcache/default.nix | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/dissect-thumbcache/default.nix b/pkgs/development/python-modules/dissect-thumbcache/default.nix index 1edd71288670..60091bb17823 100644 --- a/pkgs/development/python-modules/dissect-thumbcache/default.nix +++ b/pkgs/development/python-modules/dissect-thumbcache/default.nix @@ -1,12 +1,13 @@ -{ lib -, buildPythonPackage -, dissect-cstruct -, dissect-util -, fetchFromGitHub -, pytestCheckHook -, pythonOlder -, setuptools -, setuptools-scm +{ + lib, + buildPythonPackage, + dissect-cstruct, + dissect-util, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + setuptools, + setuptools-scm, }: buildPythonPackage rec { @@ -33,13 +34,9 @@ buildPythonPackage rec { dissect-util ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "dissect.thumbcache" - ]; + pythonImportsCheck = [ "dissect.thumbcache" ]; disabledTests = [ # Don't run Windows related tests From 3e8f12b57fe2f8d07e110f1a1cc9a96c7c6434d0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 01:07:01 +0200 Subject: [PATCH 45/70] python311Packages.dissect-squashfs: refactor --- .../development/python-modules/dissect-squashfs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dissect-squashfs/default.nix b/pkgs/development/python-modules/dissect-squashfs/default.nix index f4f5e479ef84..3d96120d36db 100644 --- a/pkgs/development/python-modules/dissect-squashfs/default.nix +++ b/pkgs/development/python-modules/dissect-squashfs/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dissect-squashfs"; version = "1.5"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -25,12 +25,12 @@ buildPythonPackage rec { hash = "sha256-eylLBPim3dmo8h95lRmlh8O9m458K07TH2uK+hn3nKs="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ dissect-cstruct dissect-util ]; From 9ed3661e75eef2d2f9ed41dbf365e24adaf1fec9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 01:07:21 +0200 Subject: [PATCH 46/70] python311Packages.dissect-squashfs: format with nixfmt --- .../dissect-squashfs/default.nix | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/dissect-squashfs/default.nix b/pkgs/development/python-modules/dissect-squashfs/default.nix index 3d96120d36db..6303663d2b07 100644 --- a/pkgs/development/python-modules/dissect-squashfs/default.nix +++ b/pkgs/development/python-modules/dissect-squashfs/default.nix @@ -1,14 +1,15 @@ -{ lib -, buildPythonPackage -, dissect-cstruct -, dissect-util -, fetchFromGitHub -, lz4 -, python-lzo -, pythonOlder -, setuptools -, setuptools-scm -, zstandard +{ + lib, + buildPythonPackage, + dissect-cstruct, + dissect-util, + fetchFromGitHub, + lz4, + python-lzo, + pythonOlder, + setuptools, + setuptools-scm, + zstandard, }: buildPythonPackage rec { @@ -43,9 +44,7 @@ buildPythonPackage rec { ]; }; - pythonImportsCheck = [ - "dissect.squashfs" - ]; + pythonImportsCheck = [ "dissect.squashfs" ]; meta = with lib; { description = "Dissect module implementing a parser for the SquashFS file system"; From 5e2dfb91dfe8fdf56e9f930ce407f2858db7defa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 01:07:39 +0200 Subject: [PATCH 47/70] python311Packages.dissect-shellitem: refactor --- .../python-modules/dissect-shellitem/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dissect-shellitem/default.nix b/pkgs/development/python-modules/dissect-shellitem/default.nix index 055871003400..fd37a8e73d90 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.8"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -23,12 +23,12 @@ buildPythonPackage rec { hash = "sha256-zoq42Au2dNJTryj3GNXJrEGvE0az8psPuMXoJNc74QM="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ dissect-cstruct dissect-util ]; From b8ebece3df5aeb1424bcc998dd7cf2740cd7e405 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 01:08:19 +0200 Subject: [PATCH 48/70] python311Packages.dissect-shellitem: format with nixfmt --- .../dissect-shellitem/default.nix | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/dissect-shellitem/default.nix b/pkgs/development/python-modules/dissect-shellitem/default.nix index fd37a8e73d90..454614199614 100644 --- a/pkgs/development/python-modules/dissect-shellitem/default.nix +++ b/pkgs/development/python-modules/dissect-shellitem/default.nix @@ -1,12 +1,13 @@ -{ lib -, buildPythonPackage -, dissect-cstruct -, dissect-util -, fetchFromGitHub -, setuptools -, setuptools-scm -, pytestCheckHook -, pythonOlder +{ + lib, + buildPythonPackage, + dissect-cstruct, + dissect-util, + fetchFromGitHub, + setuptools, + setuptools-scm, + pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { @@ -33,13 +34,9 @@ buildPythonPackage rec { dissect-util ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "dissect.shellitem" - ]; + pythonImportsCheck = [ "dissect.shellitem" ]; meta = with lib; { description = "Dissect module implementing a parser for the Shellitem structures"; From b1ac7d4ad7e9e560c0024ac687d1a95f570e9cb2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 01:08:43 +0200 Subject: [PATCH 49/70] python311Packages.dissect-sql: refactor --- pkgs/development/python-modules/dissect-sql/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dissect-sql/default.nix b/pkgs/development/python-modules/dissect-sql/default.nix index 7f5764727fcf..a46d6cb8e505 100644 --- a/pkgs/development/python-modules/dissect-sql/default.nix +++ b/pkgs/development/python-modules/dissect-sql/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "dissect-sql"; version = "3.9"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -23,12 +23,12 @@ buildPythonPackage rec { hash = "sha256-aq/p6oa+6C2BS2TV8YYXwGP580tIHYZqO455bYm0yeo="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ dissect-cstruct dissect-util ]; From 45ac464872180577e1973507f7e841e1129c9d0a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 01:09:25 +0200 Subject: [PATCH 50/70] python311Packages.dissect-sql: format with nixfmt --- .../python-modules/dissect-sql/default.nix | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/dissect-sql/default.nix b/pkgs/development/python-modules/dissect-sql/default.nix index a46d6cb8e505..6c61796409ec 100644 --- a/pkgs/development/python-modules/dissect-sql/default.nix +++ b/pkgs/development/python-modules/dissect-sql/default.nix @@ -1,12 +1,13 @@ -{ lib -, buildPythonPackage -, dissect-cstruct -, dissect-util -, fetchFromGitHub -, pytestCheckHook -, pythonOlder -, setuptools -, setuptools-scm +{ + lib, + buildPythonPackage, + dissect-cstruct, + dissect-util, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + setuptools, + setuptools-scm, }: buildPythonPackage rec { @@ -33,13 +34,9 @@ buildPythonPackage rec { dissect-util ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "dissect.sql" - ]; + pythonImportsCheck = [ "dissect.sql" ]; meta = with lib; { description = "Dissect module implementing a parsers for the SQLite database file format"; From 94cbed3d4fb06deb95530125ff970f5ab44e8175 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 01:10:10 +0200 Subject: [PATCH 51/70] python311Packages.dissect-ole: refactor --- pkgs/development/python-modules/dissect-ole/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dissect-ole/default.nix b/pkgs/development/python-modules/dissect-ole/default.nix index c77725a89244..8a6e23bbadd5 100644 --- a/pkgs/development/python-modules/dissect-ole/default.nix +++ b/pkgs/development/python-modules/dissect-ole/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-ole"; version = "3.8"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -22,12 +22,12 @@ buildPythonPackage rec { hash = "sha256-VWbgQhKV1vJBRQROrJXbJ7qDIVOfZwvjsRwUbm7q7OQ="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ dissect-cstruct dissect-util ]; From 72bcb3cdd8ff514fe3cb6d5a7d7c49944c418ba3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 01:10:32 +0200 Subject: [PATCH 52/70] python311Packages.dissect-ole: format with nixfmt --- .../python-modules/dissect-ole/default.nix | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/dissect-ole/default.nix b/pkgs/development/python-modules/dissect-ole/default.nix index 8a6e23bbadd5..cb84b16aa8fe 100644 --- a/pkgs/development/python-modules/dissect-ole/default.nix +++ b/pkgs/development/python-modules/dissect-ole/default.nix @@ -1,11 +1,12 @@ -{ lib -, buildPythonPackage -, dissect-cstruct -, dissect-util -, fetchFromGitHub -, setuptools -, setuptools-scm -, pythonOlder +{ + lib, + buildPythonPackage, + dissect-cstruct, + dissect-util, + fetchFromGitHub, + setuptools, + setuptools-scm, + pythonOlder, }: buildPythonPackage rec { @@ -35,9 +36,7 @@ buildPythonPackage rec { # Module has no tests doCheck = false; - pythonImportsCheck = [ - "dissect.ole" - ]; + pythonImportsCheck = [ "dissect.ole" ]; meta = with lib; { description = "Dissect module implementing a parser for the Object Linking & Embedding (OLE) format"; From 0b283b3ad2c15f209149a5472e7077d967c0f11a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 01:10:56 +0200 Subject: [PATCH 53/70] python311Packages.dissect-hypervisor: refactor --- .../development/python-modules/dissect-hypervisor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-hypervisor/default.nix b/pkgs/development/python-modules/dissect-hypervisor/default.nix index 6e1a35e0ccf3..07067a327d81 100644 --- a/pkgs/development/python-modules/dissect-hypervisor/default.nix +++ b/pkgs/development/python-modules/dissect-hypervisor/default.nix @@ -26,12 +26,12 @@ buildPythonPackage rec { hash = "sha256-6sjRkhZOmAckzu/lUA4Sw48cmKfMOGLGgB5dB6M06qQ="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ defusedxml dissect-cstruct dissect-util From 5ecb8bae52b23c3c96f05102ed35a27e72b5c6d0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 01:11:34 +0200 Subject: [PATCH 54/70] python311Packages.dissect-hypervisor: format with nixfmt --- .../dissect-hypervisor/default.nix | 33 +++++++++---------- 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/dissect-hypervisor/default.nix b/pkgs/development/python-modules/dissect-hypervisor/default.nix index 07067a327d81..b24f1e69f867 100644 --- a/pkgs/development/python-modules/dissect-hypervisor/default.nix +++ b/pkgs/development/python-modules/dissect-hypervisor/default.nix @@ -1,15 +1,16 @@ -{ lib -, buildPythonPackage -, defusedxml -, dissect-cstruct -, dissect-util -, fetchFromGitHub -, pycryptodome -, pytestCheckHook -, pythonOlder -, rich -, setuptools -, setuptools-scm +{ + lib, + buildPythonPackage, + defusedxml, + dissect-cstruct, + dissect-util, + fetchFromGitHub, + pycryptodome, + pytestCheckHook, + pythonOlder, + rich, + setuptools, + setuptools-scm, }: buildPythonPackage rec { @@ -44,13 +45,9 @@ buildPythonPackage rec { ]; }; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "dissect.hypervisor" - ]; + pythonImportsCheck = [ "dissect.hypervisor" ]; meta = with lib; { description = "Dissect module implementing parsers for various hypervisor disk, backup and configuration files"; From 9313ea84314000b927671f03f9c4a1550429e04b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 01:11:54 +0200 Subject: [PATCH 55/70] python311Packages.dissect-ffs: refactor --- pkgs/development/python-modules/dissect-ffs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dissect-ffs/default.nix b/pkgs/development/python-modules/dissect-ffs/default.nix index c1a061d6e331..04a38d81b0c7 100644 --- a/pkgs/development/python-modules/dissect-ffs/default.nix +++ b/pkgs/development/python-modules/dissect-ffs/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "dissect-ffs"; version = "3.8"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -23,12 +23,12 @@ buildPythonPackage rec { hash = "sha256-L2LL+Er5nSYpRBW5CO9EBkYY85vnDkuvaOP0kbkH2T4="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ dissect-cstruct dissect-util ]; From 6980707fe86b33632acbf10dc3d2bf8c0e515258 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 01:12:32 +0200 Subject: [PATCH 56/70] python311Packages.dissect-ffs: format with nixfmt --- .../python-modules/dissect-ffs/default.nix | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/dissect-ffs/default.nix b/pkgs/development/python-modules/dissect-ffs/default.nix index 04a38d81b0c7..fac9898633bc 100644 --- a/pkgs/development/python-modules/dissect-ffs/default.nix +++ b/pkgs/development/python-modules/dissect-ffs/default.nix @@ -1,12 +1,13 @@ -{ lib -, buildPythonPackage -, dissect-cstruct -, dissect-util -, fetchFromGitHub -, setuptools -, setuptools-scm -, pytestCheckHook -, pythonOlder +{ + lib, + buildPythonPackage, + dissect-cstruct, + dissect-util, + fetchFromGitHub, + setuptools, + setuptools-scm, + pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { @@ -33,13 +34,9 @@ buildPythonPackage rec { dissect-util ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "dissect.ffs" - ]; + pythonImportsCheck = [ "dissect.ffs" ]; meta = with lib; { description = "Dissect module implementing a parser for the FFS file system"; From 49da26d83146ee25d9b6a865abe79ef7df384409 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 01:12:59 +0200 Subject: [PATCH 57/70] python311Packages.dissect-fat: refactor --- 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 d0402f13394a..d1155a0b9231 100644 --- a/pkgs/development/python-modules/dissect-fat/default.nix +++ b/pkgs/development/python-modules/dissect-fat/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { hash = "sha256-U7SSLvEK6IYZjjUIGT9n1w7oLdB8Q2/msQ/EBJfatJY="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ dissect-cstruct dissect-util ]; From db0eecc0868a049a52805893c737c1326d24f04b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 01:13:37 +0200 Subject: [PATCH 58/70] python311Packages.dissect-fat: format with nixfmt --- .../python-modules/dissect-fat/default.nix | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/dissect-fat/default.nix b/pkgs/development/python-modules/dissect-fat/default.nix index d1155a0b9231..6e14afb3f1e0 100644 --- a/pkgs/development/python-modules/dissect-fat/default.nix +++ b/pkgs/development/python-modules/dissect-fat/default.nix @@ -1,11 +1,12 @@ -{ lib -, buildPythonPackage -, dissect-cstruct -, dissect-util -, fetchFromGitHub -, setuptools -, setuptools-scm -, pythonOlder +{ + lib, + buildPythonPackage, + dissect-cstruct, + dissect-util, + fetchFromGitHub, + setuptools, + setuptools-scm, + pythonOlder, }: buildPythonPackage rec { @@ -35,9 +36,7 @@ buildPythonPackage rec { # dissect.fat.exceptions.InvalidBPB: Invalid BS_jmpBoot doCheck = false; - pythonImportsCheck = [ - "dissect.fat" - ]; + pythonImportsCheck = [ "dissect.fat" ]; meta = with lib; { description = "Dissect module implementing a parser for the FAT file system"; From 371b6e717422a300e46761e2fe485724ba4b2df7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 01:14:22 +0200 Subject: [PATCH 59/70] python311Packages.dissect-executable: refactor --- .../development/python-modules/dissect-executable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-executable/default.nix b/pkgs/development/python-modules/dissect-executable/default.nix index 8511b2df9448..2b7619e45d90 100644 --- a/pkgs/development/python-modules/dissect-executable/default.nix +++ b/pkgs/development/python-modules/dissect-executable/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { hash = "sha256-aAalU0TUqXc13WnxJvirG3QzQyMstecOfnXMdFT8IzU="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ dissect-cstruct dissect-util ]; From ac0f84ce7e47fe0d2165e6dadf611d34dae28736 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 01:15:15 +0200 Subject: [PATCH 60/70] python311Packages.dissect-executable: format with nixfmt --- .../dissect-executable/default.nix | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/dissect-executable/default.nix b/pkgs/development/python-modules/dissect-executable/default.nix index 2b7619e45d90..c6abdd5ee6f6 100644 --- a/pkgs/development/python-modules/dissect-executable/default.nix +++ b/pkgs/development/python-modules/dissect-executable/default.nix @@ -1,11 +1,12 @@ -{ lib -, buildPythonPackage -, dissect-cstruct -, dissect-util -, fetchFromGitHub -, setuptools -, setuptools-scm -, pythonOlder +{ + lib, + buildPythonPackage, + dissect-cstruct, + dissect-util, + fetchFromGitHub, + setuptools, + setuptools-scm, + pythonOlder, }: buildPythonPackage rec { @@ -32,9 +33,7 @@ buildPythonPackage rec { dissect-util ]; - pythonImportsCheck = [ - "dissect.executable" - ]; + pythonImportsCheck = [ "dissect.executable" ]; meta = with lib; { description = "Dissect module implementing a parser for various executable formats such as PE, ELF and Macho-O"; From bb94985b4529a154623c0277239ee12dbbc04d4e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 01:15:36 +0200 Subject: [PATCH 61/70] python311Packages.dissect-evidence: refactor --- 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 96b13909e605..e1cb68259caa 100644 --- a/pkgs/development/python-modules/dissect-evidence/default.nix +++ b/pkgs/development/python-modules/dissect-evidence/default.nix @@ -23,12 +23,12 @@ buildPythonPackage rec { hash = "sha256-0WLX5mD+opJoRdnk4w8mMySn41473PcRod4YxEk3S2s="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ dissect-cstruct dissect-util ]; From e7afd61c43676671482e20c0b9a7ffd0ed8a7694 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 01:16:18 +0200 Subject: [PATCH 62/70] python311Packages.dissect-evidence: format with nixfmt --- .../dissect-evidence/default.nix | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/dissect-evidence/default.nix b/pkgs/development/python-modules/dissect-evidence/default.nix index e1cb68259caa..6f617db679a3 100644 --- a/pkgs/development/python-modules/dissect-evidence/default.nix +++ b/pkgs/development/python-modules/dissect-evidence/default.nix @@ -1,12 +1,13 @@ -{ lib -, buildPythonPackage -, dissect-cstruct -, dissect-util -, fetchFromGitHub -, setuptools -, setuptools-scm -, pytestCheckHook -, pythonOlder +{ + lib, + buildPythonPackage, + dissect-cstruct, + dissect-util, + fetchFromGitHub, + setuptools, + setuptools-scm, + pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { @@ -33,13 +34,9 @@ buildPythonPackage rec { dissect-util ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "dissect.evidence" - ]; + pythonImportsCheck = [ "dissect.evidence" ]; meta = with lib; { description = "Dissect module implementing a parsers for various forensic evidence file containers"; From 2e197e83ae071dce53a21f3cb48883ed4ffa2a0c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 01:16:56 +0200 Subject: [PATCH 63/70] python311Packages.dissect-etl: refactor --- pkgs/development/python-modules/dissect-etl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-etl/default.nix b/pkgs/development/python-modules/dissect-etl/default.nix index 08426d7fbc87..b65beaec3cae 100644 --- a/pkgs/development/python-modules/dissect-etl/default.nix +++ b/pkgs/development/python-modules/dissect-etl/default.nix @@ -23,12 +23,12 @@ buildPythonPackage rec { hash = "sha256-gLxBVHhtQS4Ep64H4jvndGyjUW1cQ68f346utVI9eC4="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ dissect-cstruct dissect-util ]; From 7e20be4d98606fb15ef671df652f381111341126 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 01:17:17 +0200 Subject: [PATCH 64/70] python311Packages.dissect-evidence: format with nixfmt --- .../python-modules/dissect-etl/default.nix | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/dissect-etl/default.nix b/pkgs/development/python-modules/dissect-etl/default.nix index b65beaec3cae..10ceff3e6eef 100644 --- a/pkgs/development/python-modules/dissect-etl/default.nix +++ b/pkgs/development/python-modules/dissect-etl/default.nix @@ -1,12 +1,13 @@ -{ lib -, buildPythonPackage -, dissect-cstruct -, dissect-util -, fetchFromGitHub -, setuptools -, setuptools-scm -, pytestCheckHook -, pythonOlder +{ + lib, + buildPythonPackage, + dissect-cstruct, + dissect-util, + fetchFromGitHub, + setuptools, + setuptools-scm, + pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { @@ -33,13 +34,9 @@ buildPythonPackage rec { dissect-util ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "dissect.etl" - ]; + pythonImportsCheck = [ "dissect.etl" ]; meta = with lib; { description = "Dissect module implementing a parser for Event Trace Log (ETL) files"; From b2ccce93aca64fae525cd1eaa9d085c3745111f6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 01:17:42 +0200 Subject: [PATCH 65/70] python312Packages.dissect-cobaltstrike: refactor --- .../python-modules/dissect-cobaltstrike/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dissect-cobaltstrike/default.nix b/pkgs/development/python-modules/dissect-cobaltstrike/default.nix index 7b25a817aa64..64dea4ee96fa 100644 --- a/pkgs/development/python-modules/dissect-cobaltstrike/default.nix +++ b/pkgs/development/python-modules/dissect-cobaltstrike/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "dissect-cobaltstrike"; version = "1.0.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -30,12 +30,12 @@ buildPythonPackage rec { hash = "sha256-CS50c3r7sdxp3CRS6XJ4QUmUFtmhFg6rSdKfYzJSOV4="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ dissect-cstruct dissect-util lark From 26b997060d38185945dcb73905b9752bd4197e23 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 01:18:26 +0200 Subject: [PATCH 66/70] python312Packages.dissect-cobaltstrike: format with nixfmt --- .../dissect-cobaltstrike/default.nix | 37 +++++++++---------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/dissect-cobaltstrike/default.nix b/pkgs/development/python-modules/dissect-cobaltstrike/default.nix index 64dea4ee96fa..3924f0c5164b 100644 --- a/pkgs/development/python-modules/dissect-cobaltstrike/default.nix +++ b/pkgs/development/python-modules/dissect-cobaltstrike/default.nix @@ -1,19 +1,20 @@ -{ lib -, buildPythonPackage -, dissect-cstruct -, dissect-util -, fetchFromGitHub -, flow-record -, httpx -, lark -, pycryptodome -, pyshark -, pytest-httpserver -, pytestCheckHook -, pythonOlder -, rich -, setuptools -, setuptools-scm +{ + lib, + buildPythonPackage, + dissect-cstruct, + dissect-util, + fetchFromGitHub, + flow-record, + httpx, + lark, + pycryptodome, + pyshark, + pytest-httpserver, + pytestCheckHook, + pythonOlder, + rich, + setuptools, + setuptools-scm, }: buildPythonPackage rec { @@ -69,9 +70,7 @@ buildPythonPackage rec { pytestCheckHook ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); - pythonImportsCheck = [ - "dissect.cobaltstrike" - ]; + pythonImportsCheck = [ "dissect.cobaltstrike" ]; meta = with lib; { description = "Dissect module implementing a parser for Cobalt Strike related data"; From 0bc3342a9122d49223848e4a326ea698b8985825 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 01:28:45 +0200 Subject: [PATCH 67/70] python312Packages.dissect-archive: init at 1.1 Dissect module implementing parsers for various archive and backup formats https://github.com/fox-it/dissect.archive --- .../dissect-archive/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/dissect-archive/default.nix diff --git a/pkgs/development/python-modules/dissect-archive/default.nix b/pkgs/development/python-modules/dissect-archive/default.nix new file mode 100644 index 000000000000..864e6eb1ff18 --- /dev/null +++ b/pkgs/development/python-modules/dissect-archive/default.nix @@ -0,0 +1,45 @@ +{ + lib, + buildPythonPackage, + dissect-cstruct, + dissect-util, + fetchFromGitHub, + pythonOlder, + setuptools, + setuptools-scm, +}: + +buildPythonPackage rec { + pname = "dissect-archive"; + version = "1.1"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "fox-it"; + repo = "dissect.archive"; + rev = "refs/tags/${version}"; + hash = "sha256-DUAJUbG3k6sbO7mqvNzQQns+4l8XHDUh0xZ/RA5LWEY="; + }; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + dissect-cstruct + dissect-util + ]; + + pythonImportsCheck = [ "dissect.archive" ]; + + meta = with lib; { + description = "Dissect module implementing parsers for various archive and backup formats"; + homepage = "https://github.com/fox-it/dissect.archive"; + changelog = "https://github.com/fox-it/dissect.archive/releases/tag/${version}"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 36783fd443f8..dd9513bac790 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3034,6 +3034,8 @@ self: super: with self; { dissect = callPackage ../development/python-modules/dissect { }; + dissect-archive = callPackage ../development/python-modules/dissect-archive { }; + dissect-btrfs = callPackage ../development/python-modules/dissect-btrfs { }; dissect-cim = callPackage ../development/python-modules/dissect-cim { }; From 4949c6335032d8735289ed1878a49b35b99e3d2b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 01:30:44 +0200 Subject: [PATCH 68/70] python312Packages.dissect: add dissect-archive --- pkgs/development/python-modules/dissect/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/dissect/default.nix b/pkgs/development/python-modules/dissect/default.nix index 7f0300a63aa0..a239e377e89e 100644 --- a/pkgs/development/python-modules/dissect/default.nix +++ b/pkgs/development/python-modules/dissect/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, dissect-archive , dissect-btrfs , dissect-cim , dissect-clfs @@ -56,6 +57,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + dissect-archive dissect-btrfs dissect-cim dissect-clfs From a7cc477aff1aa755d6cd8cf6a15134c7ec636f92 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 01:31:37 +0200 Subject: [PATCH 69/70] python312Packages.dissect: refactor --- pkgs/development/python-modules/dissect/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dissect/default.nix b/pkgs/development/python-modules/dissect/default.nix index a239e377e89e..0ee19d70ad8a 100644 --- a/pkgs/development/python-modules/dissect/default.nix +++ b/pkgs/development/python-modules/dissect/default.nix @@ -50,13 +50,16 @@ buildPythonPackage rec { pythonRelaxDeps = true; - nativeBuildInputs = [ - pythonRelaxDepsHook + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + dependencies = [ dissect-archive dissect-btrfs dissect-cim From 3063c3206912c8f349984a3a303e5ac5025dc9ef Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 01:32:04 +0200 Subject: [PATCH 70/70] python312Packages.dissect: format with nixfmt --- .../python-modules/dissect/default.nix | 77 +++++++++---------- 1 file changed, 37 insertions(+), 40 deletions(-) diff --git a/pkgs/development/python-modules/dissect/default.nix b/pkgs/development/python-modules/dissect/default.nix index 0ee19d70ad8a..73f022e97eaa 100644 --- a/pkgs/development/python-modules/dissect/default.nix +++ b/pkgs/development/python-modules/dissect/default.nix @@ -1,37 +1,38 @@ -{ lib -, buildPythonPackage -, dissect-archive -, dissect-btrfs -, dissect-cim -, dissect-clfs -, dissect-cobaltstrike -, dissect-cstruct -, dissect-esedb -, dissect-etl -, dissect-eventlog -, dissect-evidence -, dissect-executable -, dissect-extfs -, dissect-fat -, dissect-ffs -, dissect-hypervisor -, dissect-jffs -, dissect-ntfs -, dissect-ole -, dissect-regf -, dissect-shellitem -, dissect-sql -, dissect-squashfs -, dissect-target -, dissect-util -, dissect-vmfs -, dissect-volume -, dissect-xfs -, fetchFromGitHub -, pythonOlder -, pythonRelaxDepsHook -, setuptools -, setuptools-scm +{ + lib, + buildPythonPackage, + dissect-archive, + dissect-btrfs, + dissect-cim, + dissect-clfs, + dissect-cobaltstrike, + dissect-cstruct, + dissect-esedb, + dissect-etl, + dissect-eventlog, + dissect-evidence, + dissect-executable, + dissect-extfs, + dissect-fat, + dissect-ffs, + dissect-hypervisor, + dissect-jffs, + dissect-ntfs, + dissect-ole, + dissect-regf, + dissect-shellitem, + dissect-sql, + dissect-squashfs, + dissect-target, + dissect-util, + dissect-vmfs, + dissect-volume, + dissect-xfs, + fetchFromGitHub, + pythonOlder, + pythonRelaxDepsHook, + setuptools, + setuptools-scm, }: buildPythonPackage rec { @@ -55,9 +56,7 @@ buildPythonPackage rec { setuptools-scm ]; - nativeBuildInputs = [ - pythonRelaxDepsHook - ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ dissect-archive @@ -92,9 +91,7 @@ buildPythonPackage rec { # Module has no tests doCheck = false; - pythonImportsCheck = [ - "dissect" - ]; + pythonImportsCheck = [ "dissect" ]; meta = with lib; { description = "Dissect meta module";