diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/video/manim')
4 files changed, 17 insertions, 35 deletions
diff --git a/nixpkgs/pkgs/applications/video/manim/conftest- b/nixpkgs/pkgs/applications/video/manim/conftest- deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/nixpkgs/pkgs/applications/video/manim/conftest- +++ /dev/null diff --git a/nixpkgs/pkgs/applications/video/manim/default.nix b/nixpkgs/pkgs/applications/video/manim/default.nix index 9c7b0edb3bdf..70b3ad8e1e45 100644 --- a/nixpkgs/pkgs/applications/video/manim/default.nix +++ b/nixpkgs/pkgs/applications/video/manim/default.nix @@ -1,10 +1,9 @@ { lib , fetchFromGitHub -, fetchPypi , cairo , ffmpeg -, texlive +, texliveInfraOnly , python3 }: @@ -21,11 +20,10 @@ let # https://github.com/yihui/tinytex/blob/master/tools/pkgs-custom.txt # # these two combined add up to: - manim-tinytex = { - inherit (texlive) + manim-tinytex = texliveInfraOnly.withPackages (ps: with ps; [ # tinytex - scheme-infraonly amsfonts amsmath atbegshi atveryend auxhook babel bibtex + 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 @@ -41,42 +39,22 @@ let # 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; - }; + babel-english gnu-freefont mathastext cbfonts-fd + ]); - python = python3.override { - packageOverrides = self: super: { - networkx = super.networkx.overridePythonAttrs (oldAttrs: rec { - pname = "networkx"; - version = "2.8.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-Iw04gRevhw/OVkejxSQB/PdT6Ucg5uprQZelNVZIiF4="; - }; - }); - - watchdog = super.watchdog.overridePythonAttrs (oldAttrs: rec{ - pname = "watchdog"; - version = "2.3.1"; - src = fetchPypi { - inherit pname version; - hash = "sha256-2fntJu0iqdMxggqEMsNoBwfqi1QSHdzJ3H2fLO6zaQY="; - }; - }); - }; - }; + python = python3; in python.pkgs.buildPythonApplication rec { pname = "manim"; pyproject = true; - version = "0.17.3"; + version = "0.18.0"; disabled = python3.pythonOlder "3.8"; src = fetchFromGitHub { owner = "ManimCommunity"; - repo = pname; + repo = "manim"; rev = "refs/tags/v${version}"; - sha256 = "sha256-TU/b5nwk5Xc9wmFKAIMeBwC4YBy7HauGeGV9/n4Y64c="; + sha256 = "sha256-TI7O0b1JvUZAxTj6XfpAJKhbGqrGnhcrE9eRJUVx4GM="; }; nativeBuildInputs = with python.pkgs; [ @@ -129,13 +107,13 @@ in python.pkgs.buildPythonApplication rec { makeWrapperArgs = [ "--prefix" "PATH" ":" (lib.makeBinPath [ ffmpeg - (texlive.combine manim-tinytex) + manim-tinytex ]) ]; nativeCheckInputs = [ ffmpeg - (texlive.combine manim-tinytex) + manim-tinytex ] ++ (with python.pkgs; [ pytest-xdist pytestCheckHook diff --git a/nixpkgs/pkgs/applications/video/manim/failing_tests.nix b/nixpkgs/pkgs/applications/video/manim/failing_tests.nix index 70c3efbb610c..1bffaf6e7405 100644 --- a/nixpkgs/pkgs/applications/video/manim/failing_tests.nix +++ b/nixpkgs/pkgs/applications/video/manim/failing_tests.nix @@ -71,4 +71,7 @@ # 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/nixpkgs/pkgs/applications/video/manim/pytest-report-header.patch b/nixpkgs/pkgs/applications/video/manim/pytest-report-header.patch index 953ede5dde94..7aa87d373e50 100644 --- a/nixpkgs/pkgs/applications/video/manim/pytest-report-header.patch +++ b/nixpkgs/pkgs/applications/video/manim/pytest-report-header.patch @@ -1,8 +1,8 @@ diff --git a/conftest.py b/conftest.py -index da37e19b..d9f850d8 100644 +index dacb730a..149c6702 100644 --- a/conftest.py +++ b/conftest.py -@@ -32,16 +32,3 @@ def temp_media_dir(tmpdir, monkeypatch, request): +@@ -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 @@ -13,6 +13,7 @@ index da37e19b..d9f850d8 100644 - info = ctx.info - ctx.release() - return ( +- f"\nCairo Version: {cairo.cairo_version()}", - "\nOpenGL information", - "------------------", - f"vendor: {info['GL_VENDOR'].strip()}", |