From fd171dc8bb1cf7fe9fbc77897e665f3c039d0dd4 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 16 Sep 2025 16:41:03 +0100 Subject: [PATCH] libdevil: drop Image processing library, unmaintained upstream since 2017; probably a security liability, not a mandatory dependency of any package in the tree, and would be broken by CMake 4. --- ...0001-il_endian.h-Fix-endian-handling.patch | 35 -------- .../libraries/libdevil/default.nix | 90 ------------------- pkgs/top-level/aliases.nix | 2 + pkgs/top-level/all-packages.nix | 6 -- .../top-level/pkg-config/pkg-config-data.json | 5 -- 5 files changed, 2 insertions(+), 136 deletions(-) delete mode 100644 pkgs/development/libraries/libdevil/0001-il_endian.h-Fix-endian-handling.patch delete mode 100644 pkgs/development/libraries/libdevil/default.nix diff --git a/pkgs/development/libraries/libdevil/0001-il_endian.h-Fix-endian-handling.patch b/pkgs/development/libraries/libdevil/0001-il_endian.h-Fix-endian-handling.patch deleted file mode 100644 index a1826354f88b..000000000000 --- a/pkgs/development/libraries/libdevil/0001-il_endian.h-Fix-endian-handling.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 85ca659a59ae5be6fc0824b0684967ec94727e2a Mon Sep 17 00:00:00 2001 -From: toonn -Date: Wed, 12 Jun 2024 11:39:35 +0000 -Subject: [PATCH] il_endian.h: Fix endian handling - -Based on https://sourceforge.net/p/resil/tickets/8/, which has also been -incorporated in the MacPort for libdevil 1.7.8, -https://trac.macports.org/export/154482/trunk/dports/devel/libdevil/files/patch-src-IL-include-il_endian.h.diff, -but updated for the header included in release 1.8.0 of libdevil. ---- - src-IL/include/il_endian.h | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src-IL/include/il_endian.h b/src-IL/include/il_endian.h -index c4e6d86..a3cd57f 100644 ---- a/src-IL/include/il_endian.h -+++ b/src-IL/include/il_endian.h -@@ -23,9 +23,13 @@ extern "C" { - #ifndef __BIG_ENDIAN__ - #define __BIG_ENDIAN__ 1 - #endif -+#else -+#ifndef __LITTLE_ENDIAN__ -+#define __LITTLE_ENDIAN__ 1 -+#endif - #endif - --#if (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __BIG_ENDIAN__) \ -+#if (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) \ - || (defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__)) - #undef __LITTLE_ENDIAN__ - #define Short(s) iSwapShort(s) --- -2.44.0 - diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix deleted file mode 100644 index 94e1b9555932..000000000000 --- a/pkgs/development/libraries/libdevil/default.nix +++ /dev/null @@ -1,90 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - cmake, - libjpeg, - libpng, - libmng, - lcms1, - libtiff, - openexr, - libGL, - libX11, - pkg-config, - runtimeShell, - withXorg ? true, - testers, - libgbm, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "libdevil"; - version = "1.8.0"; - - outputs = [ - "out" - "dev" - ]; - - src = fetchurl { - url = "mirror://sourceforge/openil/DevIL-${finalAttrs.version}.tar.gz"; - hash = "sha256-AHWXPufdifBQeHPiWArHgzZFLSnTSgcTSyCPROL+twk="; - }; - - sourceRoot = "DevIL/DevIL"; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - libjpeg - libpng - libmng - lcms1 - libtiff - openexr - ] - ++ lib.optionals withXorg [ - libX11 - libGL - ]; - - configureFlags = [ - "--enable-ILU" - "--enable-ILUT" - ]; - - CXXFLAGS = lib.optionalString stdenv.cc.isClang "-Wno-register"; - - preConfigure = '' - sed -i 's,malloc.h,stdlib.h,g' src-ILU/ilur/ilur.c - ''; - - patches = [ - ./0001-il_endian.h-Fix-endian-handling.patch - ]; - - enableParallelBuilding = true; - - postPatch = '' - for a in test/Makefile.am test/format_test/format_checks.sh.in ; do - substituteInPlace $a \ - --replace /bin/bash ${runtimeShell} - done - ''; - - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - - meta = with lib; { - homepage = "https://openil.sourceforge.net/"; - description = "Image library which can can load, save, convert, manipulate, filter and display a wide variety of image formats"; - mainProgram = "ilur"; - license = licenses.lgpl2; - pkgConfigModules = [ "IL" ]; - inherit (libgbm.meta) platforms; - maintainers = [ ]; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f2567307ea6d..411934fe6ee6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1295,6 +1295,8 @@ mapAliases { libbitcoin-network = throw "libbitcoin-network has been removed as it required an obsolete version of Boost and had no maintainer in Nixpkgs"; # Added 2024-11-24 libbitcoin-protocol = throw "libbitcoin-protocol has been removed as it required an obsolete version of Boost and had no maintainer in Nixpkgs"; # Added 2024-11-24 libchop = throw "libchop has been removed due to failing to build and being unmaintained upstream"; # Added 2025-05-02 + libdevil = throw "libdevil has been removed, as it was unmaintained in Nixpkgs and upstream since 2017"; # Added 2025-09-16 + libdevil-nox = throw "libdevil has been removed, as it was unmaintained in Nixpkgs and upstream since 2017"; # Added 2025-09-16 libdwarf-lite = throw "`libdwarf-lite` has been replaced by `libdwarf` as it's mostly a mirror"; # Added 2025-06-16 libdwg = throw "libdwg has been removed as upstream is unmaintained, the code doesn't build without significant patches, and the package had no reverse dependencies"; # Added 2024-12-28 libfpx = throw "libfpx has been removed as it was unmaintained in Nixpkgs and had known vulnerabilities"; # Added 2025-05-20 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 02874bced34c..5121b72a0f83 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8032,12 +8032,6 @@ with pkgs; libdbusmenu-gtk2 = libdbusmenu.override { gtkVersion = "2"; }; libdbusmenu-gtk3 = libdbusmenu.override { gtkVersion = "3"; }; - libdevil = callPackage ../development/libraries/libdevil { }; - - libdevil-nox = callPackage ../development/libraries/libdevil { - withXorg = false; - }; - libdvdnav = callPackage ../development/libraries/libdvdnav { }; libdvdnav_4_2_1 = callPackage ../development/libraries/libdvdnav/4.2.1.nix { libdvdread = libdvdread_4_9_9; diff --git a/pkgs/top-level/pkg-config/pkg-config-data.json b/pkgs/top-level/pkg-config/pkg-config-data.json index 4e67b0326326..b8db6efa5aa5 100644 --- a/pkgs/top-level/pkg-config/pkg-config-data.json +++ b/pkgs/top-level/pkg-config/pkg-config-data.json @@ -4,11 +4,6 @@ "minor": 1 }, "modules": { - "IL": { - "attrPath": [ - "libdevil" - ] - }, "ImageMagick": { "attrPath": [ "imagemagick"