From 303f998cbb4c531fe16def584811554504d4ebaa Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Tue, 13 Aug 2024 21:55:06 +0200 Subject: [PATCH] tarsnapper: drop nose dependency --- pkgs/tools/backup/tarsnapper/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/backup/tarsnapper/default.nix b/pkgs/tools/backup/tarsnapper/default.nix index 58ab9640f5e6..204c1ffd7b47 100644 --- a/pkgs/tools/backup/tarsnapper/default.nix +++ b/pkgs/tools/backup/tarsnapper/default.nix @@ -23,6 +23,11 @@ python3Packages.buildPythonApplication rec { url = "https://github.com/miracle2k/tarsnapper/commit/2ee33ce748b9bb42d559cc2c0104115732cb4150.patch"; hash = "sha256-fEXGhzlfB+J5lw1pcsC5Ne7I8UMnDzwyyCx/zm15+fU="; }) + # Migrate to pytest, see: https://github.com/miracle2k/tarsnapper/pull/73 + (fetchpatch { + url = "https://github.com/miracle2k/tarsnapper/commit/eace01f3085fba8a6421d4f19110b814511e5170.patch?full_index=1"; + hash = "sha256-2YPb7iaAusT1DkISfOWs72jr/GBY/qG5qFyRlnVt0IY="; + }) ]; nativeBuildInputs = with python3Packages; [ @@ -35,10 +40,8 @@ python3Packages.buildPythonApplication rec { pexpect ]; - doCheck = python3Packages.pythonOlder "3.12"; - nativeCheckInputs = with python3Packages; [ - nose + pytestCheckHook ]; # Remove standard module argparse from requirements @@ -46,12 +49,6 @@ python3Packages.buildPythonApplication rec { makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ tarsnap ]}" ]; - checkPhase = '' - runHook preCheck - nosetests tests - runHook postCheck - ''; - pythonImportsCheck = [ "tarsnapper" ]; meta = with lib; {