From 2a8e1edcac88d92c50b8b7431fb5eef0c1241582 Mon Sep 17 00:00:00 2001 From: Naoki Pross Date: Wed, 20 Oct 2021 19:08:25 +0200 Subject: Remove useless folders in video/ --- video/manimgl.nix | 30 ++++++++++++++++++++++++++++++ video/manimgl/default.nix | 30 ------------------------------ video/manimgl/mapbox-earcut.nix | 25 ------------------------- video/manimpango.nix | 22 ++++++++++++++++++++++ video/manimpango/default.nix | 22 ---------------------- video/mapbox-earcut.nix | 25 +++++++++++++++++++++++++ video/shell.nix | 6 +++--- 7 files changed, 80 insertions(+), 80 deletions(-) create mode 100644 video/manimgl.nix delete mode 100644 video/manimgl/default.nix delete mode 100644 video/manimgl/mapbox-earcut.nix create mode 100644 video/manimpango.nix delete mode 100644 video/manimpango/default.nix create mode 100644 video/mapbox-earcut.nix diff --git a/video/manimgl.nix b/video/manimgl.nix new file mode 100644 index 0000000..cdab07e --- /dev/null +++ b/video/manimgl.nix @@ -0,0 +1,30 @@ +{ lib, pkgs, buildPythonApplication, buildPythonPackage, fetchPypi, pythonOlder, + manimpango, mapbox-earcut }: + +buildPythonApplication rec { + pname = "manimgl"; + version = "1.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1bsrn72vjzfz3ldh3cjn9r2gxr18408ja2shz50qwh7jnwi8alyb"; + }; + + preConfigure = '' + sed -i '/argparse/d' manimgl.egg-info/requires.txt + sed -i '/argparse/d' setup.cfg + ''; + + doCheck = false; + + propagatedBuildInputs = [ manimpango mapbox-earcut ] ++ (with pkgs; [ + texlive.combined.scheme-full ffmpeg + ]) ++ (with pkgs.python3Packages; [ + cython sympy numpy pydub scipy pyyaml pyopengl pyopengl-accelerate moderngl moderngl-window + matplotlib colour rich screeninfo tqdm validators + ]); + + disabled = pythonOlder "3.7"; + + meta = { }; +} diff --git a/video/manimgl/default.nix b/video/manimgl/default.nix deleted file mode 100644 index cdab07e..0000000 --- a/video/manimgl/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, pkgs, buildPythonApplication, buildPythonPackage, fetchPypi, pythonOlder, - manimpango, mapbox-earcut }: - -buildPythonApplication rec { - pname = "manimgl"; - version = "1.2.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "1bsrn72vjzfz3ldh3cjn9r2gxr18408ja2shz50qwh7jnwi8alyb"; - }; - - preConfigure = '' - sed -i '/argparse/d' manimgl.egg-info/requires.txt - sed -i '/argparse/d' setup.cfg - ''; - - doCheck = false; - - propagatedBuildInputs = [ manimpango mapbox-earcut ] ++ (with pkgs; [ - texlive.combined.scheme-full ffmpeg - ]) ++ (with pkgs.python3Packages; [ - cython sympy numpy pydub scipy pyyaml pyopengl pyopengl-accelerate moderngl moderngl-window - matplotlib colour rich screeninfo tqdm validators - ]); - - disabled = pythonOlder "3.7"; - - meta = { }; -} diff --git a/video/manimgl/mapbox-earcut.nix b/video/manimgl/mapbox-earcut.nix deleted file mode 100644 index d325401..0000000 --- a/video/manimgl/mapbox-earcut.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, pkgs, buildPythonPackage, fetchPypi }: - -buildPythonPackage rec { - pname = "mapbox_earcut"; - version = "0.12.10"; - src = fetchPypi { - inherit pname version; - format = "setuptools"; - sha256 = "0ly48lijgd9inq07x42pfp9c24fn16vn9axpmfwqrkn979krbnah"; - }; - - dontUseCmakeConfigure = true; - - nativeBuildInputs = with pkgs; [ cmake ]; - - buildInputs = with pkgs.python3Packages; [ - setuptools_scm pybind11 - ]; - - propagatedBuildInputs = with pkgs.python3Packages; [ - numpy - ]; - - meta = with lib; {}; -} diff --git a/video/manimpango.nix b/video/manimpango.nix new file mode 100644 index 0000000..97b5e97 --- /dev/null +++ b/video/manimpango.nix @@ -0,0 +1,22 @@ +{ lib, pkgs, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "ManimPango"; + version = "0.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "09fc7zv953ni7pilv869ldbjgz59j41a8vbz637rqzjh2yjfb9x3"; + }; + + nativeBuildInputs = with pkgs; [ + gcc pkgconfig + ]; + + propagatedBuildInputs = with pkgs; [ pango ] + ++ (with pkgs.python3Packages; [ + cython pytest numpy pillow + ]); + + meta = with lib; {}; +} diff --git a/video/manimpango/default.nix b/video/manimpango/default.nix deleted file mode 100644 index 97b5e97..0000000 --- a/video/manimpango/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, pkgs, buildPythonPackage, fetchPypi }: - -buildPythonPackage rec { - pname = "ManimPango"; - version = "0.3.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "09fc7zv953ni7pilv869ldbjgz59j41a8vbz637rqzjh2yjfb9x3"; - }; - - nativeBuildInputs = with pkgs; [ - gcc pkgconfig - ]; - - propagatedBuildInputs = with pkgs; [ pango ] - ++ (with pkgs.python3Packages; [ - cython pytest numpy pillow - ]); - - meta = with lib; {}; -} diff --git a/video/mapbox-earcut.nix b/video/mapbox-earcut.nix new file mode 100644 index 0000000..d325401 --- /dev/null +++ b/video/mapbox-earcut.nix @@ -0,0 +1,25 @@ +{ lib, pkgs, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "mapbox_earcut"; + version = "0.12.10"; + src = fetchPypi { + inherit pname version; + format = "setuptools"; + sha256 = "0ly48lijgd9inq07x42pfp9c24fn16vn9axpmfwqrkn979krbnah"; + }; + + dontUseCmakeConfigure = true; + + nativeBuildInputs = with pkgs; [ cmake ]; + + buildInputs = with pkgs.python3Packages; [ + setuptools_scm pybind11 + ]; + + propagatedBuildInputs = with pkgs.python3Packages; [ + numpy + ]; + + meta = with lib; {}; +} diff --git a/video/shell.nix b/video/shell.nix index bdb2575..9bd9680 100644 --- a/video/shell.nix +++ b/video/shell.nix @@ -1,16 +1,16 @@ with import {}; let - manimpango = callPackage manimpango/default.nix { + manimpango = callPackage ./manimpango.nix { buildPythonPackage = pkgs.python3Packages.buildPythonPackage; fetchPypi = pkgs.python3Packages.fetchPypi; }; - mapbox-earcut = callPackage manimgl/mapbox-earcut.nix { + mapbox-earcut = callPackage ./mapbox-earcut.nix { buildPythonPackage = pkgs.python3Packages.buildPythonPackage; fetchPypi = pkgs.python3Packages.fetchPypi; }; - manimgl = callPackage manimgl/default.nix { + manimgl = callPackage ./manimgl.nix { buildPythonApplication = pkgs.python3Packages.buildPythonApplication; buildPythonPackage = pkgs.python3Packages.buildPythonPackage; fetchPypi = pkgs.python3Packages.fetchPypi; -- cgit v1.2.1