Unverified Commit 5a67e7be authored by Ilan Joselevich's avatar Ilan Joselevich
Browse files

mpvScripts.youtube-quality: replace with mpvScripts.quality-menu v4.1.0 

While at it also moved scripts attrset out of all-packages.nix so we
don't set the alias there.
parent 5a01208e

pkgs/applications/video/mpv/scripts/default.nix

0 → 100644
+30 −0
Original line number Diff line number Diff line 
{ lib

, callPackage

, config

}:



lib.recurseIntoAttrs

  ({

    acompressor = callPackage ./acompressor.nix { };

    autocrop = callPackage ./autocrop.nix { };

    autodeint = callPackage ./autodeint.nix { };

    autoload = callPackage ./autoload.nix { };

    convert = callPackage ./convert.nix { };

    inhibit-gnome = callPackage ./inhibit-gnome.nix { };

    mpris = callPackage ./mpris.nix { };

    mpv-playlistmanager = callPackage ./mpv-playlistmanager.nix { };

    mpvacious = callPackage ./mpvacious.nix { };

    quality-menu = callPackage ./quality-menu.nix { };

    simple-mpv-webui = callPackage ./simple-mpv-webui.nix { };

    sponsorblock = callPackage ./sponsorblock.nix { };

    thumbfast = callPackage ./thumbfast.nix { };

    thumbnail = callPackage ./thumbnail.nix { };

    uosc = callPackage ./uosc.nix { };

    vr-reversal = callPackage ./vr-reversal.nix { };

    webtorrent-mpv-hook = callPackage ./webtorrent-mpv-hook.nix { };

    cutter = callPackage ./cutter.nix { };

  }

  // (callPackage ./occivink.nix { }))

  // lib.optionalAttrs config.allowAliases {

  youtube-quality = throw "'youtube-quality' is no longer maintained, use 'quality-menu' instead"; # added 2023-07-14

}

pkgs/applications/video/mpv/scripts/youtube-quality.nix→pkgs/applications/video/mpv/scripts/quality-menu.nix

+38 −0
Original line number Diff line number Diff line
@@ -5,14 +5,14 @@ 
}:



stdenvNoCC.mkDerivation rec {

  pname = "mpv-youtube-quality";

  version = "unstable-2020-02-11";

  pname = "mpv-quality-menu";

  version = "4.1.0";



  src = fetchFromGitHub {

    owner = "jgreco";

    repo = "mpv-youtube-quality";

    rev = "1f8c31457459ffc28cd1c3f3c2235a53efad7148";

    sha256 = "voNP8tCwCv8QnAZOPC9gqHRV/7jgCAE63VKBd/1s5ic=";

    owner = "christoph-heinrich";

    repo = "mpv-quality-menu";

    rev = "v${version}";

    hash = "sha256-93WoTeX61xzbjx/tgBgUVuwyR9MkAUzCfVSrbAC7Ddc=";

  };



  dontBuild = true;
@@ -20,20 +20,19 @@ stdenvNoCC.mkDerivation rec { 
  installPhase = ''

    runHook preInstall

    mkdir -p $out/share/mpv/scripts

    cp youtube-quality.lua $out/share/mpv/scripts

    cp quality-menu.lua $out/share/mpv/scripts

  '' + lib.optionalString oscSupport ''

    cp youtube-quality-osc.lua $out/share/mpv/scripts

    cp quality-menu-osc.lua $out/share/mpv/scripts

  '' + ''

    runHook postInstall

  '';



  passthru.scriptName = "youtube-quality.lua";

  passthru.scriptName = "quality-menu.lua";



  meta = with lib; {

    description = "A userscript for MPV that allows you to change youtube video quality (ytdl-format) on the fly";

    homepage = "https://github.com/jgreco/mpv-youtube-quality";

    license = licenses.unfree;

    platforms = platforms.all;

    homepage = "https://github.com/christoph-heinrich/mpv-quality-menu";

    license = licenses.gpl2Only;

    maintainers = with maintainers; [ lunik1 ];

  };

}

pkgs/top-level/all-packages.nix

+1 −20
Original line number Diff line number Diff line
@@ -33288,26 +33288,7 @@ with pkgs; 














  mpvpaper = callPackage ../tools/wayland/mpvpaper { };



























  mpvScripts = recurseIntoAttrs ({













    acompressor = callPackage ../applications/video/mpv/scripts/acompressor.nix {};













    autocrop = callPackage ../applications/video/mpv/scripts/autocrop.nix { };













    autodeint = callPackage ../applications/video/mpv/scripts/autodeint.nix { };













    autoload = callPackage ../applications/video/mpv/scripts/autoload.nix { };













    convert = callPackage ../applications/video/mpv/scripts/convert.nix { };













    inhibit-gnome = callPackage ../applications/video/mpv/scripts/inhibit-gnome.nix { };













    mpris = callPackage ../applications/video/mpv/scripts/mpris.nix { };













    mpv-playlistmanager = callPackage ../applications/video/mpv/scripts/mpv-playlistmanager.nix { };













    mpvacious = callPackage ../applications/video/mpv/scripts/mpvacious.nix { };













    simple-mpv-webui = callPackage ../applications/video/mpv/scripts/simple-mpv-webui.nix { };













    sponsorblock = callPackage ../applications/video/mpv/scripts/sponsorblock.nix { };













    thumbfast = callPackage ../applications/video/mpv/scripts/thumbfast.nix { };













    thumbnail = callPackage ../applications/video/mpv/scripts/thumbnail.nix { };













    uosc = callPackage ../applications/video/mpv/scripts/uosc.nix { };













    vr-reversal = callPackage ../applications/video/mpv/scripts/vr-reversal.nix { };













    webtorrent-mpv-hook = callPackage ../applications/video/mpv/scripts/webtorrent-mpv-hook.nix { };













    youtube-quality = callPackage ../applications/video/mpv/scripts/youtube-quality.nix { };













    cutter = callPackage ../applications/video/mpv/scripts/cutter.nix { };













  } // (callPackage ../applications/video/mpv/scripts/occivink.nix {}));













  mpvScripts = import ../applications/video/mpv/scripts { inherit lib callPackage config; };





























  open-in-mpv = callPackage ../applications/video/open-in-mpv { };