From d6a8f303ef33f10d469ae5f4c2168b3e2e64dc0f Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Sun, 23 Jul 2023 09:55:00 -0500 Subject: [PATCH] python3Packages.moderngl-window: 2.4.2 -> 2.4.4 Includes a fix for moderngl 5.8.x currently in nixpkgs. Enables import testing. Rename to use - instead of _ in accordance with nixpkgs guidelines. Corrects use of platform attribute and correctly sets meta.broken. --- .../python-modules/moderngl_window/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/moderngl_window/default.nix b/pkgs/development/python-modules/moderngl_window/default.nix index 36294fab76fe..e2d498bc4215 100644 --- a/pkgs/development/python-modules/moderngl_window/default.nix +++ b/pkgs/development/python-modules/moderngl_window/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , buildPythonPackage , fetchFromGitHub , isPy3k @@ -11,14 +12,14 @@ }: buildPythonPackage rec { - pname = "moderngl_window"; - version = "2.4.2"; + pname = "moderngl-window"; + version = "2.4.4"; src = fetchFromGitHub { owner = "moderngl"; - repo = pname; + repo = "moderngl_window"; rev = "refs/tags/${version}"; - hash = "sha256-jsASGYrsH9UNanswX2bZyWS3co/2Y1joaQ98virWcBE="; + hash = "sha256-mg3j5ZoMwdk39L5xjcoEJo9buqssM1VLJtndSFsuCB0="; }; propagatedBuildInputs = [ numpy moderngl pyglet pillow pyrr glcontext ]; @@ -28,11 +29,14 @@ buildPythonPackage rec { # Tests need a display to run. doCheck = false; + pythonImportsCheck = [ "moderngl_window" ]; + meta = with lib; { homepage = "https://github.com/moderngl/moderngl_window"; description = "Cross platform helper library for ModernGL making window creation and resource loading simple"; license = licenses.mit; - platforms = platforms.linux; # should be mesaPlatforms, darwin build breaks. + broken = stdenv.isDarwin; # darwin build breaks + platforms = platforms.mesaPlatforms; maintainers = with maintainers; [ c0deaddict ]; }; }