From 5c31f4aa7c11fcf720c0ce0e26d55788e2df1044 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Wed, 28 Sep 2016 13:57:21 +0200 Subject: gnu: Remove python-setuptools and python2-setuptools from inputs (part 4a) This patch contains the changes for all modules beside python.scm where setuptools are used in an inherited package and removing this input also removes the need for inheriting the package. This is the case if adding setuptools in the inherited package was the only change. Change this to not inherit and remove the new needless call to "strip-python2-variant (if applicable). * gnu/packages/bioinformatics.scm (python-biopython, python2-biopython, python-twobitreader, python2-twobitreader, python-plastid, python2-plastid, python2-pybigwig, python2-screed, sra-tools): No longer "inherit" Python 2 packages inheriting from a Python 3 package if the sole reason for inheriting was adding python-setuptools respective python2-setuptools to [inputs], [native-inputs] or [propagated-inputs]. Remove now needless [properties] "python2-variant" where applicable. * gnu/packages/django.scm (python-pytest-django, python2-pytest-django, python-django-filter, python2-django-filter): Likewise. * gnu/packages/gnupg.scm (python2-pygpgme): Likewise. * gnu/packages/mail.scm (python-mailmanclient, python2-mailmanclient): Likewise. * gnu/packages/mpd.scm (python-msp, python2-mpd2): Likewise. * gnu/packages/music.scm (python-pylast, python2-pylast): Likewise. * gnu/packages/openstack.scm (python-requests-mock, python2-requests-mock, python2-git-review): Likewise. * gnu/packages/password-utils.scm (python2-bcrypt): Likewise. * gnu/packages/protobuf.scm (python-protobuf, python2-protobuf): Likewise. * gnu/packages/statistics.scm (python-patsy, python2-patsy): Likewise. * gnu/packages/web.scm (python2-feedparser): Likewise. --- gnu/packages/mpd.scm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'gnu/packages/mpd.scm') diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index ec0861db11..83d99778ed 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -257,15 +257,10 @@ (define-public python-mpd2 (synopsis "Python MPD client library") (description "Python-mpd2 is a Python library which provides a client interface for the Music Player Daemon.") - (license license:lgpl3+) - (properties `((python2-variant . ,(delay python2-mpd2)))))) + (license license:lgpl3+))) (define-public python2-mpd2 - (let ((mpd2 (package-with-python2 - (strip-python2-variant python-mpd2)))) - (package (inherit mpd2) - (native-inputs `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs mpd2)))))) + (package-with-python2 python-mpd2)) (define-public sonata (package -- cgit v1.2.3 From d835c6cc4bc343810ec223be3d9879830e782428 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 29 Dec 2016 11:29:01 -0500 Subject: gnu: mpd: Update to 0.19.21. * gnu/packages/mpd.scm (mpd): Update to 0.19.21. --- gnu/packages/mpd.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/mpd.scm') diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 7b77c11835..36a31048ae 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -74,7 +74,7 @@ (define-public libmpdclient (define-public mpd (package (name "mpd") - (version "0.19.19") + (version "0.19.21") (source (origin (method url-fetch) (uri @@ -83,7 +83,7 @@ (define-public mpd "/mpd-" version ".tar.xz")) (sha256 (base32 - "07af1m2lgblyiq0gcs26zv8n22wrhrpmf49xsm338h1n87d6r1dw")))) + "0c0p61p3jfh89pnqwd9nrw55krfvvnzhkpdq53g6njvg0aybh1c3")))) (build-system gnu-build-system) (inputs `(("ao" ,ao) ("alsa-lib" ,alsa-lib) -- cgit v1.2.3 From 87b52095584ccd2ff50f8abd2c585ea3650ece1c Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 29 Dec 2016 11:29:19 -0500 Subject: gnu: mpd: Install systemd service files. * gnu/packages/mpd.scm (mpd)[arguments]: Add 'install-service-files' phase. --- gnu/packages/mpd.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'gnu/packages/mpd.scm') diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 36a31048ae..5231c3f7f7 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -85,6 +85,17 @@ (define-public mpd (base32 "0c0p61p3jfh89pnqwd9nrw55krfvvnzhkpdq53g6njvg0aybh1c3")))) (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'install-service-files + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (systemd (string-append out "/etc/systemd/system")) + (systemd-user (string-append out "/etc/systemd/user"))) + (install-file "systemd/system/mpd.service" systemd) + (install-file "systemd/user/mpd.service" systemd-user) + #t)))))) (inputs `(("ao" ,ao) ("alsa-lib" ,alsa-lib) ("avahi" ,avahi) -- cgit v1.2.3