Unverified Commit af9b7e6e authored by Doron Behar's avatar Doron Behar Committed by GitHub
Browse files

Merge pull request #219544 from doronbehar/pkg/taskwarrior 

taskwarrior: cleanup postInstall
parents 4e9efd34 582fb992

pkgs/applications/editors/vim/plugins/overrides.nix

+5 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
, statix

, stylish-haskell

, tabnine

, taskwarrior

, tmux

, tup

, vim
@@ -894,6 +895,10 @@ self: super: { 
      };

    });



  taskwarrior = buildVimPluginFrom2Nix {

    inherit (taskwarrior) version pname;

    src = "${taskwarrior.src}/scripts/vim";

  };

  telescope-cheat-nvim = super.telescope-cheat-nvim.overrideAttrs (old: {

    dependencies = with self; [ sqlite-lua telescope-nvim ];

  });

pkgs/applications/misc/taskwarrior/default.nix

+13 −6
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, cmake, libuuid, gnutls, python3, xdg-utils }:

{ lib, stdenv, fetchFromGitHub, cmake, libuuid, gnutls, python3, xdg-utils, installShellFiles }:



stdenv.mkDerivation rec {

  pname = "taskwarrior";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec { 
      --replace "xdg-open" "${lib.getBin xdg-utils}/bin/xdg-open"

  '';



  nativeBuildInputs = [ cmake libuuid gnutls python3 ];

  nativeBuildInputs = [ cmake libuuid gnutls python3 installShellFiles ];



  doCheck = true;

  preCheck = ''
@@ -26,10 +26,17 @@ stdenv.mkDerivation rec { 
  checkTarget = "test";



  postInstall = ''

    mkdir -p "$out/share/bash-completion/completions"

    ln -s "../../doc/task/scripts/bash/task.sh" "$out/share/bash-completion/completions/task.bash"

    mkdir -p "$out/share/fish/vendor_completions.d"

    ln -s "../../../share/doc/task/scripts/fish/task.fish" "$out/share/fish/vendor_completions.d/"

    # ZSH is installed automatically from some reason, only bash and fish need

    # manual installation

    installShellCompletion --cmd task \

      --bash $out/share/doc/task/scripts/bash/task.sh \

      --fish $out/share/doc/task/scripts/fish/task.fish

    rm -r $out/share/doc/task/scripts/bash

    rm -r $out/share/doc/task/scripts/fish

    # Install vim and neovim plugin

    mkdir -p $out/share/vim-plugins $out/share/nvim/site

    mv $out/share/doc/task/scripts/vim $out/share/vim-plugins/task

    ln -s $out/share/vim-plugins/task $out/share/nvim/site/task

  '';



  meta = with lib; {