diff options
author | Vladimír Čunát <v@cunat.cz> | 2019-08-24 08:19:05 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2019-08-24 08:55:37 +0200 |
commit | 2e6bf42a2207d5ecfe6e67de2def6e004a0eb1f1 (patch) | |
tree | 36de0660dc2c9f3731bd8b60ec852ca0c452efce /pkgs/applications/misc/khal/default.nix | |
parent | 84a91208a948be5eca97ea182c4256d9d6ecf171 (diff) | |
parent | 8943fb5f24b9e1aa1d577be4e214d166643269fd (diff) | |
download | nixpkgs-2e6bf42a2207d5ecfe6e67de2def6e004a0eb1f1.tar nixpkgs-2e6bf42a2207d5ecfe6e67de2def6e004a0eb1f1.tar.gz nixpkgs-2e6bf42a2207d5ecfe6e67de2def6e004a0eb1f1.tar.bz2 nixpkgs-2e6bf42a2207d5ecfe6e67de2def6e004a0eb1f1.tar.lz nixpkgs-2e6bf42a2207d5ecfe6e67de2def6e004a0eb1f1.tar.xz nixpkgs-2e6bf42a2207d5ecfe6e67de2def6e004a0eb1f1.tar.zst nixpkgs-2e6bf42a2207d5ecfe6e67de2def6e004a0eb1f1.zip |
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to name -> pname+version. Fortunately, almost everything was auto-resolved by kdiff3, and for now I just fixed up a couple evaluation problems, as verified by the tarball job. There might be some fallback to these conflicts, but I believe it should be minimal. Hydra nixpkgs: ?compare=1538299
Diffstat (limited to 'pkgs/applications/misc/khal/default.nix')
-rw-r--r-- | pkgs/applications/misc/khal/default.nix | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index 2e32bbd611a..6aa94b2fecb 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, python3 }: +{ stdenv, pkgs, python3, fetchpatch }: with python3.pkgs; buildPythonApplication rec { pname = "khal"; @@ -9,6 +9,14 @@ with python3.pkgs; buildPythonApplication rec { sha256 = "1r8bkgjwkh7i8ygvsv51h1cnax50sb183vafg66x5snxf3dgjl6l"; }; + # 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"; + }) ]; + propagatedBuildInputs = [ atomicwrites click @@ -26,11 +34,19 @@ with python3.pkgs; buildPythonApplication rec { pkginfo freezegun ]; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools_scm sphinx sphinxcontrib_newsfeed ]; checkInputs = [ pytest ]; postInstall = '' + # zsh completion install -D misc/__khal $out/share/zsh/site-functions/__khal + + # man page + make -C doc man + install -Dm755 doc/build/man/khal.1 -t $out/share/man/man1 + + # desktop + install -Dm755 misc/khal.desktop -t $out/share/applications ''; doCheck = !stdenv.isAarch64; |