opencollada-blender: drop

Blender 5.0 removed OpenCollada, so remove it as there should really be
no other consumers, and is now likely unmaintained.
This commit is contained in:
Andrew Marshall
2026-04-27 22:14:32 -04:00
parent 0726a0ecb6
commit 79228e9d75
4 changed files with 1 additions and 81 deletions
-4
View File
@@ -9,7 +9,6 @@
callPackage,
ceres-solver,
cmake,
colladaSupport ? true,
config,
cudaPackages,
cudaSupport ? config.cudaSupport,
@@ -54,7 +53,6 @@
nix-update-script,
openUsdSupport ? !stdenv.hostPlatform.isDarwin,
openal,
opencollada-blender,
opencolorio,
openexr,
openimagedenoise,
@@ -185,7 +183,6 @@ stdenv'.mkDerivation (finalAttrs: {
(lib.cmakeBool "WITH_INSTALL_PORTABLE" false)
(lib.cmakeBool "WITH_JACK" jackaudioSupport)
(lib.cmakeBool "WITH_LIBS_PRECOMPILED" false)
(lib.cmakeBool "WITH_OPENCOLLADA" colladaSupport)
(lib.cmakeBool "WITH_OPENIMAGEDENOISE" openImageDenoiseSupport)
(lib.cmakeBool "WITH_PIPEWIRE" false)
(lib.cmakeBool "WITH_PULSEAUDIO" false)
@@ -325,7 +322,6 @@ stdenv'.mkDerivation (finalAttrs: {
wayland
wayland-protocols
]
++ lib.optional colladaSupport opencollada-blender
++ lib.optional jackaudioSupport libjack2
++ lib.optional spaceNavSupport libspnav
++ lib.optionals vulkanSupport [
@@ -1,26 +0,0 @@
From f036950f1ccc3ebdfe2fdc0a52d35a4620252901 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sat, 27 Sep 2025 11:43:21 +0200
Subject: [PATCH] Build: update cmake minimum version to 3.10
cmake ABI compatibility with cmake <3.5 has been removed in cmake 4.
Compatibility with cmake <3.10 is deprecated and soon to be removed.
Thus set 3.10 minimum version. This is available in the vast majority
of current linux distributions, as well as other platforms.
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 95abbe213..2d14b2552 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
endif()
endif()
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 3.10)
#-----------------------------------------------------------------------------
@@ -1,51 +0,0 @@
{
cmake,
dos2unix,
fetchFromGitHub,
lib,
libxml2,
pcre,
pkg-config,
stdenv,
}:
stdenv.mkDerivation {
pname = "opencollada";
version = "0-unstable-2025-01-30";
src = fetchFromGitHub {
owner = "aras-p";
repo = "OpenCOLLADA";
rev = "4526eb8aaa6462c71fbedd23103976c151a01c50";
sha256 = "sha256-ctr+GjDzxOJxBfaMwjwayPkAOcF+FMsP1X72QCOwvTY=";
};
# Fix freaky dos-style CLRF things
prePatch = ''
dos2unix CMakeLists.txt
'';
patches = [
# https://github.com/aras-p/OpenCOLLADA/pull/1
./cmake4-compat.patch
];
nativeBuildInputs = [
cmake
pkg-config
dos2unix
];
propagatedBuildInputs = [
libxml2
pcre
];
meta = {
description = "Library for handling the COLLADA file format";
homepage = "https://github.com/aras-p/OpenCOLLADA";
maintainers = [ lib.maintainers.amarshall ];
platforms = lib.platforms.unix;
license = lib.licenses.mit;
};
}
+1
View File
@@ -1530,6 +1530,7 @@ mapAliases {
openbabel3 = openbabel; # Added 2025-09-17
openbsdCross = throw "'openbsdCross' has been renamed to/replaced by 'openbsd'"; # Converted to throw 2025-10-27
opencl-clang = throw "opencl-clang has been integrated into intel-graphics-compiler"; # Added 2025-09-10
opencollada-blender = throw "opencollada-blender has been removed, as it is unmaintained upstream"; # Added 2026-04-26
opencolorio_1 = throw "'opencolorio_1' has been removed. Use opencolorio instead"; # Added 2026-01-03
openconnect_gnutls = throw "'openconnect_gnutls' has been renamed to/replaced by 'openconnect'"; # Converted to throw 2025-10-27
openexr_3 = throw "'openexr_3' has been renamed to/replaced by 'openexr'"; # Converted to throw 2025-10-27