Merge taskwarrior package definition

diff --git a/manifests/utils/development/ide.pp b/manifests/utils/development/ide.pp
index ba040b565c236edcc2b624f0a7a5d2f2dabbcca2..9d60383e68be29fa5eda627fb20e9272f6fd2d1f 100644 (file)
--- 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 1ef871201846740ddbb10ccdd46e2d8ccab34140..47e92a9182147c637a09139440c445841d4d98e9 100644 (file)
--- 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,