[PATCH 0/3] Add Attic backup program

[PATCH 0/3] Add Attic backup program

[Leo Famulari]

This patchset adds the Attic backup program [1].

Your comments are requested!

I read the guidelines about naming Python modules based on their Python version
compatibility [2]. They don't seem to require changing the upstream name of
msgpack-python to python-msgpack but I noticed that it was done for
html5lib-python. Plus, package-with-python2 won't work as is on
'msgpack-python', so I made the change. If the change is not desired, I can
manually create the Python 2 module, but it's nice to have it automatically
generated like this.

I noticed that FUSE is in linux.scm. llfuse, on the other hand, supports Linux,
OS X, FreeBSD, and NetBSD, so I put it in its own module. What about a fuse
module?

[1] https://attic-backup.org/
[2] http://www.gnu.org/software/guix/manual/html_node/Python-Modules.html

Leo Famulari (3):
  gnu: Add llfuse.
  gnu: Add python-msgpack.
  gnu: Add Attic.

 gnu-system.am           |  1 +
 gnu/packages/backup.scm | 38 ++++++++++++++++++++++++++++++++++++--
 gnu/packages/llfuse.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 gnu/packages/python.scm | 25 +++++++++++++++++++++++++
 4 files changed, 110 insertions(+), 2 deletions(-)
 create mode 100644 gnu/packages/llfuse.scm

-- 
2.4.3

[PATCH 1/3] gnu: Add llfuse.

[Leo Famulari]

* gnu/packages/llfuse.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
---
 gnu-system.am           |  1 +
 gnu/packages/llfuse.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 gnu/packages/llfuse.scm

diff --git a/gnu-system.am b/gnu-system.am
index 130ae36..cc4edcd 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -191,6 +191,7 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/linux.scm			\
   gnu/packages/lirc.scm				\
   gnu/packages/lisp.scm				\
+  gnu/packages/llfuse.scm			\
   gnu/packages/llvm.scm				\
   gnu/packages/lout.scm				\
   gnu/packages/lsh.scm				\
diff --git a/gnu/packages/llfuse.scm b/gnu/packages/llfuse.scm
new file mode 100644
index 0000000..aae3063
--- /dev/null
+++ b/gnu/packages/llfuse.scm
@@ -0,0 +1,48 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2015 Leo Famulari <leo@famulari.name>
+;;;
+;;; 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 llfuse)
+  #:use-module (guix build-system python)
+  #:use-module (guix download)
+  #:use-module (guix licenses)
+  #:use-module (guix packages)
+  #:use-module (gnu packages attr)
+  #:use-module (gnu packages linux)
+  #:use-module (gnu packages pkg-config))
+
+(define-public llfuse
+  (package
+   (name "llfuse")
+   (version "0.40")
+   (source (origin
+            (method url-fetch)
+            (uri (string-append
+                  "https://bitbucket.org/nikratio/python-llfuse/downloads/"
+                  "llfuse-" version ".tar.bz2"))
+            (sha256
+             (base32 "0mx87n6j2g63mgiimjqn0gj6jgqfdkc04xkxc56r1azjlqji32zf"))))
+   (build-system python-build-system)
+   (inputs `(("fuse" ,fuse)
+             ("attr" ,attr)))
+   (native-inputs `(("pkg-config" ,pkg-config)))
+   (synopsis "Python bindings for FUSE")
+   (description "Python-LLFUSE is a set of Python bindings for the low level
+FUSE API.  It requires at least FUSE 2.8.0 and supports both Python 2.x and
+3.x.")
+   (home-page "https://bitbucket.org/nikratio/python-llfuse/")
+   (license lgpl2.0)))
-- 
2.4.3

Re: [PATCH 1/3] gnu: Add llfuse.

[Alex Kost]

Leo Famulari (2015-08-26 20:16 +0300) wrote:

> +(define-public llfuse
> +  (package
> +   (name "llfuse")
> +   (version "0.40")
> +   (source (origin
> +            (method url-fetch)
> +            (uri (string-append
> +                  "https://bitbucket.org/nikratio/python-llfuse/downloads/"
> +                  "llfuse-" version ".tar.bz2"))
> +            (sha256
> +             (base32 "0mx87n6j2g63mgiimjqn0gj6jgqfdkc04xkxc56r1azjlqji32zf"))))
> +   (build-system python-build-system)
> +   (inputs `(("fuse" ,fuse)
> +             ("attr" ,attr)))
> +   (native-inputs `(("pkg-config" ,pkg-config)))
> +   (synopsis "Python bindings for FUSE")
> +   (description "Python-LLFUSE is a set of Python bindings for the low level
> +FUSE API.  It requires at least FUSE 2.8.0 and supports both Python 2.x and
> +3.x.")

IMHO mentioning a version of fuse is not needed.  And IIUC this package
provides a python3 library, so I would also remove "supports both …".

> +   (home-page "https://bitbucket.org/nikratio/python-llfuse/")
> +   (license lgpl2.0)))

It should be 'lgpl2.0+' as the LICENSE file says "or (at your option)
any later version".

Also I think it is better to put this package in "python.scm" as it just
contains some general python library.  But I'm not an expert here, so
better wait for comments of other people.

But I would name it 'python-llfuse' and would also add 'python2-llfuse'
package (bug again: I didn't make a single python package).

-- 
Alex

Re: [PATCH 1/3] gnu: Add llfuse.

[Ludovic Courtès]

Alex Kost <alezost@gmail.com> skribis:

> Leo Famulari (2015-08-26 20:16 +0300) wrote:

[...]

>> +   (description "Python-LLFUSE is a set of Python bindings for the low level
>> +FUSE API.  It requires at least FUSE 2.8.0 and supports both Python 2.x and
>> +3.x.")
>
> IMHO mentioning a version of fuse is not needed.  And IIUC this package
> provides a python3 library, so I would also remove "supports both …".

+1

>> +   (home-page "https://bitbucket.org/nikratio/python-llfuse/")
>> +   (license lgpl2.0)))
>
> It should be 'lgpl2.0+' as the LICENSE file says "or (at your option)
> any later version".

Yes.  Leo, could you also check a few source file headers to confirm
they either have the “or later” clause, or do not specify any version?

> Also I think it is better to put this package in "python.scm" as it just
> contains some general python library.  But I'm not an expert here, so
> better wait for comments of other people.

Agreed.

> But I would name it 'python-llfuse' and would also add 'python2-llfuse'
> package (bug again: I didn't make a single python package).

Right.  See the convention described at
<https://www.gnu.org/software/guix/manual/html_node/Python-Modules.html>.

Leo, could you send an updated patch?

Thanks,
Ludo’.

Re: [PATCH 1/3] gnu: Add llfuse.

[Leo Famulari]

On Mon, Aug 31, 2015, at 07:52, Ludovic Courtès wrote:
> Alex Kost <alezost@gmail.com> skribis:
> 
> > Leo Famulari (2015-08-26 20:16 +0300) wrote:
> 
> [...]
> 
> >> +   (description "Python-LLFUSE is a set of Python bindings for the low level
> >> +FUSE API.  It requires at least FUSE 2.8.0 and supports both Python 2.x and
> >> +3.x.")
> >
> > IMHO mentioning a version of fuse is not needed.  And IIUC this package
> > provides a python3 library, so I would also remove "supports both …".
> 
> +1

Done.

> 
> >> +   (home-page "https://bitbucket.org/nikratio/python-llfuse/")
> >> +   (license lgpl2.0)))
> >
> > It should be 'lgpl2.0+' as the LICENSE file says "or (at your option)
> > any later version".
> 
> Yes.  Leo, could you also check a few source file headers to confirm
> they either have the “or later” clause, or do not specify any version?

The LLFUSE source files are all "LGPL" without mention of a version. The
LICENSE file is the only place where the version is specified (LGPL
2.0+). However, I also found that an included source file from another
project (underscore.js) is MIT/expat. 

> > Also I think it is better to put this package in "python.scm" as it just
> > contains some general python library.  But I'm not an expert here, so
> > better wait for comments of other people.
> 
> Agreed.
> 
> > But I would name it 'python-llfuse' and would also add 'python2-llfuse'
> > package (bug again: I didn't make a single python package).
> 
> Right.  See the convention described at
> <https://www.gnu.org/software/guix/manual/html_node/Python-Modules.html>.

Done.

> Leo, could you send an updated patch?

Forthcoming...

[PATCH 2/3] gnu: Add python-msgpack.

[Leo Famulari]

* gnu/packages/python.scm (python-msgpack, python2-msgpack): New variables.
---
 gnu/packages/python.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 940efec..3c6b2f5 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -10,6 +10,7 @@
 ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2015 Christopher Allan Webber <cwebber@dustycloud.org>
 ;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
+;;; Copyright © 2015 Leo Famulari <leo@famulari.name>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -4629,3 +4630,27 @@ term.js Javascript terminal emulator library.")
                  ,python2-backport-ssl-match-hostname)
                 ,@(alist-delete "python-tornado"
                                 (package-propagated-inputs terminado)))))))
+
+(define-public python-msgpack
+  (package
+   (name "python-msgpack")
+   (version "0.4.6")
+   (source (origin
+            (method url-fetch)
+            (uri (string-append
+                  "https://pypi.python.org/packages/source/m/msgpack-python/"
+                  "msgpack-python-" version ".tar.gz"))
+            (sha256
+             (base32 "1527c76b6fn4zzkgfq5xvhh7x9a9686g7fjiz717rw5vklf5ik5z"))))
+   (build-system python-build-system)
+    (native-inputs
+     `(("python-setuptools" ,python-setuptools)))
+   (synopsis "MessagePack (de)serializer")
+   (description "MessagePack is a fast, compact binary serialization format,
+suitable for similar data to JSON.  This package provides CPython bindings for
+reading and writing MessagePack data.")
+   (home-page "https://pypi.python.org/pypi/msgpack-python/")
+   (license asl2.0)))
+
+(define-public python2-msgpack
+  (package-with-python2 python-msgpack))
-- 
2.4.3

Re: [PATCH 2/3] gnu: Add python-msgpack.

[Alex Kost]

Leo Famulari (2015-08-26 20:16 +0300) wrote:

> * gnu/packages/python.scm (python-msgpack, python2-msgpack): New variables.
> ---
>  gnu/packages/python.scm | 25 +++++++++++++++++++++++++
>  1 file changed, 25 insertions(+)

This patch LGTM.

-- 
Alex

Re: [PATCH 2/3] gnu: Add python-msgpack.

[Ludovic Courtès]

Alex Kost <alezost@gmail.com> skribis:

> Leo Famulari (2015-08-26 20:16 +0300) wrote:
>
>> * gnu/packages/python.scm (python-msgpack, python2-msgpack): New variables.
>> ---
>>  gnu/packages/python.scm | 25 +++++++++++++++++++++++++
>>  1 file changed, 25 insertions(+)
>
> This patch LGTM.

Please feel free to apply patches that look good to you, don’t upset
‘guix lint’, and are in line with “Commit Access” in ‘HACKING’.

Otherwise there’s a risk of having these patches remain uncomitted and
Leo getting mad at us.  ;-)

Thanks,
Ludo’.

[PATCH 3/3] gnu: Add Attic.

[Leo Famulari]

* gnu/packages/backup.scm (attic): New variable.
---
 gnu/packages/backup.scm | 38 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index 3c703ec..68246e7 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014, 2015 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net>
+;;; Copyright © 2015 Leo Famulari <leo@famulari.name>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -26,20 +27,22 @@
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system python)
   #:use-module (gnu packages)
+  #:use-module (gnu packages acl)
   #:use-module (gnu packages base)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages dejagnu)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages linux)
+  #:use-module (gnu packages llfuse)
   #:use-module (gnu packages mcrypt)
   #:use-module (gnu packages nettle)
   #:use-module (gnu packages pcre)
-  #:use-module (gnu packages python)
-  #:use-module (gnu packages linux)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages python)
   #:use-module (gnu packages rsync)
   #:use-module (gnu packages ssh)
+  #:use-module (gnu packages tls)
   #:use-module (gnu packages xml))
 
 (define-public duplicity
@@ -316,3 +319,34 @@ rsync.  Thus you can use rdiff-backup and ssh to securely back a hard drive up
 to a remote location, and only the differences will be transmitted.  Finally,
 rdiff-backup is easy to use and settings have sensible defaults.")
     (license license:gpl2+)))
+
+(define-public attic
+  (package
+   (name "attic")
+   (version "0.16")
+   (source (origin
+            (method url-fetch)
+            (uri (string-append
+                  "https://pypi.python.org/packages/source/A/Attic/Attic-"
+                   version ".tar.gz"))
+            (sha256
+             (base32 "0b5skd36r4c0915lwpkqg5hxm49gls9pprs1b7hc40910wlcsl36"))))
+   (build-system python-build-system)
+   (arguments
+    `(#:phases (modify-phases %standard-phases
+     (add-before
+      'build 'set-openssl-prefix
+      (lambda* (#:key inputs #:allow-other-keys)
+        (setenv "ATTIC_OPENSSL_PREFIX" (assoc-ref inputs "openssl"))
+        #t)))))
+   (inputs `(("acl" ,acl)
+             ("llfuse" ,llfuse)
+             ("openssl" ,openssl)
+             ("python-msgpack" ,python-msgpack)))
+   (synopsis "Deduplicating backup program")
+   (description "Attic is a deduplicating backup program.  The main goal of
+Attic is to provide an efficient and secure way to backup data.  The data
+deduplication technique used makes Attic suitable for daily backups since only
+changes are stored.")
+   (home-page "https://attic-backup.org/")
+   (license license:bsd-3)))
-- 
2.4.3

Re: [PATCH 3/3] gnu: Add Attic.

[Alex Kost]

Leo Famulari (2015-08-26 20:16 +0300) wrote:

> +(define-public attic
> +  (package
> +   (name "attic")
> +   (version "0.16")
> +   (source (origin
> +            (method url-fetch)
> +            (uri (string-append
> +                  "https://pypi.python.org/packages/source/A/Attic/Attic-"
> +                   version ".tar.gz"))
> +            (sha256
> +             (base32 "0b5skd36r4c0915lwpkqg5hxm49gls9pprs1b7hc40910wlcsl36"))))
> +   (build-system python-build-system)
> +   (arguments
> +    `(#:phases (modify-phases %standard-phases
> +     (add-before
> +      'build 'set-openssl-prefix
> +      (lambda* (#:key inputs #:allow-other-keys)
> +        (setenv "ATTIC_OPENSSL_PREFIX" (assoc-ref inputs "openssl"))
> +        #t)))))

Please align modify-phases clause like this:

(modify-phases %standard-phases
  (add-before
   'build 'set-openssl-prefix
   (lambda* (#:key inputs #:allow-other-keys)
     (setenv "ATTIC_OPENSSL_PREFIX" (assoc-ref inputs "openssl"))
     #t)))

The rest LGTM, thank you.

-- 
Alex

Re: [PATCH 3/3] gnu: Add Attic.

[Leo Famulari]

On Sun, Aug 30, 2015, at 15:58, Alex Kost wrote:
> Please align modify-phases clause like this:
> 
> (modify-phases %standard-phases
>   (add-before
>    'build 'set-openssl-prefix
>    (lambda* (#:key inputs #:allow-other-keys)
>      (setenv "ATTIC_OPENSSL_PREFIX" (assoc-ref inputs "openssl"))
>      #t)))

Hopefully my forthcoming revision fixes this. I need to set up an editor
to do this for me properly... paredit in Vim is not enough.

Re: [PATCH 0/3] Add Attic backup program

[Alex Kost]

Leo Famulari (2015-08-26 20:16 +0300) wrote:

> This patchset adds the Attic backup program [1].
>
> Your comments are requested!
>
> I read the guidelines about naming Python modules based on their Python version
> compatibility [2]. They don't seem to require changing the upstream name of
> msgpack-python to python-msgpack but I noticed that it was done for
> html5lib-python. Plus, package-with-python2 won't work as is on
> 'msgpack-python', so I made the change. If the change is not desired, I can
> manually create the Python 2 module, but it's nice to have it automatically
> generated like this.
>
> I noticed that FUSE is in linux.scm. llfuse, on the other hand, supports Linux,
> OS X, FreeBSD, and NetBSD, so I put it in its own module. What about a fuse
> module?

Ah, sorry, I read this after replying to your 'llfuse' patch.  I agree
on separating fuse module, as there are several fuse-related packages
(sshfs-fuse, unionfs-fuse, fuse-exfat).

-- 
Alex

Re: [PATCH 0/3] Add Attic backup program

[Leo Famulari]

Thanks for your comments!

On Sun, Aug 30, 2015, at 16:05, Alex Kost wrote:> 
> Ah, sorry, I read this after replying to your 'llfuse' patch.  I agree
> on separating fuse module, as there are several fuse-related packages
> (sshfs-fuse, unionfs-fuse, fuse-exfat).

The reasoning behind meta-modules like python.scm, backup.scm, or a
potential fuse.scm is not clear to me — there are some Python programs
in their own modules or in other meta-modules. Ditto for prepending
"python-" to certain module names and not others.

Anyway, if there is a consensus on what to do about llfuse, I will
submit a revised patchset.

Right now it seems that the choices are either:
1) llfuse.scm (this patchset would do this)
2) put it in python.scm as python-llfuse
3) create fuse.scm and put it in there along with some other
fuse-related modules.

In the meantime, I will prepare revisions to address your other
comments.

Re: [PATCH 0/3] Add Attic backup program

[Ludovic Courtès]

Leo Famulari <leo@famulari.name> skribis:

> Right now it seems that the choices are either:
> 1) llfuse.scm (this patchset would do this)
> 2) put it in python.scm as python-llfuse
> 3) create fuse.scm and put it in there along with some other
> fuse-related modules.

For now I’d suggest #2, but after that a patch to move things in
fuse.scm would be good, IMO.

Thanks,
Ludo’.