Merge pull request #1588 from ocharles/pythonPackages.tarsnapper

pythonPackages.tarsnapper: New expression

pkgs/development/python-modules/tarsnapper-path.patch

@@ -0,0 +1,20 @@
+diff --git a/src/tarsnapper/script.py b/src/tarsnapper/script.py
+index 737ac8d..52cc775 100644
+--- a/src/tarsnapper/script.py
++++ b/src/tarsnapper/script.py
+@@ -48,7 +48,7 @@ class TarsnapBackend(object):
+         """
+         ``arguments`` is a single list of strings.
+         """
+-        call_with = ['tarsnap']
++        call_with = ['@NIXTARSNAPPATH@']
+         for option in self.options:
+             key = option[0]
+             pre = "-" if len(key) == 1 else "--"
+@@ -499,4 +499,4 @@ def run():
+ 
+ 
+ if __name__ == '__main__':
+-    run()
+\ No newline at end of file
++    run()

pkgs/top-level/python-packages.nix

@@ -1029,7 +1029,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       url = "https://github.com/agrover/configshell-fb/archive/v${version}.tar.gz";
       sha256 = "1dd87xvm98nk3jzybb041gjdahi2z9b53pwqhyxcfj4a91y82ndy";
     };
-    
+
     propagatedBuildInputs = [
       pyparsing
       modules.readline
@@ -1871,7 +1871,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       url = "http://pypi.python.org/packages/source/h/hypatia/${name}.tar.gz";
       md5 = "3a67683c578754cd8f23317db6d28ffd";
     };
- 
+
     buildInputs = [ zope_interface zodb3 ];
 
     meta = {
@@ -1887,7 +1887,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       url = "http://pypi.python.org/packages/source/z/zope.copy/${name}.zip";
       md5 = "36aa2c96dec4cfeea57f54da2b733eb9";
     };
- 
+
     buildInputs = [ pkgs.unzip zope_interface zope_location zope_schema ];
 
     meta = {
@@ -1903,7 +1903,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       url = "http://pypi.python.org/packages/source/s/statsd/${name}.tar.gz";
       md5 = "476ef5b9004f6e2cb25c7da440bb53d0";
     };
- 
+
     buildInputs = [ ];
 
     meta = {
@@ -1919,7 +1919,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       url = "http://pypi.python.org/packages/source/p/pyramid_zodbconn/${name}.tar.gz";
       md5 = "22e88cc82cafbbe00274e7378434e5fe";
     };
- 
+
     buildInputs = [ pyramid mock ];
     propagatedBuildInputs = [ zodb3 zodburi ];
 
@@ -1936,7 +1936,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       url = "http://pypi.python.org/packages/source/p/pyramid_mailer/${name}.tar.gz";
       md5 = "43800c7c894097a23140da58e3638c93";
     };
- 
+
     buildInputs = [ pyramid transaction ];
     propagatedBuildInputs = [ repoze_sendmail ];
 
@@ -1953,7 +1953,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       url = "http://pypi.python.org/packages/source/r/repoze.sendmail/${name}.tar.gz";
       md5 = "81d15f1f03cc67d6f56f2091c594ef57";
     };
- 
+
     buildInputs = [ transaction ];
 
     meta = {
@@ -1969,7 +1969,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       url = "http://pypi.python.org/packages/source/z/zodburi/${name}.tar.gz";
       md5 = "52cc13c32ffe4ee7b5f5abc79f70f3c2";
     };
- 
+
     buildInputs = [ zodb3 mock ];
 
     meta = {
@@ -2215,7 +2215,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
   };
 
   django = django_1_6;
-  
+
   django_1_6 = buildPythonPackage rec {
     name = "Django-${version}";
     version = "1.6";
@@ -6239,7 +6239,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     };
 
     # 4 failing tests
-    doCheck = false; 
+    doCheck = false;
 
     buildInputs = [ nose modules.curses ];
 
@@ -6617,7 +6617,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       url = "https://github.com/agrover/targetcli-fb/archive/v${version}.tar.gz";
       sha256 = "1zcm0agdpf866020b43fl8zyyyzz6r74mn1sz4xpaa0pinpwjk42";
     };
-    
+
     propagatedBuildInputs = [
       configshell_fb
       rtslib_fb
@@ -6630,6 +6630,24 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     };
   };
 
+  tarsnapper = buildPythonPackage rec {
+    name = "tarsnapper-0.2.1";
+
+    src = fetchgit {
+      url = https://github.com/miracle2k/tarsnapper.git;
+      rev = "620439bca68892f2ffaba1079a34b18496cc6596";
+    };
+
+    propagatedBuildInputs = [ argparse pyyaml ];
+
+    patches = [ ../development/python-modules/tarsnapper-path.patch ];
+
+    preConfigure = ''
+      substituteInPlace src/tarsnapper/script.py \
+        --replace '@NIXTARSNAPPATH@' '${pkgs.tarsnap}/bin/tarsnap'
+    '';
+  };
+
   taskcoach = buildPythonPackage rec {
     name = "TaskCoach-1.3.22";
 
@@ -7073,7 +7091,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
   webtest = buildPythonPackage rec {
     version = "2.0.11";
     name = "webtest-${version}";
-  
+
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/W/WebTest/WebTest-${version}.zip";
       md5 = "e51da21da8815cef07f543d8688effea";