From: Lars-Dominik Braun <lars@6xq.net>
To: Leo Famulari <leo@famulari.name>
Cc: 44197@debbugs.gnu.org
Subject: [bug#44197] [PATCH] gnu: khal: Update to 0.10.2.
Date: Mon, 26 Oct 2020 08:37:24 +0100 [thread overview]
Message-ID: <20201026073724.GA1390@noor.fritz.box> (raw)
In-Reply-To: <20201025181429.GC25773@jasmine.lan>
[-- Attachment #1: Type: text/plain, Size: 461 bytes --]
Hi Leo,
> Unfortunately, the second part of the patch ("hunk 2") does not apply to
> the latest Guix Git master branch:
you’re right. Looks like there is a weird space character between “;;”
and “Reported upstream”. Maybe email ate that? I’m attaching a `git
show` instead and also uploading the change to
https://github.com/PromyLOPh/guix (branch work-khal, commit
503169b39de09e3c3969bb2dc92464f054d79560).
Thanks for taking care of this,
Lars
[-- Attachment #2: khal.patch --]
[-- Type: text/x-diff, Size: 3533 bytes --]
commit 503169b39de09e3c3969bb2dc92464f054d79560
Author: Lars-Dominik Braun <lars@6xq.net>
Date: Sat Oct 24 20:17:48 2020 +0200
gnu: khal: Update to 0.10.2.
* gnu/packages/calendar.scm (khal): Update to 0.10.2.
[source]: Drop upstream patches.
[arguments]: Drop substitute* for bug fixed upstream and ignore failing
test in 'check.
[inputs]: Add missing inputs.
diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm
index 1dde978d72..dabf8bfb15 100644
--- a/gnu/packages/calendar.scm
+++ b/gnu/packages/calendar.scm
@@ -168,23 +168,13 @@ data units.")
(define-public khal
(package
(name "khal")
- (version "0.10.1")
+ (version "0.10.2")
(source (origin
- (method url-fetch)
- (uri (pypi-uri "khal" version))
- (sha256
- (base32
- "1r8bkgjwkh7i8ygvsv51h1cnax50sb183vafg66x5snxf3dgjl6l"))
- (patches
- (list
- (origin
- (method url-fetch)
- ;; This patch fixes an issue with python-urwid-2.1.0
- (uri "https://github.com/pimutils/khal/commit/2c5990c2de2015b251ba23617faa40ee11b8c22a.patch")
- (file-name "khal-compat-urwid-2.1.0.patch")
- (sha256
- (base32
- "11nd8hkjz68imwqqn0p54zmb53z2pfxmzchaviy7jc1ky5s9l663")))))))
+ (method url-fetch)
+ (uri (pypi-uri "khal" version))
+ (sha256
+ (base32
+ "11qhrga44knlnp88py9p547d4nr5kn041d2nszwa3dqw7mf22ks9"))))
(build-system python-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
@@ -198,19 +188,14 @@ data units.")
"doc/build/man/khal.1"
(string-append (assoc-ref outputs "out") "/share/man/man1"))
#t))
- (add-before 'check 'fix-tests
- (lambda _
- ;; Reported upstream: <https://github.com/pimutils/khal/issues/947>.
- (substitute* "tests/cli_test.py"
- (("Invalid value for \"\\[ICS\\]\"") "Invalid value for \\'[ICS]\\'"))
- #t))
(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"))
- (invoke "py.test" "tests"))))))
+ (lambda* (#:key inputs tests? #:allow-other-keys)
+ (if tests?
+ (begin
+ ;; The tests require us to choose a timezone.
+ (setenv "TZ" "UTC")
+ ;; The disabled test expects /dev/tty.
+ (invoke "pytest" "tests" "-k" "not test_import_from_stdin"))))))))
(native-inputs
`(("python-pytest" ,python-pytest)
("python-pytest-cov" ,python-pytest-cov)
@@ -229,6 +214,11 @@ data units.")
("python-icalendar" ,python-icalendar)
("python-tzlocal" ,python-tzlocal)
("python-urwid" ,python-urwid)
+ ("python-pytz" ,python-pytz)
+ ("python-setproctitle" ,python-setproctitle)
+ ("python-atomicwrites" ,python-atomicwrites)
+ ("python-click" ,python-click)
+ ("python-click-log" ,python-click-log)
("python-pyxdg" ,python-pyxdg)))
(synopsis "Console calendar program")
(description "Khal is a standards based console calendar program,
next prev parent reply other threads:[~2020-10-26 7:38 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-24 18:23 [bug#44197] [PATCH] gnu: khal: Update to 0.10.2 Lars-Dominik Braun
2020-10-25 18:14 ` Leo Famulari
2020-10-26 7:37 ` Lars-Dominik Braun [this message]
2020-10-26 17:39 ` bug#44197: Disable khal test suite? (was Re: [bug#44197] [PATCH] gnu: khal: Update to 0.10.2.) Leo Famulari
2020-10-27 8:14 ` [bug#44197] " Lars-Dominik Braun
2020-10-27 21:59 ` Leo Famulari
2020-10-28 7:22 ` Lars-Dominik Braun
2020-10-28 16:30 ` Leo Famulari
2020-10-29 10:10 ` Lars-Dominik Braun
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201026073724.GA1390@noor.fritz.box \
--to=lars@6xq.net \
--cc=44197@debbugs.gnu.org \
--cc=leo@famulari.name \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).