aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifests/utils/development/ide.pp2
-rw-r--r--manifests/utils/office.pp10
2 files changed, 10 insertions, 2 deletions
diff --git a/manifests/utils/development/ide.pp b/manifests/utils/development/ide.pp
index ba040b5..9d60383 100644
--- a/manifests/utils/development/ide.pp
+++ b/manifests/utils/development/ide.pp
@@ -17,7 +17,7 @@ class nodo::utils::development::ide {
}
# Jessie onwards
- package { [ 'ttyrec', 'taskwarrior', 'bugs-everywhere', 'silversearcher-ag', 'vit' ]:
+ package { [ 'ttyrec', 'bugs-everywhere', 'silversearcher-ag', 'vit' ]:
ensure => $::lsbdistcodename ? {
'wheezy' => absent,
default => present,
diff --git a/manifests/utils/office.pp b/manifests/utils/office.pp
index 1ef8712..47e92a9 100644
--- a/manifests/utils/office.pp
+++ b/manifests/utils/office.pp
@@ -6,11 +6,19 @@ class nodo::utils::office {
'gnucash', 'worklog', 'pdftk',
'calibre', 'fbreader', 'gobby-0.5',
'mat', 'evince', 'jekyll',
- 'task', 'aewan', 'autocutsel',
+ 'aewan', 'autocutsel',
'parcellite' ]:
ensure => installed,
}
+ package { 'taskwarrior':
+ ensure => present,
+ name => $::lsbdistcodename ? {
+ 'wheezy' => 'task',
+ default => 'taskwarrior',
+ },
+ }
+
# Finance
package { [ 'ledger', 'clipf', 'misery' ]:
ensure => present,