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: 84fd68150b7f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f30a8774d9f7
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 23, 2020

  1. mpv: 0.32.0 -> 0.33.0 

    https://github.com/mpv-player/mpv/releases/tag/v0.33.0
    @Ma27
    Ma27 committed Nov 23, 2020
    Copy the full SHA
    d148709 View commit details

Commits on Nov 24, 2020

  1. Merge pull request #104716 from Ma27/bump-mpv 

    mpv: 0.32.0 -> 0.33.0
    @AndersonTorres
    AndersonTorres authored Nov 24, 2020
    Copy the full SHA
    f30a877 View commit details
Showing with 2 additions and 13 deletions.
  1. +2 −13 pkgs/applications/video/mpv/default.nix
15 changes: 2 additions & 13 deletions pkgs/applications/video/mpv/default.nix
View file
Original file line number Diff line number Diff line change
@@ -39,13 +39,8 @@
, libpngSupport ? true, libpng ? null
, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null
, rubberbandSupport ? stdenv.isLinux, rubberband ? null
# NOTE: samba support should be removed on the next mpv release, see also:
# https://github.com/NixOS/nixpkgs/pull/89145#issuecomment-636424362
# Please remove this line on the next mpv release.
, sambaSupport ? false, samba ? null
, screenSaverSupport ? true, libXScrnSaver ? null
, sdl2Support ? true, SDL2 ? null
, sndioSupport ? true, sndio ? null
, speexSupport ? true, speex ? null
, swiftSupport ? false, swift ? null
, theoraSupport ? true, libtheora ? null
@@ -80,9 +75,7 @@ assert openalSupport -> available openalSoft;
assert pulseSupport -> available libpulseaudio;
assert rubberbandSupport -> available rubberband;
assert screenSaverSupport -> available libXScrnSaver;
assert sambaSupport -> available samba;
assert sdl2Support -> available SDL2;
assert sndioSupport -> available sndio;
assert speexSupport -> available speex;
assert theoraSupport -> available libtheora;
assert vaapiSupport -> available libva;
@@ -100,13 +93,13 @@ let

in stdenv.mkDerivation rec {
pname = "mpv";
version = "0.32.0";
version = "0.33.0";

src = fetchFromGitHub {
owner = "mpv-player";
repo = "mpv";
rev = "v${version}";
sha256 = "0kmy1q0hp87vq4rpv7py04x8bpg1wmlzaibavmkf713jqp6qy596";
sha256 = "sha256-3l32qQBpvWVjbLp5CZtO039oDQeH7C/cNAKtJxrzlRk=";
};

postPatch = ''
@@ -140,9 +133,7 @@ in stdenv.mkDerivation rec {
(enableFeature cddaSupport "cdda")
(enableFeature dvdnavSupport "dvdnav")
(enableFeature openalSupport "openal")
(enableFeature sambaSupport "libsmbclient")
(enableFeature sdl2Support "sdl2")
(enableFeature sndioSupport "sndio")
(enableFeature vaapiSupport "vaapi")
(enableFeature waylandSupport "wayland")
(enableFeature stdenv.isLinux "dvbin")
@@ -168,10 +159,8 @@ in stdenv.mkDerivation rec {
++ optional openalSupport openalSoft
++ optional pulseSupport libpulseaudio
++ optional rubberbandSupport rubberband
++ optional sambaSupport samba
++ optional screenSaverSupport libXScrnSaver
++ optional sdl2Support SDL2
++ optional sndioSupport sndio
++ optional speexSupport speex
++ optional theoraSupport libtheora
++ optional vaapiSupport libva