From 728b094519063b825650c46f7d0474c11dc32403 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 3 Mar 2024 16:32:15 +0100 Subject: python312Packages.moderngl-window: normalize folder name --- .../python-modules/moderngl-window/default.nix | 91 ++++++++++++++++++++++ .../python-modules/moderngl_window/default.nix | 91 ---------------------- pkgs/top-level/python-packages.nix | 2 +- 3 files changed, 92 insertions(+), 92 deletions(-) create mode 100644 pkgs/development/python-modules/moderngl-window/default.nix delete mode 100644 pkgs/development/python-modules/moderngl_window/default.nix diff --git a/pkgs/development/python-modules/moderngl-window/default.nix b/pkgs/development/python-modules/moderngl-window/default.nix new file mode 100644 index 000000000000..34b1b650da08 --- /dev/null +++ b/pkgs/development/python-modules/moderngl-window/default.nix @@ -0,0 +1,91 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, pythonRelaxDepsHook +, setuptools +, glfw +, moderngl +, numpy +, pillow +, pygame +, pyglet +, pyqt5 +, pyrr +, pysdl2 +, pyside2 +, pythonOlder +, scipy +, trimesh +}: + +buildPythonPackage rec { + pname = "moderngl-window"; + version = "2.4.5"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "moderngl"; + repo = "moderngl_window"; + rev = "refs/tags/${version}"; + hash = "sha256-OfvIxezeZyuv5LLbe+4o1X2UCGnXT2DNvAF7t2Isw6Y="; + }; + + pythonRelaxDeps = [ + "pillow" + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + setuptools + ]; + + propagatedBuildInputs = [ + numpy + moderngl + pyglet + pillow + pyrr + ]; + + passthru.optional-dependencies = { + trimesh = [ + trimesh + scipy + ]; + glfw = [ + glfw + ]; + pygame = [ + pygame + ]; + PySDL2 = [ + pysdl2 + ]; + PySide2 = [ + pyside2 + ]; + pyqt5 = [ + pyqt5 + ]; + }; + + # Tests need a display to run. + doCheck = false; + + pythonImportsCheck = [ + "moderngl_window" + ]; + + meta = with lib; { + description = "Cross platform helper library for ModernGL making window creation and resource loading simple"; + homepage = "https://github.com/moderngl/moderngl-window"; + changelog = "https://github.com/moderngl/moderngl-window/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ c0deaddict ]; + platforms = platforms.mesaPlatforms; + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/development/python-modules/moderngl_window/default.nix b/pkgs/development/python-modules/moderngl_window/default.nix deleted file mode 100644 index 34b1b650da08..000000000000 --- a/pkgs/development/python-modules/moderngl_window/default.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ lib -, stdenv -, buildPythonPackage -, fetchFromGitHub -, pythonRelaxDepsHook -, setuptools -, glfw -, moderngl -, numpy -, pillow -, pygame -, pyglet -, pyqt5 -, pyrr -, pysdl2 -, pyside2 -, pythonOlder -, scipy -, trimesh -}: - -buildPythonPackage rec { - pname = "moderngl-window"; - version = "2.4.5"; - pyproject = true; - - disabled = pythonOlder "3.8"; - - src = fetchFromGitHub { - owner = "moderngl"; - repo = "moderngl_window"; - rev = "refs/tags/${version}"; - hash = "sha256-OfvIxezeZyuv5LLbe+4o1X2UCGnXT2DNvAF7t2Isw6Y="; - }; - - pythonRelaxDeps = [ - "pillow" - ]; - - nativeBuildInputs = [ - pythonRelaxDepsHook - setuptools - ]; - - propagatedBuildInputs = [ - numpy - moderngl - pyglet - pillow - pyrr - ]; - - passthru.optional-dependencies = { - trimesh = [ - trimesh - scipy - ]; - glfw = [ - glfw - ]; - pygame = [ - pygame - ]; - PySDL2 = [ - pysdl2 - ]; - PySide2 = [ - pyside2 - ]; - pyqt5 = [ - pyqt5 - ]; - }; - - # Tests need a display to run. - doCheck = false; - - pythonImportsCheck = [ - "moderngl_window" - ]; - - meta = with lib; { - description = "Cross platform helper library for ModernGL making window creation and resource loading simple"; - homepage = "https://github.com/moderngl/moderngl-window"; - changelog = "https://github.com/moderngl/moderngl-window/blob/${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ c0deaddict ]; - platforms = platforms.mesaPlatforms; - broken = stdenv.isDarwin; - }; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2b8c698bdbdf..341cb3795205 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7350,7 +7350,7 @@ self: super: with self; { moderngl = callPackage ../development/python-modules/moderngl { }; - moderngl-window = callPackage ../development/python-modules/moderngl_window { }; + moderngl-window = callPackage ../development/python-modules/moderngl-window { }; modestmaps = callPackage ../development/python-modules/modestmaps { }; -- cgit 1.4.1