diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index e31798a101b..089751947cc 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -5,11 +5,11 @@ pythonPackages.buildPythonPackage rec { name = "mopidy-${version}"; - version = "0.14.2"; + version = "0.15.0"; src = fetchurl { url = "https://github.com/mopidy/mopidy/archive/v${version}.tar.gz"; - sha256 = "0fqx7lk9g61d744b951cwx0szqbyji58dhw2ravnq9785nkhi7i4"; + sha256 = "1fpnddcx6343wgxzh10s035w21g8jmfh2kzgx32w0xsshpra3gn1"; }; propagatedBuildInputs = with pythonPackages; [ diff --git a/pkgs/applications/audio/mopidy/git.nix b/pkgs/applications/audio/mopidy/git.nix deleted file mode 100644 index 2b5e1627ac6..00000000000 --- a/pkgs/applications/audio/mopidy/git.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, fetchgit, pythonPackages, pygobject, gst_python -, gst_plugins_good, gst_plugins_base -}: - -pythonPackages.buildPythonPackage rec { - name = "mopidy-${version}"; - - version = "git-20130226"; - - src = fetchgit { - url = "https://github.com/mopidy/mopidy.git"; - rev = "86a7c2d7519680c6b9130795d35c4654958f4c04"; - sha256 = "00fxcfkpl19nslv4f4bspzw0kvjjp6hhcwag7rknmb8scfinqfac"; - }; - - propagatedBuildInputs = with pythonPackages; [ - gst_python pygobject pykka pyspotify pylast cherrypy ws4py - ]; - - # python zip complains about old timestamps - preConfigure = '' - find -print0 | xargs -0 touch - ''; - - # There are no tests - doCheck = false; - - postInstall = '' - for p in $out/bin/mopidy $out/bin/mopidy-scan; do - wrapProgram $p \ - --prefix GST_PLUGIN_PATH : ${gst_plugins_good}/lib/gstreamer-0.10 \ - --prefix GST_PLUGIN_PATH : ${gst_plugins_base}/lib/gstreamer-0.10 - done - ''; - - meta = { - homepage = http://www.mopidy.com/; - description = '' - A music server which can play music from Spotify and from your - local hard drive. - ''; - maintainers = [ stdenv.lib.maintainers.rickynils ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 38dd85a2252..53e46e026e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8161,7 +8161,6 @@ let }; mopidy = callPackage ../applications/audio/mopidy { }; - mopidy_git = callPackage ../applications/audio/mopidy/git.nix { }; mozilla = callPackage ../applications/networking/browsers/mozilla { inherit (gnome) libIDL;