pythonPackages.taskw: fix build
Broken by 8600798172e6a4c526d593ec8da48ce28cf0d15c in #49741.
This commit is contained in:
parent
84d133c845
commit
3fd67fbb42
@ -5,6 +5,7 @@
|
|||||||
, tox
|
, tox
|
||||||
, six
|
, six
|
||||||
, dateutil
|
, dateutil
|
||||||
|
, kitchen
|
||||||
, pytz
|
, pytz
|
||||||
, pkgs
|
, pkgs
|
||||||
}:
|
}:
|
||||||
@ -28,7 +29,7 @@ buildPythonPackage rec {
|
|||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
buildInputs = [ nose pkgs.taskwarrior tox ];
|
buildInputs = [ nose pkgs.taskwarrior tox ];
|
||||||
propagatedBuildInputs = [ six dateutil pytz ];
|
propagatedBuildInputs = [ six dateutil kitchen pytz ];
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
homepage = https://github.com/ralphbean/taskw;
|
homepage = https://github.com/ralphbean/taskw;
|
||||||
|
@ -4,45 +4,11 @@ Date: Sun Nov 16 15:19:38 2014 +0100
|
|||||||
|
|
||||||
Use a template for taskwarrior install path.
|
Use a template for taskwarrior install path.
|
||||||
|
|
||||||
diff --git a/taskw/warrior.py b/taskw/warrior.py
|
|
||||||
index 21dde88..e0509f2 100644
|
|
||||||
--- a/taskw/warrior.py
|
--- a/taskw/warrior.py
|
||||||
+++ b/taskw/warrior.py
|
+++ b/taskw/warrior.py
|
||||||
@@ -451,17 +451,17 @@ class TaskWarriorShellout(TaskWarriorBase):
|
@@ -449 +449 @@ class TaskWarriorShellout(TaskWarriorBase):
|
||||||
def _execute(self, *args):
|
|
||||||
""" Execute a given taskwarrior command with arguments
|
|
||||||
|
|
||||||
Returns a 2-tuple of stdout and stderr (respectively).
|
|
||||||
|
|
||||||
"""
|
|
||||||
command = (
|
|
||||||
[
|
|
||||||
- 'task',
|
- 'task',
|
||||||
+ '@@taskwarrior@@/bin/task',
|
+ '@@taskwarrior@@/bin/task',
|
||||||
'rc:%s' % self.config_filename,
|
@@ -553 +553 @@ class TaskWarriorShellout(TaskWarriorBase):
|
||||||
]
|
|
||||||
+ self.get_configuration_override_args()
|
|
||||||
+ [six.text_type(arg) for arg in args]
|
|
||||||
)
|
|
||||||
|
|
||||||
# subprocess is expecting bytestrings only, so nuke unicode if present
|
|
||||||
for i in range(len(command)):
|
|
||||||
@@ -525,17 +525,17 @@ class TaskWarriorShellout(TaskWarriorBase):
|
|
||||||
except OSError:
|
|
||||||
# OSError is raised if subprocess.Popen fails to find
|
|
||||||
# the executable.
|
|
||||||
return False
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def get_version(cls):
|
|
||||||
taskwarrior_version = subprocess.Popen(
|
|
||||||
- ['task', '--version'],
|
- ['task', '--version'],
|
||||||
+ ['@@taskwarrior@@/bin/task', '--version'],
|
+ ['@@taskwarrior@@/bin/task', '--version'],
|
||||||
stdout=subprocess.PIPE
|
|
||||||
).communicate()[0]
|
|
||||||
return LooseVersion(taskwarrior_version.decode())
|
|
||||||
|
|
||||||
def sync(self, init=False):
|
|
||||||
if self.get_version() < LooseVersion('2.3'):
|
|
||||||
raise UnsupportedVersionException(
|
|
||||||
"'sync' requires version 2.3 of taskwarrior or later."
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user