From 4d6557cdf0be403979a7ad85a4aaeaf9263ad02c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 26 Feb 2026 21:38:11 -0800 Subject: [PATCH] pfstools: drop --- .../haskell-modules/hackage-packages.nix | 2 +- pkgs/tools/graphics/pfstools/default.nix | 91 ------------------- pkgs/tools/graphics/pfstools/glut.patch | 12 --- pkgs/tools/graphics/pfstools/pfsalign.patch | 12 --- pkgs/tools/graphics/pfstools/pfstools.patch | 21 ----- pkgs/tools/graphics/pfstools/threads.patch | 20 ---- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 8 files changed, 2 insertions(+), 159 deletions(-) delete mode 100644 pkgs/tools/graphics/pfstools/default.nix delete mode 100644 pkgs/tools/graphics/pfstools/glut.patch delete mode 100644 pkgs/tools/graphics/pfstools/pfsalign.patch delete mode 100644 pkgs/tools/graphics/pfstools/pfstools.patch delete mode 100644 pkgs/tools/graphics/pfstools/threads.patch diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index c9844fc81fdb..b7b9353f9ea8 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -17855,7 +17855,7 @@ self: { badPlatforms = lib.platforms.darwin; hydraPlatforms = lib.platforms.none; } - ) { inherit (pkgs) pfstools; }; + ) { pfstools = null; }; HERA = callPackage ( { diff --git a/pkgs/tools/graphics/pfstools/default.nix b/pkgs/tools/graphics/pfstools/default.nix deleted file mode 100644 index a5ffd9d2d859..000000000000 --- a/pkgs/tools/graphics/pfstools/default.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - cmake, - pkg-config, - wrapQtAppsHook, - openexr, - zlib, - imagemagick6, - libGLU, - libGL, - libglut, - fftwFloat, - fftw, - gsl, - libexif, - perl, - qtbase, - netpbm, - enableUnfree ? false, - opencv, -}: - -stdenv.mkDerivation rec { - pname = "pfstools"; - version = "2.2.0"; - - src = fetchurl { - url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}.tgz"; - sha256 = "sha256-m/aESYVmMibCGZjutDwmGsuOSziRuakbcpVUQGKJ18o="; - }; - - outputs = [ - "out" - "dev" - "man" - ]; - - cmakeFlags = [ "-DWITH_MATLAB=false" ]; - - preConfigure = '' - sed -e 's|#include( ''${PROJECT_SRC_DIR}/cmake/FindNETPBM.cmake )|include( ''${PROJECT_SOURCE_DIR}/cmake/FindNETPBM.cmake )|' -i CMakeLists.txt - - rm cmake/FindNETPBM.cmake - echo "SET(NETPBM_LIBRARY `find ${lib.getLib netpbm} -name "*${stdenv.hostPlatform.extensions.sharedLibrary}*" -type f`)" >> cmake/FindNETPBM.cmake - echo "SET(NETPBM_LIBRARIES `find ${lib.getLib netpbm} -name "*${stdenv.hostPlatform.extensions.sharedLibrary}*" -type f`)" >> cmake/FindNETPBM.cmake - echo "SET(NETPBM_INCLUDE_DIR ${lib.getDev netpbm}/include/netpbm)" >> cmake/FindNETPBM.cmake - echo "INCLUDE(FindPackageHandleStandardArgs)" >> cmake/FindNETPBM.cmake - echo "FIND_PACKAGE_HANDLE_STANDARD_ARGS(NETPBM DEFAULT_MSG NETPBM_LIBRARY NETPBM_INCLUDE_DIR)" >> cmake/FindNETPBM.cmake - ''; - - nativeBuildInputs = [ - cmake - pkg-config - wrapQtAppsHook - ]; - buildInputs = [ - openexr - zlib - imagemagick6 - fftwFloat - fftw - gsl - libexif - perl - qtbase - netpbm - ] - ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ - libGLU - libGL - libglut - ] - ++ lib.optional enableUnfree (opencv.override { enableUnfree = true; }); - - patches = [ - ./glut.patch - ./threads.patch - ./pfstools.patch - ./pfsalign.patch - ]; - - meta = { - homepage = "https://pfstools.sourceforge.net/"; - description = "Toolkit for manipulation of HDR images"; - platforms = lib.platforms.linux; - license = lib.licenses.lgpl2; - maintainers = [ lib.maintainers.juliendehos ]; - }; -} diff --git a/pkgs/tools/graphics/pfstools/glut.patch b/pkgs/tools/graphics/pfstools/glut.patch deleted file mode 100644 index b540b5ebc6a6..000000000000 --- a/pkgs/tools/graphics/pfstools/glut.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/src/pfsglview/CMakeLists.txt 2022-04-04 23:21:11.164016369 +0300 -+++ b/src/pfsglview/CMakeLists.txt 2022-04-04 23:21:32.757878750 +0300 -@@ -11,8 +11,7 @@ - - add_executable(pfsglview pfsglview.cpp picture_io.cpp module.cpp m_histogram.cpp m_status.cpp m_on_screen_display.cpp) - --# TODO: Use ${GLUT_LIBRARY} instead. --target_link_libraries(pfsglview ${OPENGL_LIBRARIES} ${GLUT_glut_LIBRARY} pfs) -+target_link_libraries(pfsglview ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES} pfs) - - install (TARGETS pfsglview DESTINATION bin) - install (FILES pfsglview.1 DESTINATION ${MAN_DIR}) diff --git a/pkgs/tools/graphics/pfstools/pfsalign.patch b/pkgs/tools/graphics/pfstools/pfsalign.patch deleted file mode 100644 index f079415ddcba..000000000000 --- a/pkgs/tools/graphics/pfstools/pfsalign.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/src/camera/CMakeLists.txt 2017-11-13 18:38:27.000000000 +0100 -+++ b/src/camera/CMakeLists.txt 2018-12-30 14:55:30.235571520 +0100 -@@ -9,7 +9,7 @@ target_link_libraries(${TRG} pfs) - install (TARGETS ${TRG} DESTINATION bin) - install (FILES ${TRG}.1 DESTINATION ${MAN_DIR}) - --if( OpenCV_FOUND AND EXIF_FOUND ) -+if( OpenCV_FOUND AND MYPKG_FOUND ) - - set(TRG pfsalign) - add_executable(${TRG} ${TRG}.cpp "${GETOPT_OBJECT}") - diff --git a/pkgs/tools/graphics/pfstools/pfstools.patch b/pkgs/tools/graphics/pfstools/pfstools.patch deleted file mode 100644 index c678a25b01bd..000000000000 --- a/pkgs/tools/graphics/pfstools/pfstools.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/CMakeLists.txt 2016-05-26 11:31:16.000000000 +0200 -+++ b/CMakeLists.txt 2016-07-22 19:07:22.074669909 +0200 -@@ -320,12 +320,12 @@ - - # ======== libexif ========== - --find_package(EXIF) --if( NOT EXIF_FOUND ) -- message( "EXIF library (libexif) not found. 'pfsalign' will not be compiled" ) --else( NOT EXIF_FOUND ) -- message(STATUS "libexif library found.") --endif( NOT EXIF_FOUND ) -+find_package( PkgConfig REQUIRED ) -+pkg_check_modules( MYPKG REQUIRED libexif IlmBase ) -+if( MYPKG_FOUND ) -+ message( STATUS "libexif and IlmBase found." ) -+endif( MYPKG_FOUND ) -+include_directories( ${MYPKG_INCLUDE_DIRS} ) - - # ======== Config and sub dirs =========== - diff --git a/pkgs/tools/graphics/pfstools/threads.patch b/pkgs/tools/graphics/pfstools/threads.patch deleted file mode 100644 index e3f61db60899..000000000000 --- a/pkgs/tools/graphics/pfstools/threads.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/src/fileformat/CMakeLists.txt 2016-05-26 11:31:23.000000000 +0200 -+++ b/src/fileformat/CMakeLists.txt 2016-07-21 23:19:56.510958771 +0200 -@@ -53,13 +53,15 @@ - if( OPENEXR_FOUND ) - include_directories("${OPENEXR_INCLUDE_DIR}") - -+ find_package (Threads) -+ - add_executable(pfsinexr pfsinexr.cpp "${GETOPT_OBJECT}") -- target_link_libraries(pfsinexr pfs ${OPENEXR_LIBRARIES}) -+ target_link_libraries(pfsinexr pfs ${OPENEXR_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) - install (TARGETS pfsinexr DESTINATION bin) - install (FILES pfsinexr.1 DESTINATION ${MAN_DIR}) - - add_executable(pfsoutexr pfsoutexr.cpp "${GETOPT_OBJECT}") -- target_link_libraries(pfsoutexr pfs ${OPENEXR_LIBRARIES}) -+ target_link_libraries(pfsoutexr pfs ${OPENEXR_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) - install (TARGETS pfsoutexr DESTINATION bin) - install (FILES pfsoutexr.1 DESTINATION ${MAN_DIR}) - endif( OPENEXR_FOUND ) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4a0bd82326c2..f18b4ac2e2a3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1534,6 +1534,7 @@ mapAliases { percona-xtrabackup_lts = throw "'percona-xtrabackup_lts' has been renamed to/replaced by 'percona-xtrabackup'"; # Converted to throw 2025-10-27 peruse = throw "'peruse' has been removed as it depends on KDE Gear 5, which has reached EOL"; # Added 2025-08-20 petrifoo = throw "'petrifoo' was remove due to lack of maintenance and relying on gtk2"; # Added 2025-12-02 + pfstools = throw "'pfstools' was removed because it was broken and depends on an old version of ImageMagick"; # added 2026-02-26 pg_cron = throw "'pg_cron' has been removed. Use 'postgresqlPackages.pg_cron' instead."; # Added 2025-07-19 pg_hll = throw "'pg_hll' has been removed. Use 'postgresqlPackages.pg_hll' instead."; # Added 2025-07-19 pg_repack = throw "'pg_repack' has been removed. Use 'postgresqlPackages.pg_repack' instead."; # Added 2025-07-19 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b0bec92c53e1..a6101ced494c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3232,8 +3232,6 @@ with pkgs; ssh = openssh; }; - pfstools = libsForQt5.callPackage ../tools/graphics/pfstools { }; - phosh = callPackage ../applications/window-managers/phosh { }; phosh-mobile-settings =