Unverified Commit 92663b61 authored by OTABI Tomoya's avatar OTABI Tomoya Committed by GitHub
Browse files

Merge pull request #266903 from GaetanLepage/manim 

manim: 0.17.3 -> 0.18.0
parents 61b95ec6 7fed8b19

pkgs/applications/video/manim/conftest-

deleted100644 → 0
+0 −0

Empty file deleted.

pkgs/applications/video/manim/default.nix

+4 −25
Original line number Diff line number Diff line 
{ lib

, fetchFromGitHub

, fetchPypi



, cairo

, ffmpeg
@@ -43,39 +42,19 @@ let 
    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; [

pkgs/applications/video/manim/failing_tests.nix

+3 −0
Original line number Diff line number Diff line
@@ -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"

]

pkgs/applications/video/manim/pytest-report-header.patch

+3 −2
Original line number Diff line number Diff line 
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()}",