diff options
author | OTABI Tomoya <tomoya.otabi@gmail.com> | 2023-10-22 15:33:30 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-22 15:33:30 +0900 |
commit | a89fc94a74a2d986c682b7cf40d82ca14ce9b35a (patch) | |
tree | 84b2e7cc5b378d78d5e02cba2060535e27cda6b1 /pkgs | |
parent | 4adadba6d8edc4242fcd9c70561de9b4107d46f0 (diff) | |
parent | f8f08f449b8293c0eda23fd1480188fc24ae7e65 (diff) |
Merge pull request #261666 from GaetanLepage/moderngl-window
python310Packages.moderngl-window: 2.4.4 -> 2.4.5, manim: 0.16.0.post0 -> 0.17.3
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/video/manim/conftest- | 0 | ||||
-rw-r--r-- | pkgs/applications/video/manim/default.nix | 13 | ||||
-rw-r--r-- | pkgs/applications/video/manim/pytest-report-header.patch | 21 | ||||
-rw-r--r-- | pkgs/development/python-modules/moderngl_window/default.nix | 15 |
4 files changed, 39 insertions, 10 deletions
diff --git a/pkgs/applications/video/manim/conftest- b/pkgs/applications/video/manim/conftest- new file mode 100644 index 0000000000000..e69de29bb2d1d --- /dev/null +++ b/pkgs/applications/video/manim/conftest- diff --git a/pkgs/applications/video/manim/default.nix b/pkgs/applications/video/manim/default.nix index c4443af00dbe7..9c7b0edb3bdf1 100644 --- a/pkgs/applications/video/manim/default.nix +++ b/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/pkgs/applications/video/manim/pytest-report-header.patch b/pkgs/applications/video/manim/pytest-report-header.patch new file mode 100644 index 0000000000000..953ede5dde94d --- /dev/null +++ b/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/pkgs/development/python-modules/moderngl_window/default.nix b/pkgs/development/python-modules/moderngl_window/default.nix index 31d76131c2ba7..f4e1d6a04de59 100644 --- a/pkgs/development/python-modules/moderngl_window/default.nix +++ b/pkgs/development/python-modules/moderngl_window/default.nix @@ -2,6 +2,7 @@ , stdenv , buildPythonPackage , fetchFromGitHub +, setuptools , glfw , moderngl , numpy @@ -19,18 +20,22 @@ buildPythonPackage rec { pname = "moderngl-window"; - version = "2.4.4"; - format = "setuptools"; + version = "2.4.5"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "moderngl"; repo = "moderngl_window"; rev = "refs/tags/${version}"; - hash = "sha256-mg3j5ZoMwdk39L5xjcoEJo9buqssM1VLJtndSFsuCB0="; + hash = "sha256-OfvIxezeZyuv5LLbe+4o1X2UCGnXT2DNvAF7t2Isw6Y="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ numpy moderngl @@ -75,6 +80,6 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ c0deaddict ]; platforms = platforms.mesaPlatforms; - broken = versionAtLeast pillow.version "2" || stdenv.isDarwin; + broken = stdenv.isDarwin; }; } |