git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #66351 from jonringer/bump-python-mpv

python3Packages.mpv: 0.1 -> 0.3.9

commitaafdf8b7f4cf46ac41e7d8ba05d440b92507d0e3 authorMichael Raskin <7c6f434c@mail.ru> dateTue 20 Aug 2019, 08:16 (7 years ago) parenta111f95d570b83
3 files changed+25−21
pkgs/development/python-modules/mps-youtube/default.nix+5−9 pkgs/development/python-modules/mpv/default.nix+19−11 pkgs/top-level/python-packages.nix+1−1
pkgs/development/python-modules/mps-youtube/default.nix+5−9
@@ -1,20 +1,17 @@
1−{ stdenv
2−, buildPythonPackage
3−, fetchFromGitHub
4−, isPy3k
1+{ lib, buildPythonPackage, fetchFromGitHub, isPy3k
52, pafy
63}:
74
85buildPythonPackage rec {
9− name = "mps-youtube-${version}";
10− version = "0.2.7.1";
6+ pname = "mps-youtube";
7+ version = "0.2.8";
118 disabled = (!isPy3k);
129
1310 src = fetchFromGitHub {
1411 owner = "mps-youtube";
1512 repo = "mps-youtube";
1613 rev = "v${version}";
17− sha256 = "16zn5gwb3568w95lr21b88zkqlay61p1541sa9c3x69zpi8v0pys";
14+ sha256 = "1w1jhw9rg3dx7vp97cwrk5fymipkcy2wrbl1jaa38ivcjhqg596y";
1815 };
1916
2017 propagatedBuildInputs = [ pafy ];
@@ -29,11 +26,10 @@ buildPythonPackage rec {
2926 export XDG_CONFIG_HOME=$(pwd)/check-phase
3027 '';
3128
32− meta = with stdenv.lib; {
29+ meta = with lib; {
3330 description = "Terminal based YouTube player and downloader";
3431 homepage = https://github.com/np1/mps-youtube;
3532 license = licenses.gpl3;
3633 maintainers = with maintainers; [ odi ];
3734 };
38−
3935}
pkgs/development/python-modules/mpv/default.nix+19−11
@@ -1,25 +1,33 @@
1−{ stdenv
2−, buildPythonPackage
3−, fetchPypi
4−, pkgs
1+{ stdenv, buildPythonPackage, fetchFromGitHub, python, isPy27
2+, mpv
53}:
64
75buildPythonPackage rec {
86 pname = "mpv";
9− version = "0.1";
7+ version = "0.3.9";
8+ disabled = isPy27;
109
11− src = fetchPypi {
12− inherit pname version;
13− sha256 = "0b9kd70mshdr713f3l1lbnz1q0vlg2y76h5d8liy1bzqm7hjcgfw";
10+ src = fetchFromGitHub {
11+ owner = "jaseg";
12+ repo = "python-mpv";
13+ rev = "v${version}";
14+ sha256 = "112kr9wppcyy3shsb7v7kq0s1pdw6vw3v2fvqicm7qb2f49y2p4q";
1415 };
1516
16− buildInputs = [ pkgs.mpv ];
17− patchPhase = "substituteInPlace mpv.py --replace libmpv.so ${pkgs.mpv}/lib/libmpv.so";
17+ buildInputs = [ mpv ];
18+
19+ postPatch = ''
20+ substituteInPlace mpv.py \
21+ --replace "sofile = ctypes.util.find_library('mpv')" \
22+ 'sofile = "${mpv}/lib/libmpv${stdenv.targetPlatform.extensions.sharedLibrary}"'
23+ '';
24+
25+ # tests impure, will error if it can't load libmpv.so
26+ checkPhase = "${python.interpreter} -c 'import mpv'";
1827
1928 meta = with stdenv.lib; {
2029 description = "A python interface to the mpv media player";
2130 homepage = "https://github.com/jaseg/python-mpv";
2231 license = licenses.agpl3;
2332 };
24−
2533}
pkgs/top-level/python-packages.nix+1−1
@@ -3752,7 +3752,7 @@ in {
37523752
37533753 mpd2 = callPackage ../development/python-modules/mpd2 { };
37543754
3755− mpv = callPackage ../development/python-modules/mpv { };
3755+ mpv = callPackage ../development/python-modules/mpv { mpv = pkgs.mpv; };
37563756
37573757 mrbob = callPackage ../development/python-modules/mrbob {};
37583758