From 95d624394e73cb0b107e0f0214307979a018a997 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 26 May 2022 03:48:48 +0200 Subject: [PATCH] appleseed: remove hasn't built on hydra since 2020-10-09 16:57:25 --- pkgs/tools/graphics/appleseed/default.nix | 84 ----------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - pkgs/top-level/python-packages.nix | 2 - 4 files changed, 1 insertion(+), 88 deletions(-) delete mode 100644 pkgs/tools/graphics/appleseed/default.nix diff --git a/pkgs/tools/graphics/appleseed/default.nix b/pkgs/tools/graphics/appleseed/default.nix deleted file mode 100644 index efa46b3b608a..000000000000 --- a/pkgs/tools/graphics/appleseed/default.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost165, pkg-config, guile, -eigen, libpng, python3, libGLU, qt4, openexr, openimageio, -opencolorio_1, xercesc, ilmbase, osl, seexpr, makeWrapper -}: - -let boost_static = boost165.override { - enableStatic = true; - enablePython = true; - python = python3; -}; -in stdenv.mkDerivation rec { - - pname = "appleseed"; - version = "2.0.5-beta"; - - src = fetchFromGitHub { - owner = "appleseedhq"; - repo = "appleseed"; - rev = version; - sha256 = "1sq9s0rzjksdn8ayp1g17gdqhp7fqks8v1ddd3i5rsl96b04fqx5"; - }; - nativeBuildInputs = [ cmake pkg-config makeWrapper ]; - buildInputs = [ - boost_static guile eigen libpng python3 - libGLU qt4 openexr openimageio opencolorio_1 xercesc - osl seexpr - ]; - - NIX_CFLAGS_COMPILE = toString [ - "-I${openexr.dev}/include/OpenEXR" - "-I${ilmbase.dev}/include/OpenEXR" - "-I${openimageio.dev}/include/OpenImageIO" - - "-Wno-unused-but-set-variable" - "-Wno-error=class-memaccess" - "-Wno-error=maybe-uninitialized" - "-Wno-error=catch-value" - "-Wno-error=stringop-truncation" - ]; - - cmakeFlags = [ - "-DUSE_EXTERNAL_XERCES=ON" "-DUSE_EXTERNAL_OCIO=ON" "-DUSE_EXTERNAL_OIIO=ON" - "-DUSE_EXTERNAL_OSL=ON" "-DWITH_CLI=ON" "-DWITH_STUDIO=ON" "-DWITH_TOOLS=ON" - "-DUSE_EXTERNAL_PNG=ON" "-DUSE_EXTERNAL_ZLIB=ON" - "-DUSE_EXTERNAL_EXR=ON" "-DUSE_EXTERNAL_SEEXPR=ON" - "-DWITH_PYTHON=ON" - "-DWITH_DISNEY_MATERIAL=ON" - "-DUSE_SSE=ON" - "-DUSE_SSE42=ON" - ]; - - meta = with lib; { - description = "Open source, physically-based global illumination rendering engine"; - homepage = "https://appleseedhq.net/"; - maintainers = with maintainers; [ hodapp ]; - license = licenses.mit; - platforms = platforms.linux; - }; - - # Work around a bug in the CMake build: - postInstall = '' - chmod a+x $out/bin/* - wrapProgram $out/bin/appleseed.studio --set PYTHONHOME ${python3} - ''; -} - -# TODO: Is the below problematic? - -# CMake Warning (dev) at /nix/store/dsyw2zla2h3ld2p0jj4cv0j3wal1bp3h-cmake-3.11.2/share/cmake-3.11/Modules/FindOpenGL.cmake:270 (message): -# Policy CMP0072 is not set: FindOpenGL prefers GLVND by default when -# available. Run "cmake --help-policy CMP0072" for policy details. Use the -# cmake_policy command to set the policy and suppress this warning. -# -# FindOpenGL found both a legacy GL library: -# -# OPENGL_gl_LIBRARY: /nix/store/yxrgmcz2xlgn113wz978a91qbsy4rc8g-libGL-1.0.0/lib/libGL.so -# -# and GLVND libraries for OpenGL and GLX: -# -# OPENGL_opengl_LIBRARY: /nix/store/yxrgmcz2xlgn113wz978a91qbsy4rc8g-libGL-1.0.0/lib/libOpenGL.so -# OPENGL_glx_LIBRARY: /nix/store/yxrgmcz2xlgn113wz978a91qbsy4rc8g-libGL-1.0.0/lib/libGLX.so -# -# OpenGL_GL_PREFERENCE has not been set to "GLVND" or "LEGACY", so for -# compatibility with CMake 3.10 and below the legacy GL library will be used. diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e104b7ecb856..b7262913886b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -83,6 +83,7 @@ mapAliases ({ antimicro = throw "antimicro has been removed as it was broken, see antimicrox instead"; # Added 2020-08-06 antimicroX = antimicrox; # Added 2021-10-31 apple-music-electron = throw "'apple-music-electron' is end of life and has been removed, you can use 'cider' instead"; # Added 2022-10-02 + appleseed = throw "appleseed has been removed, because it was unmaintained"; # Added 2022-05-26 arangodb_3_3 = throw "arangodb_3_3 went end of life and has been removed"; # Added 2022-10-08 arangodb_3_4 = throw "arangodb_3_4 went end of life and has been removed"; # Added 2022-10-08 arangodb_3_5 = throw "arangodb_3_5 went end of life and has been removed"; # Added 2022-10-08 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a70dd9e0494c..4d923d6bb207 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5037,8 +5037,6 @@ with pkgs; apparix = callPackage ../tools/misc/apparix { }; - appleseed = callPackage ../tools/graphics/appleseed { }; - apc-temp-fetch = with python3.pkgs; callPackage ../tools/networking/apc-temp-fetch { }; arping = callPackage ../tools/networking/arping { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 617356b42c4e..5d3263e4ff79 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -518,8 +518,6 @@ self: super: with self; { appdirs = callPackage ../development/python-modules/appdirs { }; - appleseed = toPythonModule (pkgs.appleseed.override { python3 = self.python; }); - applicationinsights = callPackage ../development/python-modules/applicationinsights { }; appnope = callPackage ../development/python-modules/appnope { };