commit
c634e5cd24
|
@ -11,17 +11,8 @@ let
|
||||||
|
|
||||||
mopidyConf = writeText "mopidy.conf" cfg.configuration;
|
mopidyConf = writeText "mopidy.conf" cfg.configuration;
|
||||||
|
|
||||||
mopidyLauncher = stdenv.mkDerivation {
|
mopidyEnv = python.buildEnv.override {
|
||||||
name = "mopidy-launcher";
|
extraLibs = [ mopidy ] ++ cfg.extensionPackages;
|
||||||
phases = [ "installPhase" ];
|
|
||||||
buildInputs = [ makeWrapper python ];
|
|
||||||
installPhase = ''
|
|
||||||
mkdir -p $out/bin
|
|
||||||
ln -s ${mopidy}/bin/mopidy $out/bin/mopidy
|
|
||||||
wrapProgram $out/bin/mopidy \
|
|
||||||
--prefix PYTHONPATH : \
|
|
||||||
"${concatStringsSep ":" (map (p: "$(toPythonPath ${p})") cfg.extensionPackages)}"
|
|
||||||
'';
|
|
||||||
};
|
};
|
||||||
|
|
||||||
in {
|
in {
|
||||||
|
@ -86,7 +77,7 @@ in {
|
||||||
description = "mopidy music player daemon";
|
description = "mopidy music player daemon";
|
||||||
preStart = "mkdir -p ${cfg.dataDir} && chown -R mopidy:mopidy ${cfg.dataDir}";
|
preStart = "mkdir -p ${cfg.dataDir} && chown -R mopidy:mopidy ${cfg.dataDir}";
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
ExecStart = "${mopidyLauncher}/bin/mopidy --config ${concatStringsSep ":" ([mopidyConf] ++ cfg.extraConfigFiles)}";
|
ExecStart = "${mopidyEnv}/bin/mopidy --config ${concatStringsSep ":" ([mopidyConf] ++ cfg.extraConfigFiles)}";
|
||||||
User = "mopidy";
|
User = "mopidy";
|
||||||
PermissionsStartOnly = true;
|
PermissionsStartOnly = true;
|
||||||
};
|
};
|
||||||
|
@ -96,7 +87,7 @@ in {
|
||||||
description = "mopidy local files scanner";
|
description = "mopidy local files scanner";
|
||||||
preStart = "mkdir -p ${cfg.dataDir} && chown -R mopidy:mopidy ${cfg.dataDir}";
|
preStart = "mkdir -p ${cfg.dataDir} && chown -R mopidy:mopidy ${cfg.dataDir}";
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
ExecStart = "${mopidyLauncher}/bin/mopidy --config ${concatStringsSep ":" ([mopidyConf] ++ cfg.extraConfigFiles)} local scan";
|
ExecStart = "${mopidyEnv}/bin/mopidy --config ${concatStringsSep ":" ([mopidyConf] ++ cfg.extraConfigFiles)} local scan";
|
||||||
User = "mopidy";
|
User = "mopidy";
|
||||||
PermissionsStartOnly = true;
|
PermissionsStartOnly = true;
|
||||||
Type = "oneshot";
|
Type = "oneshot";
|
||||||
|
|
|
@ -3,11 +3,11 @@
|
||||||
pythonPackages.buildPythonPackage rec {
|
pythonPackages.buildPythonPackage rec {
|
||||||
name = "mopidy-mopify-${version}";
|
name = "mopidy-mopify-${version}";
|
||||||
|
|
||||||
version = "1.5.1";
|
version = "1.5.8";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/dirkgroenen/mopidy-mopify/archive/${version}.tar.gz";
|
url = "https://github.com/dirkgroenen/mopidy-mopify/archive/${version}.tar.gz";
|
||||||
sha256 = "0hhdss4i5436dj37pndxk81a4g3g8f6zqjyv04lhpqcww01290as";
|
sha256 = "1gq88i5hbyskwhqf51myndqgmrndkyy6gs022sc387fy3dwxmvn0";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = with pythonPackages; [ mopidy configobj ];
|
propagatedBuildInputs = with pythonPackages; [ mopidy configobj ];
|
||||||
|
|
|
@ -0,0 +1,24 @@
|
||||||
|
{ stdenv, fetchFromGitHub, pythonPackages, mopidy }:
|
||||||
|
|
||||||
|
pythonPackages.buildPythonPackage rec {
|
||||||
|
name = "mopidy-musicbox-webclient-${version}";
|
||||||
|
|
||||||
|
version = "2.0.0";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "pimusicbox";
|
||||||
|
repo = "mopidy-musicbox-webclient";
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "0gnw6jn55jr6q7bdp70mk3cm5f6jy8lm3s7ayfmisihhjbl3rnaq";
|
||||||
|
};
|
||||||
|
|
||||||
|
propagatedBuildInputs = [ mopidy ];
|
||||||
|
|
||||||
|
doCheck = false;
|
||||||
|
|
||||||
|
meta = with stdenv.lib; {
|
||||||
|
description = "Mopidy extension for playing music from SoundCloud";
|
||||||
|
license = licenses.mit;
|
||||||
|
maintainers = [ maintainers.spwhitt ];
|
||||||
|
};
|
||||||
|
}
|
24
pkgs/applications/audio/mopidy-soundcloud/default.nix
Normal file
24
pkgs/applications/audio/mopidy-soundcloud/default.nix
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
{ stdenv, fetchFromGitHub, pythonPackages, mopidy }:
|
||||||
|
|
||||||
|
pythonPackages.buildPythonPackage rec {
|
||||||
|
name = "mopidy-soundcloud-${version}";
|
||||||
|
|
||||||
|
version = "2.0.1";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "mopidy";
|
||||||
|
repo = "mopidy-soundcloud";
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "05yvjnivj26wjish7x1xrd9l5z8i14b610a8pbifnq3cq7y2m22r";
|
||||||
|
};
|
||||||
|
|
||||||
|
propagatedBuildInputs = [ mopidy ];
|
||||||
|
|
||||||
|
doCheck = false;
|
||||||
|
|
||||||
|
meta = with stdenv.lib; {
|
||||||
|
description = "Mopidy extension for playing music from SoundCloud";
|
||||||
|
license = licenses.mit;
|
||||||
|
maintainers = [ maintainers.spwhitt ];
|
||||||
|
};
|
||||||
|
}
|
24
pkgs/applications/audio/mopidy-spotify-tunigo/default.nix
Normal file
24
pkgs/applications/audio/mopidy-spotify-tunigo/default.nix
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
{ stdenv, fetchFromGitHub, pythonPackages, mopidy, mopidy-spotify }:
|
||||||
|
|
||||||
|
pythonPackages.buildPythonPackage rec {
|
||||||
|
name = "mopidy-spotify-tunigo-${version}";
|
||||||
|
|
||||||
|
version = "0.2.1";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "trygveaa";
|
||||||
|
repo = "mopidy-spotify-tunigo";
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "0827wghbgrscncnshz30l97hgg0g5bsnm0ad8596zh7cai0ibss0";
|
||||||
|
};
|
||||||
|
|
||||||
|
propagatedBuildInputs = [ mopidy mopidy-spotify pythonPackages.tunigo ];
|
||||||
|
|
||||||
|
doCheck = false;
|
||||||
|
|
||||||
|
meta = with stdenv.lib; {
|
||||||
|
description = "Mopidy extension for providing the browse feature of Spotify";
|
||||||
|
license = licenses.asl20;
|
||||||
|
maintainers = [ maintainers.spwhitt ];
|
||||||
|
};
|
||||||
|
}
|
24
pkgs/applications/audio/mopidy-youtube/default.nix
Normal file
24
pkgs/applications/audio/mopidy-youtube/default.nix
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
{ stdenv, fetchFromGitHub, pythonPackages, mopidy }:
|
||||||
|
|
||||||
|
pythonPackages.buildPythonPackage rec {
|
||||||
|
name = "mopidy-youtube-${version}";
|
||||||
|
|
||||||
|
version = "2.0.1";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "mopidy";
|
||||||
|
repo = "mopidy-youtube";
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "1si7j7m5kg0cxlhkw8s2mbnpmc9mb3l69n5sgklb1yv1s55iia6z";
|
||||||
|
};
|
||||||
|
|
||||||
|
propagatedBuildInputs = with pythonPackages; [ mopidy pafy ];
|
||||||
|
|
||||||
|
doCheck = false;
|
||||||
|
|
||||||
|
meta = with stdenv.lib; {
|
||||||
|
description = "Mopidy extension for playing music from YouTube";
|
||||||
|
license = licenses.asl20;
|
||||||
|
maintainers = [ maintainers.spwhitt ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -1,5 +1,5 @@
|
||||||
{ stdenv, fetchurl, pythonPackages, pygobject, gst_python
|
{ stdenv, fetchurl, pythonPackages, pygobject, gst_python
|
||||||
, gst_plugins_good, gst_plugins_base
|
, gst_plugins_good, gst_plugins_base, gst_plugins_ugly
|
||||||
}:
|
}:
|
||||||
|
|
||||||
pythonPackages.buildPythonPackage rec {
|
pythonPackages.buildPythonPackage rec {
|
||||||
|
@ -13,7 +13,7 @@ pythonPackages.buildPythonPackage rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = with pythonPackages; [
|
propagatedBuildInputs = with pythonPackages; [
|
||||||
gst_python pygobject pykka tornado requests2 gst_plugins_base gst_plugins_good
|
gst_python pygobject pykka tornado requests2 gst_plugins_base gst_plugins_good gst_plugins_ugly
|
||||||
];
|
];
|
||||||
|
|
||||||
# There are no tests
|
# There are no tests
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{ fetchurl, stdenv, pkgconfig, gst_plugins_base, aalib, cairo
|
{ fetchurl, stdenv, pkgconfig, gst_plugins_base, aalib, cairo
|
||||||
, flac, libjpeg, zlib, speex, libpng, libdv, libcaca, libvpx
|
, flac, libjpeg, zlib, speex, libpng, libdv, libcaca, libvpx
|
||||||
, libiec61883, libavc1394, taglib, libpulseaudio, gdk_pixbuf, orc
|
, libiec61883, libavc1394, taglib, libpulseaudio, gdk_pixbuf, orc
|
||||||
, glib, gstreamer, bzip2, libsoup, libintlOrEmpty
|
, glib, gstreamer, bzip2, libsoup, libshout, libintlOrEmpty
|
||||||
, # Whether to build no plugins that have external dependencies
|
, # Whether to build no plugins that have external dependencies
|
||||||
# (except the PulseAudio plugin).
|
# (except the PulseAudio plugin).
|
||||||
minimalDeps ? false
|
minimalDeps ? false
|
||||||
|
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
||||||
++ libintlOrEmpty
|
++ libintlOrEmpty
|
||||||
++ stdenv.lib.optionals (!minimalDeps)
|
++ stdenv.lib.optionals (!minimalDeps)
|
||||||
[ aalib libcaca cairo libdv flac libjpeg libpng speex
|
[ aalib libcaca cairo libdv flac libjpeg libpng speex
|
||||||
taglib bzip2 libvpx gdk_pixbuf orc libsoup ];
|
taglib bzip2 libvpx gdk_pixbuf orc libsoup libshout ];
|
||||||
|
|
||||||
NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
|
NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{ fetchurl, stdenv, pkgconfig, glib, gstreamer, gst_plugins_base
|
{ fetchurl, stdenv, pkgconfig, glib, gstreamer, gst_plugins_base
|
||||||
, libmad, libdvdread, libmpeg2, libcdio, a52dec, x264, orc, libintlOrEmpty }:
|
, libmad, libdvdread, libmpeg2, libcdio, a52dec, x264, orc, lame, libintlOrEmpty }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "gst-plugins-ugly-0.10.19";
|
name = "gst-plugins-ugly-0.10.19";
|
||||||
|
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
[ pkgconfig glib gstreamer gst_plugins_base libmad libdvdread a52dec x264 orc ] ++ libintlOrEmpty;
|
[ pkgconfig glib gstreamer gst_plugins_base libmad libdvdread a52dec x264 orc lame ] ++ libintlOrEmpty;
|
||||||
|
|
||||||
NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
|
NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
|
||||||
|
|
||||||
|
|
|
@ -12478,6 +12478,14 @@ let
|
||||||
|
|
||||||
mopidy-mopify = callPackage ../applications/audio/mopidy-mopify { };
|
mopidy-mopify = callPackage ../applications/audio/mopidy-mopify { };
|
||||||
|
|
||||||
|
mopidy-spotify-tunigo = callPackage ../applications/audio/mopidy-spotify-tunigo { };
|
||||||
|
|
||||||
|
mopidy-youtube = callPackage ../applications/audio/mopidy-youtube { };
|
||||||
|
|
||||||
|
mopidy-soundcloud = callPackage ../applications/audio/mopidy-soundcloud { };
|
||||||
|
|
||||||
|
mopidy-musicbox-webclient = callPackage ../applications/audio/mopidy-musicbox-webclient { };
|
||||||
|
|
||||||
mozplugger = callPackage ../applications/networking/browsers/mozilla-plugins/mozplugger {};
|
mozplugger = callPackage ../applications/networking/browsers/mozilla-plugins/mozplugger {};
|
||||||
|
|
||||||
easytag = callPackage ../applications/audio/easytag { };
|
easytag = callPackage ../applications/audio/easytag { };
|
||||||
|
|
|
@ -20900,6 +20900,25 @@ in modules // {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
tunigo = buildPythonPackage rec {
|
||||||
|
name = "tunigo-${version}";
|
||||||
|
version = "0.1.3";
|
||||||
|
propagatedBuildInputs = with self; [ requests2 ];
|
||||||
|
|
||||||
|
src = pkgs.fetchFromGitHub {
|
||||||
|
owner = "trygveaa";
|
||||||
|
repo = "python-tunigo";
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "02ili37dbs5mk5f6v3fmi1sji39ymc4zyq44x0abxzr88nc8nh97";
|
||||||
|
};
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Python API for the browse feature of Spotify";
|
||||||
|
homepage = https://github.com/trygveaa/python-tunigo;
|
||||||
|
license = licenses.asl20;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
screenkey = buildPythonPackage rec {
|
screenkey = buildPythonPackage rec {
|
||||||
version = "0.2-b3634a2c6eb6d6936c3b2c1ef5078bf3a84c40c6";
|
version = "0.2-b3634a2c6eb6d6936c3b2c1ef5078bf3a84c40c6";
|
||||||
name = "screenkey-${version}";
|
name = "screenkey-${version}";
|
||||||
|
|
Loading…
Reference in a new issue