[PATCH 0/5] Add Khard and dependencies

[PATCH 0/5] Add Khard and dependencies

[Leo Famulari]

These patches add the command-line address book Khard and its
dependencies.

I use it as described here: <https://github.com/scheibler/khard/#mutt>.

I also took the opportunity to update python2-pyicu and create both
Python variants. The warnings in the old python2-pyicu definition seem
to no longer apply.

Leo Famulari (5):
  gnu: Add python2-atomicwrites.
  gnu: python2-pyicu: Update to 1.9.2.
  gnu: Split python2-pyicu into python-pyicu and python2-pyicu.
  gnu: Add python-vobject.
  gnu: Add khard.

 gnu/packages/mail.scm   | 47 +++++++++++++++++++++++++++++++++++---
 gnu/packages/python.scm | 60 ++++++++++++++++++++++++++++++++++++++++---------
 2 files changed, 94 insertions(+), 13 deletions(-)

-- 
2.6.3

[PATCH 1/5] gnu: Add python2-atomicwrites.

[Leo Famulari]

* gnu/packages/python.scm (python2-atomicwrites): New variable.
---
 gnu/packages/python.scm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 131ec62..1a2c88a 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -6756,7 +6756,14 @@ WebSocket usage in Python programs.")
     (description "Library for atomic file writes using platform dependent tools
 for atomic filesystem operations.")
     (home-page "https://github.com/untitaker/python-atomicwrites")
-    (license license:expat)))
+    (license license:expat)
+    (properties `((python2-variant . ,(delay python2-atomicwrites))))))
+
+(define-public python2-atomicwrites
+  (package (inherit (package-with-python2
+                     (strip-python2-variant python-atomicwrites)))
+    (native-inputs
+     `(("python2-setuptools" ,python2-setuptools)))))
 
 (define-public python-requests-toolbelt
   (package
-- 
2.6.3

Re: [PATCH 1/5] gnu: Add python2-atomicwrites.

[Ludovic Courtès]

Leo Famulari <leo@famulari.name> skribis:

> * gnu/packages/python.scm (python2-atomicwrites): New variable.

Sure!  And sorry for the delay!

Ludo'.

[PATCH 2/5] gnu: python2-pyicu: Update to 1.9.2.

[Leo Famulari]

* gnu/packages/python.scm (python2-pyicu): Update to 1.9.2.
---
 gnu/packages/python.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 1a2c88a..f168d15 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1136,7 +1136,7 @@ Python 3.3+.")
 (define-public python2-pyicu
   (package
     (name "python2-pyicu")
-    (version "1.8")
+    (version "1.9.2")
     (source
      (origin
       (method url-fetch)
@@ -1144,7 +1144,7 @@ Python 3.3+.")
                           version ".tar.gz"))
       (sha256
        (base32
-        "1y361x82lnh9k9srmdx3q92z5iag112z7r5fxm0n1sfwb349yjdw"))))
+        "1diba0g8md614fvm9yf50paiwdkhj6rd7xwf1rg9mc0pxc0hhn4v"))))
     (build-system python-build-system)
     (inputs
      `(("icu4c" ,icu4c)))
-- 
2.6.3

Re: [PATCH 2/5] gnu: python2-pyicu: Update to 1.9.2.

[Ludovic Courtès]

Leo Famulari <leo@famulari.name> skribis:

> * gnu/packages/python.scm (python2-pyicu): Update to 1.9.2.

OK!

[PATCH 3/5] gnu: Split python2-pyicu into python-pyicu and python2-pyicu.

[Leo Famulari]

* gnu/packages/python.scm (python2-pyicu): Split variable into...
(python-pyicu, python2-pyicu): ...both Python variants.
(python-pyicu)[arguments]: Enable tests.
---
 gnu/packages/python.scm | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index f168d15..b168183 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1133,9 +1133,9 @@ Python 3.3+.")
   (package-with-python2 python-simplejson))
 
 
-(define-public python2-pyicu
+(define-public python-pyicu
   (package
-    (name "python2-pyicu")
+    (name "python-pyicu")
     (version "1.9.2")
     (source
      (origin
@@ -1148,15 +1148,18 @@ Python 3.3+.")
     (build-system python-build-system)
     (inputs
      `(("icu4c" ,icu4c)))
-    (arguments
-     `(#:python ,python-2 ; Python 3 works also, but needs special care for
-                          ; linking with libpython3.3m
-       #:tests? #f)) ; no check target
     (home-page "http://pyicu.osafoundation.org/")
     (synopsis "Python extension wrapping the ICU C++ API")
     (description
      "PyICU is a python extension wrapping the ICU C++ API.")
-    (license x11)))
+    (license x11)
+    (properties `((python2-variant . ,(delay python2-pyicu))))))
+
+(define-public python2-pyicu
+  (package
+    (inherit (package-with-python2
+              (strip-python2-variant python-pyicu)))
+    (native-inputs `(("python2-setuptools" ,python2-setuptools)))))
 
 (define-public python2-dogtail
   ;; Python 2 only, as it leads to "TabError: inconsistent use of tabs and
-- 
2.6.3

Re: [PATCH 3/5] gnu: Split python2-pyicu into python-pyicu and python2-pyicu.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 2380 bytes --]

On Thu, Mar 03, 2016 at 05:11:54PM -0500, Leo Famulari wrote:
> * gnu/packages/python.scm (python2-pyicu): Split variable into...
> (python-pyicu, python2-pyicu): ...both Python variants.
> (python-pyicu)[arguments]: Enable tests.
> ---

If we had the python- variant and were adding the python2- variant then
the message would be "add python2 variant," so I'd go with something
similar. Currently reading it I thought that there was already the
python and python2 variants, and there was a bigger split going on.

>  gnu/packages/python.scm | 17 ++++++++++-------
>  1 file changed, 10 insertions(+), 7 deletions(-)
> 
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index f168d15..b168183 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -1133,9 +1133,9 @@ Python 3.3+.")
>    (package-with-python2 python-simplejson))
>  
>  
> -(define-public python2-pyicu
> +(define-public python-pyicu
>    (package
> -    (name "python2-pyicu")
> +    (name "python-pyicu")
>      (version "1.9.2")
>      (source
>       (origin
> @@ -1148,15 +1148,18 @@ Python 3.3+.")
>      (build-system python-build-system)
>      (inputs
>       `(("icu4c" ,icu4c)))
> -    (arguments
> -     `(#:python ,python-2 ; Python 3 works also, but needs special care for
> -                          ; linking with libpython3.3m

Whatever the magic that was needed, does it work?

> -       #:tests? #f)) ; no check target
>      (home-page "http://pyicu.osafoundation.org/")
>      (synopsis "Python extension wrapping the ICU C++ API")
>      (description
>       "PyICU is a python extension wrapping the ICU C++ API.")
> -    (license x11)))
> +    (license x11)
> +    (properties `((python2-variant . ,(delay python2-pyicu))))))
> +
> +(define-public python2-pyicu
> +  (package
> +    (inherit (package-with-python2
> +              (strip-python2-variant python-pyicu)))
> +    (native-inputs `(("python2-setuptools" ,python2-setuptools)))))
>  
>  (define-public python2-dogtail
>    ;; Python 2 only, as it leads to "TabError: inconsistent use of tabs and
> -- 
> 2.6.3
> 
> 

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH 3/5] gnu: Split python2-pyicu into python-pyicu and python2-pyicu.

[Leo Famulari]

On Sat, Mar 05, 2016 at 09:42:59PM +0200, Efraim Flashner wrote:
> On Thu, Mar 03, 2016 at 05:11:54PM -0500, Leo Famulari wrote:
> > * gnu/packages/python.scm (python2-pyicu): Split variable into...
> > (python-pyicu, python2-pyicu): ...both Python variants.
> > (python-pyicu)[arguments]: Enable tests.
> > ---
> 
> If we had the python- variant and were adding the python2- variant then
> the message would be "add python2 variant," so I'd go with something
> similar. Currently reading it I thought that there was already the
> python and python2 variants, and there was a bigger split going on.

I admit it's a confusing commit message; I wasn't sure how to structure
it. I've attached a variant on it.

> 
> >  gnu/packages/python.scm | 17 ++++++++++-------
> >  1 file changed, 10 insertions(+), 7 deletions(-)
> > 
> > diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> > index f168d15..b168183 100644
> > --- a/gnu/packages/python.scm
> > +++ b/gnu/packages/python.scm
> > @@ -1133,9 +1133,9 @@ Python 3.3+.")
> >    (package-with-python2 python-simplejson))
> >  
> >  
> > -(define-public python2-pyicu
> > +(define-public python-pyicu
> >    (package
> > -    (name "python2-pyicu")
> > +    (name "python-pyicu")
> >      (version "1.9.2")
> >      (source
> >       (origin
> > @@ -1148,15 +1148,18 @@ Python 3.3+.")
> >      (build-system python-build-system)
> >      (inputs
> >       `(("icu4c" ,icu4c)))
> > -    (arguments
> > -     `(#:python ,python-2 ; Python 3 works also, but needs special care for
> > -                          ; linking with libpython3.3m
> 
> Whatever the magic that was needed, does it work?

No magic ;)

I understood that message as "Python 3 could work, but we will have to
do something special to help it link with libpython3.3m".

When it built successfully and passed its test suite, I figured it was
okay.

Andreas, do you remember what this comment is describing?

> 
> > -       #:tests? #f)) ; no check target
> >      (home-page "http://pyicu.osafoundation.org/")
> >      (synopsis "Python extension wrapping the ICU C++ API")
> >      (description
> >       "PyICU is a python extension wrapping the ICU C++ API.")
> > -    (license x11)))
> > +    (license x11)
> > +    (properties `((python2-variant . ,(delay python2-pyicu))))))
> > +
> > +(define-public python2-pyicu
> > +  (package
> > +    (inherit (package-with-python2
> > +              (strip-python2-variant python-pyicu)))
> > +    (native-inputs `(("python2-setuptools" ,python2-setuptools)))))
> >  
> >  (define-public python2-dogtail
> >    ;; Python 2 only, as it leads to "TabError: inconsistent use of tabs and
> > -- 
> > 2.6.3
> > 
> > 
> 
> -- 
> Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
> GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
> Confidentiality cannot be guaranteed on emails sent or received unencrypted

Re: [PATCH 3/5] gnu: Split python2-pyicu into python-pyicu and python2-pyicu.

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 3171 bytes --]

On Sat, Mar 05, 2016 at 05:32:07PM -0500, Leo Famulari wrote:
> On Sat, Mar 05, 2016 at 09:42:59PM +0200, Efraim Flashner wrote:
> > On Thu, Mar 03, 2016 at 05:11:54PM -0500, Leo Famulari wrote:
> > > * gnu/packages/python.scm (python2-pyicu): Split variable into...
> > > (python-pyicu, python2-pyicu): ...both Python variants.
> > > (python-pyicu)[arguments]: Enable tests.
> > > ---
> > 
> > If we had the python- variant and were adding the python2- variant then
> > the message would be "add python2 variant," so I'd go with something
> > similar. Currently reading it I thought that there was already the
> > python and python2 variants, and there was a bigger split going on.
> 
> I admit it's a confusing commit message; I wasn't sure how to structure
> it. I've attached a variant on it.

Now I've attached the variant :p

> 
> > 
> > >  gnu/packages/python.scm | 17 ++++++++++-------
> > >  1 file changed, 10 insertions(+), 7 deletions(-)
> > > 
> > > diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> > > index f168d15..b168183 100644
> > > --- a/gnu/packages/python.scm
> > > +++ b/gnu/packages/python.scm
> > > @@ -1133,9 +1133,9 @@ Python 3.3+.")
> > >    (package-with-python2 python-simplejson))
> > >  
> > >  
> > > -(define-public python2-pyicu
> > > +(define-public python-pyicu
> > >    (package
> > > -    (name "python2-pyicu")
> > > +    (name "python-pyicu")
> > >      (version "1.9.2")
> > >      (source
> > >       (origin
> > > @@ -1148,15 +1148,18 @@ Python 3.3+.")
> > >      (build-system python-build-system)
> > >      (inputs
> > >       `(("icu4c" ,icu4c)))
> > > -    (arguments
> > > -     `(#:python ,python-2 ; Python 3 works also, but needs special care for
> > > -                          ; linking with libpython3.3m
> > 
> > Whatever the magic that was needed, does it work?
> 
> No magic ;)
> 
> I understood that message as "Python 3 could work, but we will have to
> do something special to help it link with libpython3.3m".
> 
> When it built successfully and passed its test suite, I figured it was
> okay.
> 
> Andreas, do you remember what this comment is describing?
> 
> > 
> > > -       #:tests? #f)) ; no check target
> > >      (home-page "http://pyicu.osafoundation.org/")
> > >      (synopsis "Python extension wrapping the ICU C++ API")
> > >      (description
> > >       "PyICU is a python extension wrapping the ICU C++ API.")
> > > -    (license x11)))
> > > +    (license x11)
> > > +    (properties `((python2-variant . ,(delay python2-pyicu))))))
> > > +
> > > +(define-public python2-pyicu
> > > +  (package
> > > +    (inherit (package-with-python2
> > > +              (strip-python2-variant python-pyicu)))
> > > +    (native-inputs `(("python2-setuptools" ,python2-setuptools)))))
> > >  
> > >  (define-public python2-dogtail
> > >    ;; Python 2 only, as it leads to "TabError: inconsistent use of tabs and
> > > -- 
> > > 2.6.3
> > > 
> > > 
> > 
> > -- 
> > Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
> > GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
> > Confidentiality cannot be guaranteed on emails sent or received unencrypted
> 
> 
> 

[-- Attachment #2: 0001-gnu-python2-pyicu-Add-python-3-variant.patch --]
[-- Type: text/x-diff, Size: 1859 bytes --]

From 423b73522fa6cdea98817a7601f7acaac4224b33 Mon Sep 17 00:00:00 2001
Message-Id: <423b73522fa6cdea98817a7601f7acaac4224b33.1457224797.git.leo@famulari.name>
From: Leo Famulari <leo@famulari.name>
Date: Thu, 3 Mar 2016 17:04:56 -0500
Subject: [PATCH 1/1] gnu: python2-pyicu: Add python-3 variant.

* gnu/packages/python.scm (python-pyicu): New variable.
(python-pyicu, python2-pyicu)[arguments]: Enable tests.
---
 gnu/packages/python.scm | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 54bcd4c..c160273 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1133,9 +1133,9 @@ Python 3.3+.")
   (package-with-python2 python-simplejson))
 
 
-(define-public python2-pyicu
+(define-public python-pyicu
   (package
-    (name "python2-pyicu")
+    (name "python-pyicu")
     (version "1.9.2")
     (source
      (origin
@@ -1148,15 +1148,18 @@ Python 3.3+.")
     (build-system python-build-system)
     (inputs
      `(("icu4c" ,icu4c)))
-    (arguments
-     `(#:python ,python-2 ; Python 3 works also, but needs special care for
-                          ; linking with libpython3.3m
-       #:tests? #f)) ; no check target
     (home-page "http://pyicu.osafoundation.org/")
     (synopsis "Python extension wrapping the ICU C++ API")
     (description
      "PyICU is a python extension wrapping the ICU C++ API.")
-    (license x11)))
+    (license x11)
+    (properties `((python2-variant . ,(delay python2-pyicu))))))
+
+(define-public python2-pyicu
+  (package
+    (inherit (package-with-python2
+              (strip-python2-variant python-pyicu)))
+    (native-inputs `(("python2-setuptools" ,python2-setuptools)))))
 
 (define-public python2-dogtail
   ;; Python 2 only, as it leads to "TabError: inconsistent use of tabs and
-- 
2.6.3

Re: [PATCH 3/5] gnu: Split python2-pyicu into python-pyicu and python2-pyicu.

[Andreas Enge]

On Sat, Mar 05, 2016 at 05:32:07PM -0500, Leo Famulari wrote:
> I understood that message as "Python 3 could work, but we will have to
> do something special to help it link with libpython3.3m".
> 
> When it built successfully and passed its test suite, I figured it was
> okay.
> 
> Andreas, do you remember what this comment is describing?

No idea. I understood the message like you :-)

Andreas

Re: [PATCH 3/5] gnu: Split python2-pyicu into python-pyicu and python2-pyicu.

[Leo Famulari]

On Sun, Mar 06, 2016 at 01:58:00PM +0100, Andreas Enge wrote:
> On Sat, Mar 05, 2016 at 05:32:07PM -0500, Leo Famulari wrote:
> > I understood that message as "Python 3 could work, but we will have to
> > do something special to help it link with libpython3.3m".
> > 
> > When it built successfully and passed its test suite, I figured it was
> > okay.
> > 
> > Andreas, do you remember what this comment is describing?
> 
> No idea. I understood the message like you :-)

So, in the past it did not build successfully? If so, I'd say it works
now.

> 
> Andreas
> 

Re: [PATCH 3/5] gnu: Split python2-pyicu into python-pyicu and python2-pyicu.

[Leo Famulari]

On Sun, Mar 06, 2016 at 01:49:17PM -0500, Leo Famulari wrote:
> On Sun, Mar 06, 2016 at 01:58:00PM +0100, Andreas Enge wrote:
> > On Sat, Mar 05, 2016 at 05:32:07PM -0500, Leo Famulari wrote:
> > > I understood that message as "Python 3 could work, but we will have to
> > > do something special to help it link with libpython3.3m".
> > > 
> > > When it built successfully and passed its test suite, I figured it was
> > > okay.
> > > 
> > > Andreas, do you remember what this comment is describing?
> > 
> > No idea. I understood the message like you :-)
> 
> So, in the past it did not build successfully? If so, I'd say it works
> now.

If there are no objections, I'd like to apply these patches in the next
day or so.

> 
> > 
> > Andreas
> > 
> 

Re: [PATCH 3/5] gnu: Split python2-pyicu into python-pyicu and python2-pyicu.

[Ludovic Courtès]

Leo Famulari <leo@famulari.name> skribis:

> * gnu/packages/python.scm (python2-pyicu): Split variable into...
> (python-pyicu, python2-pyicu): ...both Python variants.
> (python-pyicu)[arguments]: Enable tests.

OK.

Re: [PATCH 3/5] gnu: Split python2-pyicu into python-pyicu and python2-pyicu.

[Leo Famulari]

On Sun, Mar 13, 2016 at 11:28:14PM +0100, Ludovic Courtès wrote:
> Leo Famulari <leo@famulari.name> skribis:
> 
> > * gnu/packages/python.scm (python2-pyicu): Split variable into...
> > (python-pyicu, python2-pyicu): ...both Python variants.
> > (python-pyicu)[arguments]: Enable tests.
> 
> OK.

Good timing! You were sending these emails as I was writing my own!

[PATCH 4/5] gnu: Add python-vobject.

[Leo Famulari]

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

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index b168183..6d92b67 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -8203,3 +8203,33 @@ introspection of @code{zope.interface} instances in code.")
     (inherit (package-with-python2
               (strip-python2-variant python-psycopg2)))
     (native-inputs `(("python2-setuptools" ,python2-setuptools)))))
+
+(define-public python-vobject
+  (package
+    (name "python-vobject")
+    (version "0.9.1")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "vobject" version))
+              (sha256
+               (base32
+                "1cwzjnrdr9yg2x21wbf3kf59ibnchvj33mygd69yzi178a9gs9gz"))))
+    (build-system python-build-system)
+    (inputs
+     `(("python-dateutil-2" ,python-dateutil-2)
+       ("python-pyicu" ,python-pyicu)))
+    (synopsis "Parse and generate vCard and vCalendar files")
+    (description "Vobject is intended to be a full featured Python package for
+parsing and generating vCard and vCalendar files.  Currently, iCalendar files
+are supported and well tested. vCard 3.0 files are supported, and all data
+should be imported, but only a few components are understood in a sophisticated
+way.")
+    (home-page "http://eventable.github.io/vobject/")
+    (license asl2.0)
+    (properties `((python2-variant . ,(delay python2-vobject))))))
+
+(define-public python2-vobject
+  (package
+    (inherit (package-with-python2
+              (strip-python2-variant python-vobject)))
+    (native-inputs `(("python2-setuptools" ,python2-setuptools)))))
-- 
2.6.3

Re: [PATCH 4/5] gnu: Add python-vobject.

[Ludovic Courtès]

Leo Famulari <leo@famulari.name> skribis:

> * gnu/packages/python.scm (python-vobject, python2-vobject): New variables.

LGTM!

[PATCH 5/5] gnu: Add khard.

[Leo Famulari]

* gnu/packages/mail.scm (khard): New variable.
---
 gnu/packages/mail.scm | 47 ++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 44 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 013954b..a34a4de 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -71,8 +71,8 @@
   #:use-module (gnu packages xml)
   #:use-module (gnu packages xorg)
   #:use-module ((guix licenses)
-                #:select (gpl2 gpl2+ gpl3+ lgpl2.1 lgpl2.1+ lgpl3+ non-copyleft
-                          (expat . license:expat)))
+                #:select (gpl2 gpl2+ gpl3 gpl3+ lgpl2.1 lgpl2.1+ lgpl3+
+                               non-copyleft (expat . license:expat)))
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix git-download)
@@ -1150,5 +1150,46 @@ maintained.")
                       ;; nonfree Artistic License 1.0
                       ;; as alternative to the GPL2+.
                       ;; This option is not listed here.
-;;; mail.scm ends here
 
+(define-public khard
+  (package
+    (name "khard")
+    (version "0.8.1")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri name version))
+              (sha256
+               (base32
+                "098gs94qmnspdfn6ar8lycx7dbsz9bcff90aps0cmn47mw7llch0"))))
+    (build-system python-build-system)
+    (arguments
+      `(#:python ,python-2 ; only python-2 is supported.
+        #:phases
+        (modify-phases %standard-phases
+          (add-before 'build 'disable-egg-compression
+            ;; Do not compress the egg.
+            (lambda _
+              (let ((port (open-file "setup.cfg" "a")))
+                (display "\n[easy_install]\nzip_ok = 0\n"
+                         port)
+                (close-port port)
+                #t)))
+          (add-after 'install 'install-doc
+            (lambda* (#:key outputs #:allow-other-keys)
+              (let* ((out (assoc-ref outputs "out"))
+                     (doc (string-append out "/share/doc/khard")))
+                (copy-recursively "misc/khard" doc)))))))
+    (native-inputs
+     `(("python2-setuptools" ,python2-setuptools)))
+    (propagated-inputs
+     `(("python2-vobject" ,python2-vobject)
+       ("python2-pyyaml" ,python2-pyyaml)
+       ("python2-atomicwrites" ,python2-atomicwrites)
+       ("python2-configobj" ,python2-configobj)))
+    (synopsis "Console address book using CardDAV")
+    (description "Khard is an address book for the console.  It creates, reads,
+modifies and removes CardDAV address book entries at your local machine.  For
+synchronizing with a remote address book, @command{vdirsyncer} is recommended.
+Khard can also be used from within the email client @command{mutt}.")
+    (home-page "https://github.com/scheibler/khard")
+    (license gpl3))) ; "later version" never mentioned
-- 
2.6.3

Re: [PATCH 5/5] gnu: Add khard.

[Leo Famulari]

On Thu, Mar 03, 2016 at 05:11:56PM -0500, Leo Famulari wrote:
> * gnu/packages/mail.scm (khard): New variable.
> +    (description "Khard is an address book for the console.  It creates, reads,
> +modifies and removes CardDAV address book entries at your local machine.  For
> +synchronizing with a remote address book, @command{vdirsyncer} is recommended.
> +Khard can also be used from within the email client @command{mutt}.")

Is this an appropriate use of texinfo?

> +    (home-page "https://github.com/scheibler/khard")
> +    (license gpl3))) ; "later version" never mentioned
> -- 
> 2.6.3
> 
> 

Re: [PATCH 5/5] gnu: Add khard.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 1151 bytes --]

On Thu, Mar 03, 2016 at 05:11:56PM -0500, Leo Famulari wrote:
> * gnu/packages/mail.scm (khard): New variable.
> ---
>  gnu/packages/mail.scm | 47 ++++++++++++++++++++++++++++++++++++++++++++---
>  1 file changed, 44 insertions(+), 3 deletions(-)
> 
> diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
> index 013954b..a34a4de 100644
> --- a/gnu/packages/mail.scm
> +++ b/gnu/packages/mail.scm
> @@ -71,8 +71,8 @@
>    #:use-module (gnu packages xml)
>    #:use-module (gnu packages xorg)
>    #:use-module ((guix licenses)
> -                #:select (gpl2 gpl2+ gpl3+ lgpl2.1 lgpl2.1+ lgpl3+ non-copyleft
> -                          (expat . license:expat)))
> +                #:select (gpl2 gpl2+ gpl3 gpl3+ lgpl2.1 lgpl2.1+ lgpl3+
> +                               non-copyleft (expat . license:expat)))
                    ---------^
I would move this back a bit so that the indentation isn't changed.

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH 5/5] gnu: Add khard.

[Leo Famulari]

On Sat, Mar 05, 2016 at 09:42:42PM +0200, Efraim Flashner wrote:
> On Thu, Mar 03, 2016 at 05:11:56PM -0500, Leo Famulari wrote:
> > * gnu/packages/mail.scm (khard): New variable.
> > ---
> >  gnu/packages/mail.scm | 47 ++++++++++++++++++++++++++++++++++++++++++++---
> >  1 file changed, 44 insertions(+), 3 deletions(-)
> > 
> > diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
> > index 013954b..a34a4de 100644
> > --- a/gnu/packages/mail.scm
> > +++ b/gnu/packages/mail.scm
> > @@ -71,8 +71,8 @@
> >    #:use-module (gnu packages xml)
> >    #:use-module (gnu packages xorg)
> >    #:use-module ((guix licenses)
> > -                #:select (gpl2 gpl2+ gpl3+ lgpl2.1 lgpl2.1+ lgpl3+ non-copyleft
> > -                          (expat . license:expat)))
> > +                #:select (gpl2 gpl2+ gpl3 gpl3+ lgpl2.1 lgpl2.1+ lgpl3+
> > +                               non-copyleft (expat . license:expat)))
>                     ---------^
> I would move this back a bit so that the indentation isn't changed.

Done.

> 
> -- 
> Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
> GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
> Confidentiality cannot be guaranteed on emails sent or received unencrypted

Re: [PATCH 5/5] gnu: Add khard.

[Ludovic Courtès]

Leo Famulari <leo@famulari.name> skribis:

> * gnu/packages/mail.scm (khard): New variable.

[...]

> +    (home-page "https://github.com/scheibler/khard")
> +    (license gpl3))) ; "later version" never mentioned

If the source file headers or other documents do not specify a version,
then we write it as ‘gpl3+’ (in fact, Section 14 of GPLv3 says: “If the
Program does not specify a version number of the GNU General Public
License, you may choose any version ever published by the Free Software
Foundation.”)

> On Thu, Mar 03, 2016 at 05:11:56PM -0500, Leo Famulari wrote:
>> * gnu/packages/mail.scm (khard): New variable.
>> +    (description "Khard is an address book for the console.  It creates, reads,
>> +modifies and removes CardDAV address book entries at your local machine.  For
>> +synchronizing with a remote address book, @command{vdirsyncer} is recommended.
>> +Khard can also be used from within the email client @command{mutt}.")
>
> Is this an appropriate use of texinfo?

Yes.

Thanks for your work, and sorry again for the delay!

Ludo’.

Re: [PATCH 5/5] gnu: Add khard.

[Leo Famulari]

On Sun, Mar 13, 2016 at 11:32:34PM +0100, Ludovic Courtès wrote:
> Leo Famulari <leo@famulari.name> skribis:
> 
> > * gnu/packages/mail.scm (khard): New variable.
> 
> [...]
> 
> > +    (home-page "https://github.com/scheibler/khard")
> > +    (license gpl3))) ; "later version" never mentioned
> 
> If the source file headers or other documents do not specify a version,
> then we write it as ‘gpl3+’ (in fact, Section 14 of GPLv3 says: “If the
> Program does not specify a version number of the GNU General Public
> License, you may choose any version ever published by the Free Software
> Foundation.”)

Okay, thanks for clarifying this. I've made the change. In this case,
the source files have no license headers. There is only the LICENSE
file.

> 
> > On Thu, Mar 03, 2016 at 05:11:56PM -0500, Leo Famulari wrote:
> >> * gnu/packages/mail.scm (khard): New variable.
> >> +    (description "Khard is an address book for the console.  It creates, reads,
> >> +modifies and removes CardDAV address book entries at your local machine.  For
> >> +synchronizing with a remote address book, @command{vdirsyncer} is recommended.
> >> +Khard can also be used from within the email client @command{mutt}.")
> >
> > Is this an appropriate use of texinfo?
> 
> Yes.
> 
> Thanks for your work, and sorry again for the delay!
> 
> Ludo’.

Re: [PATCH 0/5] Add Khard and dependencies

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 1252 bytes --]

On Thu, Mar 03, 2016 at 05:11:51PM -0500, Leo Famulari wrote:
> These patches add the command-line address book Khard and its
> dependencies.
> 
> I use it as described here: <https://github.com/scheibler/khard/#mutt>.
> 
> I also took the opportunity to update python2-pyicu and create both
> Python variants. The warnings in the old python2-pyicu definition seem
> to no longer apply.
> 
> Leo Famulari (5):
>   gnu: Add python2-atomicwrites.
>   gnu: python2-pyicu: Update to 1.9.2.
>   gnu: Split python2-pyicu into python-pyicu and python2-pyicu.
>   gnu: Add python-vobject.
>   gnu: Add khard.
> 
>  gnu/packages/mail.scm   | 47 +++++++++++++++++++++++++++++++++++---
>  gnu/packages/python.scm | 60 ++++++++++++++++++++++++++++++++++++++++---------
>  2 files changed, 94 insertions(+), 13 deletions(-)
> 
> -- 
> 2.6.3
> 

I'm going to have to take a look at it. After reading and checking out khal
I'm working on setting up vdirsyncer so I can use it. Being able to edit
contacts also would be great!

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH 0/5] Add Khard and dependencies

[Leo Famulari]

On Sat, Mar 05, 2016 at 09:42:51PM +0200, Efraim Flashner wrote:
> On Thu, Mar 03, 2016 at 05:11:51PM -0500, Leo Famulari wrote:
> > These patches add the command-line address book Khard and its
> > dependencies.
> > 
> > I use it as described here: <https://github.com/scheibler/khard/#mutt>.
> > 
> > I also took the opportunity to update python2-pyicu and create both
> > Python variants. The warnings in the old python2-pyicu definition seem
> > to no longer apply.
> > 
> > Leo Famulari (5):
> >   gnu: Add python2-atomicwrites.
> >   gnu: python2-pyicu: Update to 1.9.2.
> >   gnu: Split python2-pyicu into python-pyicu and python2-pyicu.
> >   gnu: Add python-vobject.
> >   gnu: Add khard.
> > 
> >  gnu/packages/mail.scm   | 47 +++++++++++++++++++++++++++++++++++---
> >  gnu/packages/python.scm | 60 ++++++++++++++++++++++++++++++++++++++++---------
> >  2 files changed, 94 insertions(+), 13 deletions(-)
> > 
> > -- 
> > 2.6.3
> > 
> 
> I'm going to have to take a look at it. After reading and checking out khal
> I'm working on setting up vdirsyncer so I can use it. Being able to edit
> contacts also would be great!

It's pretty nice. Now we just need a service to run a DAV server :)


> 
> -- 
> Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
> GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
> Confidentiality cannot be guaranteed on emails sent or received unencrypted