diff --git a/pkgs/development/libraries/embree/2.x.nix b/pkgs/development/libraries/embree/2.x.nix deleted file mode 100644 index d8adcf7df8a2..000000000000 --- a/pkgs/development/libraries/embree/2.x.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - pkg-config, - ispc, - tbb_2020, - glfw, - openimageio, - libjpeg, - libpng, - libpthreadstubs, - libX11, - python3Packages, - nix-update-script, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "embree"; - version = "2.17.7"; - - src = fetchFromGitHub { - owner = "embree"; - repo = "embree"; - tag = "v${finalAttrs.version}"; - hash = "sha256-FD/ITZBJnYy1F+x4jLTVTsGsNKy/mS7OYWP06NoHZqc="; - }; - - cmakeFlags = [ "-DEMBREE_TUTORIALS=OFF" ]; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - buildInputs = [ - ispc - # tbb_2022 is not backward compatible - tbb_2020 - glfw - openimageio - libjpeg - libpng - libX11 - libpthreadstubs - ]; - - passthru = { - updateScript = nix-update-script { - extraArgs = [ - "--version-regex" - "v(2.*)" - ]; - }; - tbb = tbb_2020; - tests = { - inherit (python3Packages) embreex; - }; - }; - - meta = with lib; { - description = "High performance ray tracing kernels from Intel"; - homepage = "https://embree.github.io/"; - maintainers = with maintainers; [ - hodapp - pbsds - ]; - license = licenses.asl20; - platforms = [ "x86_64-linux" ]; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b77212deae62..5851719a7ba8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -828,6 +828,7 @@ mapAliases { emacsWithPackages = throw "'emacsWithPackages' has been renamed to/replaced by 'emacs.pkgs.withPackages'"; # Converted to throw 2024-10-17 emacsPackages = emacs.pkgs; # Added 2025-03-02 + embree2 = throw "embree2 has been removed, as it is unmaintained upstream and depended on tbb_2020"; # Added 2025-09-14 EmptyEpsilon = empty-epsilon; # Added 2024-07-14 enyo-doom = enyo-launcher; # Added 2022-09-09 eolie = throw "'eolie' has been removed due to being unmaintained"; # Added 2025-04-15 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74ff82150ade..7b7eb7398fe7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2762,7 +2762,6 @@ with pkgs; ); embree = callPackage ../development/libraries/embree { }; - embree2 = callPackage ../development/libraries/embree/2.x.nix { }; emborg = python3Packages.callPackage ../development/python-modules/emborg { };