From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id YI5UOktxlF+6aQAA0tVLHw (envelope-from ) for ; Sat, 24 Oct 2020 18:24:11 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id 4CdJNktxlF+TaAAAbx9fmQ (envelope-from ) for ; Sat, 24 Oct 2020 18:24:11 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 912249401DD for ; Sat, 24 Oct 2020 18:24:11 +0000 (UTC) Received: from localhost ([::1]:56444 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kWOD3-0005R7-Kx for larch@yhetil.org; Sat, 24 Oct 2020 14:24:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45834) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kWOCw-0005Qs-NR for guix-patches@gnu.org; Sat, 24 Oct 2020 14:24:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51790) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kWOCw-00066t-DI for guix-patches@gnu.org; Sat, 24 Oct 2020 14:24:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kWOCw-0006hw-95 for guix-patches@gnu.org; Sat, 24 Oct 2020 14:24:02 -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: Sat, 24 Oct 2020 18:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 44197 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 44197@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.160356383325768 (code B ref -1); Sat, 24 Oct 2020 18:24:02 +0000 Received: (at submit) by debbugs.gnu.org; 24 Oct 2020 18:23:53 +0000 Received: from localhost ([127.0.0.1]:35103 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kWOCn-0006hX-7U for submit@debbugs.gnu.org; Sat, 24 Oct 2020 14:23:53 -0400 Received: from lists.gnu.org ([209.51.188.17]:45124) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kWOCk-0006hP-Eg for submit@debbugs.gnu.org; Sat, 24 Oct 2020 14:23:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45728) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kWOCi-0005NV-L2 for guix-patches@gnu.org; Sat, 24 Oct 2020 14:23:50 -0400 Received: from mout-p-102.mailbox.org ([2001:67c:2050::465:102]:39546) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1kWOCe-00064r-W9 for guix-patches@gnu.org; Sat, 24 Oct 2020 14:23:48 -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-102.mailbox.org (Postfix) with ESMTPS id 4CJTxk4H3MzQlVQ for ; Sat, 24 Oct 2020 20:23:38 +0200 (CEST) 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=1603563816; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4YNJr7ZJofKWUt+jGFyxv4GDvn/dlX8UQGT2eKG7O9Y=; b=X5Psb7gapR4rPwH12EnDL0909V00PlLKAnqRc3xouf7r51fcs1jEAfF3HBUSBMyhY7xX+J mRyuI70Qu3CHhzU/fc0emHIeM41UHJSXS4M/0sei2zF9Le6gIk+hd5utSOwfLhmU/8K8EZ eOuf+GtxGEWBJstKIRgOpVNfy7HtD1fIoQGKl8oXAfaRLXReYuh7e1zdnXdCzDoVzaaTD7 13HByNVbrdLwrnmlJcrx0eX7wZ36qhTXSfAUdCsxJ7SS3QyuXS4x7CKSgE34Guw26eiDph R5LDqs6a4a06YokVF253MjmGNgmCZyWKj8LkUK+cJkMo74U8aJ5xpv9A6G8n2A== 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 Etf4s9cifzgy for ; Sat, 24 Oct 2020 20:23:34 +0200 (CEST) Date: Sat, 24 Oct 2020 20:23:33 +0200 From: Lars-Dominik Braun Message-ID: <20201024182333.GA69388@noor.fritz.box> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit X-MBO-SPAM-Probability: X-Rspamd-Score: -6.81 / 15.00 / 15.00 X-Rspamd-Queue-Id: 48A46170D X-Rspamd-UID: 7ef7e5 Received-SPF: pass client-ip=2001:67c:2050::465:102; envelope-from=lars@6xq.net; helo=mout-p-102.mailbox.org X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.6 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -2.6 (--) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=6xq.net header.s=MBO0001 header.b=X5Psb7ga; dmarc=fail reason="SPF not aligned (relaxed)" header.from=6xq.net (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 0.09 X-TUID: KbpCBzVJogHa * 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. --- gnu/packages/calendar.scm | 46 +++++++++++++++------------------------ 1 file changed, 18 insertions(+), 28 deletions(-) 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, -- 2.26.2