From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 4Pd1G7LAlV+5FwAA0tVLHw (envelope-from ) for ; Sun, 25 Oct 2020 18:15:14 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id uB9DF7LAlV8VNQAAB5/wlQ (envelope-from ) for ; Sun, 25 Oct 2020 18:15:14 +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 CDE6894043B for ; Sun, 25 Oct 2020 18:15:13 +0000 (UTC) Received: from localhost ([::1]:49756 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kWkXw-0008Kn-RG for larch@yhetil.org; Sun, 25 Oct 2020 14:15:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48434) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kWkXn-0008Kg-7H for guix-patches@gnu.org; Sun, 25 Oct 2020 14:15:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54305) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kWkXl-0005g4-Vf for guix-patches@gnu.org; Sun, 25 Oct 2020 14:15:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kWkXl-0002li-RN for guix-patches@gnu.org; Sun, 25 Oct 2020 14:15:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#44197] [PATCH] gnu: khal: Update to 0.10.2. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 25 Oct 2020 18:15: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: Lars-Dominik Braun Cc: 44197@debbugs.gnu.org Received: via spool by 44197-submit@debbugs.gnu.org id=B44197.160364967810597 (code B ref 44197); Sun, 25 Oct 2020 18:15:01 +0000 Received: (at 44197) by debbugs.gnu.org; 25 Oct 2020 18:14:38 +0000 Received: from localhost ([127.0.0.1]:37618 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kWkXN-0002kq-Mk for submit@debbugs.gnu.org; Sun, 25 Oct 2020 14:14:37 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:41513) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kWkXM-0002kd-8z for 44197@debbugs.gnu.org; Sun, 25 Oct 2020 14:14:36 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 3A7955C0095; Sun, 25 Oct 2020 14:14:31 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Sun, 25 Oct 2020 14:14:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-transfer-encoding:in-reply-to; s=mesmtp; bh=8Dvv9T8oiWrTY/OHwstOZkNKdUNYZPaUW2gHD3b37w8=; b=Y5h1d/wcQZIj Ibc0kWgHMpsECmrNG6eZyqMe9B3P6XnK1/O5QGLQAOGguHPI65o2drvBIS8W96dL 9E4VLy/8hcicCC1MnJOkOlRVA9vJuAtSoGQk0fElvw5VssG31O/HbP9mVesv4XpH tCKx7+peMxn+bVGwA2PzdMJARQ6xa48= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; bh=8Dvv9T8oiWrTY/OHwstOZkNKdUNYZPaUW2gHD3b37 w8=; b=OuKZkNvVZl8MwR1wQe1vMbcnBlhePJX5IIy0dVJ8VZj+Sp91udLu5xUBj ix9pTn67jIxV7MNpU/J2iUXYcbOL8jfW9xlOH9YqK9FLYYEQYP6gQH8MXw2gC6oI Cs/inhbAcP4N2Vp4ctkUvcmpBwm535CB8ErPsFg1hKaVtchBrkgTNHcwgwzuvbni W96NKpH1MR52CX+rtGAML0pd169WvsCbndYgpyMqfq/4dkDn3PrWJOVsVRkatYJx Bgefwdhkb9tsSVR1FnQ0w8VbT1I6C+V6EB0XUGc5ORr4ST9teRc3MUOI1e7YzCm/ o38ELKxuJVzB66cYhUSH3y7PbM62Q== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrkeeggdduudduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtugfgjgesthekredttddtudenucfhrhhomhepnfgvohcu hfgrmhhulhgrrhhiuceolhgvohesfhgrmhhulhgrrhhirdhnrghmvgeqnecuggftrfgrth htvghrnhepveevgfdvjeffudffleeuueegtedvvdfgteejffefteffteffudeugeekgfdt tddvnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucfkphepjeefrddugedurdduvd ejrddugeeinecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhho mheplhgvohesfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Received: from localhost (c-73-141-127-146.hsd1.pa.comcast.net [73.141.127.146]) by mail.messagingengine.com (Postfix) with ESMTPA id B644A3280059; Sun, 25 Oct 2020 14:14:30 -0400 (EDT) Date: Sun, 25 Oct 2020 14:14:29 -0400 From: Leo Famulari Message-ID: <20201025181429.GC25773@jasmine.lan> References: <20201024182333.GA69388@noor.fritz.box> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20201024182333.GA69388@noor.fritz.box> X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.7 (-) 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=famulari.name header.s=mesmtp header.b=Y5h1d/wc; dkim=fail (rsa verify failed) header.d=messagingengine.com header.s=fm1 header.b=OuKZkNvV; dmarc=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.01 X-TUID: gKcLX9F3AxqE 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: . > - (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?