From patchwork Mon Oct 26 07:37:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lars-Dominik Braun X-Patchwork-Id: 24816 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id AB65D27BBF1; Mon, 26 Oct 2020 07:38:11 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 13ACF27BBF2 for ; Mon, 26 Oct 2020 07:38:10 +0000 (GMT) Received: from localhost ([::1]:57258 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kWx4z-0003mu-2B for patchwork@mira.cbaines.net; Mon, 26 Oct 2020 03:38:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36328) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kWx4s-0003m1-9b for guix-patches@gnu.org; Mon, 26 Oct 2020 03:38:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54997) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kWx4s-0001gr-0X for guix-patches@gnu.org; Mon, 26 Oct 2020 03:38:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kWx4r-000879-U7 for guix-patches@gnu.org; Mon, 26 Oct 2020 03:38:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#44197] [PATCH] gnu: khal: Update to 0.10.2. Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 26 Oct 2020 07:38:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44197 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Leo Famulari Cc: 44197@debbugs.gnu.org Received: via spool by 44197-submit@debbugs.gnu.org id=B44197.160369786131158 (code B ref 44197); Mon, 26 Oct 2020 07:38:01 +0000 Received: (at 44197) by debbugs.gnu.org; 26 Oct 2020 07:37:41 +0000 Received: from localhost ([127.0.0.1]:38310 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kWx4W-00086T-RK for submit@debbugs.gnu.org; Mon, 26 Oct 2020 03:37:41 -0400 Received: from mout-p-201.mailbox.org ([80.241.56.171]:31918) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kWx4U-00086D-5S for 44197@debbugs.gnu.org; Mon, 26 Oct 2020 03:37:39 -0400 Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:105:465:1:2:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4CKRWG1smLzQjbV; Mon, 26 Oct 2020 08:37:30 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1603697848; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UvimiciJbGnlqq4KFQm7GiDBeWATeAPYfEs47ofkEgk=; b=hTnQQM6P2sizmzolY5T7zhARiKj6JrlHX3UrdFis94K3lxfOHO5P4NVAYyc60KX/lP+kWc XlgITKrTA3O3W0P04LzY1nrIBWQXLQZipXp6R7znjatRtz3OgazoXbHrOdoacLhwr/yzfA mhrBhV6EIZ/zz4MRAoGSD/TiX9p0EgcTUW7/RrAG3qPt8a4krsMtZkbKX+t894/c/xoDPB QBZpK+K7afMxD/WVioIS146u81psgffTwRFe4jJjgLIT85Sr+8SxrEGuqDx+iZBQWQMoD/ /LW8c8BzMLSO+tESpYyT5LIrUNrIrGwrEqdl0LLczKpk8qg0ULqLUfqal4wwtQ== Received: from smtp2.mailbox.org ([80.241.60.241]) by hefe.heinlein-support.de (hefe.heinlein-support.de [91.198.250.172]) (amavisd-new, port 10030) with ESMTP id vZRkNOSQVv2C; Mon, 26 Oct 2020 08:37:26 +0100 (CET) Date: Mon, 26 Oct 2020 08:37:24 +0100 From: Lars-Dominik Braun Message-ID: <20201026073724.GA1390@noor.fritz.box> References: <20201024182333.GA69388@noor.fritz.box> <20201025181429.GC25773@jasmine.lan> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20201025181429.GC25773@jasmine.lan> X-MBO-SPAM-Probability: X-Rspamd-Score: -6.27 / 15.00 / 15.00 X-Rspamd-Queue-Id: DBFCAEF7 X-Rspamd-UID: 82c215 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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 commit 503169b39de09e3c3969bb2dc92464f054d79560 Author: Lars-Dominik Braun 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: . - (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,