From: Leo Famulari <leo@famulari.name>
To: Lars-Dominik Braun <lars@6xq.net>
Cc: 44197@debbugs.gnu.org
Subject: [bug#44197] [PATCH] gnu: khal: Update to 0.10.2.
Date: Sun, 25 Oct 2020 14:14:29 -0400 [thread overview]
Message-ID: <20201025181429.GC25773@jasmine.lan> (raw)
In-Reply-To: <20201024182333.GA69388@noor.fritz.box>
On Sat, Oct 24, 2020 at 08:23:33PM +0200, Lars-Dominik Braun wrote:
> * 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.
Thanks!
Unfortunately, the second part of the patch ("hunk 2") does not apply to
the latest Guix Git master branch:
> @@ -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)
Can you double-check and see if there is something else in your local
copy of the Guix source code?
next prev parent reply other threads:[~2020-10-25 18:15 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 [this message]
2020-10-26 7:37 ` Lars-Dominik Braun
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=20201025181429.GC25773@jasmine.lan \
--to=leo@famulari.name \
--cc=44197@debbugs.gnu.org \
--cc=lars@6xq.net \
/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).