diff --git a/pkgs/development/libraries/openimagedenoise/1_2_x.nix b/pkgs/development/libraries/openimagedenoise/1_2_x.nix deleted file mode 100644 index 7b2901b69b7..00000000000 --- a/pkgs/development/libraries/openimagedenoise/1_2_x.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchzip, cmake, tbb, python3, ispc }: - -stdenv.mkDerivation rec { - pname = "openimagedenoise"; - version = "1.2.2"; - - # The release tarballs include pretrained weights, which would otherwise need to be fetched with git-lfs - src = fetchzip { - url = "https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz"; - sha256 = "0wyaarjxkzlvljmpnr7qm06ma2wl1aik3z664gwpzhizswygk6yp"; - }; - - nativeBuildInputs = [ cmake python3 ispc ]; - buildInputs = [ tbb ]; - - cmakeFlags = [ - "-DTBB_ROOT=${tbb}" - "-DTBB_INCLUDE_DIR=${tbb.dev}/include" - ]; - - meta = with lib; { - homepage = "https://openimagedenoise.github.io"; - description = "High-Performance Denoising Library for Ray Tracing"; - license = licenses.asl20; - maintainers = [ maintainers.leshainc ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/tools/graphics/luxcorerender/default.nix b/pkgs/tools/graphics/luxcorerender/default.nix deleted file mode 100644 index 44ba46895fe..00000000000 --- a/pkgs/tools/graphics/luxcorerender/default.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ lib, config, stdenv, fetchFromGitHub, symlinkJoin, wrapGAppsHook, cmake, boost172 -, pkg-config, flex, bison, libpng, libtiff, zlib, python3, embree, openexr -, openimagedenoise, openimageio_1, tbb, c-blosc, gtk3, pcre, doxygen -# OpenCL Support -, withOpenCL ? true, ocl-icd -# Cuda Support -, withCuda ? config.cudaSupport or false, cudatoolkit }: - -let - boostWithPython = boost172.override { - enablePython = true; - enableNumpy = true; - python = python3; - }; - - # Requires a version number like "" - pythonVersion = (lib.versions.major python3.version) - + (lib.versions.minor python3.version); - -in stdenv.mkDerivation rec { - pname = "luxcorerender"; - version = "2.4"; - - src = fetchFromGitHub { - owner = "LuxCoreRender"; - repo = "LuxCore"; - rev = "luxcorerender_v${version}"; - sha256 = "0xvivw79719fa1q762b76nyvzawfd3hmp8y5j04bax8a7f8mfa9k"; - }; - - nativeBuildInputs = [ pkg-config cmake flex bison doxygen wrapGAppsHook ]; - - buildInputs = [ - libpng - libtiff - zlib - boostWithPython.dev - python3 - embree - openexr - openimagedenoise - tbb - c-blosc - gtk3 - pcre - openimageio_1.dev - openimageio_1.out - ] ++ lib.optionals withOpenCL [ ocl-icd ] - ++ lib.optionals withCuda [ cudatoolkit ]; - - cmakeFlags = [ "-DPYTHON_V=${pythonVersion}" ] - ++ lib.optional (!withOpenCL) "-DLUXRAYS_DISABLE_OPENCL=1" - ++ lib.optional (!withCuda) "-DLUXRAYS_DISABLE_CUDA=1"; - - preConfigure = '' - NIX_LDFLAGS+=" -lpython3" - ''; - - installPhase = '' - mkdir -p $out/bin - mkdir -p $out/lib - cp -va bin/* $out/bin - cp -va lib/* $out/lib - ''; - - meta = with lib; { - description = "Open source, physically based, unbiased rendering engine"; - homepage = "https://luxcorerender.org/"; - maintainers = with maintainers; [ hodapp ]; - license = licenses.asl20; - platforms = platforms.linux; - }; -} - -# TODO (might not be necessary): -# -# luxcoreui still gives warnings like: "failed to commit changes to -# dconf: GDBus.Error:org.freedesktop.DBus.Error.ServiceUnknown: The -# name ca.desrt.dconf was not provided by any .service files" - -# CMake complains of the FindOpenGL/GLVND preference diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index db03cd8bab3..55de1a99016 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1003,6 +1003,7 @@ mapAliases ({ lua5_sec = throw "'lua5_sec' has been renamed to/replaced by 'luaPackages.luasec'"; # Converted to throw 2022-02-22 lumo = throw "lumo has been removed: abandoned by upstream"; # Added 2022-04-25 lumpy = throw "lumpy has been removed from nixpkgs, as it is stuck on python2"; # Added 2022-01-12 + luxcorerender = throw "'luxcorerender' has been removed as it's unmaintained and broken in nixpkgs since a while ago"; # Added 2023-06-07 lxappearance-gtk3 = throw "lxappearance-gtk3 has been removed. Use lxappearance instead, which now defaults to Gtk3"; # Added 2020-06-03 lzma = xz; # moved from top-level 2021-03-14 @@ -1188,6 +1189,7 @@ mapAliases ({ openconnect_unstable = throw "openconnect_unstable was removed from nixpkgs as it was not being updated"; # Added 2023-06-01 openelec-dvb-firmware = libreelec-dvb-firmware; # Added 2021-05-10 openexr_ctl = throw "'openexr_ctl' has been renamed to/replaced by 'ctl'"; # Converted to throw 2022-02-22 + openimagedenoise_1_2_x = throw "'openimagedenoise_1_2_x' has been renamed to/replaced by 'openimagedenoise'"; # Added 2023-06-07 openimageio2 = openimageio; # Added 2023-01-05 openisns = open-isns; # Added 2020-01-28 openjpeg_1 = throw "openjpeg_1 has been removed, use openjpeg_2 instead"; # Added 2021-01-24 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 50e41a1cd58..9a95f07d6f7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10003,10 +10003,6 @@ with pkgs; lziprecover = callPackage ../tools/compression/lziprecover { }; - luxcorerender = callPackage ../tools/graphics/luxcorerender { - openimagedenoise = openimagedenoise_1_2_x; - }; - xz = callPackage ../tools/compression/xz { }; lz4 = callPackage ../tools/compression/lz4 { }; @@ -10871,8 +10867,6 @@ with pkgs; openimagedenoise = callPackage ../development/libraries/openimagedenoise { }; - openimagedenoise_1_2_x = callPackage ../development/libraries/openimagedenoise/1_2_x.nix { }; - openmvg = callPackage ../applications/science/misc/openmvg { inherit (llvmPackages) openmp; };