pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #303130 from felix-andreas/manim-python-package

manim: move to python modules and use toPythonApplication

authored by OTABI Tomoya and committed by GitHub a4082b9e 0d92c737

+41 -11
unified split
+38 -10
pkgs/applications/video/manim/default.nix pkgs/development/python-modules/manim/default.nix
··· 1 { lib 2 , fetchFromGitHub 3 4 , cairo 5 , ffmpeg 6 , texliveInfraOnly 7 8 - , python3 9 }: 10 11 let ··· 42 babel-english gnu-freefont mathastext cbfonts-fd 43 ]); 44 45 - python = python3; 46 - 47 - in python.pkgs.buildPythonApplication rec { 48 pname = "manim"; 49 pyproject = true; 50 version = "0.18.1"; 51 - disabled = python3.pythonOlder "3.9"; 52 53 src = fetchFromGitHub { 54 owner = "ManimCommunity"; ··· 57 hash = "sha256-o+Wl3NMK6yopcsRVFtZuUE9c1GABa5d8rbQNHDJ4OiQ="; 58 }; 59 60 - nativeBuildInputs = with python.pkgs; [ 61 poetry-core 62 pythonRelaxDepsHook 63 ]; ··· 81 82 buildInputs = [ cairo ]; 83 84 - propagatedBuildInputs = with python.pkgs; [ 85 click 86 click-default-group 87 cloup ··· 101 pycairo 102 pydub 103 pygments 104 - pysrt 105 rich 106 scipy 107 screeninfo ··· 122 nativeCheckInputs = [ 123 ffmpeg 124 manim-tinytex 125 - ] ++ (with python.pkgs; [ 126 pytest-xdist 127 pytestCheckHook 128 - ]); 129 130 # about 55 of ~600 tests failing mostly due to demand for display 131 disabledTests = import ./failing_tests.nix;
··· 1 { lib 2 + , buildPythonPackage 3 , fetchFromGitHub 4 + , poetry-core 5 + , pytest-xdist 6 + , pytestCheckHook 7 + , pythonOlder 8 + , pythonRelaxDepsHook 9 10 , cairo 11 , ffmpeg 12 , texliveInfraOnly 13 14 + , click 15 + , click-default-group 16 + , cloup 17 + , colour 18 + , grpcio 19 + , grpcio-tools 20 + , importlib-metadata 21 + , isosurfaces 22 + , jupyterlab 23 + , manimpango 24 + , mapbox-earcut 25 + , moderngl 26 + , moderngl-window 27 + , networkx 28 + , numpy 29 + , pillow 30 + , pycairo 31 + , pydub 32 + , pygments 33 + , rich 34 + , scipy 35 + , screeninfo 36 + , skia-pathops 37 + , srt 38 + , svgelements 39 + , tqdm 40 + , watchdog 41 }: 42 43 let ··· 74 babel-english gnu-freefont mathastext cbfonts-fd 75 ]); 76 77 + in buildPythonPackage rec { 78 pname = "manim"; 79 pyproject = true; 80 version = "0.18.1"; 81 + disabled = pythonOlder "3.9"; 82 83 src = fetchFromGitHub { 84 owner = "ManimCommunity"; ··· 87 hash = "sha256-o+Wl3NMK6yopcsRVFtZuUE9c1GABa5d8rbQNHDJ4OiQ="; 88 }; 89 90 + nativeBuildInputs = [ 91 poetry-core 92 pythonRelaxDepsHook 93 ]; ··· 111 112 buildInputs = [ cairo ]; 113 114 + propagatedBuildInputs = [ 115 click 116 click-default-group 117 cloup ··· 131 pycairo 132 pydub 133 pygments 134 rich 135 scipy 136 screeninfo ··· 151 nativeCheckInputs = [ 152 ffmpeg 153 manim-tinytex 154 pytest-xdist 155 pytestCheckHook 156 + ]; 157 158 # about 55 of ~600 tests failing mostly due to demand for display 159 disabledTests = import ./failing_tests.nix;
pkgs/applications/video/manim/failing_tests.nix pkgs/development/python-modules/manim/failing_tests.nix
pkgs/applications/video/manim/pytest-report-header.patch pkgs/development/python-modules/manim/pytest-report-header.patch
+1 -1
pkgs/top-level/all-packages.nix
··· 31428 31429 m32edit = callPackage ../applications/audio/midas/m32edit.nix { }; 31430 31431 - manim = callPackage ../applications/video/manim { }; 31432 31433 manim-slides = python3Packages.toPythonApplication ( 31434 python3Packages.manim-slides.override {
··· 31428 31429 m32edit = callPackage ../applications/audio/midas/m32edit.nix { }; 31430 31431 + manim = python3Packages.toPythonApplication python3Packages.manim; 31432 31433 manim-slides = python3Packages.toPythonApplication ( 31434 python3Packages.manim-slides.override {
+2
pkgs/top-level/python-packages.nix
··· 7116 7117 manhole = callPackage ../development/python-modules/manhole { }; 7118 7119 manimpango = callPackage ../development/python-modules/manimpango { 7120 inherit (pkgs.darwin.apple_sdk.frameworks) AppKit; 7121 };
··· 7116 7117 manhole = callPackage ../development/python-modules/manhole { }; 7118 7119 + manim = callPackage ../development/python-modules/manim { }; 7120 + 7121 manimpango = callPackage ../development/python-modules/manimpango { 7122 inherit (pkgs.darwin.apple_sdk.frameworks) AppKit; 7123 };