3
0
Fork 0
forked from mirrors/nixpkgs

khal: 0.10.1 -> 0.10.2

This commit is contained in:
Gabriel Ebner 2020-08-16 17:54:16 +02:00
parent 52b424a248
commit 539d37ec6b
2 changed files with 14 additions and 9 deletions

View file

@ -2,21 +2,14 @@
with python3.pkgs; buildPythonApplication rec {
pname = "khal";
version = "0.10.1";
version = "0.10.2";
src = fetchPypi {
inherit pname version;
sha256 = "1r8bkgjwkh7i8ygvsv51h1cnax50sb183vafg66x5snxf3dgjl6l";
sha256 = "11qhrga44knlnp88py9p547d4nr5kn041d2nszwa3dqw7mf22ks9";
};
# Include a khal.desktop file via upstream commit.
# This patch should be removed when updating to the next version, probably.
patches = [
(fetchpatch {
name = "add-khal-dot-desktop.patch";
url = "https://github.com/pimutils/khal/commit/1f93d238fec7c934dd2f8e48f54925d22130e3aa.patch";
sha256 = "06skn3van7zd93348fc6axllx71ckkc7h2zljqlvwa339vca608c";
})
./skip-broken-test.patch
];

View file

@ -1,3 +1,15 @@
diff --git a/tests/cli_test.py b/tests/cli_test.py
index 5e354a5..d8fbcd5 100644
--- a/tests/cli_test.py
+++ b/tests/cli_test.py
@@ -493,6 +493,7 @@ def test_import_invalid_choice_and_prefix(runner):
assert result.output == '09.04.-09.04. An Event\n'
+@pytest.mark.skip(reason="Mocking breaks in this testcase")
def test_import_from_stdin(runner, monkeypatch):
ics_data = 'This is some really fake icalendar data'
diff --git a/tests/ui/test_editor.py b/tests/ui/test_editor.py
index 27b7fa5..5978d72 100644
--- a/tests/ui/test_editor.py