From 711876c9053984d32c71fd768cc1dde14bc55295 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 14 Sep 2025 16:33:14 +0100 Subject: [PATCH] python313Packages.embreex: drop --- .../python-modules/embreex/default.nix | 72 ------------------- .../python-modules/trimesh/default.nix | 5 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 4 files changed, 2 insertions(+), 78 deletions(-) delete mode 100644 pkgs/development/python-modules/embreex/default.nix diff --git a/pkgs/development/python-modules/embreex/default.nix b/pkgs/development/python-modules/embreex/default.nix deleted file mode 100644 index 38b2904a2cbf..000000000000 --- a/pkgs/development/python-modules/embreex/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ - lib, - fetchFromGitHub, - fetchpatch, - buildPythonPackage, - embree2, - cython, - numpy, - setuptools, - pytestCheckHook, -}: - -buildPythonPackage rec { - pname = "embreex"; - version = "2.17.7.post6"; - pyproject = true; - - src = fetchFromGitHub { - owner = "trimesh"; - repo = "embreex"; - tag = version; - hash = "sha256-iLIfhngorSFOdkOvlCAJQXGQrVuRfBSDGzvjXOlQuHk="; - }; - - patches = [ - # https://github.com/trimesh/embreex/pull/7 - (fetchpatch { - name = "fix-use-after-free.patch"; - url = "https://github.com/trimesh/embreex/commit/c6b047285419f8986fae962e2734a01522be7ef7.patch"; - hash = "sha256-s8x2vsqbsIR3aoNUDrYs2vQttuNY8lLJ6TC7H8FMRyQ="; - }) - ]; - - build-system = [ - setuptools - numpy - cython - ]; - - dependencies = [ - numpy - ]; - - buildInputs = [ - embree2 - embree2.tbb - ]; - - pythonImportsCheck = [ - "embreex" - "embreex.mesh_construction" - "embreex.rtcore" - "embreex.rtcore_scene" - "embreex.triangles" - ]; - - preCheck = '' - # conflicts with $out - rm -rf embreex/ - ''; - - nativeCheckInputs = [ pytestCheckHook ]; - - meta = { - description = "Maintained PyEmbree fork, wrapper for Embree v2"; - homepage = "https://github.com/trimesh/embreex"; - changelog = "https://github.com/trimesh/embreex/releases/tag/${src.tag}"; - license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ pbsds ]; - inherit (embree2.meta) platforms; - }; -} diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index fdb3597e7cd8..44f3e2b992b4 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -24,7 +24,6 @@ scipy, pillow, mapbox-earcut, - embreex, }: buildPythonPackage rec { @@ -63,9 +62,7 @@ buildPythonPackage rec { pillow # vhacdx # not packaged mapbox-earcut - ] - ++ lib.optionals embreex.meta.available [ - embreex + # embreex # not packaged ]; }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index c67d1f74c929..9774f8dc8b1c 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -241,6 +241,7 @@ mapAliases ({ eebrightbox = throw "eebrightbox is unmaintained upstream and has therefore been removed"; # added 2022-02-03 EasyProcess = easyprocess; # added 2023-02-19 email_validator = email-validator; # added 2022-06-22 + embreex = throw "embreex has been removed, as it required embree2"; # added 2025-09-14 enhancements = throw "enhancements is unmaintained upstream and has therefore been removed"; # added 2023-10-27 enum-compat = throw "enum-compat is a virtual package providing enum34, which does not do anything since Python 3.4"; # added 2025-02-15 enum34 = throw "enum34 is no longer needed since Python 3.4"; # added 2025-03-06 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f46afb3bc10e..0731479650c8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4691,8 +4691,6 @@ self: super: with self; { embrace = callPackage ../development/python-modules/embrace { }; - embreex = callPackage ../development/python-modules/embreex { }; - emcee = callPackage ../development/python-modules/emcee { }; emoji = callPackage ../development/python-modules/emoji { };