diff --git a/pkgs/development/python-modules/acquire/default.nix b/pkgs/development/python-modules/acquire/default.nix index e27075b7e133..5c0a9e3dcf26 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.19"; + version = "3.20"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "acquire"; tag = version; - hash = "sha256-0aqngfv2ZyVw1ymotz1PmXKUZeTHUVL9ICL6cyEn/wk="; + hash = "sha256-BfY7LKSP82QnRz3QdfUNFvz7epw5RwGT/H2S43MSvVk="; }; build-system = [ diff --git a/pkgs/development/python-modules/dissect-cramfs/default.nix b/pkgs/development/python-modules/dissect-cramfs/default.nix new file mode 100644 index 000000000000..378814bee641 --- /dev/null +++ b/pkgs/development/python-modules/dissect-cramfs/default.nix @@ -0,0 +1,45 @@ +{ + lib, + buildPythonPackage, + dissect-cstruct, + dissect-util, + fetchFromGitHub, + setuptools, + setuptools-scm, +}: + +buildPythonPackage rec { + pname = "dissect-cramfs"; + version = "1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "fox-it"; + repo = "dissect.cramfs"; + tag = version; + hash = "sha256-0BHt7v2sI9uxZFUVsTkPZHy+wC6twaHeBmgH04anmp0="; + }; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + dissect-cstruct + dissect-util + ]; + + # Issue with the test file handling + doCheck = false; + + pythonImportsCheck = [ "dissect.cramfs" ]; + + meta = with lib; { + description = "Dissect module implementing a parser for the CRAMFS file system"; + homepage = "https://github.com/fox-it/dissect.cramfs"; + changelog = "https://github.com/fox-it/dissect.crmfs/releases/tag/${src.tag}"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/dissect/default.nix b/pkgs/development/python-modules/dissect/default.nix index 22d017e2bb1c..0015349fb296 100644 --- a/pkgs/development/python-modules/dissect/default.nix +++ b/pkgs/development/python-modules/dissect/default.nix @@ -5,6 +5,7 @@ dissect-btrfs, dissect-cim, dissect-clfs, + dissect-cramfs, dissect-cstruct, dissect-esedb, dissect-etl, @@ -37,7 +38,7 @@ buildPythonPackage rec { pname = "dissect"; - version = "3.19"; + version = "3.20.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -46,7 +47,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect"; tag = version; - hash = "sha256-eEiWKblhJPkZuxJvwJnHtxwvJ9uhXIkS56CeRtmEfkU="; + hash = "sha256-Zc9NBrRDbSP5Yk3gJoMG+6nAGFxBHiPKvvfQLMcu+tk="; }; pythonRelaxDeps = true; @@ -61,6 +62,7 @@ buildPythonPackage rec { dissect-btrfs dissect-cim dissect-clfs + dissect-cramfs dissect-cstruct dissect-esedb dissect-etl diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0fa2df7e9269..0acdb846b369 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3715,6 +3715,8 @@ self: super: with self; { dissect-cobaltstrike = callPackage ../development/python-modules/dissect-cobaltstrike { }; + dissect-cramfs = callPackage ../development/python-modules/dissect-cramfs { }; + dissect-cstruct = callPackage ../development/python-modules/dissect-cstruct { }; dissect-esedb = callPackage ../development/python-modules/dissect-esedb { };