From mboxrd@z Thu Jan 1 00:00:00 1970 From: Efraim Flashner Subject: Re: [PATCH 17/17] gnu: Add khal. Date: Wed, 6 Jan 2016 21:23:54 +0200 Message-ID: <20160106212354.3e3d459a@debian-netbook> References: Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; boundary="Sig_/va=FHPjuM3K=qvWSzfbP6cz"; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:59908) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aGtgf-00083O-Tm for guix-devel@gnu.org; Wed, 06 Jan 2016 14:24:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aGtgc-0000qQ-Lx for guix-devel@gnu.org; Wed, 06 Jan 2016 14:24:01 -0500 Received: from flashner.co.il ([178.62.234.194]:33880) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aGtgc-0000pO-B3 for guix-devel@gnu.org; Wed, 06 Jan 2016 14:23:58 -0500 In-Reply-To: List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: Leo Famulari Cc: guix-devel@gnu.org --Sig_/va=FHPjuM3K=qvWSzfbP6cz Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On Sun, 3 Jan 2016 19:05:15 -0500 Leo Famulari wrote: > * gnu/packages/calendar.scm (khal): New variable. > --- > gnu/packages/calendar.scm | 79 +++++++++++++++++++++++++++++++++++++++++= +++++- > 1 file changed, 78 insertions(+), 1 deletion(-) >=20 > diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm > index 7e87fbb..d8f9627 100644 > --- a/gnu/packages/calendar.scm > +++ b/gnu/packages/calendar.scm > @@ -1,5 +1,6 @@ > ;;; GNU Guix --- Functional package management for GNU > ;;; Copyright =C2=A9 2015 David Thompson > +;;; Copyright =C2=A9 2015 Leo Famulari > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -22,8 +23,14 @@ > #:use-module (guix packages) > #:use-module (guix download) > #:use-module (guix build-system cmake) > + #:use-module (guix build-system python) > + #:use-module (gnu packages base) > + #:use-module (gnu packages databases) > + #:use-module (gnu packages dav) > + #:use-module (gnu packages freedesktop) > #:use-module (gnu packages icu4c) > - #:use-module (gnu packages perl)) > + #:use-module (gnu packages perl) > + #:use-module (gnu packages python)) > =20 > (define-public libical > (package > @@ -50,3 +57,73 @@ > "Libical is an implementation of the iCalendar protocols and protoc= ol > data units.") > (license lgpl2.1))) > + > +(define-public khal > + (package > + (name "khal") > + (version "0.7.0") > + (source (origin > + (method url-fetch) > + (uri (pypi-uri "khal" version)) > + (sha256 > + (base32 > + "00llxj7cv31mjsx0j6zxmyi9s1q20yvfkn025xcy8cv1ylfwic66")))) > + (build-system python-build-system) > + (arguments > + `(#:phases (modify-phases %standard-phases > + ;; Patch sent upstream: https://github.com/geier/khal/pull/307 > + (add-after > + 'unpack 'patch-broken-path move these to the previous line for consistancy > + (lambda _ > + (substitute* "doc/source/Makefile" > + (("../../../khal/khal/settings/khal.spec") > + "../../khal/settings/khal.spec" )))) > + ;; Bug reported: https://github.com/geier/khal/issues/309 > + (add-after 'unpack 'disable-test > + (lambda _ > + (substitute* "tests/khalendar_test.py" > + (("test_only_update_old_event") > + "disabled_only_update_old_event")))) > + ;; Building the manpage requires khal to be installed. > + (add-after 'install 'manpage > + (lambda* (#:key outputs #:allow-other-keys) > + (setenv "PYTHONPATH" > + (string-append > + (getenv "PYTHONPATH") > + ":" (assoc-ref outputs "out"))) stylistic change, I would put the ":" on the previous line. The assoc-ref also if it all fits within 80 characters. > + (zero? (system* "make" "--directory=3Ddoc/" "man")) > + (install-file > + "doc/build/man/khal.1" > + (string-append > + (assoc-ref outputs "out") > + "/share/man/man1")))) would these 3 lines fit on one line? > + (replace 'check > + (lambda* (#:key inputs #:allow-other-keys) > + ;; The tests require us to choose a timezone. > + (setenv "TZ" > + (string-append (assoc-ref inputs "tzdata") > + "/share/zoneinfo/Zulu")) > + (zero? (system* "py.test" "tests"))))))) > + (native-inputs > + `(("python-pytest" ,python-pytest) > + ("python-setuptools-scm" ,python-setuptools-scm) > + ;; Required for tests > + ("tzdata" ,tzdata) > + ;; Required to build manpage > + ("python-sphinxcontrib-newsfeed" ,python-sphinxcontrib-newsfeed) > + ("python-sphinx" ,python-sphinx))) > + (inputs > + `(("sqlite" ,sqlite))) > + (propagated-inputs > + `(("python-configobj" ,python-configobj) > + ("python-dateutil-2" ,python-dateutil-2) > + ("python-icalendar" ,python-icalendar) > + ("python-tzlocal" ,python-tzlocal) > + ("python-urwid" ,python-urwid) > + ("python-pyxdg" ,python-pyxdg) > + ("vdirsyncer" ,vdirsyncer))) > + (synopsis "CLI and TUI calendar program") > + (description "Khal is a standards based CLI and TUI calendar program= , able > +to synchronize with CalDAV servers through vdirsyncer.") > + (home-page "http://lostpackets.de/khal/") > + (license expat))) --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --Sig_/va=FHPjuM3K=qvWSzfbP6cz Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCgAGBQJWjWnKAAoJEPTB05F+rO6TCXoP/1AUopi4JwGhWw20XpYe/BQh PtGgJc1WKlNvv1N69TrjgYecCC6uFZsUpF5aCEhBCBgHZr8DXmu2St/e5bp0VF4w YiFcK9O9AOHdNfnfJLZQU23rVcLHVz0tBZ/oYScT+3g0fZ+y5YwWmy3bPfWTgs27 3JI6EckC1T1pYPdkNOpwEJ7ZxhF7QlSQS/Vi3e7RPUGA3UAQanJefYn8/hXJ2HBj IJDoE534EG0m6UcLHh0mwHgXisfHPL/8TEC7fuhSR4++9IoCLKBmwx8ivrmSxdXK AMbGgxhLQUnhB5KaaXXiGMo3zz0QESwRlcTM0HZka8edSAkpXPF9NQuM1I0xxh6V xPXK6uIDCBiU/DyXQMzbZCIeo7prDCqnIOO1TaPlYe46tmCA9BUE19x4TLQVKyN7 HAuvJfUhT1/CiHB4AlPKsSHFt/FcQ0U+Vm3gel+xhF7JkSo5JNm/Zd6ZbpAST009 c597O3g/vVqE+jpgYjM92YqM5Q8UM0SDI0lOM9xSxzpbt0LXoEGjXfJ0RgKxds6M hhbm+ogqriOQkaXVf0jNmijn6bRJUut7KEBsWKhxajpPiqP0CFm2jfxjIGkTaOf2 sDDqnODojkwgzio1S7Y95Vfr0nulZOMG8nHSwHbi+055UuzuyShf3vqoFpGMz5uM 0ymO21HgcEeYEIayoFcG =je4f -----END PGP SIGNATURE----- --Sig_/va=FHPjuM3K=qvWSzfbP6cz--