aboutsummaryrefslogtreecommitdiff
path: root/manifests/utils
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2022-02-02 13:02:03 -0300
committerSilvio Rhatto <rhatto@riseup.net>2022-02-02 13:02:03 -0300
commitb73974e366d0fb88b39ce67ae157c3a93a753665 (patch)
tree512a12a8bb404a4e9a3ae3c2c07325e7837956c2 /manifests/utils
parent1f355d2d2b824a6b3bad00b9790c8230127bb6c9 (diff)
downloadpuppet-nodo-b73974e366d0fb88b39ce67ae157c3a93a753665.tar.gz
puppet-nodo-b73974e366d0fb88b39ce67ae157c3a93a753665.tar.bz2
Fix: update package list
Diffstat (limited to 'manifests/utils')
-rw-r--r--manifests/utils/android.pp7
-rw-r--r--manifests/utils/development/debian.pp2
-rw-r--r--manifests/utils/development/git.pp2
-rw-r--r--manifests/utils/development/python.pp14
-rw-r--r--manifests/utils/development/toolchain.pp2
-rw-r--r--manifests/utils/development/virtual.pp2
-rw-r--r--manifests/utils/multimedia/minimal.pp10
-rw-r--r--manifests/utils/office.pp2
-rw-r--r--manifests/utils/office/console.pp2
-rw-r--r--manifests/utils/security.pp2
-rw-r--r--manifests/utils/security/tails.pp2
-rw-r--r--manifests/utils/web/console.pp9
12 files changed, 33 insertions, 23 deletions
diff --git a/manifests/utils/android.pp b/manifests/utils/android.pp
index ea0fd99..fcd85ad 100644
--- a/manifests/utils/android.pp
+++ b/manifests/utils/android.pp
@@ -8,13 +8,10 @@ class nodo::utils::android (
ensure => $ensure,
}
- # Not available on stretch
+ # Not in use
package { [
'android-tools-fsutils',
]:
- ensure => $::lsbdistcodename ? {
- 'stretch' => absent,
- default => present,
- },
+ ensure => absent,
}
}
diff --git a/manifests/utils/development/debian.pp b/manifests/utils/development/debian.pp
index 7a54c82..05d16b8 100644
--- a/manifests/utils/development/debian.pp
+++ b/manifests/utils/development/debian.pp
@@ -3,7 +3,7 @@ class nodo::utils::development::debian (
) {
package { [
'debhelper',
- 'python-stdeb',
+ 'python3-stdeb',
'fakeroot',
'dupload',
'autotools-dev',
diff --git a/manifests/utils/development/git.pp b/manifests/utils/development/git.pp
index 06f4686..d1c0179 100644
--- a/manifests/utils/development/git.pp
+++ b/manifests/utils/development/git.pp
@@ -6,7 +6,7 @@ class nodo::utils::development::git (
'git-extras',
'git-flow',
'git-email',
- 'python-gitlab',
+ 'python3-gitlab',
#'legit',
#'topgit',
#'git-remote-gcrypt',
diff --git a/manifests/utils/development/python.pp b/manifests/utils/development/python.pp
index ab999b2..2679d55 100644
--- a/manifests/utils/development/python.pp
+++ b/manifests/utils/development/python.pp
@@ -2,13 +2,13 @@ class nodo::utils::development::python (
$ensure = 'installed',
) {
package { [
- 'python-setuptools',
- 'python-virtualenv',
- 'python-yaml',
- 'python-cheetah',
- 'python-unidecode',
- 'python-shortuuid',
- 'python-pycurl',
+ 'python3-setuptools',
+ 'python3-virtualenv',
+ 'python3-yaml',
+ 'python3-cheetah',
+ 'python3-unidecode',
+ 'python3-shortuuid',
+ 'python3-pycurl',
#'python-bs4',
#'python-scrapy',
#'python3-pgpy',
diff --git a/manifests/utils/development/toolchain.pp b/manifests/utils/development/toolchain.pp
index 5678d4e..25f2269 100644
--- a/manifests/utils/development/toolchain.pp
+++ b/manifests/utils/development/toolchain.pp
@@ -2,7 +2,6 @@ class nodo::utils::development::toolchain (
$ensure = 'installed',
) {
package { [
- 'emdebian-archive-keyring',
'qemu-user-static',
'multistrap',
'fakechroot',
@@ -15,6 +14,7 @@ class nodo::utils::development::toolchain (
'xapt',
'pdebuild-cross',
'scratchbox2',
+ 'emdebian-archive-keyring',
]:
ensure => absent,
}
diff --git a/manifests/utils/development/virtual.pp b/manifests/utils/development/virtual.pp
index 59f3984..fb3c3d5 100644
--- a/manifests/utils/development/virtual.pp
+++ b/manifests/utils/development/virtual.pp
@@ -13,7 +13,7 @@ class nodo::utils::development::virtual inherits nodo::utils::virtual {
'mbr',
# Needed by https://github.com/hartwork/image-bootstrap
- 'python-colorama',
+ 'python3-colorama',
]:
ensure => present,
}
diff --git a/manifests/utils/multimedia/minimal.pp b/manifests/utils/multimedia/minimal.pp
index 144493b..c81530b 100644
--- a/manifests/utils/multimedia/minimal.pp
+++ b/manifests/utils/multimedia/minimal.pp
@@ -5,11 +5,17 @@ class nodo::utils::multimedia::minimal (
'alsa-utils',
'mpg123',
'mediainfo',
- 'mplayer2',
'mpv',
- 'mps-youtube',
'ffmpegthumbnailer',
]:
ensure => $ensure,
}
+
+ # Not in use
+ package { [
+ 'mplayer2',
+ 'mps-youtube',
+ ]:
+ ensure => absent,
+ }
}
diff --git a/manifests/utils/office.pp b/manifests/utils/office.pp
index 5998db8..28bbc65 100644
--- a/manifests/utils/office.pp
+++ b/manifests/utils/office.pp
@@ -4,7 +4,7 @@ class nodo::utils::office (
package { [
'taskwarrior',
'timewarrior',
- 'python-powerline-taskwarrior',
+ 'python3-powerline-taskwarrior',
]:
ensure => present,
}
diff --git a/manifests/utils/office/console.pp b/manifests/utils/office/console.pp
index c21ed86..a83f85d 100644
--- a/manifests/utils/office/console.pp
+++ b/manifests/utils/office/console.pp
@@ -11,8 +11,8 @@ class nodo::utils::office::console (
'pandoc-citeproc',
'pdfgrep',
'poppler-utils',
- 'python-pdfminer',
'mat',
+ 'python3-pdfminer',
#'worklog',
#'lolcat',
]:
diff --git a/manifests/utils/security.pp b/manifests/utils/security.pp
index 9a3c0ca..e23f288 100644
--- a/manifests/utils/security.pp
+++ b/manifests/utils/security.pp
@@ -3,7 +3,6 @@ class nodo::utils::security inherits nodo::utils::security::base {
package { [
'libnss3-tools',
'ssss',
- 'onetime',
'gnupg2',
'gnutls-bin',
'gnupg-agent',
@@ -30,6 +29,7 @@ class nodo::utils::security inherits nodo::utils::security::base {
'harden',
'paperkey',
'gnome-keysign',
+ 'onetime',
]:
ensure => absent,
}
diff --git a/manifests/utils/security/tails.pp b/manifests/utils/security/tails.pp
index 8cafd4a..e030396 100644
--- a/manifests/utils/security/tails.pp
+++ b/manifests/utils/security/tails.pp
@@ -4,6 +4,6 @@ class nodo::utils::security::tails (
package { [
'tails-installer',
]:
- ensure => $ensure,
+ ensure => absent,
}
}
diff --git a/manifests/utils/web/console.pp b/manifests/utils/web/console.pp
index 07d1473..d0a5877 100644
--- a/manifests/utils/web/console.pp
+++ b/manifests/utils/web/console.pp
@@ -6,8 +6,15 @@ class nodo::utils::web::console (
'elinks',
'surfraw',
'w3m',
- 'newsbeuter',
+ 'newsboat',
]:
ensure => $ensure,
}
+
+ # Not in use
+ package { [
+ 'newsbeuter',
+ ]:
+ ensure => absent,
+ }
}