Merge pull request #233487 from vlaci/update-jefferson

jefferson: 0.4.2 -> 0.4.5

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

@@ -0,0 +1,50 @@
+{ lib
+, stdenv
+, buildPythonPackage
+, callPackage
+, fetchFromGitHub
+, rustPlatform
+, libiconv
+}:
+
+buildPythonPackage rec {
+  pname = "lzallright";
+  version = "0.2.3";
+
+  src = fetchFromGitHub {
+    owner = "vlaci";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-Zzif6WtecgAkNmml0kt0Z+Ewx0L30ahr+kwzYR5aUAM=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoTarball {
+    inherit src;
+    name = "${pname}-${version}";
+    hash = "sha256-+pV9q2QM6qFA1a5E10OAsE7KJEUsTiEiU1KqO4/2rFw=";
+  };
+
+  format = "pyproject";
+
+  nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ];
+
+  buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
+
+  pythonImportsCheck = [ "lzallright" ];
+
+  doCheck = false;
+
+  passthru.tests = {
+    pytest = callPackage ./tests.nix { };
+  };
+
+  meta = with lib; {
+    description = ''
+      A Python 3.8+ binding for lzokay library which is an MIT licensed
+      a minimal, C++14 implementation of the LZO compression format.
+    '';
+    homepage = "https://github.com/vlaci/lzallright";
+    license = licenses.mit;
+    maintainers = with maintainers; [ vlaci ];
+  };
+}

pkgs/development/python-modules/lzallright/tests.nix

@@ -0,0 +1,15 @@
+{ lzallright, buildPythonPackage, pytestCheckHook }:
+
+buildPythonPackage {
+  inherit (lzallright) version src;
+  pname = "lzallright-tests";
+  format = "other";
+
+  dontBuild = true;
+  dontInstall = true;
+
+  nativeCheckInputs = [
+    lzallright
+    pytestCheckHook
+  ];
+}

pkgs/tools/filesystems/jefferson/default.nix

@@ -5,14 +5,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "jefferson";
-  version = "0.4.2";
+  version = "0.4.5";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "onekey-sec";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-zW38vcDw4Jz5gO9IHrWRlvUznKvUyPbxkYMxn7VSTpA=";
+    hash = "sha256-PGtrvZ0cQvdiswn2Bk43c3LbIZqJyvNe5rnTPw/ipUM=";
   };
 
   nativeBuildInputs = with python3.pkgs; [
@@ -22,7 +22,7 @@ python3.pkgs.buildPythonApplication rec {
   propagatedBuildInputs = with python3.pkgs; [
     click
     cstruct
-    python-lzo
+    lzallright
   ];
 
   pythonImportsCheck = [
@@ -36,6 +36,6 @@ python3.pkgs.buildPythonApplication rec {
     description = "JFFS2 filesystem extraction tool";
     homepage = "https://github.com/onekey-sec/jefferson";
     license = licenses.mit;
-    maintainers = with maintainers; [ tnias ];
+    maintainers = with maintainers; [ tnias vlaci ];
   };
 }

pkgs/top-level/python-packages.nix

@@ -5969,6 +5969,8 @@ self: super: with self; {
 
   lz4 = callPackage ../development/python-modules/lz4 { };
 
+  lzallright = callPackage ../development/python-modules/lzallright { };
+
   lzstring = callPackage ../development/python-modules/lzstring { };
 
   m2crypto = callPackage ../development/python-modules/m2crypto { };