From e245f99133da5a24260a3ca90722bdffa493726b Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 4 Jan 2023 10:09:35 +0100 Subject: [PATCH 1/3] fvwm: drop unused imlib --- pkgs/applications/window-managers/fvwm/3.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/window-managers/fvwm/3.nix b/pkgs/applications/window-managers/fvwm/3.nix index 5c2cc999f45e..2e458c84f5f6 100644 --- a/pkgs/applications/window-managers/fvwm/3.nix +++ b/pkgs/applications/window-managers/fvwm/3.nix @@ -7,7 +7,6 @@ , fontconfig , freetype , fribidi -, imlib , libSM , libX11 , libXcursor @@ -53,7 +52,6 @@ stdenv.mkDerivation (finalAttrs: { fontconfig freetype fribidi - imlib libSM libX11 libXcursor From 8cf8dc233a3edeef8e33748cd9926bc0f5e4785b Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 4 Jan 2023 10:09:46 +0100 Subject: [PATCH 2/3] sawfish: drop unused imlib --- pkgs/applications/window-managers/sawfish/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/window-managers/sawfish/default.nix b/pkgs/applications/window-managers/sawfish/default.nix index ef001787a596..51f3b0012a40 100644 --- a/pkgs/applications/window-managers/sawfish/default.nix +++ b/pkgs/applications/window-managers/sawfish/default.nix @@ -5,7 +5,6 @@ , gdk-pixbuf-xlib , gettext , gtk2 -, imlib , libICE , libSM , libxcrypt @@ -42,7 +41,6 @@ stdenv.mkDerivation rec { buildInputs = [ gdk-pixbuf-xlib gtk2 - imlib libICE libSM libxcrypt From 113b3cb395d711ba746b15afe0907842dd7e5dd9 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 4 Jan 2023 10:09:56 +0100 Subject: [PATCH 3/3] imlib: drop --- pkgs/development/libraries/imlib/default.nix | 64 ------------------- .../development/libraries/libtiff/default.nix | 3 +- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 -- 4 files changed, 2 insertions(+), 70 deletions(-) delete mode 100644 pkgs/development/libraries/imlib/default.nix diff --git a/pkgs/development/libraries/imlib/default.nix b/pkgs/development/libraries/imlib/default.nix deleted file mode 100644 index af6b4285708f..000000000000 --- a/pkgs/development/libraries/imlib/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fetchpatch -, giflib -, libX11 -, libXext -, libjpeg -, libpng -, libtiff -, xorgproto -}: - -stdenv.mkDerivation rec { - pname = "imlib"; - version = "1.9.15"; - - src = fetchurl { - url = "https://ftp.acc.umu.se/pub/GNOME/sources/imlib/1.9/${pname}-${version}.tar.gz"; - hash = "sha256-o4mQb38hgK7w4czb5lEoIH3VkuyAbIQWYP2S+7bv8j0="; - }; - - patches = [ - (fetchpatch { - name = "CVE-2007-3568.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/imlib/files/imlib-1.9.15-bpp16-CVE-2007-3568.patch"; - sha256 = "0lxfibi094gki39sq1w4p0hcx25xlk0875agbhjkjngzx862wvbg"; - }) - - # The following two patches fix the build with recent giflib. - (fetchpatch { - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/imlib/files/imlib-1.9.15-giflib51-1.patch?id=c6d0ed89ad5653421f21cbf3b3d40fd9a1361828"; - sha256 = "0jynlhxcyjiwnz1m8j48xwz4z5csgyg03jfjc8xgpvvcyid4m65l"; - }) - (fetchpatch { - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/imlib/files/imlib-1.9.15-giflib51-2.patch?id=c6d0ed89ad5653421f21cbf3b3d40fd9a1361828"; - sha256 = "164x7rd992930rqllmr89p5ahfmbz37ipi8x0igd8gkvc8a4fd5x"; - }) - ]; - - configureFlags = [ - "--disable-shm" - "--x-includes=${libX11.dev}/include" - "--x-libraries=${libX11.out}/lib" - ]; - - buildInputs = [ - libjpeg - libXext - libX11 - xorgproto - libtiff - giflib - libpng - ]; - - meta = with lib; { - description = "An image loading and rendering library for X11"; - platforms = platforms.unix; - license = with licenses; [ gpl2Only lgpl2Only ]; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; - }; -} diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index ffed49235286..20c59ed9e0d3 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -18,7 +18,6 @@ , gdal , openimageio , freeimage -, imlib }: stdenv.mkDerivation rec { @@ -89,7 +88,7 @@ stdenv.mkDerivation rec { doCheck = true; passthru.tests = { - inherit libgeotiff imagemagick graphicsmagick gdal openimageio freeimage imlib; + inherit libgeotiff imagemagick graphicsmagick gdal openimageio freeimage; inherit (python3Packages) pillow imread; }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7041d012f4b2..6e7595ea6567 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -649,6 +649,7 @@ mapAliases ({ imagemagick7Big = imagemagickBig; # Added 2021-02-22 imagemagick7 = imagemagick; # Added 2021-02-22 imagemagick7_light = imagemagick_light; # Added 2021-02-22 + imlib = throw "imlib has been dropped due to the lack of maintenance from upstream since 2004"; # Added 2023-01-04 impressive = throw "impressive has been removed due to lack of released python 2 support and maintainership in nixpkgs"; # Added 2022-01-27 i-score = throw "i-score has been removed: abandoned upstream"; # Added 2020-11-21 inboxer = throw "inboxer has been removed as it is no longer maintained and no longer works as Google shut down the inbox service this package wrapped"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 104f8eef991a..eeb7510820aa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20029,10 +20029,6 @@ with pkgs; imtui = callPackage ../development/libraries/imtui { }; - imlib = callPackage ../development/libraries/imlib { - libpng = libpng12; - }; - imv = callPackage ../applications/graphics/imv { }; iml = callPackage ../development/libraries/iml { };