Merge pull request #71197 from arcnmx/pr-vit2

vit 2.0.0
This commit is contained in:
worldofpeace 2019-10-16 19:22:53 +00:00 committed by GitHub
commit b28a7579fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 64 additions and 29 deletions

View File

@ -1,40 +1,37 @@
{ stdenv, fetchFromGitHub
, makeWrapper, which
, taskwarrior, ncurses, perlPackages }:
{ lib
, python3Packages
, taskwarrior }:
stdenv.mkDerivation rec {
with python3Packages;
buildPythonApplication rec {
pname = "vit";
version = "1.3";
version = "2.0.0";
disabled = lib.versionOlder python.version "3.6";
src = fetchFromGitHub {
owner = "scottkosty";
repo = pname;
rev = "v${version}";
sha256 = "0a34rh5w8393wf7jwwr0f74rp1zv2vz606z5j8sr7w19k352ijip";
src = fetchPypi {
inherit pname version;
sha256 = "5282d8076d9814d9248071aec8784cffbd968601542533ccb28ca61d1d08205e";
};
preConfigure = ''
substituteInPlace Makefile.in \
--replace sudo ""
substituteInPlace configure \
--replace /usr/bin/perl ${perlPackages.perl}/bin/perl
substituteInPlace cmdline.pl \
--replace "view " "vim -R "
propagatedBuildInputs = [
pytz
tasklib
tzlocal
urwid
];
makeWrapperArgs = [ "--suffix" "PATH" ":" "${taskwarrior}/bin" ];
preCheck = ''
export TERM=''${TERM-linux}
'';
postInstall = ''
wrapProgram $out/bin/vit --prefix PERL5LIB : $PERL5LIB
'';
nativeBuildInputs = [ makeWrapper which ];
buildInputs = [ taskwarrior ncurses ]
++ (with perlPackages; [ perl Curses TryTiny TextCharWidth ]);
meta = with stdenv.lib; {
meta = with lib; {
homepage = https://github.com/scottkosty/vit;
description = "Visual Interactive Taskwarrior";
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ dtzWill arcnmx ];
platforms = platforms.all;
license = licenses.gpl3;
license = licenses.mit;
};
}

View File

@ -0,0 +1,36 @@
{ lib, pythonPackages, taskwarrior, writeShellScriptBin }:
with pythonPackages;
let
wsl_stub = writeShellScriptBin "wsl" "true";
in buildPythonPackage rec {
pname = "tasklib";
version = "1.2.1";
src = fetchPypi {
inherit pname version;
sha256 = "3964fb7e87f86dc5e2708addb67e69d0932534991991b6bae2e37a0c2059273f";
};
propagatedBuildInputs = [
six
pytz
tzlocal
];
checkInputs = [
taskwarrior
wsl_stub
];
meta = with lib; {
homepage = https://github.com/robgolding/tasklib;
description = "A library for interacting with taskwarrior databases";
maintainers = with maintainers; [ arcnmx ];
platforms = platforms.all;
license = licenses.bsd3;
};
}

View File

@ -5001,6 +5001,8 @@ in {
tadasets = callPackage ../development/python-modules/tadasets { };
tasklib = callPackage ../development/python-modules/tasklib { };
tempita = callPackage ../development/python-modules/tempita { };
terminado = callPackage ../development/python-modules/terminado { };