From ea3b1344d01a6b0a00ab96249b42b5e9a730e970 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 25 Jul 2024 23:11:18 +0200 Subject: [PATCH 1/2] python312Packages.telfhash: drop nose dependency --- pkgs/development/python-modules/telfhash/default.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/telfhash/default.nix b/pkgs/development/python-modules/telfhash/default.nix index 0aafd816d039d5a..860c9becb6d0ee4 100644 --- a/pkgs/development/python-modules/telfhash/default.nix +++ b/pkgs/development/python-modules/telfhash/default.nix @@ -6,7 +6,6 @@ packaging, pyelftools, tlsh, - nose, }: buildPythonPackage rec { pname = "telfhash"; @@ -34,11 +33,7 @@ buildPythonPackage rec { packaging ]; - nativeCheckInputs = [ nose ]; - - checkPhase = '' - nosetests - ''; + doCheck = false; # no tests pythonImportsCheck = [ "telfhash" ]; From 3fafc1a39b8f52f51460b2b3fc009a41726ac5ba Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 27 Jul 2024 01:56:54 +0200 Subject: [PATCH 2/2] python312Packages.telfhash: migrate to pyproject --- pkgs/development/python-modules/telfhash/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/telfhash/default.nix b/pkgs/development/python-modules/telfhash/default.nix index 860c9becb6d0ee4..18b67b6bf5022fc 100644 --- a/pkgs/development/python-modules/telfhash/default.nix +++ b/pkgs/development/python-modules/telfhash/default.nix @@ -6,11 +6,12 @@ packaging, pyelftools, tlsh, + setuptools, }: buildPythonPackage rec { pname = "telfhash"; version = "0.9.8"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "trendmicro"; @@ -22,11 +23,14 @@ buildPythonPackage rec { # The tlsh library's name is just "tlsh" postPatch = '' substituteInPlace requirements.txt \ - --replace "python-tlsh" "tlsh" \ - --replace "py-tlsh" "tlsh" + --replace-fail "python-tlsh" "tlsh" \ + --replace-fail "py-tlsh" "tlsh" \ + --replace-fail "nose>=1.3.7" "" ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ capstone pyelftools tlsh