Subject: Re: [bug#44197] [PATCH] gnu: khal: Update to 0.10.2.

From: Leo Famulari <[email-masked]>
Date: Sun, 25 Oct 2020 14:14:29 -0400

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?