[PATCH 4/4] gnu: Add duplicity.

[PATCH 4/4] gnu: Add duplicity.

[Eric Bavier]

[-- Attachment #1: 0004-gnu-Add-duplicity.patch --]
[-- Type: text/x-diff, Size: 3769 bytes --]

From aef259cda9464f55aca23e0e1c9a5b8005a9efab Mon Sep 17 00:00:00 2001
From: Eric Bavier <bavier@member.fsf.org>
Date: Tue, 20 May 2014 08:40:10 -0500
Subject: [PATCH 4/4] gnu: Add duplicity.

* gnu/packages/backup.scm: New file.
* gnu-system.am: Add it.
---
 gnu-system.am           |    1 +
 gnu/packages/backup.scm |   66 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+)
 create mode 100644 gnu/packages/backup.scm

diff --git a/gnu-system.am b/gnu-system.am
index 3646292..d7ea31b 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -35,6 +35,7 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/autogen.scm			\
   gnu/packages/autotools.scm			\
   gnu/packages/avahi.scm			\
+  gnu/packages/backup.scm			\
   gnu/packages/base.scm				\
   gnu/packages/bash.scm				\
   gnu/packages/bdb.scm				\
diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
new file mode 100644
index 0000000..6593155
--- /dev/null
+++ b/gnu/packages/backup.scm
@@ -0,0 +1,66 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages backup)
+  #:use-module (guix packages)
+  #:use-module (guix licenses)
+  #:use-module (guix download)
+  #:use-module (guix build-system python)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages gnupg)
+  #:use-module (gnu packages rsync)
+  #:use-module (srfi srfi-1))
+
+(define-public duplicity
+  (package
+    (name "duplicity")
+    (version "0.6.24")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "https://code.launchpad.net/duplicity/"
+                          (string-join (take (string-split version #\.) 2) ".")
+                          "-series/" version "/+download/duplicity-"
+                          version ".tar.gz"))
+      (sha256
+       (base32
+        "0l14nrhbgkyjgvh339bbhnm6hrdwrjadphq1jmpi0mcgcdbdfh8x"))))
+    (build-system python-build-system)
+    (native-inputs
+     `(("python2-setuptools" ,python2-setuptools)))
+    (inputs
+     `(("python" ,python-2)
+       ("librsync" ,librsync)
+       ("mock" ,python2-mock)           ;for testing
+       ("lockfile" ,python2-lockfile)
+       ("gnupg" ,gnupg)))
+    (arguments
+     `(#:python ,python-2               ;setup assumes Python 2
+       #:tests? #f                      ;TODO: tests cannot find lockfile module
+       #:test-target "test"))
+    (home-page "http://duplicity.nongnu.org/index.html")
+    (synopsis "Encrypted backup using rsync algorithm")
+    (description
+     "Duplicity backs up directories by producing encrypted tar-format volumes
+and uploading them to a remote or local file server.  Because duplicity uses
+librsync, the incremental archives are space efficient and only record the
+parts of files that have changed since the last backup.  Because duplicity
+uses GnuPG to encrypt and/or sign these archives, they will be safe from
+spying and/or modification by the server.")
+    (license gpl2+)))
-- 
1.7.9.5


[-- Attachment #2: Type: text/plain, Size: 17 bytes --]


-- 
Eric Bavier

Re: [PATCH 4/4] gnu: Add duplicity.

[Ludovic Courtès]

Eric Bavier <ericbavier@gmail.com> skribis:

> From aef259cda9464f55aca23e0e1c9a5b8005a9efab Mon Sep 17 00:00:00 2001
> From: Eric Bavier <bavier@member.fsf.org>
> Date: Tue, 20 May 2014 08:40:10 -0500
> Subject: [PATCH 4/4] gnu: Add duplicity.
>
> * gnu/packages/backup.scm: New file.
> * gnu-system.am: Add it.

LGTM, but...

[...]

> +    (inputs
> +     `(("python" ,python-2)
> +       ("librsync" ,librsync)
> +       ("mock" ,python2-mock)           ;for testing
> +       ("lockfile" ,python2-lockfile)
> +       ("gnupg" ,gnupg)))
> +    (arguments
> +     `(#:python ,python-2               ;setup assumes Python 2
> +       #:tests? #f                      ;TODO: tests cannot find lockfile module

As Andreas notes, may be worth investigating, since that could be a real
issue.  Could it be that it’s expecting a different version of
python2-lockfile or something like that?

Thanks for all this!

Ludo’.

Re: [PATCH 4/4] gnu: Add duplicity.

[Eric Bavier]

Ludovic Courtès writes:

>> +    (arguments
>> +     `(#:python ,python-2               ;setup assumes Python 2
>> +       #:tests? #f                      ;TODO: tests cannot find lockfile module
>
> As Andreas notes, may be worth investigating, since that could be a real
> issue.  Could it be that it’s expecting a different version of
> python2-lockfile or something like that?

The "#:tests? #f" is a hold-over from a previous mistake.  The tests can
indeed find the lockfile module.

However, I am seeing some non-deterministic hangs in the python2.7
threading module when running the tests.  If the tests don't hang, there
are many, many ERRORs.  I believe the errors are due to the tests
themselves, but I'm not sure about the threading hangs.  Has enyone else
had issues with our python's threading module?

-- 
Eric Bavier

Re: [PATCH 4/4] gnu: Add duplicity.

[Ludovic Courtès]

Eric Bavier <ericbavier@gmail.com> skribis:

> Ludovic Courtès writes:
>
>>> +    (arguments
>>> +     `(#:python ,python-2               ;setup assumes Python 2
>>> +       #:tests? #f                      ;TODO: tests cannot find lockfile module
>>
>> As Andreas notes, may be worth investigating, since that could be a real
>> issue.  Could it be that it’s expecting a different version of
>> python2-lockfile or something like that?
>
> The "#:tests? #f" is a hold-over from a previous mistake.  The tests can
> indeed find the lockfile module.

OK.

> However, I am seeing some non-deterministic hangs in the python2.7
> threading module when running the tests.  If the tests don't hang, there
> are many, many ERRORs.  I believe the errors are due to the tests
> themselves, but I'm not sure about the threading hangs.  Has enyone else
> had issues with our python's threading module?

Not me.  You think it’s not specific to Duplicity?

Ludo’.