Re: [PATCH 5/5] gnu: Add khard.
On Sun, Mar 13, 2016 at 11:32:34PM +0100, Ludovic Courtès wrote:
> Leo Famulari 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 5/5] gnu: Add khard.
Leo Famulari 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.
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 אפרים פלשנר > 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.
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 אפרים פלשנר GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted signature.asc Description: PGP signature
Re: [PATCH 5/5] gnu: Add khard.
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
>
>
[PATCH 5/5] gnu: Add khard.
* 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
