From d1487097ef215256ad886f041f9010c1529986ed Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 23 Nov 2020 23:54:46 +0100 Subject: [PATCH] mpv: 0.32.0 -> 0.33.0 https://github.com/mpv-player/mpv/releases/tag/v0.33.0 --- pkgs/applications/video/mpv/default.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 4b7d78303b2f..22d34fb474c1 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -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