diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-05-01 12:01:23 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-01 12:01:23 +0000 |
commit | 992b6af1a405b218a2cf38bf912a7849e080d460 (patch) | |
tree | 39ecaf7190e5148240ffdafec74458e8a44a5d81 /pkgs/applications/video | |
parent | 41126a9493dced3c29ffca51b7bcad9bc8123251 (diff) | |
parent | 8a23e9931979fe31b76de903816b018da575f6e4 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/video')
16 files changed, 80 insertions, 19 deletions
diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 2802ed8a5b960..8fc656981a3ad 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -49,13 +49,13 @@ let in stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "83.0"; + version = "84.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - hash = "sha256-MHi3ewxCn560vpVfOucV34CNj/95U2OFd6bxAjtMBoc="; + hash = "sha256-//I++WWnSHnkpTZ0TzS3lhH5+eDD5mazTQ1HVMQS4Ug="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/mpv/scripts/chapterskip.nix b/pkgs/applications/video/mpv/scripts/chapterskip.nix index 9d0c7dafc1dbf..6c6fc4ba51fee 100644 --- a/pkgs/applications/video/mpv/scripts/chapterskip.nix +++ b/pkgs/applications/video/mpv/scripts/chapterskip.nix @@ -6,7 +6,7 @@ buildLua { pname = "chapterskip"; - version = "unstable-2022-09-08"; + version = "0-unstable-2022-09-08"; src = fetchFromGitHub { owner = "po5"; repo = "chapterskip"; diff --git a/pkgs/applications/video/mpv/scripts/convert.nix b/pkgs/applications/video/mpv/scripts/convert.nix index aaf9afcc0d52b..d1fdc9c801bb7 100644 --- a/pkgs/applications/video/mpv/scripts/convert.nix +++ b/pkgs/applications/video/mpv/scripts/convert.nix @@ -10,7 +10,7 @@ buildLua { pname = "mpv-convert-script"; - version = "unstable-2015-07-02"; + version = "0-unstable-2015-07-02"; src = fetchgit { url = "https://gist.github.com/Zehkul/25ea7ae77b30af959be0"; rev = "f95cee43e390e843a47e8ec9d1711a12a8cd343d"; diff --git a/pkgs/applications/video/mpv/scripts/cutter.nix b/pkgs/applications/video/mpv/scripts/cutter.nix index 36bc69bebaf81..ac2f518a9b5ab 100644 --- a/pkgs/applications/video/mpv/scripts/cutter.nix +++ b/pkgs/applications/video/mpv/scripts/cutter.nix @@ -2,7 +2,7 @@ buildLua { pname = "video-cutter"; - version = "unstable-2023-11-09"; + version = "0-unstable-2023-11-10"; src = fetchFromGitHub { owner = "rushmj"; diff --git a/pkgs/applications/video/mpv/scripts/default.nix b/pkgs/applications/video/mpv/scripts/default.nix index c20ac69ab068c..85cbd8233426a 100644 --- a/pkgs/applications/video/mpv/scripts/default.nix +++ b/pkgs/applications/video/mpv/scripts/default.nix @@ -70,6 +70,7 @@ let dynamic-crop = callPackage ./dynamic-crop.nix { }; inhibit-gnome = callPackage ./inhibit-gnome.nix { }; memo = callPackage ./memo.nix { }; + manga-reader = callPackage ./manga-reader.nix { }; modernx = callPackage ./modernx.nix { }; modernx-zydezu = callPackage ./modernx-zydezu.nix { }; mpris = callPackage ./mpris.nix { }; @@ -90,6 +91,7 @@ let visualizer = callPackage ./visualizer.nix { }; vr-reversal = callPackage ./vr-reversal.nix { }; webtorrent-mpv-hook = callPackage ./webtorrent-mpv-hook.nix { }; + youtube-upnext = callPackage ./youtube-upnext.nix { }; }; aliases = { diff --git a/pkgs/applications/video/mpv/scripts/manga-reader.nix b/pkgs/applications/video/mpv/scripts/manga-reader.nix new file mode 100644 index 0000000000000..9a9621cb34d0e --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/manga-reader.nix @@ -0,0 +1,29 @@ +{ + lib, + fetchFromGitHub, + unstableGitUpdater, + buildLua, +}: + +buildLua rec { + pname = "manga-reader"; + + version = "0-unstable-2024-03-17"; + src = fetchFromGitHub { + owner = "Dudemanguy"; + repo = "mpv-manga-reader"; + rev = "6b65d98be7d20c8e272a4caa6c5018ed3a8bb2b3"; + hash = "sha256-54n513lpn1KCErXJHqL+GKdDE1P52LolS6xDott/epY="; + }; + passthru.updateScript = unstableGitUpdater { }; + + meta = { + description = "Manga reading script for mpv"; + longDescription = '' + mpv-manga-reader is a script aimed at making mpv a usable manga reader. + ''; + homepage = "https://github.com//mpv-manga-reader"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ idlip ]; + }; +} diff --git a/pkgs/applications/video/mpv/scripts/modernx.nix b/pkgs/applications/video/mpv/scripts/modernx.nix index e6e9ec6110c4f..340b169a0c03d 100644 --- a/pkgs/applications/video/mpv/scripts/modernx.nix +++ b/pkgs/applications/video/mpv/scripts/modernx.nix @@ -6,14 +6,14 @@ }: buildLua (finalAttrs: { pname = "modernx"; - version = "0.6.0"; + version = "0.6.1"; scriptPath = "modernx.lua"; src = fetchFromGitHub { owner = "cyl0"; repo = "ModernX"; rev = finalAttrs.version; - hash = "sha256-Gpofl529VbmdN7eOThDAsNfNXNkUDDF82Rd+csXGOQg="; + hash = "sha256-q7DwyfmOIM7K1L7vvCpq1EM0RVpt9E/drhAa9rLYb1k="; }; postInstall = '' diff --git a/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix b/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix index 5287c7f21108d..44f09b8f21fe8 100644 --- a/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix +++ b/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix @@ -2,7 +2,7 @@ buildLua rec { pname = "mpv-playlistmanager"; - version = "unstable-2024-02-26"; + version = "0-unstable-2024-02-26"; src = fetchFromGitHub { owner = "jonniek"; diff --git a/pkgs/applications/video/mpv/scripts/mpv-webm.nix b/pkgs/applications/video/mpv/scripts/mpv-webm.nix index e2411264c7b5d..efff9fa8ee169 100644 --- a/pkgs/applications/video/mpv/scripts/mpv-webm.nix +++ b/pkgs/applications/video/mpv/scripts/mpv-webm.nix @@ -7,7 +7,7 @@ buildLua { pname = "mpv-webm"; - version = "unstable-2024-04-22"; + version = "0-unstable-2024-04-22"; src = fetchFromGitHub { owner = "ekisu"; @@ -15,7 +15,10 @@ buildLua { rev = "225e8e53842f7da6f77034309c1e54293dc629a4"; hash = "sha256-82xWiuOChxfzX6e0+cGFxTqyuiPefyVwpvLM5ka7nPk="; }; - passthru.updateScript = unstableGitUpdater {}; + passthru.updateScript = unstableGitUpdater { + # only "latest" tag pointing at HEAD + hardcodeZeroVersion = true; + }; dontBuild = false; nativeBuildInputs = [ luaPackages.moonscript ]; diff --git a/pkgs/applications/video/mpv/scripts/occivink.nix b/pkgs/applications/video/mpv/scripts/occivink.nix index 1f17a27172872..be3bdb07db8da 100644 --- a/pkgs/applications/video/mpv/scripts/occivink.nix +++ b/pkgs/applications/video/mpv/scripts/occivink.nix @@ -13,7 +13,7 @@ let mkScript = name: args: let self = rec { pname = camelToKebab name; - version = "unstable-2024-01-11"; + version = "0-unstable-2024-01-11"; src = fetchFromGitHub { owner = "occivink"; repo = "mpv-scripts"; diff --git a/pkgs/applications/video/mpv/scripts/quack.nix b/pkgs/applications/video/mpv/scripts/quack.nix index e7138de928779..646a7a524d18f 100644 --- a/pkgs/applications/video/mpv/scripts/quack.nix +++ b/pkgs/applications/video/mpv/scripts/quack.nix @@ -6,10 +6,10 @@ buildLua rec { pname = "mpv-quack"; - version = "unstable-2020-05-26"; + version = "0-unstable-2020-05-27"; src = fetchFromGitHub { owner = "CounterPillow"; - repo = pname; + repo = "mpv-quack"; rev = "1c87f36f9726d462dd112188c04be54d85692cf3"; hash = "sha256-dEnJbS8RJoAxpKINdoMHN4l7vpEdf7+C5JVWpK0VXMw="; }; @@ -24,8 +24,8 @@ buildLua rec { The volume is linearly increased back up to its original level. Repeated seeks before the transition is done work as well. ''; - homepage = "https://github.com/CounterPillow/quack"; - license = lib.licenses.gpl3; + homepage = "https://github.com/CounterPillow/mpv-quack"; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ nicoo ]; }; } diff --git a/pkgs/applications/video/mpv/scripts/reload.nix b/pkgs/applications/video/mpv/scripts/reload.nix index ec9f441f7cfba..426aabd7fe495 100644 --- a/pkgs/applications/video/mpv/scripts/reload.nix +++ b/pkgs/applications/video/mpv/scripts/reload.nix @@ -6,7 +6,7 @@ buildLua rec { pname = "mpv-reload"; - version = "unstable-2024-03-22"; + version = "0-unstable-2024-03-22"; src = fetchFromGitHub { owner = "4e6"; repo = pname; diff --git a/pkgs/applications/video/mpv/scripts/sponsorblock-minimal.nix b/pkgs/applications/video/mpv/scripts/sponsorblock-minimal.nix index 7ea503ddd62c5..2557db8313d6d 100644 --- a/pkgs/applications/video/mpv/scripts/sponsorblock-minimal.nix +++ b/pkgs/applications/video/mpv/scripts/sponsorblock-minimal.nix @@ -2,7 +2,7 @@ buildLua { pname = "mpv_sponsorblock_minimal"; - version = "unstable-2023-08-20"; + version = "0-unstable-2023-08-20"; scriptPath = "sponsorblock_minimal.lua"; src = fetchFromGitea { diff --git a/pkgs/applications/video/mpv/scripts/thumbfast.nix b/pkgs/applications/video/mpv/scripts/thumbfast.nix index 7336fbe35dad8..e30c62774b759 100644 --- a/pkgs/applications/video/mpv/scripts/thumbfast.nix +++ b/pkgs/applications/video/mpv/scripts/thumbfast.nix @@ -2,7 +2,7 @@ buildLua { pname = "mpv-thumbfast"; - version = "unstable-2023-12-08"; + version = "0-unstable-2023-12-08"; src = fetchFromGitHub { owner = "po5"; diff --git a/pkgs/applications/video/mpv/scripts/visualizer.nix b/pkgs/applications/video/mpv/scripts/visualizer.nix index d387ac7b9ec71..332604286847a 100644 --- a/pkgs/applications/video/mpv/scripts/visualizer.nix +++ b/pkgs/applications/video/mpv/scripts/visualizer.nix @@ -6,7 +6,7 @@ }: buildLua { pname = "visualizer"; - version = "unstable-2024-03-10"; + version = "0-unstable-2024-03-10"; src = fetchFromGitHub { owner = "mfcc64"; diff --git a/pkgs/applications/video/mpv/scripts/youtube-upnext.nix b/pkgs/applications/video/mpv/scripts/youtube-upnext.nix new file mode 100644 index 0000000000000..cdd7ea66a1763 --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/youtube-upnext.nix @@ -0,0 +1,27 @@ +{ buildLua, fetchFromGitHub, curl, unstableGitUpdater, lib }: + +buildLua rec { + pname = "youtube-upnext"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "cvzi"; + repo = "mpv-youtube-upnext"; + rev = "v${version}"; + hash = "sha256-x9mfyc8JIlOpbSfGEwxXoUtsH0A+K3JPwT/8MHq7ks4="; + }; + + postPatch = '' + substituteInPlace youtube-upnext.lua \ + --replace '"curl"' '"${lib.getExe curl}"' + ''; + + passthru.updateScript = unstableGitUpdater { }; + + meta = with lib; { + description = "A userscript that allows you to play 'up next'/recommended youtube videos"; + homepage = "https://github.com/cvzi/mpv-youtube-upnext"; + maintainers = with maintainers; [ bddvlpr ]; + license = licenses.unfree; + }; +} |