From ca81338f518cfe7f105fa2cda58bc1ff57420076 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Vask=C3=B3?= <1771332+vlaci@users.noreply.github.com> Date: Tue, 11 Feb 2025 16:45:10 +0100 Subject: [PATCH 1/2] jefferson: add update script --- pkgs/by-name/je/jefferson/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/je/jefferson/package.nix b/pkgs/by-name/je/jefferson/package.nix index 81b27588147f..8db93d43cdb3 100644 --- a/pkgs/by-name/je/jefferson/package.nix +++ b/pkgs/by-name/je/jefferson/package.nix @@ -1,6 +1,7 @@ { lib, fetchFromGitHub, + gitUpdater, python3, }: @@ -35,6 +36,10 @@ python3.pkgs.buildPythonApplication rec { # upstream has no tests doCheck = false; + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + }; + meta = with lib; { description = "JFFS2 filesystem extraction tool"; homepage = "https://github.com/onekey-sec/jefferson"; From e6da6a19bda25d9594a833c8d7d40e795993d63d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Vask=C3=B3?= <1771332+vlaci@users.noreply.github.com> Date: Tue, 11 Feb 2025 16:45:54 +0100 Subject: [PATCH 2/2] jefferson: 0.4.5 -> 0.4.6 The `cstruct` workaround is no longer needed. --- pkgs/by-name/je/jefferson/package.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/je/jefferson/package.nix b/pkgs/by-name/je/jefferson/package.nix index 8db93d43cdb3..d1b95dd2df0a 100644 --- a/pkgs/by-name/je/jefferson/package.nix +++ b/pkgs/by-name/je/jefferson/package.nix @@ -7,14 +7,15 @@ python3.pkgs.buildPythonApplication rec { pname = "jefferson"; - version = "0.4.5"; + version = "0.4.6"; format = "pyproject"; + disabled = python3.pkgs.pythonOlder "3.9"; src = fetchFromGitHub { owner = "onekey-sec"; repo = pname; rev = "v${version}"; - hash = "sha256-PGtrvZ0cQvdiswn2Bk43c3LbIZqJyvNe5rnTPw/ipUM="; + hash = "sha256-6eh4i9N3aArU8+W8K341pp9J0QYEojDiMrEc8yax4SY="; }; nativeBuildInputs = with python3.pkgs; [ @@ -27,8 +28,6 @@ python3.pkgs.buildPythonApplication rec { lzallright ]; - pythonRelaxDeps = [ "cstruct" ]; - pythonImportsCheck = [ "jefferson" ];