diff options
Diffstat (limited to 'pkgs/applications/video')
57 files changed, 379 insertions, 462 deletions
diff --git a/pkgs/applications/video/bilibili/default.nix b/pkgs/applications/video/bilibili/default.nix deleted file mode 100644 index e460a9037da45..0000000000000 --- a/pkgs/applications/video/bilibili/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib -, stdenv -, fetchurl -, electron -, makeWrapper -}: - -stdenv.mkDerivation rec { - pname = "bilibili"; - version = "1.13.2-1"; - src = fetchurl { - url = "https://github.com/msojocs/bilibili-linux/releases/download/v${version}/io.github.msojocs.bilibili_${version}_amd64.deb"; - hash = "sha256-yqgQNsTD4iT54LJYEbV6dk7OD7KoZvX61XERYQ4MsSA="; - }; - - unpackPhase = '' - runHook preUnpack - - ar x $src - tar xf data.tar.xz - - runHook postUnpack - ''; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - cp -r usr/share $out/share - sed -i "s|Exec=.*|Exec=$out/bin/bilibili|" $out/share/applications/*.desktop - cp -r opt/apps/io.github.msojocs.bilibili/files/bin/app $out/opt - makeWrapper ${electron}/bin/electron $out/bin/bilibili \ - --argv0 "bilibili" \ - --add-flags "$out/opt/app.asar" - - runHook postInstall - ''; - - meta = with lib; { - description = "Electron-based bilibili desktop client"; - homepage = "https://github.com/msojocs/bilibili-linux"; - license = with licenses; [ unfree mit ]; - maintainers = with maintainers; [ jedsek kashw2 ]; - platforms = [ "x86_64-linux" ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - mainProgram = "bilibili"; - }; -} diff --git a/pkgs/applications/video/ccextractor/default.nix b/pkgs/applications/video/ccextractor/default.nix index 3814f921fa240..399287c93f7ff 100644 --- a/pkgs/applications/video/ccextractor/default.nix +++ b/pkgs/applications/video/ccextractor/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { # during Linking C executable ccextractor broken = stdenv.isAarch64; license = licenses.gpl2Only; - maintainers = with maintainers; [ titanous ]; + maintainers = with maintainers; [ ]; mainProgram = "ccextractor"; }; } diff --git a/pkgs/applications/video/clapper/default.nix b/pkgs/applications/video/clapper/default.nix index 954ea58b4554d..b638bc3afd7df 100644 --- a/pkgs/applications/video/clapper/default.nix +++ b/pkgs/applications/video/clapper/default.nix @@ -2,54 +2,49 @@ , lib , stdenv , fetchFromGitHub -, glib , gobject-introspection -, python3 , pkg-config , ninja -, wayland -, wayland-protocols , desktop-file-utils , makeWrapper , shared-mime-info , wrapGAppsHook4 , meson -, gjs , gtk4 , gst_all_1 , libGL , libadwaita -, appstream-glib -, libsoup +, libsoup_3 +, vala +, cmake +, libmicrodns }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "clapper"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "Rafostar"; - repo = pname; - rev = version; - sha256 = "sha256-s+qdTq3/pHHstwr1W3Hs2Zje++iJFHM6hQTFoZD43bY="; + repo = "clapper"; + rev = finalAttrs.version; + hash = "sha256-5fD1OnVcY3ZC+QfoFqe2jV43/J36r85SpLUYF2ti7dY="; }; nativeBuildInputs = [ - appstream-glib - desktop-file-utils # for update-desktop-database - glib gobject-introspection meson + cmake ninja makeWrapper pkg-config - python3 - shared-mime-info # for update-mime-database wrapGAppsHook4 # for gsettings + desktop-file-utils # for update-desktop-database + shared-mime-info # for update-mime-database + vala ]; buildInputs = [ - gjs gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good @@ -58,29 +53,30 @@ stdenv.mkDerivation rec { gtk4 libGL libadwaita - libsoup - wayland - wayland-protocols + libsoup_3 + libmicrodns ]; postPatch = '' - patchShebangs build-aux/meson/postinstall.py + patchShebangs --build build-aux/meson/postinstall.py ''; - postInstall = '' - cp ${src}/data/icons/*.svg $out/share/icons/hicolor/scalable/apps/ - cp ${src}/data/icons/*.svg $out/share/icons/hicolor/symbolic/apps/ + # The package uses "clappersink" provided by itself + preFixup = '' + gappsWrapperArgs+=( + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : $out/lib/gstreamer-1.0 + ) ''; meta = with lib; { - description = "A GNOME media player built using GJS with GTK4 toolkit and powered by GStreamer with OpenGL rendering. "; + description = "A GNOME media player built using GTK4 toolkit and powered by GStreamer with OpenGL rendering"; longDescription = '' - Clapper is a GNOME media player build using GJS with GTK4 toolkit. - The media player is using GStreamer as a media backend and renders everything via OpenGL. + Clapper is a GNOME media player built using the GTK4 toolkit. + The media player is using GStreamer as a media backend. ''; homepage = "https://github.com/Rafostar/clapper"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ tomfitzhenry ]; + maintainers = with maintainers; [ aleksana ]; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/applications/video/davinci-resolve/default.nix b/pkgs/applications/video/davinci-resolve/default.nix index 7caf12ee76d81..bb631909872cf 100644 --- a/pkgs/applications/video/davinci-resolve/default.nix +++ b/pkgs/applications/video/davinci-resolve/default.nix @@ -181,7 +181,6 @@ let in buildFHSEnv { inherit (davinci) pname version; - name = null; targetPkgs = pkgs: with pkgs; [ alsa-lib diff --git a/pkgs/applications/video/electronplayer/electronplayer.nix b/pkgs/applications/video/electronplayer/electronplayer.nix index 270d5543c9939..cc26adc24780a 100644 --- a/pkgs/applications/video/electronplayer/electronplayer.nix +++ b/pkgs/applications/video/electronplayer/electronplayer.nix @@ -2,21 +2,18 @@ let pname = "electronplayer"; version = "2.0.8"; - name = "${pname}-${version}"; #TODO: remove the -rc4 from the tag in the url when possible src = fetchurl { - url = "https://github.com/oscartbeaumont/ElectronPlayer/releases/download/v${version}-rc4/${name}.AppImage"; + url = "https://github.com/oscartbeaumont/ElectronPlayer/releases/download/v${version}-rc4/${pname}-${version}.AppImage"; sha256 = "wAsmSFdbRPnYnDyWQSbtyj+GLJLN7ibksUE7cegfkhI="; }; - appimageContents = appimageTools.extractType2 { inherit name src; }; + appimageContents = appimageTools.extractType2 { inherit pname version src; }; in appimageTools.wrapType2 { - inherit name src; + inherit pname version src; extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} - install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop substituteInPlace $out/share/applications/${pname}.desktop \ --replace 'Exec=AppRun' 'Exec=ElectronPlayer' diff --git a/pkgs/applications/video/flowblade/default.nix b/pkgs/applications/video/flowblade/default.nix index 4e558d335e03f..937f5865d4043 100644 --- a/pkgs/applications/video/flowblade/default.nix +++ b/pkgs/applications/video/flowblade/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "flowblade"; - version = "2.14.0.1"; + version = "2.14.0.2"; src = fetchFromGitHub { owner = "jliljebl"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kyW/vYKGy/tgHmev8LgJbGugfKkzKFwLZStQQfWYPuQ="; + sha256 = "sha256-M+M6qkgYD5zM8IOFwQsuQlK7qQsvmSjR+CXVpTW+O8k="; }; buildInputs = [ diff --git a/pkgs/applications/video/go-chromecast/default.nix b/pkgs/applications/video/go-chromecast/default.nix index d554fd56847cb..44495386d4cf3 100644 --- a/pkgs/applications/video/go-chromecast/default.nix +++ b/pkgs/applications/video/go-chromecast/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { homepage = "https://github.com/vishen/go-chromecast"; description = "CLI for Google Chromecast, Home devices and Cast Groups"; license = licenses.asl20; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; mainProgram = "go-chromecast"; }; } diff --git a/pkgs/applications/video/haruna/default.nix b/pkgs/applications/video/haruna/default.nix index 14b0ca9497bc5..273b26808af58 100644 --- a/pkgs/applications/video/haruna/default.nix +++ b/pkgs/applications/video/haruna/default.nix @@ -1,6 +1,6 @@ { lib +, stdenv , fetchFromGitLab -, mkKdeDerivation , breeze-icons , breeze , cmake @@ -15,7 +15,7 @@ , kirigami , kxmlgui , kdoctools -, mpv +, mpvqt , pkg-config , wrapQtAppsHook , qqc2-desktop-style @@ -23,7 +23,7 @@ , yt-dlp }: -mkKdeDerivation rec { +stdenv.mkDerivation rec { pname = "haruna"; version = "1.0.2"; @@ -56,7 +56,7 @@ mkKdeDerivation rec { kirigami kxmlgui kdoctools - mpv + mpvqt qtbase ]; diff --git a/pkgs/applications/video/kodi/addons/jellyfin/default.nix b/pkgs/applications/video/kodi/addons/jellyfin/default.nix index 63cac3e7261cf..7623a3c4db136 100644 --- a/pkgs/applications/video/kodi/addons/jellyfin/default.nix +++ b/pkgs/applications/video/kodi/addons/jellyfin/default.nix @@ -5,13 +5,13 @@ in buildKodiAddon rec { pname = "jellyfin"; namespace = "plugin.video.jellyfin"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-kodi"; rev = "v${version}"; - sha256 = "sha256-i9lRPMHniUmKTeNSzgp6dF11uYOcjH3PgJEa+Jasx68="; + sha256 = "sha256-yCgsQnzmlmyYAjp1q0J9QxGDRg5JCd23H9xgVozHiGM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/keymap/default.nix b/pkgs/applications/video/kodi/addons/keymap/default.nix index 154bbd6b3c1e5..e98e5ca2cb419 100644 --- a/pkgs/applications/video/kodi/addons/keymap/default.nix +++ b/pkgs/applications/video/kodi/addons/keymap/default.nix @@ -3,11 +3,11 @@ buildKodiAddon rec { pname = "keymap"; namespace = "script.keymap"; - version = "1.1.5"; + version = "1.2.1"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; - sha256 = "sha256-wSztipTEGIqw1icsz+ziNxYuRZOFt3C66T1Ifap/ta0="; + sha256 = "sha256-AtIufZbOi3MW7aSOAlON8csJheJqAbuBtKIX0sX6zIw="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/youtube/default.nix b/pkgs/applications/video/kodi/addons/youtube/default.nix index d98acd70ac5c4..f2f340b257dbe 100644 --- a/pkgs/applications/video/kodi/addons/youtube/default.nix +++ b/pkgs/applications/video/kodi/addons/youtube/default.nix @@ -3,13 +3,13 @@ buildKodiAddon rec { pname = "youtube"; namespace = "plugin.video.youtube"; - version = "7.0.5"; + version = "7.0.6"; src = fetchFromGitHub { owner = "anxdpanic"; repo = "plugin.video.youtube"; rev = "v${version}"; - hash = "sha256-oM1n0Rye2QagxXoAZ/6mXKeGqKjEdewgS79lhp+yCQI="; + hash = "sha256-pxW45D/tppUTTgeR5wVteOP2f4TZ4wl/9A5IBhOZhTM="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/lbry/default.nix b/pkgs/applications/video/lbry/default.nix index b7c03850c951c..c3eb942fed929 100644 --- a/pkgs/applications/video/lbry/default.nix +++ b/pkgs/applications/video/lbry/default.nix @@ -1,14 +1,12 @@ { lib, fetchurl, appimageTools}: -let +appimageTools.wrapAppImage rec { pname = "lbry-desktop"; version = "0.53.9"; -in appimageTools.wrapAppImage rec { - name = "${pname}-${version}"; # Fetch from GitHub Releases and extract src = appimageTools.extract { - inherit name; + inherit pname version; src = fetchurl { url = "https://github.com/lbryio/lbry-desktop/releases/download/v${version}/LBRY_${version}.AppImage"; # Gotten from latest-linux.yml @@ -24,7 +22,7 @@ in appimageTools.wrapAppImage rec { # General fixup extraInstallCommands = '' # Firstly, rename the executable to lbry for convinence - mv $out/bin/${name} $out/bin/lbry + mv $out/bin/${pname} $out/bin/lbry # Now, install assets such as the desktop file and icons install -m 444 -D ${src}/lbry.desktop -t $out/share/applications diff --git a/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix b/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix index d75adb88f359c..1317536f3cf55 100644 --- a/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix +++ b/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix @@ -22,7 +22,7 @@ let inherit pname version src; }; in -(appimageTools.wrapType2 { +appimageTools.wrapType2 { inherit pname version src; profile = '' @@ -32,7 +32,6 @@ in extraPkgs = ps: appimageTools.defaultFhsEnvArgs.multiPkgs ps; extraInstallCommands = '' - mv $out/bin/{${pname}-${version},losslesscut} ( mkdir -p $out/share cd ${extracted}/usr @@ -53,6 +52,4 @@ in platforms = [ "x86_64-linux" ]; mainProgram = "losslesscut"; }; -}) // { - inherit pname version; } diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index dc016fda0a991..261e8008f6bc0 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -1,16 +1,17 @@ -{ lib -, mkDerivation -, fetchurl -, autoPatchelfHook -, pkg-config -, curl -, ffmpeg -, openssl -, qtbase -, zlib - -, withJava ? true -, jre_headless +{ + lib, + mkDerivation, + fetchurl, + autoPatchelfHook, + pkg-config, + curl, + ffmpeg, + openssl, + qtbase, + zlib, + + withJava ? true, + jre_headless, }: let @@ -30,12 +31,15 @@ let ]; sha256 = "2dtNdyv0+QYWQrfrIu5RQKSN4scSWKuLFNlJZXpxDUM="; }; - -in mkDerivation { +in +mkDerivation { pname = "makemkv"; inherit version; - srcs = [ src_bin src_oss ]; + srcs = [ + src_bin + src_oss + ]; sourceRoot = "makemkv-oss-${version}"; @@ -43,18 +47,25 @@ in mkDerivation { enableParallelBuilding = true; - nativeBuildInputs = [ autoPatchelfHook pkg-config ]; + nativeBuildInputs = [ + autoPatchelfHook + pkg-config + ]; - buildInputs = [ ffmpeg openssl qtbase zlib ]; + buildInputs = [ + ffmpeg + openssl + qtbase + zlib + ]; runtimeDependencies = [ (lib.getLib curl) ]; qtWrapperArgs = let binPath = lib.makeBinPath [ jre_headless ]; - in lib.optionals withJava [ - "--prefix PATH : ${binPath}" - ]; + in + lib.optionals withJava [ "--prefix PATH : ${binPath}" ]; installPhase = '' runHook preInstall @@ -84,9 +95,12 @@ in mkDerivation { expiration date. ''; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = [ licenses.unfree licenses.lgpl21 ]; + license = [ + licenses.unfree + licenses.lgpl21 + ]; homepage = "http://makemkv.com"; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ titanous ]; + maintainers = with maintainers; [ jchw ]; }; } diff --git a/pkgs/applications/video/manim/default.nix b/pkgs/applications/video/manim/default.nix deleted file mode 100644 index 57186eec19f8c..0000000000000 --- a/pkgs/applications/video/manim/default.nix +++ /dev/null @@ -1,147 +0,0 @@ -{ lib -, fetchFromGitHub - -, cairo -, ffmpeg -, texliveInfraOnly - -, python3 -}: - -let - # According to ManimCommunity documentation manim uses tex-packages packaged - # in a custom distribution called "manim-latex", - # - # https://community.chocolatey.org/packages/manim-latex#files - # - # which includes another cutom distribution called tinytex, for which the - # package list can be found at - # - # https://github.com/yihui/tinytex/blob/master/tools/pkgs-custom.txt - # - # these two combined add up to: - manim-tinytex = texliveInfraOnly.withPackages (ps: with ps; [ - - # tinytex - amsfonts amsmath atbegshi atveryend auxhook babel bibtex - bigintcalc bitset booktabs cm dehyph dvipdfmx dvips ec epstopdf-pkg etex - etexcmds etoolbox euenc everyshi fancyvrb filehook firstaid float fontspec - framed geometry gettitlestring glyphlist graphics graphics-cfg graphics-def - grffile helvetic hycolor hyperref hyph-utf8 iftex inconsolata infwarerr - intcalc knuth-lib kvdefinekeys kvoptions kvsetkeys l3backend l3kernel - l3packages latex latex-amsmath-dev latex-bin latex-fonts latex-tools-dev - latexconfig latexmk letltxmacro lm lm-math ltxcmds lua-alt-getopt luahbtex - lualatex-math lualibs luaotfload luatex mdwtools metafont mfware natbib - pdfescape pdftex pdftexcmds plain psnfss refcount rerunfilecheck stringenc - tex tex-ini-files times tipa tools unicode-data unicode-math uniquecounter - url xcolor xetex xetexconfig xkeyval xunicode zapfding - - # manim-latex - standalone everysel preview doublestroke ms setspace rsfs relsize ragged2e - fundus-calligra microtype wasysym physics dvisvgm jknapltx wasy cm-super - babel-english gnu-freefont mathastext cbfonts-fd - ]); - - python = python3; - -in python.pkgs.buildPythonApplication rec { - pname = "manim"; - pyproject = true; - version = "0.18.0.post0"; - disabled = python3.pythonOlder "3.8"; - - src = fetchFromGitHub { - owner = "ManimCommunity"; - repo = "manim"; - rev = "refs/tags/v${version}"; - hash = "sha256-4HwQ74oHloK+1KOD6SzXCzGIDD+Dc0jDabw6/+cqmos="; - }; - - nativeBuildInputs = with python.pkgs; [ - poetry-core - pythonRelaxDepsHook - ]; - - pythonRelaxDeps = [ - "cloup" - "isosurfaces" - "pillow" - "skia-pathops" - "watchdog" - ]; - - patches = [ - ./pytest-report-header.patch - ]; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "--no-cov-on-fail --cov=manim --cov-report xml --cov-report term" "" - ''; - - buildInputs = [ cairo ]; - - propagatedBuildInputs = with python.pkgs; [ - click - click-default-group - cloup - colour - grpcio - grpcio-tools - importlib-metadata - isosurfaces - jupyterlab - manimpango - mapbox-earcut - moderngl - moderngl-window - networkx - numpy - pillow - pycairo - pydub - pygments - pysrt - rich - scipy - screeninfo - skia-pathops - srt - svgelements - tqdm - watchdog - ]; - - makeWrapperArgs = [ - "--prefix" "PATH" ":" (lib.makeBinPath [ - ffmpeg - manim-tinytex - ]) - ]; - - nativeCheckInputs = [ - ffmpeg - manim-tinytex - ] ++ (with python.pkgs; [ - pytest-xdist - pytestCheckHook - ]); - - # about 55 of ~600 tests failing mostly due to demand for display - disabledTests = import ./failing_tests.nix; - - pythonImportsCheck = [ "manim" ]; - - meta = with lib; { - description = "Animation engine for explanatory math videos - Community version"; - longDescription = '' - Manim is an animation engine for explanatory math videos. It's used to - create precise animations programmatically, as seen in the videos of - 3Blue1Brown on YouTube. This is the community maintained version of - manim. - ''; - homepage = "https://github.com/ManimCommunity/manim"; - license = licenses.mit; - maintainers = with maintainers; [ friedelino ]; - }; -} diff --git a/pkgs/applications/video/manim/failing_tests.nix b/pkgs/applications/video/manim/failing_tests.nix deleted file mode 100644 index ac788c25be20c..0000000000000 --- a/pkgs/applications/video/manim/failing_tests.nix +++ /dev/null @@ -1,92 +0,0 @@ -[ - # reason for failure: tests try to open display - "test_background_color" - "test_scene_add_remove" - "test_Circle" - "test_wait_skip" - "test_basic_scene_with_default_values" - "test_dry_run_with_png_format" - "test_dry_run_with_png_format_skipped_animations" - "test_FixedMobjects3D" - "test_basic_scene_l_flag" - "test_n_flag" - "test_s_flag_opengl_renderer" - "test_s_flag_no_animations" - "test_image_output_for_static_scene" - "test_no_image_output_with_interactive_embed" - "test_no_default_image_output_with_non_static_scene" - "test_image_output_for_static_scene_with_write_to_movie" - "test_s_flag" - "test_r_flag" - "test_play_skip" - "test_write_to_movie_disables_window" - "test_a_flag" - "test_pixel_coords_to_space_coords" - "test_t_values" - "test_custom_folders" - "test_t_values[15]" - "test_t_values[30]" - "test_t_values[60]" - "test_dash_as_filename" - "test_images_are_created_when_png_format_set_for_opengl" - "test_t_values_with_skip_animations" - "test_static_wait_detection" - "test_non_static_wait_detection" - "test_frozen_frame" - "test_gif_format_output" - "test_animate_with_changed_custom_attribute" - "test_images_are_zero_padded_when_zero_pad_set_for_opengl" - "test_mp4_format_output" - "test_videos_not_created_when_png_format_set" - "test_images_are_created_when_png_format_set" - "test_images_are_zero_padded_when_zero_pad_set" - "test_webm_format_output" - "test_default_format_output_for_transparent_flag" - "test_mov_can_be_set_as_output_format" - "test_force_window_opengl_render_with_format" - "test_get_frame_with_preview_disabled" - "test_get_frame_with_preview_enabled" - - # reason for failure: tests try to reach network - "test_logging_to_file" - "test_plugin_function_like" - "test_plugin_no_all" - "test_plugin_with_all" - - # failing with: - # E AssertionError: - # E Not equal to tolerance rtol=1e-07, atol=1.01 - # E Frame no -1. You can use --show_diff to visually show the difference. - # E Mismatched elements: 18525 / 1639680 (1.13%) - # E Max absolute difference: 255 - # E Max relative difference: 255. - "test_Text2Color" - "test_PointCloudDot" - "test_Torus" - - # test_ImplicitFunction[/test_implicit_graph] failing with: - # E AssertionError: - # E Not equal to tolerance rtol=1e-07, atol=1.01 - # E Frame no -1. You can use --show_diff to visually show the difference. - # E Mismatched elements: 1185[/633] / 1639680[/1639680] (0.0723[/0.0386]%) - # E Max absolute difference: 125[/121] - # E Max relative difference: 6.5[/1] - # - # These started failing after relaxing the “watchdog” and “isosurfaces” dependencies, - # likely due to a tolerance difference. They should, however, start working again when [1] is - # included in a Manim release. - # [1]: https://github.com/ManimCommunity/manim/pull/3376 - "test_ImplicitFunction" - "test_implicit_graph" - - # failing with: - # TypeError: __init__() got an unexpected keyword argument 'msg' - maybe you meant pytest.mark.skipif? - "test_force_window_opengl_render_with_movies" - - # mismatching expecation on the new commandline - "test_manim_new_command" - - # This tests checks if the manim executable is a python script. In our case it is not. - # It is a wrapper shell script instead. - "test_manim_checkhealth_subcommand" -] diff --git a/pkgs/applications/video/manim/pytest-report-header.patch b/pkgs/applications/video/manim/pytest-report-header.patch deleted file mode 100644 index 7aa87d373e508..0000000000000 --- a/pkgs/applications/video/manim/pytest-report-header.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/conftest.py b/conftest.py -index dacb730a..149c6702 100644 ---- a/conftest.py -+++ b/conftest.py -@@ -33,17 +33,3 @@ def temp_media_dir(tmpdir, monkeypatch, request): - with tempconfig({"media_dir": str(tmpdir)}): - assert config.media_dir == str(tmpdir) - yield tmpdir -- -- --def pytest_report_header(config): -- ctx = moderngl.create_standalone_context() -- info = ctx.info -- ctx.release() -- return ( -- f"\nCairo Version: {cairo.cairo_version()}", -- "\nOpenGL information", -- "------------------", -- f"vendor: {info['GL_VENDOR'].strip()}", -- f"renderer: {info['GL_RENDERER'].strip()}", -- f"version: {info['GL_VERSION'].strip()}\n", -- ) 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/molotov/default.nix b/pkgs/applications/video/molotov/default.nix index 1930f06ffdb60..58e66c8f77ae8 100644 --- a/pkgs/applications/video/molotov/default.nix +++ b/pkgs/applications/video/molotov/default.nix @@ -12,7 +12,6 @@ in appimageTools.wrapType2 { inherit pname version src; extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} install -m 444 -D \ ${appimageContents}/@molotovdesktop-wrapper.desktop \ $out/share/applications/${pname}.desktop diff --git a/pkgs/applications/video/mpv/scripts/buildLua.nix b/pkgs/applications/video/mpv/scripts/buildLua.nix index e0afa7d932c67..8db7d4b1aa3c9 100644 --- a/pkgs/applications/video/mpv/scripts/buildLua.nix +++ b/pkgs/applications/video/mpv/scripts/buildLua.nix @@ -2,7 +2,10 @@ , stdenvNoCC }: let - escapedList = with lib; concatMapStringsSep " " (s: "'${escape [ "'" ] s}'"); + # Escape strings for embedding in shell scripts + escaped = s: "'${lib.escape [ "'" ] s}'"; + escapedList = lib.concatMapStringsSep " " escaped; + fileName = pathStr: lib.last (lib.splitString "/" pathStr); scriptsDir = "$out/share/mpv/scripts"; @@ -50,14 +53,14 @@ lib.makeOverridable (args: stdenvNoCC.mkDerivation (extendedBy } [ ${with builtins; toString (length extraScripts)} -eq 0 ] || { echo "mpvScripts.buildLua does not support 'extraScripts'" \ - "when 'scriptPath' is a directory" + "when 'scriptPath' is a directory" >&2 exit 1 } mkdir -p "${scriptsDir}" cp -a "${scriptPath}" "${scriptsDir}/${scriptName}" else - install -m644 -Dt "${scriptsDir}" \ - ${escapedList ([ scriptPath ] ++ extraScripts)} + install -m644 -Dt "${scriptsDir}" ${escaped scriptPath} + ${lib.optionalString (extraScripts != []) ''cp -at "${scriptsDir}/" ${escapedList extraScripts}''} fi runHook postInstall 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 69eba782cc1d7..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"; @@ -29,7 +29,6 @@ buildLua { extraScripts = [ "c_concat.sh" ]; postInstall = '' - chmod 0755 $out/share/mpv/scripts/c_concat.sh wrapProgram $out/share/mpv/scripts/c_concat.sh \ --run "mkdir -p ~/.config/mpv/cutter/" ''; diff --git a/pkgs/applications/video/mpv/scripts/default.nix b/pkgs/applications/video/mpv/scripts/default.nix index fac7c910d57ad..ce5188c09d294 100644 --- a/pkgs/applications/video/mpv/scripts/default.nix +++ b/pkgs/applications/video/mpv/scripts/default.nix @@ -69,12 +69,16 @@ let cutter = callPackage ./cutter.nix { }; 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 { }; mpv-cheatsheet = callPackage ./mpv-cheatsheet.nix { }; + mpv-notify-send = callPackage ./mpv-notify-send.nix { }; mpv-osc-modern = callPackage ./mpv-osc-modern.nix { }; mpv-playlistmanager = callPackage ./mpv-playlistmanager.nix { }; + mpv-slicing = callPackage ./mpv-slicing.nix { }; mpv-webm = callPackage ./mpv-webm.nix { }; mpvacious = callPackage ./mpvacious.nix { }; quack = callPackage ./quack.nix { }; @@ -86,9 +90,11 @@ let thumbfast = callPackage ./thumbfast.nix { }; thumbnail = callPackage ./thumbnail.nix { }; uosc = callPackage ./uosc.nix { }; + videoclip = callPackage ./videoclip.nix { }; 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/memo.nix b/pkgs/applications/video/mpv/scripts/memo.nix new file mode 100644 index 0000000000000..5361b796268e1 --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/memo.nix @@ -0,0 +1,26 @@ +{ fetchFromGitHub +, buildLua +, lib +, unstableGitUpdater +}: + +buildLua { + pname = "memo"; + version = "0-unstable-2023-10-31"; + + src = fetchFromGitHub { + owner = "po5"; + repo = "memo"; + rev = "6f2b036ef860e130ea584657389e0a7ceb4d954f"; + hash = "sha256-m8ikXuw7PM4Btg8w7ufLneKA4fnYjMyfVJYueZILMw8="; + }; + + passthru.updateScript = unstableGitUpdater {}; + + meta = with lib; { + description = "A recent files menu for mpv"; + homepage = "https://github.com/po5/memo"; + license = licenses.gpl3Only; + maintainers = with lib.maintainers; [ purrpurrn ]; + }; +} 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-cheatsheet.nix b/pkgs/applications/video/mpv/scripts/mpv-cheatsheet.nix index 56013b1fceeb4..a15f54d01ef22 100644 --- a/pkgs/applications/video/mpv/scripts/mpv-cheatsheet.nix +++ b/pkgs/applications/video/mpv/scripts/mpv-cheatsheet.nix @@ -1,4 +1,9 @@ -{ lib, fetchFromGitHub, nodePackages, stdenvNoCC }: +{ lib +, fetchFromGitHub +, gitUpdater +, nodePackages +, stdenvNoCC +}: stdenvNoCC.mkDerivation (finalAttrs: { pname = "mpv-cheatsheet"; version = "0.30.0.2"; @@ -9,6 +14,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { rev = "v${finalAttrs.version}"; hash = "sha256-MWK0CYto3zgn3fivmL43tvgZn6XrjPxKLp0lgTFdplM="; }; + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; nativeBuildInputs = [ nodePackages.browserify diff --git a/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix b/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix new file mode 100644 index 0000000000000..04b03670b79f2 --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix @@ -0,0 +1,39 @@ +{ lib +, buildLua +, fetchFromGitHub +, fetchpatch +, unstableGitUpdater +, libnotify }: + +buildLua rec { + pname = "mpv-notify-send"; + version = "0-unstable-2020-02-24"; + + src = fetchFromGitHub { + owner = "emilazy"; + repo = pname; + rev = "a2bab8b2fd8e8d14faa875b5cc3a73f1276cd88a"; + sha256 = "sha256-EwVkhyB87TJ3i9xJmmZMSTMUKvfbImI1S+y1vgRWbDk="; + }; + + patches = [ + # show title of online videos instead of url + (fetchpatch { + url = "https://github.com/emilazy/mpv-notify-send/pull/6.patch"; + hash = "sha256-7aXQ8qeqG4yX0Uyn09xCIESnwPZsb6Frd7C49XgbpFw="; + }) + ]; + + passthru.extraWrapperArgs = [ + "--prefix" "PATH" ":" (lib.makeBinPath libnotify) + ]; + + passthru.updateScript = unstableGitUpdater { }; + + meta = with lib; { + description = "A Lua script for mpv to send notifications with notify-send"; + homepage = "https://github.com/emilazy/mpv-notify-send"; + license = licenses.wtfpl; + maintainers = with maintainers; [ r3n3gad3p3arl ]; + }; +} 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-slicing.nix b/pkgs/applications/video/mpv/scripts/mpv-slicing.nix new file mode 100644 index 0000000000000..cf66a6c78a297 --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/mpv-slicing.nix @@ -0,0 +1,34 @@ +{ + lib, + buildLua, + fetchFromGitHub, + ffmpeg, + unstableGitUpdater, +}: + +buildLua { + pname = "mpv-slicing"; + version = "0-unstable-2017-11-25"; + + src = fetchFromGitHub { + owner = "Kagami"; + repo = "mpv_slicing"; + rev = "d09c11227704c8d5bdaa2c799ef64dce881c63a7"; + hash = "sha256-MKoM0f74/XoctiHQVOB3LzFWtJXpsREfQh5icaebCJo="; + }; + passthru.updateScript = unstableGitUpdater { }; + + postPatch = '' + substituteInPlace slicing.lua \ + --replace-fail ffmpeg ${lib.getExe ffmpeg} + ''; + + passthru.scriptName = "slicing.lua"; + + meta = { + description = "A lua script to cut fragments of the video in uncompressed RGB format"; + homepage = "https://github.com/Kagami/mpv_slicing"; + license = lib.licenses.cc0; + maintainers = with lib.maintainers; [ tomasajt ]; + }; +} diff --git a/pkgs/applications/video/mpv/scripts/mpv-webm.nix b/pkgs/applications/video/mpv/scripts/mpv-webm.nix index 5645d6a65f6bf..efff9fa8ee169 100644 --- a/pkgs/applications/video/mpv/scripts/mpv-webm.nix +++ b/pkgs/applications/video/mpv/scripts/mpv-webm.nix @@ -7,15 +7,18 @@ buildLua { pname = "mpv-webm"; - version = "unstable-2023-11-18"; + version = "0-unstable-2024-04-22"; src = fetchFromGitHub { owner = "ekisu"; repo = "mpv-webm"; - rev = "6b5863f68275b3dc91c2507284c039ec8a4cbd97"; - hash = "sha256-rJamBm6FyxWcJO7VXXOUTO9piWCkPfEVdqGKGeJ/h0c="; + rev = "225e8e53842f7da6f77034309c1e54293dc629a4"; + hash = "sha256-82xWiuOChxfzX6e0+cGFxTqyuiPefyVwpvLM5ka7nPk="; + }; + passthru.updateScript = unstableGitUpdater { + # only "latest" tag pointing at HEAD + hardcodeZeroVersion = true; }; - passthru.updateScript = unstableGitUpdater {}; dontBuild = false; nativeBuildInputs = [ luaPackages.moonscript ]; diff --git a/pkgs/applications/video/mpv/scripts/mpvacious.nix b/pkgs/applications/video/mpv/scripts/mpvacious.nix index ec4e25b88fb7b..adac4d1d60692 100644 --- a/pkgs/applications/video/mpv/scripts/mpvacious.nix +++ b/pkgs/applications/video/mpv/scripts/mpvacious.nix @@ -9,13 +9,13 @@ buildLua rec { pname = "mpvacious"; - version = "0.27"; + version = "0.33"; src = fetchFromGitHub { owner = "Ajatt-Tools"; repo = "mpvacious"; rev = "v${version}"; - sha256 = "sha256-pn6hNEhOzKiU+zQJKj/rF0GLXaEe+XBpHp0RlzsNIio="; + sha256 = "sha256-VHMXW2AzgX88EDnNshxo9Gh8mpXzRoTAq+58HKasUdo="; }; passthru.updateScript = gitUpdater { rev-prefix = "v"; 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/sponsorblock.nix b/pkgs/applications/video/mpv/scripts/sponsorblock.nix index 077b8f0590b28..56ac2575ecdea 100644 --- a/pkgs/applications/video/mpv/scripts/sponsorblock.nix +++ b/pkgs/applications/video/mpv/scripts/sponsorblock.nix @@ -32,7 +32,7 @@ buildLua { --replace 'mp.find_config_file("scripts")' "\"$out/share/mpv/scripts\"" ''; - postInstall = "cp -a sponsorblock_shared $out/share/mpv/scripts/"; + extraScripts = [ "sponsorblock_shared" ]; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; 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/videoclip.nix b/pkgs/applications/video/mpv/scripts/videoclip.nix new file mode 100644 index 0000000000000..fff5b788b0286 --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/videoclip.nix @@ -0,0 +1,40 @@ +{ lib +, fetchFromGitHub +, curl +, xclip +, wl-clipboard +, stdenv +, buildLua +, unstableGitUpdater +}: +buildLua { + pname = "videoclip"; + version = "0-unstable-2024-03-08"; + + src = fetchFromGitHub { + owner = "Ajatt-Tools"; + repo = "videoclip"; + rev = "0e3f2245b03e888c14c093a50261e0f54ecdf8e8"; + hash = "sha256-Sg6LHU9OVmVx3cTs8Y0WL8wACb5BlVyeBRccoX+7BXY="; + }; + + patchPhase = '' + substituteInPlace platform.lua \ + --replace \'curl\' \'${lib.getExe curl}\' \ + '' + lib.optionalString stdenv.isLinux '' + --replace xclip ${lib.getExe xclip} \ + --replace wl-copy ${lib.getExe' wl-clipboard "wl-copy"} + ''; + + scriptPath = "."; + passthru.scriptName = "videoclip"; + passthru.updateScript = unstableGitUpdater { }; + + meta = with lib; { + description = "Easily create videoclips with mpv"; + homepage = "https://github.com/Ajatt-Tools/videoclip"; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = with maintainers; [ BatteredBunny ]; + }; +} 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; + }; +} diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix index fba7eb16839ef..07e8be2bea719 100644 --- a/pkgs/applications/video/mythtv/default.nix +++ b/pkgs/applications/video/mythtv/default.nix @@ -42,6 +42,6 @@ mkDerivation rec { description = "Open Source DVR"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.titanous ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 3df52d08684d5..f278d832958ed 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -198,7 +198,7 @@ stdenv.mkDerivation (finalAttrs: { video content, efficiently ''; homepage = "https://obsproject.com"; - maintainers = with maintainers; [ eclairevoyant jb55 MP2E materus fpletz ]; + maintainers = with maintainers; [ eclairevoyant jb55 materus fpletz ]; license = with licenses; [ gpl2Plus ] ++ optional withFdk fraunhofer-fdk; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; mainProgram = "obs"; diff --git a/pkgs/applications/video/obs-studio/plugins/input-overlay.nix b/pkgs/applications/video/obs-studio/plugins/input-overlay.nix index 8926b7e1764b8..9f13de2847402 100644 --- a/pkgs/applications/video/obs-studio/plugins/input-overlay.nix +++ b/pkgs/applications/video/obs-studio/plugins/input-overlay.nix @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { pname = "obs-input-overlay"; - version = "5.0.4"; + version = "5.0.5"; src = fetchFromGitHub { owner = "univrsal"; repo = "input-overlay"; rev = "v${version}"; - sha256 = "sha256-MON68yjHUOF/bggWqhw8D0+23HpKQN3jWs+5lLAacaQ="; + sha256 = "sha256-9HqEz+KnTt8MyhwqFWjalbl3H/DCzumckXMctCGhs3o="; fetchSubmodules = true; }; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/default.nix index 766fca414cd8d..638d0785f4c80 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/default.nix @@ -2,37 +2,45 @@ , stdenv , fetchFromGitHub , cmake +, ninja , obs-studio , onnxruntime , opencv +, qt6 +, curl }: stdenv.mkDerivation rec { pname = "obs-backgroundremoval"; - version = "0.5.16"; + version = "1.1.13"; src = fetchFromGitHub { - owner = "royshil"; + owner = "occ-ai"; repo = "obs-backgroundremoval"; - rev = "v${version}"; - hash = "sha256-E+pm/Ma6dZTYlX3DpB49ynTETsRS2TBqgHSCijl/Txc="; + rev = version; + hash = "sha256-QoC9/HkwOXMoFNvcOxQkGCLLAJmsja801LKCNT9O9T0="; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ obs-studio onnxruntime opencv ]; + nativeBuildInputs = [ cmake ninja ]; + buildInputs = [ obs-studio onnxruntime opencv qt6.qtbase curl ]; dontWrapQtApps = true; cmakeFlags = [ + "--preset linux-x86_64" + "-DCMAKE_MODULE_PATH:PATH=${src}/cmake" "-DUSE_SYSTEM_ONNXRUNTIME=ON" "-DUSE_SYSTEM_OPENCV=ON" + "-DDISABLE_ONNXRUNTIME_GPU=ON" ]; - postInstall = '' - mkdir $out/lib $out/share - mv $out/obs-plugins/64bit $out/lib/obs-plugins - rm -rf $out/obs-plugins - mv $out/data $out/share/obs + buildPhase = '' + cd .. + cmake --build build_x86_64 --parallel + ''; + + installPhase = '' + cmake --install build_x86_64 --prefix "$out" ''; meta = with lib; { @@ -40,6 +48,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/royshil/obs-backgroundremoval"; maintainers = with maintainers; [ zahrun ]; license = licenses.mit; - platforms = [ "x86_64-linux" "i686-linux" ]; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-command-source.nix b/pkgs/applications/video/obs-studio/plugins/obs-command-source.nix index f38d53a14101e..df4ec89316b33 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-command-source.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-command-source.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "obs-command-source"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "norihiro"; repo = "obs-command-source"; rev = version; - sha256 = "sha256-rBGMQb7iGtxF54bBOK5lHI6VFYCSEyeSq2Arz0T0DPo="; + sha256 = "sha256-yrzY4pHSupkkdRlx725oSVtQTH1Ci9zFolHN3i2Vm28="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix b/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix index deebf1af7b848..f400fced2ac08 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "obs-shaderfilter"; - version = "2.3.1"; + version = "2.3.2"; src = fetchFromGitHub { owner = "exeldro"; repo = "obs-shaderfilter"; rev = version; - sha256 = "sha256-J7tCEIB9zQ0zZFl1eSuEARd+KqpNClHfYx3wcLawFeM="; + sha256 = "sha256-INxz8W4AMKxRcfpZkhqqsWWWQQVEc2G9iFQBit1YA2E="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix b/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix index c6e9f450b9907..82767da10d998 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "obs-vertical-canvas"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "Aitum"; repo = "obs-vertical-canvas"; rev = version; - sha256 = "sha256-baEF8vcAmac4bwpzJnGE2WczTa6vojjRQ/oEKgYeXgk="; + sha256 = "sha256-3lFM7bOzsKex6JUdbcw8MNS4PRzaN/E/vngdukgfV0s="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix index 089b60a3b27c5..fdd96d1aa3ded 100644 --- a/pkgs/applications/video/openshot-qt/default.nix +++ b/pkgs/applications/video/openshot-qt/default.nix @@ -8,6 +8,9 @@ , python3 , qtbase , qtsvg +, qtwayland +, wayland +, waylandSupport ? stdenv.isLinux , wrapGAppsHook }: @@ -33,6 +36,9 @@ mkDerivationWith python3.pkgs.buildPythonApplication { buildInputs = [ gtk3 + ] ++ lib.optionals waylandSupport [ + qtwayland + wayland ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 8678c456b07f7..87732ad75b8cc 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -21,13 +21,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "shotcut"; - version = "24.02.29"; + version = "24.04.28"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${finalAttrs.version}"; - hash = "sha256-PHpVquqC0MT7WNoWcdB9WTz4ZiSK4/f4oD5PH1gWBnw="; + hash = "sha256-iMg2XrTrLFZXXvnJ7lMdkxf/LTaL9bh9Nc2jsPOS0eo="; }; nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook ]; diff --git a/pkgs/applications/video/showmethekey/default.nix b/pkgs/applications/video/showmethekey/default.nix index cd61cfc9d0d44..ef30ed13784c0 100644 --- a/pkgs/applications/video/showmethekey/default.nix +++ b/pkgs/applications/video/showmethekey/default.nix @@ -12,15 +12,16 @@ , libxkbcommon , pkg-config }: + stdenv.mkDerivation rec { pname = "showmethekey"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "AlynxZhou"; - repo = pname; - rev = "v${version}"; - hash = "sha256-eeObomb4Gv/vpvViHsi3+O0JR/rYamrlZNZaXKL6KJw="; + repo = "showmethekey"; + rev = "refs/tags/v${version}"; + hash = "sha256-pVFkO/+a7GAOXbYBfU0zcO/uD26PX+y02bEZa3f1ZP8="; }; nativeBuildInputs = [ @@ -40,8 +41,9 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://showmethekey.alynx.one/"; description = "Show keys you typed on screen"; + homepage = "https://showmethekey.alynx.one/"; + changelog = "https://github.com/AlynxZhou/showmethekey/releases/tag/v${version}"; license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ ocfox ]; diff --git a/pkgs/applications/video/vcs/default.nix b/pkgs/applications/video/vcs/default.nix index e21e3a98f1f7f..63a9989134735 100644 --- a/pkgs/applications/video/vcs/default.nix +++ b/pkgs/applications/video/vcs/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { meta = { description = "Generates contact sheets from video files"; homepage = "http://p.outlyer.net/vcs"; - license = licenses.cc-by-nc-sa-30; + license = licenses.lgpl21Plus; maintainers = with maintainers; [ elitak ]; platforms = with platforms; unix; mainProgram = "vcs"; diff --git a/pkgs/applications/video/vdr/default.nix b/pkgs/applications/video/vdr/default.nix index c5159fdd61f0f..5713aeb954af3 100644 --- a/pkgs/applications/video/vdr/default.nix +++ b/pkgs/applications/video/vdr/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { pname = "vdr"; - version = "2.6.6"; + version = "2.6.7"; src = fetchgit { url = "git://git.tvdr.de/vdr.git"; rev = version; - hash = "sha256-3om/Q67PHtX/aIG4zMCaJTyD9bZNEcyE5LQTeb+zB+M="; + hash = "sha256-6i3EQgARwMLNejgB0NevmLmd9OrNBvjqW+qLrAdqUxE="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/video/vdr/markad/default.nix b/pkgs/applications/video/vdr/markad/default.nix index 28dad0200270a..efc08eaf06d19 100644 --- a/pkgs/applications/video/vdr/markad/default.nix +++ b/pkgs/applications/video/vdr/markad/default.nix @@ -19,12 +19,12 @@ }: stdenv.mkDerivation rec { pname = "vdr-markad"; - version = "3.4.13"; + version = "3.6.0"; src = fetchFromGitHub { repo = "vdr-plugin-markad"; owner = "kfb77"; - sha256 = "sha256-pDnziIWX6deBXuVIN7w6F6TdYDCcEO6MSaUIMB63uAg="; + sha256 = "sha256-O958GNQI6Z+m4sIJfGQzLaCrzyrdpn+ZY8COx7RoUZs="; rev = "V${version}"; }; diff --git a/pkgs/applications/video/vdr/softhddevice/default.nix b/pkgs/applications/video/vdr/softhddevice/default.nix index 23c6433f9ebbd..caccdc6ed39a8 100644 --- a/pkgs/applications/video/vdr/softhddevice/default.nix +++ b/pkgs/applications/video/vdr/softhddevice/default.nix @@ -14,12 +14,12 @@ }: stdenv.mkDerivation rec { pname = "vdr-softhddevice"; - version = "2.1.2"; + version = "2.2.0"; src = fetchFromGitHub { owner = "ua0lnj"; repo = "vdr-plugin-softhddevice"; - sha256 = "sha256-y6b0nOf597uxS9zDh0NQOwLN81nk4U7lHK2CalyVi8s="; + sha256 = "sha256-1yCDNfUdQLgJ0WWyx0q3Hi0yxb6zxaK7wMzLD9jXweI="; rev = "v${version}"; }; diff --git a/pkgs/applications/video/wf-recorder/default.nix b/pkgs/applications/video/wf-recorder/default.nix index 56a85517eb0a1..f4e2c8ee714fd 100644 --- a/pkgs/applications/video/wf-recorder/default.nix +++ b/pkgs/applications/video/wf-recorder/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; changelog = "https://github.com/ammen99/wf-recorder/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ yuka ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; mainProgram = "wf-recorder"; }; |