Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a111f954017d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: aafdf8b7f4cf
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Aug 11, 2019

  1. python3Packages.mpv: 0.1 -> 0.3.9

    Jonathan Ringer committed Aug 11, 2019
    Copy the full SHA
    0f85491 View commit details

  2. python3Packages.mps-youtube: 0.2.7.1 -> 0.2.8

    Jonathan Ringer committed Aug 11, 2019
    Copy the full SHA
    d570b83 View commit details

Commits on Aug 20, 2019

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

    python3Packages.mpv: 0.1 -> 0.3.9
    @7c6f434c
    7c6f434c authored Aug 20, 2019
    Copy the full SHA
    aafdf8b View commit details
Showing with 25 additions and 21 deletions.
  1. +5 −9 pkgs/development/python-modules/mps-youtube/default.nix
  2. +19 −11 pkgs/development/python-modules/mpv/default.nix
  3. +1 −1 pkgs/top-level/python-packages.nix
14 changes: 5 additions & 9 deletions pkgs/development/python-modules/mps-youtube/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@
{ stdenv
, buildPythonPackage
, fetchFromGitHub
, isPy3k
{ lib, buildPythonPackage, fetchFromGitHub, isPy3k
, pafy
}:

buildPythonPackage rec {
name = "mps-youtube-${version}";
version = "0.2.7.1";
pname = "mps-youtube";
version = "0.2.8";
disabled = (!isPy3k);

src = fetchFromGitHub {
owner = "mps-youtube";
repo = "mps-youtube";
rev = "v${version}";
sha256 = "16zn5gwb3568w95lr21b88zkqlay61p1541sa9c3x69zpi8v0pys";
sha256 = "1w1jhw9rg3dx7vp97cwrk5fymipkcy2wrbl1jaa38ivcjhqg596y";
};

propagatedBuildInputs = [ pafy ];
@@ -29,11 +26,10 @@ buildPythonPackage rec {
export XDG_CONFIG_HOME=$(pwd)/check-phase
'';

meta = with stdenv.lib; {
meta = with lib; {
description = "Terminal based YouTube player and downloader";
homepage = https://github.com/np1/mps-youtube;
license = licenses.gpl3;
maintainers = with maintainers; [ odi ];
};

}
30 changes: 19 additions & 11 deletions pkgs/development/python-modules/mpv/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,33 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, pkgs
{ stdenv, buildPythonPackage, fetchFromGitHub, python, isPy27
, mpv
}:

buildPythonPackage rec {
pname = "mpv";
version = "0.1";
version = "0.3.9";
disabled = isPy27;

src = fetchPypi {
inherit pname version;
sha256 = "0b9kd70mshdr713f3l1lbnz1q0vlg2y76h5d8liy1bzqm7hjcgfw";
src = fetchFromGitHub {
owner = "jaseg";
repo = "python-mpv";
rev = "v${version}";
sha256 = "112kr9wppcyy3shsb7v7kq0s1pdw6vw3v2fvqicm7qb2f49y2p4q";
};

buildInputs = [ pkgs.mpv ];
patchPhase = "substituteInPlace mpv.py --replace libmpv.so ${pkgs.mpv}/lib/libmpv.so";
buildInputs = [ mpv ];

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; {
description = "A python interface to the mpv media player";
homepage = "https://github.com/jaseg/python-mpv";
license = licenses.agpl3;
};

}
2 changes: 1 addition & 1 deletion pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -3752,7 +3752,7 @@ in {

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 {};