From ad91dca85111252273fef1b34316571c5644f987 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 25 Mar 2019 19:14:30 -0500 Subject: [PATCH 1/4] khal: 0.9.10 -> 0.10.0 https://github.com/pimutils/khal/releases/tag/v0.10.0 * new dep, click-log * enable tests (pass!) Release notes mention 'only dateutil < 2.7 is supported', which may be a problem as ours is currently 2.8. There's a history of python-dateutil version particularity in previous releases (such as 0.9.10 upgrading from), unsure if should override to older or if it's just a suggestion. --- pkgs/applications/misc/khal/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index da0c8c38e73..52edb44efe9 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -2,18 +2,19 @@ with python3.pkgs; buildPythonApplication rec { pname = "khal"; - version = "0.9.10"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "03h0j0d3xyqh98x5v2gv63wv3g91hip3vsaxvybsn5iz331d23h4"; + sha256 = "1p49f3g25x900vk32spjbr2aipj12kcbhayny2vwhdpkjlv6k396"; }; - LC_ALL = "en_US.UTF-8"; + LC_ALL = "C.UTF-8"; propagatedBuildInputs = [ atomicwrites click + click-log configobj dateutil icalendar @@ -27,15 +28,14 @@ with python3.pkgs; buildPythonApplication rec { pkginfo freezegun ]; - nativeBuildInputs = [ setuptools_scm pkgs.glibcLocales ]; + nativeBuildInputs = [ setuptools_scm ]; checkInputs = [ pytest ]; postInstall = '' install -D misc/__khal $out/share/zsh/site-functions/__khal ''; - # One test fails as of 0.9.10 due to the upgrade to icalendar 4.0.3 - doCheck = false; + doCheck = true; checkPhase = '' py.test From c8fa1272c6864e30ef5195156a26941aabc69e21 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 25 Mar 2019 23:17:14 -0500 Subject: [PATCH 2/4] khal: no need to set LC_ALL, python build bits do this. --- pkgs/applications/misc/khal/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index 52edb44efe9..d44793326c2 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -9,8 +9,6 @@ with python3.pkgs; buildPythonApplication rec { sha256 = "1p49f3g25x900vk32spjbr2aipj12kcbhayny2vwhdpkjlv6k396"; }; - LC_ALL = "C.UTF-8"; - propagatedBuildInputs = [ atomicwrites click From 4f62e1bb0c1cf4c4c8372b2aede674ab7471e8b2 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 30 Mar 2019 12:58:32 -0500 Subject: [PATCH 3/4] khal: 0.10.0 -> 0.10.1 --- pkgs/applications/misc/khal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index d44793326c2..bffea916824 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -2,11 +2,11 @@ with python3.pkgs; buildPythonApplication rec { pname = "khal"; - version = "0.10.0"; + version = "0.10.1"; src = fetchPypi { inherit pname version; - sha256 = "1p49f3g25x900vk32spjbr2aipj12kcbhayny2vwhdpkjlv6k396"; + sha256 = "1r8bkgjwkh7i8ygvsv51h1cnax50sb183vafg66x5snxf3dgjl6l"; }; propagatedBuildInputs = [ From d4f172c87f7c84f8d321c9b040f3ddf70ff1563d Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 31 Mar 2019 12:08:46 -0500 Subject: [PATCH 4/4] khal: disable tests on aarch64 --- pkgs/applications/misc/khal/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index bffea916824..2e32bbd611a 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -33,7 +33,7 @@ with python3.pkgs; buildPythonApplication rec { install -D misc/__khal $out/share/zsh/site-functions/__khal ''; - doCheck = true; + doCheck = !stdenv.isAarch64; checkPhase = '' py.test