diff --git a/pkgs/by-name/kh/khal/package.nix b/pkgs/by-name/kh/khal/package.nix index ffc0c69aeb52..974d71af3065 100644 --- a/pkgs/by-name/kh/khal/package.nix +++ b/pkgs/by-name/kh/khal/package.nix @@ -4,48 +4,22 @@ fetchFromGitHub, glibcLocales, installShellFiles, - python3, + python3Packages, }: -let - python = python3.override { - packageOverrides = self: super: { - # https://github.com/pimutils/khal/issues/1361 - icalendar = super.icalendar.overridePythonAttrs (old: rec { - version = "5.0.13"; - src = fetchFromGitHub { - owner = "collective"; - repo = "icalendar"; - tag = "v${version}"; - hash = "sha256-2gpWfLXR4HThw23AWxY2rY9oiK6CF3Qiad8DWHCs4Qk="; - }; - patches = [ ]; - build-system = with self; [ setuptools ]; - dependencies = with self; [ - python-dateutil - pytz - ]; - }); - }; - }; -in -python.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "khal"; - version = "0.11.3"; + version = "0.13.0"; pyproject = true; src = fetchFromGitHub { owner = "pimutils"; repo = "khal"; tag = "v${version}"; - hash = "sha256-YP2kQ/qXPDwvFvlHf+A2Ymvk49dmt5tAnTaOhrOV92M="; + hash = "sha256-pbBdScyYQMdT2NjCk2dKPkR75Zcizzco2IkXpHkgPR8="; }; - postPatch = '' - sed -i /intersphinx/d doc/source/conf.py - ''; - - build-system = with python.pkgs; [ + build-system = with python3Packages; [ setuptools setuptools-scm ]; @@ -55,8 +29,7 @@ python.pkgs.buildPythonApplication rec { installShellFiles ]; - dependencies = with python.pkgs; [ - atomicwrites + dependencies = with python3Packages; [ click click-log configobj @@ -73,7 +46,7 @@ python.pkgs.buildPythonApplication rec { urwid ]; - nativeCheckInputs = with python.pkgs; [ + nativeCheckInputs = with python3Packages; [ freezegun hypothesis packaging @@ -90,7 +63,7 @@ python.pkgs.buildPythonApplication rec { # man page PATH="${ - python3.withPackages ( + python3Packages.python.withPackages ( ps: with ps; [ sphinx sphinxcontrib-newsfeed @@ -120,6 +93,6 @@ python.pkgs.buildPythonApplication rec { homepage = "https://lostpackets.de/khal/"; changelog = "https://github.com/pimutils/khal/releases/tag/v${version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ antonmosich ]; }; }