diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-10-22 19:49:40 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-10-22 19:49:40 +0000 |
commit | 20437996b9a2db0a9d32391d15fbd1e8872f3baf (patch) | |
tree | 6b3287be5160b30523675178d52ba440e4267465 /nixpkgs/pkgs/applications/video | |
parent | 0f33cd5208992fe4992f932374a872f7687b9a6d (diff) | |
parent | a37d70e902fed9b9c0d1d4ac978e4373b86cc9bb (diff) | |
download | nixlib-20437996b9a2db0a9d32391d15fbd1e8872f3baf.tar nixlib-20437996b9a2db0a9d32391d15fbd1e8872f3baf.tar.gz nixlib-20437996b9a2db0a9d32391d15fbd1e8872f3baf.tar.bz2 nixlib-20437996b9a2db0a9d32391d15fbd1e8872f3baf.tar.lz nixlib-20437996b9a2db0a9d32391d15fbd1e8872f3baf.tar.xz nixlib-20437996b9a2db0a9d32391d15fbd1e8872f3baf.tar.zst nixlib-20437996b9a2db0a9d32391d15fbd1e8872f3baf.zip |
Merge commit 'a37d70e902fed9b9c0d1d4ac978e4373b86cc9bb'
Diffstat (limited to 'nixpkgs/pkgs/applications/video')
5 files changed, 33 insertions, 9 deletions
diff --git a/nixpkgs/pkgs/applications/video/manim/conftest- b/nixpkgs/pkgs/applications/video/manim/conftest- new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/nixpkgs/pkgs/applications/video/manim/conftest- diff --git a/nixpkgs/pkgs/applications/video/manim/default.nix b/nixpkgs/pkgs/applications/video/manim/default.nix index c4443af00dbe..9c7b0edb3bdf 100644 --- a/nixpkgs/pkgs/applications/video/manim/default.nix +++ b/nixpkgs/pkgs/applications/video/manim/default.nix @@ -68,27 +68,29 @@ let in python.pkgs.buildPythonApplication rec { pname = "manim"; - format = "pyproject"; - version = "0.16.0.post0"; + pyproject = true; + version = "0.17.3"; disabled = python3.pythonOlder "3.8"; src = fetchFromGitHub { owner = "ManimCommunity"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-iXiPnI6lTP51P1X3iLp75ArRP66o8WAANBLoStPrz4M="; + sha256 = "sha256-TU/b5nwk5Xc9wmFKAIMeBwC4YBy7HauGeGV9/n4Y64c="; }; nativeBuildInputs = with python.pkgs; [ poetry-core ]; + patches = [ + ./pytest-report-header.patch + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace "--no-cov-on-fail --cov=manim --cov-report xml --cov-report term" "" \ --replace 'cloup = "^0.13.0"' 'cloup = "*"' \ - --replace 'mapbox-earcut = "^0.12.10"' 'mapbox-earcut = "*"' \ - --replace 'click = ">=7.2<=9.0"' 'click = ">=7.2,<=9.0"' # https://github.com/ManimCommunity/manim/pull/2954 ''; buildInputs = [ cairo ]; @@ -119,6 +121,7 @@ in python.pkgs.buildPythonApplication rec { screeninfo skia-pathops srt + svgelements tqdm watchdog ]; diff --git a/nixpkgs/pkgs/applications/video/manim/pytest-report-header.patch b/nixpkgs/pkgs/applications/video/manim/pytest-report-header.patch new file mode 100644 index 000000000000..953ede5dde94 --- /dev/null +++ b/nixpkgs/pkgs/applications/video/manim/pytest-report-header.patch @@ -0,0 +1,21 @@ +diff --git a/conftest.py b/conftest.py +index da37e19b..d9f850d8 100644 +--- a/conftest.py ++++ b/conftest.py +@@ -32,16 +32,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 ( +- "\nOpenGL information", +- "------------------", +- f"vendor: {info['GL_VENDOR'].strip()}", +- f"renderer: {info['GL_RENDERER'].strip()}", +- f"version: {info['GL_VERSION'].strip()}\n", +- ) diff --git a/nixpkgs/pkgs/applications/video/ustreamer/default.nix b/nixpkgs/pkgs/applications/video/ustreamer/default.nix index 59da5b324425..777a1ce0c7f1 100644 --- a/nixpkgs/pkgs/applications/video/ustreamer/default.nix +++ b/nixpkgs/pkgs/applications/video/ustreamer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ustreamer"; - version = "5.41"; + version = "5.42"; src = fetchFromGitHub { owner = "pikvm"; repo = "ustreamer"; rev = "v${version}"; - hash = "sha256-N70wBKiKfOhlAR9qOSkc6dlO44lJXHWiUYb8nwXMKxo="; + hash = "sha256-V4ScXzZwh3fWCWmeGeb1hce+INYBmf3wtemwNch5FjY="; }; buildInputs = [ libbsd libevent libjpeg ]; diff --git a/nixpkgs/pkgs/applications/video/vdr/markad/default.nix b/nixpkgs/pkgs/applications/video/vdr/markad/default.nix index 3ced362b946d..23f966544e8b 100644 --- a/nixpkgs/pkgs/applications/video/vdr/markad/default.nix +++ b/nixpkgs/pkgs/applications/video/vdr/markad/default.nix @@ -19,12 +19,12 @@ }: stdenv.mkDerivation rec { pname = "vdr-markad"; - version = "3.3.3"; + version = "3.3.5"; src = fetchFromGitHub { repo = "vdr-plugin-markad"; owner = "kfb77"; - sha256 = "sha256-wU8hfNss0Lxvf9CqFhDAPOxIVaG/9vNR620xpEJkxWI="; + sha256 = "sha256-5D4nlGZfmPaNaLx2PoqLRqlbcukpM6DHpCtqmee+cww="; rev = "V${version}"; }; |