1 files changed, 33 insertions, 9 deletions
diff --git a/nixpkgs/pkgs/tools/backup/tarsnapper/default.nix b/nixpkgs/pkgs/tools/backup/tarsnapper/default.nix
index a5ad2c3625c1..d793017ad873 100644
--- a/nixpkgs/pkgs/tools/backup/tarsnapper/default.nix
+++ b/nixpkgs/pkgs/tools/backup/tarsnapper/default.nix
@@ -1,25 +1,49 @@
-{ python3Packages, fetchFromGitHub , tarsnap }:
+{ lib
+, python3Packages
+, fetchFromGitHub
+, tarsnap
+}:
 
 python3Packages.buildPythonApplication rec {
-  name = "tarsnapper-${version}";
+  pname = "tarsnapper";
   version = "0.4";
 
   src = fetchFromGitHub {
     owner = "miracle2k";
-    repo = "tarsnapper";
+    repo = pname;
     rev = version;
     sha256 = "03db49188f4v1946c8mqqj30ah10x68hbg3a58js0syai32v12pm";
   };
 
-  checkInputs = with python3Packages; [ nose pytest ];
+  propagatedBuildInputs = with python3Packages; [
+    pyyaml
+    python-dateutil
+    pexpect
+  ];
+
+  checkInputs = with python3Packages; [
+    nose
+  ];
+
+  patches = [
+    # Remove standard module argparse from requirements
+    ./remove-argparse.patch
+  ];
+
+  makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ tarsnap ]}" ];
 
   checkPhase = ''
-    py.test .
+    runHook preCheck
+    nosetests tests
+    runHook postCheck
   '';
 
-  propagatedBuildInputs = with python3Packages; [ pyyaml python-dateutil pexpect ];
+  pythonImportsCheck = [ "tarsnapper" ];
 
-  patches = [ ./remove-argparse.patch ];
-
-  makeWrapperArgs = ["--prefix PATH : ${tarsnap}/bin"];
+  meta = with lib; {
+    description = "Wrapper which expires backups using a gfs-scheme";
+    homepage = "https://github.com/miracle2k/tarsnapper";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ ];
+  };
 }