Unverified Commit 27faaf70 authored by Fabian Affolter's avatar Fabian Affolter Committed by GitHub
Browse files

Merge pull request #283495 from fabaff/khal-fix 

khal: override urwid
parents 10c47275 001dfac4

pkgs/applications/misc/khal/default.nix

+27 −4
Original line number Diff line number Diff line
@@ -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 ];

  };