public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #66351 from jonringer/bump-python-mpv

Browse Source 
python3Packages.mpv: 0.1 -> 0.3.9
This commit is contained in:
Michael Raskin 2019-08-20 08:16:43 +00:00 committed by GitHub
commit aafdf8b7f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/python-modules/mps-youtube/default.nix
View File

@ -1,20 +1,17 @@
{ stdenv { lib, buildPythonPackage, fetchFromGitHub, isPy3k
, buildPythonPackage
, fetchFromGitHub
, isPy3k
, pafy , pafy
}: }:
buildPythonPackage rec { buildPythonPackage rec {
name = "mps-youtube-${version}"; pname = "mps-youtube";
version = "0.2.7.1"; version = "0.2.8";
disabled = (!isPy3k); disabled = (!isPy3k);
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mps-youtube"; owner = "mps-youtube";
repo = "mps-youtube"; repo = "mps-youtube";
rev = "v${version}"; rev = "v${version}";
sha256 = "16zn5gwb3568w95lr21b88zkqlay61p1541sa9c3x69zpi8v0pys"; sha256 = "1w1jhw9rg3dx7vp97cwrk5fymipkcy2wrbl1jaa38ivcjhqg596y";
}; };
propagatedBuildInputs = [ pafy ]; propagatedBuildInputs = [ pafy ];
@ -29,11 +26,10 @@ buildPythonPackage rec {
export XDG_CONFIG_HOME=$(pwd)/check-phase export XDG_CONFIG_HOME=$(pwd)/check-phase
''; '';
meta = with stdenv.lib; { meta = with lib; {
description = "Terminal based YouTube player and downloader"; description = "Terminal based YouTube player and downloader";
homepage = https://github.com/np1/mps-youtube; homepage = https://github.com/np1/mps-youtube;
license = licenses.gpl3; license = licenses.gpl3;
maintainers = with maintainers; [ odi ]; maintainers = with maintainers; [ odi ];
}; };
} }

30
pkgs/development/python-modules/mpv/default.nix
View File

@ -1,25 +1,33 @@
{ stdenv { stdenv, buildPythonPackage, fetchFromGitHub, python, isPy27
, buildPythonPackage , mpv
, fetchPypi
, pkgs
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "mpv"; pname = "mpv";
version = "0.1"; version = "0.3.9";
disabled = isPy27;
src = fetchPypi { src = fetchFromGitHub {
inherit pname version; owner = "jaseg";
sha256 = "0b9kd70mshdr713f3l1lbnz1q0vlg2y76h5d8liy1bzqm7hjcgfw"; repo = "python-mpv";
rev = "v${version}";
sha256 = "112kr9wppcyy3shsb7v7kq0s1pdw6vw3v2fvqicm7qb2f49y2p4q";
}; };
buildInputs = [ pkgs.mpv ]; buildInputs = [ mpv ];
patchPhase = "substituteInPlace mpv.py --replace libmpv.so ${pkgs.mpv}/lib/libmpv.so";
postPatch = ''
substituteInPlace mpv.py \
--replace "sofile = ctypes.util.find_library('mpv')" \
'sofile = "${mpv}/lib/libmpv${stdenv.targetPlatform.extensions.sharedLibrary}"'
'';
# tests impure, will error if it can't load libmpv.so
checkPhase = "${python.interpreter} -c 'import mpv'";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A python interface to the mpv media player"; description = "A python interface to the mpv media player";
homepage = "https://github.com/jaseg/python-mpv"; homepage = "https://github.com/jaseg/python-mpv";
license = licenses.agpl3; license = licenses.agpl3;
}; };
} }

2
pkgs/top-level/python-packages.nix
View File

@ -3752,7 +3752,7 @@ in {
mpd2 = callPackage ../development/python-modules/mpd2 { }; mpd2 = callPackage ../development/python-modules/mpd2 { };
mpv = callPackage ../development/python-modules/mpv { }; mpv = callPackage ../development/python-modules/mpv { mpv = pkgs.mpv; };
mrbob = callPackage ../development/python-modules/mrbob {}; mrbob = callPackage ../development/python-modules/mrbob {};