diff --git a/pkgs/development/python-modules/mesa/default.nix b/pkgs/development/python-modules/mesa/default.nix deleted file mode 100644 index c26bf68c8582..000000000000 --- a/pkgs/development/python-modules/mesa/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - isPy27, - cookiecutter, - networkx, - pandas, - tornado, - tqdm, - pytestCheckHook, -}: - -buildPythonPackage rec { - pname = "mesa"; - version = "3.2.0"; - format = "setuptools"; - - # According to their docs, this library is for Python 3+. - disabled = isPy27; - - src = fetchPypi { - pname = "mesa"; - inherit version; - hash = "sha256-k4UjkUGL4qDgOhucQU7svRNZtM3ZqtO6NUxpl4NhQl0="; - }; - - propagatedBuildInputs = [ - cookiecutter - networkx - pandas - tornado - tqdm - ]; - - nativeCheckInputs = [ pytestCheckHook ]; - - disabledTests = [ - "test_examples" - "test_run" - "test_scaffold_creates_project_dir" - ]; - - meta = with lib; { - homepage = "https://github.com/projectmesa/mesa"; - description = "Agent-based modeling (or ABM) framework in Python"; - license = licenses.asl20; - maintainers = [ maintainers.dpaetzel ]; - broken = true; # missing dependencies - }; -} diff --git a/pkgs/development/python-modules/pyglet/default.nix b/pkgs/development/python-modules/pyglet/default.nix index 9948a21bdec6..ecf741205aea 100644 --- a/pkgs/development/python-modules/pyglet/default.nix +++ b/pkgs/development/python-modules/pyglet/default.nix @@ -18,7 +18,6 @@ openal, libpulseaudio, harfbuzz, - mesa, apple-sdk, }: diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 5e7673c9deae..8b8feaa7e57d 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -443,6 +443,7 @@ mapAliases ({ mathlibtools = throw "mathlibtools has been removed because the upstream repository was archived in 2023"; # added 2025-07-09 matrix-api-async = throw "matrix-api-async has been removed as it is an old wrapper and no longer in use"; # added 2025-01-01 memory_profiler = memory-profiler; # added 2023-10-09 + mesa = throw "python3Packages.mesa has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-03 mir_eval = mir-eval; # added 2024-01-07 mistune_0_8 = throw "mistune_0_8 was removed because it was outdated and insecure"; # added 2022-08-12 mistune_2_0 = mistune; # added 2022-08-12 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4dc67b8ebc8e..64f7de775471 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9231,8 +9231,6 @@ self: super: with self; { meross-iot = callPackage ../development/python-modules/meross-iot { }; - mesa = callPackage ../development/python-modules/mesa { }; - meshcat = callPackage ../development/python-modules/meshcat { }; meshcore = callPackage ../development/python-modules/meshcore { }; @@ -9594,7 +9592,9 @@ 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 { + inherit (pkgs) mesa; + }; moehlenhoff-alpha2 = callPackage ../development/python-modules/moehlenhoff-alpha2 { }; @@ -13671,7 +13671,9 @@ self: super: with self; { pyopencl = callPackage ../development/python-modules/pyopencl { }; - pyopengl = callPackage ../development/python-modules/pyopengl { }; + pyopengl = callPackage ../development/python-modules/pyopengl { + inherit (pkgs) mesa; + }; pyopengl-accelerate = callPackage ../development/python-modules/pyopengl-accelerate { }; @@ -13876,7 +13878,9 @@ self: super: with self; { pyqt5-multimedia = self.pyqt5.override { withMultimedia = true; }; - pyqt5-sip = callPackage ../development/python-modules/pyqt/sip.nix { }; + pyqt5-sip = callPackage ../development/python-modules/pyqt/sip.nix { + inherit (pkgs) mesa; + }; pyqt5-stubs = callPackage ../development/python-modules/pyqt5-stubs { }; @@ -13885,13 +13889,21 @@ self: super: with self; { # `propagatedBuildInputs` may cause collisions. pyqt5-webkit = self.pyqt5.override { withWebKit = true; }; - pyqt6 = callPackage ../development/python-modules/pyqt/6.x.nix { }; + pyqt6 = callPackage ../development/python-modules/pyqt/6.x.nix { + inherit (pkgs) mesa; + }; - pyqt6-charts = callPackage ../development/python-modules/pyqt6-charts { }; + pyqt6-charts = callPackage ../development/python-modules/pyqt6-charts { + inherit (pkgs) mesa; + }; - pyqt6-sip = callPackage ../development/python-modules/pyqt/pyqt6-sip.nix { }; + pyqt6-sip = callPackage ../development/python-modules/pyqt/pyqt6-sip.nix { + inherit (pkgs) mesa; + }; - pyqt6-webengine = callPackage ../development/python-modules/pyqt6-webengine { }; + pyqt6-webengine = callPackage ../development/python-modules/pyqt6-webengine { + inherit (pkgs) mesa; + }; pyqtchart = pkgs.libsForQt5.callPackage ../development/python-modules/pyqtchart { inherit (self) @@ -13923,7 +13935,9 @@ self: super: with self; { pyqtgraph = callPackage ../development/python-modules/pyqtgraph { }; - pyqtwebengine = callPackage ../development/python-modules/pyqtwebengine { }; + pyqtwebengine = callPackage ../development/python-modules/pyqtwebengine { + inherit (pkgs) mesa; + }; pyquaternion = callPackage ../development/python-modules/pyquaternion { };