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 1 { lib 2 + , buildPythonPackage 2 3 , fetchFromGitHub 4 + , poetry-core 5 + , pytest-xdist 6 + , pytestCheckHook 7 + , pythonOlder 8 + , pythonRelaxDepsHook 3 9 4 10 , cairo 5 11 , ffmpeg 6 12 , texliveInfraOnly 7 13 8 - , python3 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 9 41 }: 10 42 11 43 let ··· 42 74 babel-english gnu-freefont mathastext cbfonts-fd 43 75 ]); 44 76 45 - python = python3; 46 - 47 - in python.pkgs.buildPythonApplication rec { 77 + in buildPythonPackage rec { 48 78 pname = "manim"; 49 79 pyproject = true; 50 80 version = "0.18.1"; 51 - disabled = python3.pythonOlder "3.9"; 81 + disabled = pythonOlder "3.9"; 52 82 53 83 src = fetchFromGitHub { 54 84 owner = "ManimCommunity"; ··· 57 87 hash = "sha256-o+Wl3NMK6yopcsRVFtZuUE9c1GABa5d8rbQNHDJ4OiQ="; 58 88 }; 59 89 60 - nativeBuildInputs = with python.pkgs; [ 90 + nativeBuildInputs = [ 61 91 poetry-core 62 92 pythonRelaxDepsHook 63 93 ]; ··· 81 111 82 112 buildInputs = [ cairo ]; 83 113 84 - propagatedBuildInputs = with python.pkgs; [ 114 + propagatedBuildInputs = [ 85 115 click 86 116 click-default-group 87 117 cloup ··· 101 131 pycairo 102 132 pydub 103 133 pygments 104 - pysrt 105 134 rich 106 135 scipy 107 136 screeninfo ··· 122 151 nativeCheckInputs = [ 123 152 ffmpeg 124 153 manim-tinytex 125 - ] ++ (with python.pkgs; [ 126 154 pytest-xdist 127 155 pytestCheckHook 128 - ]); 156 + ]; 129 157 130 158 # about 55 of ~600 tests failing mostly due to demand for display 131 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 31428 31429 31429 m32edit = callPackage ../applications/audio/midas/m32edit.nix { }; 31430 31430 31431 - manim = callPackage ../applications/video/manim { }; 31431 + manim = python3Packages.toPythonApplication python3Packages.manim; 31432 31432 31433 31433 manim-slides = python3Packages.toPythonApplication ( 31434 31434 python3Packages.manim-slides.override {
+2
pkgs/top-level/python-packages.nix
··· 7116 7116 7117 7117 manhole = callPackage ../development/python-modules/manhole { }; 7118 7118 7119 + manim = callPackage ../development/python-modules/manim { }; 7120 + 7119 7121 manimpango = callPackage ../development/python-modules/manimpango { 7120 7122 inherit (pkgs.darwin.apple_sdk.frameworks) AppKit; 7121 7123 };