From 744b191483ffa08e0cd859e7fa87062a89402f9c Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Wed, 19 Jun 2024 21:55:28 -0700 Subject: Move all mpd-related packages into (oni packages mpd) --- oni/home/config/rincewind.scm | 2 +- oni/home/services/mpd.scm | 2 +- oni/packages/mpd-notify.scm | 42 -------------------- oni/packages/mpd-random-albums.scm | 44 --------------------- oni/packages/mpd.scm | 78 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 80 insertions(+), 88 deletions(-) delete mode 100644 oni/packages/mpd-notify.scm delete mode 100644 oni/packages/mpd-random-albums.scm create mode 100644 oni/packages/mpd.scm diff --git a/oni/home/config/rincewind.scm b/oni/home/config/rincewind.scm index 7060b9f..fe607e2 100644 --- a/oni/home/config/rincewind.scm +++ b/oni/home/config/rincewind.scm @@ -199,7 +199,7 @@ emacs-oni-php)) #:use-module ((oni packages inbox-size) #:select (inbox-size)) - #:use-module ((oni packages mpd-random-albums) + #:use-module ((oni packages mpd) #:select (mpd-random-albums)) #:use-module ((oni packages notmuch-collect-tasks) #:select (notmuch-collect-tasks)) diff --git a/oni/home/services/mpd.scm b/oni/home/services/mpd.scm index b59cb41..c3c272c 100644 --- a/oni/home/services/mpd.scm +++ b/oni/home/services/mpd.scm @@ -9,7 +9,7 @@ #:use-module (srfi srfi-1) #:use-module (oop goops) #:use-module (ice-9 string-fun) - #:use-module ((oni packages mpd-notify) + #:use-module ((oni packages mpd) #:select (mpd-notify)) #:export (home-mpd-service-type diff --git a/oni/packages/mpd-notify.scm b/oni/packages/mpd-notify.scm deleted file mode 100644 index 44b4d25..0000000 --- a/oni/packages/mpd-notify.scm +++ /dev/null @@ -1,42 +0,0 @@ -(define-module (oni packages mpd-notify) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (gnu packages base) - #:use-module (gnu packages shells) - #:use-module (gnu packages mpd) - #:use-module (gnu packages gnome) - #:use-module (guix build-system gnu) - #:use-module (guix git-download) - #:use-module (guix packages)) - -(define-public mpd-notify - (let ((commit "1bf3786878eb499b6a0c56e47ba3f3e07cd81182") - (revision "0")) - (package - (name "mpd-notify") - (version (git-version "0.0.0" revision commit)) - (source - (origin - (uri (git-reference - (url "git://code.ryuslash.org/util/tom/mpd-notify.git") - (commit commit))) - (method git-fetch) - (sha256 - (base32 "1i72h3mxsifymnmpmrgfqhgrbq9sjhgn1b9d64f164m1m0g0smq3")) - (file-name (git-file-name name version)))) - (propagated-inputs - (list mpd-mpc zsh libnotify)) - (build-system gnu-build-system) - (arguments - `(#:tests? #f - #:phases - (modify-phases %standard-phases - (delete 'configure) - (delete 'build) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) - (install-file "mpd-notify" bin))))))) - (home-page "https://ryuslash.org/") - (synopsis "A simple script that notifies you of MPD player state changes.") - (description "Uses `mpc idleloop' to listen to player state changes and sends notifications.") - (license license:gpl3+)))) diff --git a/oni/packages/mpd-random-albums.scm b/oni/packages/mpd-random-albums.scm deleted file mode 100644 index 527914b..0000000 --- a/oni/packages/mpd-random-albums.scm +++ /dev/null @@ -1,44 +0,0 @@ -(define-module (oni packages mpd-random-albums) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (gnu packages base) - #:use-module (gnu packages bash) - #:use-module (gnu packages mpd) - #:use-module (guix build-system gnu) - #:use-module (guix git-download) - #:use-module (guix packages) - #:use-module (oni packages scsh)) - -(define-public mpd-random-albums - (let ((commit "c12a766e1920e726129dfd1161a2ef15471f89e8") - (revision "0")) - (package - (name "mpd-random-albums") - (version (git-version "0.0.0" revision commit)) - (source - (origin - (uri (git-reference - (url "git://ryuslash.org/util/tom/mpd-random-albums") - (commit commit))) - (method git-fetch) - (sha256 - (base32 "0mgs9377hw3x1nfcah3wwr3zijvzrkqicvgrbcjl3g1p4fmlb8mr")) - (file-name (git-file-name name version)))) - (propagated-inputs - (list mpd bash scsh)) - (build-system gnu-build-system) - (arguments - `(#:tests? #f - #:phases - (modify-phases %standard-phases - (delete 'configure) - (delete 'build) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((bin (string-append (assoc-ref outputs "out") "/bin")) - (site (string-append (assoc-ref outputs "out") "/share/scsh-0.7"))) - (install-file "mpd-random-albums" bin) - (install-file "mpd.scm" site))))))) - (home-page "https://ryuslash.org/") - (synopsis "A simple script that populates the MPD playlist with all of my albums in random order.") - (description "Creates a new playlist in MPD with all of the albums in my database and shuffles them by album.") - (license license:gpl3+)))) diff --git a/oni/packages/mpd.scm b/oni/packages/mpd.scm new file mode 100644 index 0000000..cb1cac1 --- /dev/null +++ b/oni/packages/mpd.scm @@ -0,0 +1,78 @@ +(define-module (oni packages mpd) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (gnu packages base) + #:use-module (gnu packages shells) + #:use-module (gnu packages bash) + #:use-module (gnu packages mpd) + #:use-module (gnu packages gnome) + #:use-module (guix build-system gnu) + #:use-module (guix git-download) + #:use-module (guix packages)) + +(define-public mpd-notify + (let ((commit "1bf3786878eb499b6a0c56e47ba3f3e07cd81182") + (revision "0")) + (package + (name "mpd-notify") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (uri (git-reference + (url "git://code.ryuslash.org/util/tom/mpd-notify.git") + (commit commit))) + (method git-fetch) + (sha256 + (base32 "1i72h3mxsifymnmpmrgfqhgrbq9sjhgn1b9d64f164m1m0g0smq3")) + (file-name (git-file-name name version)))) + (propagated-inputs + (list mpd-mpc zsh libnotify)) + (build-system gnu-build-system) + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) + (install-file "mpd-notify" bin))))))) + (home-page "https://ryuslash.org/") + (synopsis "A simple script that notifies you of MPD player state changes.") + (description "Uses `mpc idleloop' to listen to player state changes and sends notifications.") + (license license:gpl3+)))) + +(define-public mpd-random-albums + (let ((commit "c12a766e1920e726129dfd1161a2ef15471f89e8") + (revision "0")) + (package + (name "mpd-random-albums") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (uri (git-reference + (url "git://ryuslash.org/util/tom/mpd-random-albums") + (commit commit))) + (method git-fetch) + (sha256 + (base32 "0mgs9377hw3x1nfcah3wwr3zijvzrkqicvgrbcjl3g1p4fmlb8mr")) + (file-name (git-file-name name version)))) + (propagated-inputs + (list mpd bash scsh)) + (build-system gnu-build-system) + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((bin (string-append (assoc-ref outputs "out") "/bin")) + (site (string-append (assoc-ref outputs "out") "/share/scsh-0.7"))) + (install-file "mpd-random-albums" bin) + (install-file "mpd.scm" site))))))) + (home-page "https://ryuslash.org/") + (synopsis "A simple script that populates the MPD playlist with all of my albums in random order.") + (description "Creates a new playlist in MPD with all of the albums in my database and shuffles them by album.") + (license license:gpl3+)))) -- cgit v1.2.3-54-g00ecf