From 675ece97388fc1bdec2d231a43ca1a016d717ad5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 28 Apr 2024 01:37:06 +0200 Subject: [PATCH] diffoscope: downgrade tlsh --- pkgs/tools/misc/diffoscope/default.nix | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 55a02002e257..01d74b9c5306 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -76,8 +76,26 @@ , writeScript }: +let + python = python3.override { + packageOverrides = final: prev: { + # version 4 or newer would log the followng error but tests currently don't fail because radare2 is disabled + # ValueError: argument TNULL is not a TLSH hex string + tlsh = prev.tlsh.overridePythonAttrs ({ src, ... }: let + version = "3.19.1"; + in { + inherit version; + src = src.override { + rev = version; + hash = "sha256-ZYEjT/yShfA4+zpbGOtaFOx1nSSOWPtMvskPhHv3c9U="; + }; + }); + }; + }; +in + # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! -python3.pkgs.buildPythonApplication rec { +python.pkgs.buildPythonApplication rec { pname = "diffoscope"; version = "265"; @@ -160,7 +178,7 @@ python3.pkgs.buildPythonApplication rec { zip zstd ] - ++ (with python3.pkgs; [ + ++ (with python.pkgs; [ argcomplete debian defusedxml @@ -209,7 +227,7 @@ python3.pkgs.buildPythonApplication rec { wabt xmlbeans ] - ++ (with python3.pkgs; [ + ++ (with python.pkgs; [ androguard binwalk guestfs @@ -224,7 +242,7 @@ python3.pkgs.buildPythonApplication rec { ++ lib.optionals (stdenv.hostPlatform.system != "aarch64-darwin") [ gnumeric ] )); - nativeCheckInputs = with python3.pkgs; [ + nativeCheckInputs = with python.pkgs; [ pytestCheckHook ] ++ pythonPath;