diff --git a/pkgs/development/python-modules/mps-youtube/default.nix b/pkgs/applications/misc/mps-youtube/default.nix similarity index 67% rename from pkgs/development/python-modules/mps-youtube/default.nix rename to pkgs/applications/misc/mps-youtube/default.nix index 753a0d24d0a..b1118cfc597 100644 --- a/pkgs/development/python-modules/mps-youtube/default.nix +++ b/pkgs/applications/misc/mps-youtube/default.nix @@ -1,17 +1,16 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy3k -, pafy -}: +{ lib, python3Packages, fetchFromGitHub }: -buildPythonPackage rec { +with python3Packages; + +buildPythonApplication rec { pname = "mps-youtube"; - version = "0.2.8"; - disabled = (!isPy3k); + version = "unstable-2020-01-28"; src = fetchFromGitHub { owner = "mps-youtube"; repo = "mps-youtube"; - rev = "v${version}"; - sha256 = "1w1jhw9rg3dx7vp97cwrk5fymipkcy2wrbl1jaa38ivcjhqg596y"; + rev = "b808697133ec2ad7654953232d1e841b20aa7cc3"; + sha256 = "0lqprlpc0v092xqkjc0cc395ag45lijwgd34dpg2jy6i0f2szywv"; }; propagatedBuildInputs = [ pafy ]; @@ -30,6 +29,6 @@ buildPythonPackage rec { description = "Terminal based YouTube player and downloader"; homepage = "https://github.com/mps-youtube/mps-youtube"; license = licenses.gpl3; - maintainers = with maintainers; [ odi ]; + maintainers = with maintainers; [ koral odi ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d29413530b9..91fd0aeaf01 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20448,6 +20448,8 @@ in mpc-qt = libsForQt5.callPackage ../applications/video/mpc-qt { }; + mps-youtube = callPackage ../applications/misc/mps-youtube { }; + mplayer = callPackage ../applications/video/mplayer ({ libdvdnav = libdvdnav_4_2_1; } // (config.mplayer or {})); diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7451215072d..84672f06600 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6493,8 +6493,6 @@ in { maildir-deduplicate = callPackage ../development/python-modules/maildir-deduplicate { }; - mps-youtube = callPackage ../development/python-modules/mps-youtube { }; - d2to1 = callPackage ../development/python-modules/d2to1 { }; ovh = callPackage ../development/python-modules/ovh { };