From bf42a8fc5dd86f185a62737c63d53ce4efd14b35 Mon Sep 17 00:00:00 2001 From: John Shuping Date: Fri, 27 Oct 2017 08:18:51 -0400 Subject: [PATCH 1/5] update some pkg locations and deps --- roles/bluetooth/tasks/main.yml | 1 + roles/media/tasks/beets.yml | 7 +------ roles/media/tasks/imv.yml | 3 +-- roles/wormhole/tasks/main.yml | 9 +++++++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/roles/bluetooth/tasks/main.yml b/roles/bluetooth/tasks/main.yml index dc41d81..c91bef8 100644 --- a/roles/bluetooth/tasks/main.yml +++ b/roles/bluetooth/tasks/main.yml @@ -7,6 +7,7 @@ - bluez-utils - bluez-firmware - blueman + - rfkill notify: - restart pulse as user diff --git a/roles/media/tasks/beets.yml b/roles/media/tasks/beets.yml index e9a21ae..7d3655a 100644 --- a/roles/media/tasks/beets.yml +++ b/roles/media/tasks/beets.yml @@ -11,16 +11,11 @@ - python-gobject - python-pylast - python-requests + - python-pyacoustid - beets tags: - beets -- name: Install python-pyacoustid - aur: name=python-pyacoustid user={{ user.name }} - tags: - - aur - - beets - - name: Install mp3val aur: name=mp3val user={{ user.name }} tags: diff --git a/roles/media/tasks/imv.yml b/roles/media/tasks/imv.yml index bd7328f..d2c53c4 100644 --- a/roles/media/tasks/imv.yml +++ b/roles/media/tasks/imv.yml @@ -1,6 +1,5 @@ --- - name: Install imv - aur: name=imv user={{ user.name }} + pacman: name=imv state=present tags: - - aur - imv diff --git a/roles/wormhole/tasks/main.yml b/roles/wormhole/tasks/main.yml index 121db37..dc0e54b 100644 --- a/roles/wormhole/tasks/main.yml +++ b/roles/wormhole/tasks/main.yml @@ -1,12 +1,17 @@ --- +- name: Install magic-wormhole dependencies + pacman: name={{ item }} state=present + with_items: + - python-humanize + - python-tqdm + - name: Install magic-wormhole aur: name={{ item }} user={{ user.name }} with_items: - python-hkdf - python-spake2 - - python-humanize - - python-tqdm - python-ipaddress + - python-txtorcon - magic-wormhole tags: - aur From 9f5f6e0c899701def4d22350148753ef95bd9ade Mon Sep 17 00:00:00 2001 From: Brett Eisenberg Date: Wed, 27 Dec 2017 18:09:29 -0800 Subject: [PATCH 2/5] cleanup wormhole and thinkpad deps that migrated to community --- roles/thinkpad/tasks/main.yml | 6 ++---- roles/wormhole/tasks/main.yml | 3 --- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/roles/thinkpad/tasks/main.yml b/roles/thinkpad/tasks/main.yml index 3de9d87..3c06167 100644 --- a/roles/thinkpad/tasks/main.yml +++ b/roles/thinkpad/tasks/main.yml @@ -1,14 +1,12 @@ --- - name: Install acpi_call for TLP battery functions - aur: name=acpi_call-dkms user={{ user.name }} + pacman: name=acpi_call-dkms state=present tags: - - aur - battery - name: Install tpacpi-bat - aur: name=tpacpi-bat user={{ user.name }} + pacman: name=tpacpi-bat state=present tags: - - aur - battery - name: Install fprintd diff --git a/roles/wormhole/tasks/main.yml b/roles/wormhole/tasks/main.yml index dc0e54b..6e69805 100644 --- a/roles/wormhole/tasks/main.yml +++ b/roles/wormhole/tasks/main.yml @@ -1,9 +1,6 @@ --- - name: Install magic-wormhole dependencies pacman: name={{ item }} state=present - with_items: - - python-humanize - - python-tqdm - name: Install magic-wormhole aur: name={{ item }} user={{ user.name }} From a7b4506f47d72a769f11996cbf19a0700af89d1b Mon Sep 17 00:00:00 2001 From: Brett Eisenberg Date: Thu, 28 Dec 2017 10:33:02 -0800 Subject: [PATCH 3/5] rfkill moved to util-linux --- roles/bluetooth/tasks/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/roles/bluetooth/tasks/main.yml b/roles/bluetooth/tasks/main.yml index c91bef8..dc41d81 100644 --- a/roles/bluetooth/tasks/main.yml +++ b/roles/bluetooth/tasks/main.yml @@ -7,7 +7,6 @@ - bluez-utils - bluez-firmware - blueman - - rfkill notify: - restart pulse as user From 9f26408cd9eaccb70907c6faec8597f786e00f9a Mon Sep 17 00:00:00 2001 From: Brett Eisenberg Date: Thu, 28 Dec 2017 10:57:48 -0800 Subject: [PATCH 4/5] fix wormhole dependency loop --- roles/wormhole/tasks/main.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/roles/wormhole/tasks/main.yml b/roles/wormhole/tasks/main.yml index 6e69805..e4e4e17 100644 --- a/roles/wormhole/tasks/main.yml +++ b/roles/wormhole/tasks/main.yml @@ -1,7 +1,4 @@ --- -- name: Install magic-wormhole dependencies - pacman: name={{ item }} state=present - - name: Install magic-wormhole aur: name={{ item }} user={{ user.name }} with_items: @@ -9,7 +6,6 @@ - python-spake2 - python-ipaddress - python-txtorcon - - magic-wormhole tags: - aur From c55c3aae6aeaab774f2e0cd75d036ec07ee8c520 Mon Sep 17 00:00:00 2001 From: Brett Eisenberg Date: Thu, 28 Dec 2017 11:35:44 -0800 Subject: [PATCH 5/5] re-add mistakenly removed dependency --- roles/wormhole/tasks/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/wormhole/tasks/main.yml b/roles/wormhole/tasks/main.yml index e4e4e17..857404a 100644 --- a/roles/wormhole/tasks/main.yml +++ b/roles/wormhole/tasks/main.yml @@ -6,6 +6,7 @@ - python-spake2 - python-ipaddress - python-txtorcon + - magic-wormhole tags: - aur