diff options
author | Fabian Affolter <fabian@affolter-engineering.ch> | 2024-01-24 23:33:53 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-24 23:33:53 +0100 |
commit | 27faaf70d7aecd758c19c305166a9aadf424fc2e (patch) | |
tree | d758c5cc37e373db573096a54978a6a152b62b21 /pkgs | |
parent | 10c472752eb6e0626d5300d74d8b9809d63a92c5 (diff) | |
parent | 001dfac4c86599a31412c0cc318f6f91ccb2f710 (diff) |
Merge pull request #283495 from fabaff/khal-fix
khal: override urwid
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/misc/khal/default.nix | 31 |
1 files changed, 27 insertions, 4 deletions
diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index c892f046c895c..2366556a8968e 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -6,14 +6,35 @@ , python3 }: -python3.pkgs.buildPythonApplication rec { +let + py = python3.override { + packageOverrides = self: super: { + + # Doesn't work with latest urwid + urwid = super.urwid.overridePythonAttrs (oldAttrs: rec { + version = "2.1.2"; + src = fetchFromGitHub { + owner = "urwid"; + repo = "urwid"; + rev = "refs/tags/${version}"; + hash = "sha256-oPb2h/+gaqkZTXIiESjExMfBNnOzDvoMkXvkZ/+KVwo="; + }; + doCheck = false; + }); + }; + }; +in +with py.pkgs; + +buildPythonApplication rec { pname = "khal"; version = "0.11.2"; + pyproject = true; src = fetchFromGitHub { owner = "pimutils"; - repo = pname; - rev = "v${version}"; + repo = "khal"; + rev = "refs/tags/v${version}"; hash = "sha256-yI33pB/t+UISvSbLUzmsZqBxLF6r8R3j9iPNeosKcYw="; }; @@ -21,12 +42,13 @@ python3.pkgs.buildPythonApplication rec { glibcLocales installShellFiles ] ++ (with python3.pkgs; [ + setuptools setuptools-scm sphinx sphinxcontrib-newsfeed ]); - propagatedBuildInputs = with python3.pkgs;[ + propagatedBuildInputs = with py.pkgs;[ atomicwrites click click-log @@ -82,6 +104,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "CLI calendar application"; homepage = "http://lostpackets.de/khal/"; + changelog = "https://github.com/pimutils/khal/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ gebner ]; }; |