colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libungif: remove in favour of giflib

Browse Source 
libungif was merged into giflib in 2006, and hasn't been updated
since.  All non-broken packages still using it build fine with giflib.

See <http://giflib.sourceforge.net/history.html>.
This commit is contained in:
Alyssa Ross 2021-02-12 21:15:48 +00:00
parent 451d9d6f8e
commit 6e3b5fd046
14 changed files with 23 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/editors/emacs/generic.nix
View File

@ -7,7 +7,7 @@
, patches ? [ ] , patches ? [ ]
}: }:
{ stdenv, lib, fetchurl, fetchpatch, ncurses, xlibsWrapper, libXaw, libXpm { stdenv, lib, fetchurl, fetchpatch, ncurses, xlibsWrapper, libXaw, libXpm
, Xaw3d, libXcursor, pkg-config, gettext, libXft, dbus, libpng, libjpeg, libungif , Xaw3d, libXcursor, pkg-config, gettext, libXft, dbus, libpng, libjpeg, giflib
, libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux
, alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf , alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf
, jansson, harfbuzz , jansson, harfbuzz
@ -108,7 +108,7 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp {
[ ncurses gconf libxml2 gnutls alsaLib acl gpm gettext jansson harfbuzz.dev ] [ ncurses gconf libxml2 gnutls alsaLib acl gpm gettext jansson harfbuzz.dev ]
++ lib.optionals stdenv.isLinux [ dbus libselinux systemd ] ++ lib.optionals stdenv.isLinux [ dbus libselinux systemd ]
++ lib.optionals withX ++ lib.optionals withX
[ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff libXft [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg giflib libtiff libXft
gconf cairo ] gconf cairo ]
++ lib.optionals (withX || withNS) [ librsvg ] ++ lib.optionals (withX || withNS) [ librsvg ]
++ lib.optionals withImageMagick [ imagemagick ] ++ lib.optionals withImageMagick [ imagemagick ]

4
pkgs/applications/graphics/fbida/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, libjpeg, libexif, libungif, libtiff, libpng, libwebp, libdrm { lib, stdenv, fetchurl, libjpeg, libexif, giflib, libtiff, libpng, libwebp, libdrm
, pkg-config, freetype, fontconfig, which, imagemagick, curl, sane-backends, libXpm , pkg-config, freetype, fontconfig, which, imagemagick, curl, sane-backends, libXpm
, epoxy, poppler, mesa, lirc }: , epoxy, poppler, mesa, lirc }:
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config which ]; nativeBuildInputs = [ pkg-config which ];
buildInputs = [ buildInputs = [
libexif libjpeg libpng libungif freetype fontconfig libtiff libwebp libexif libjpeg libpng giflib freetype fontconfig libtiff libwebp
imagemagick curl sane-backends libdrm libXpm epoxy poppler lirc imagemagick curl sane-backends libdrm libXpm epoxy poppler lirc
mesa mesa
]; ];

4
pkgs/applications/science/math/glsurf/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, ocamlPackages, libGLU, libGL, freeglut { lib, stdenv, fetchurl, ocamlPackages, libGLU, libGL, freeglut, giflib
, libmysqlclient, mpfr, gmp, libtiff, libjpeg, libpng, giflib , libmysqlclient, mpfr, gmp, libtiff, libjpeg, libpng
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {

4
pkgs/applications/window-managers/icewm/default.nix
View File

@ -30,7 +30,7 @@
, libpthreadstubs , libpthreadstubs
, libsndfile , libsndfile
, libtiff , libtiff
, libungif , giflib
, libxcb , libxcb
, mkfontdir , mkfontdir
, pcre , pcre
@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
libpthreadstubs libpthreadstubs
libsndfile libsndfile
libtiff libtiff
libungif giflib
libxcb libxcb
mkfontdir mkfontdir
pcre pcre

4
pkgs/applications/window-managers/windowmaker/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, pkg-config { lib, stdenv, fetchurl, pkg-config
, libX11, libXext, libXft, libXmu, libXinerama, libXrandr, libXpm , libX11, libXext, libXft, libXmu, libXinerama, libXrandr, libXpm
, imagemagick, libpng, libjpeg, libexif, libtiff, libungif, libwebp }: , imagemagick, libpng, libjpeg, libexif, libtiff, giflib, libwebp }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "windowmaker"; pname = "windowmaker";
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ libX11 libXext libXft libXmu libXinerama libXrandr libXpm buildInputs = [ libX11 libXext libXft libXmu libXinerama libXrandr libXpm
imagemagick libpng libjpeg libexif libtiff libungif libwebp ]; imagemagick libpng libjpeg libexif libtiff giflib libwebp ];
configureFlags = [ configureFlags = [
"--with-x" "--with-x"

4
pkgs/desktops/gnustep/base/default.nix
View File

@ -4,7 +4,7 @@
, fetchurl, fetchpatch , fetchurl, fetchpatch
, gmp, gnutls , gmp, gnutls
, libffi, binutils-unwrapped , libffi, binutils-unwrapped
, libjpeg, libtiff, libpng, giflib, libungif , libjpeg, libtiff, libpng, giflib
, libxml2, libxslt, libiconv , libxml2, libxslt, libiconv
, libobjc, libgcrypt , libobjc, libgcrypt
, icu , icu
@ -26,7 +26,7 @@ gsmakeDerivation {
cups cups
gmp gnutls gmp gnutls
libffi binutils-unwrapped libffi binutils-unwrapped
libjpeg libtiff libpng giflib libungif libjpeg libtiff libpng giflib giflib
libxml2 libxslt libiconv libxml2 libxslt libiconv
libobjc libgcrypt libobjc libgcrypt
icu icu

4
pkgs/development/libraries/SDL2_image/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, SDL2, libpng, libjpeg, libtiff, libungif, libwebp, libXpm, zlib, Foundation }: { lib, stdenv, fetchurl, SDL2, libpng, libjpeg, libtiff, giflib, libwebp, libXpm, zlib, Foundation }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "SDL2_image"; pname = "SDL2_image";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1l0864kas9cwpp2d32yxl81g98lx40dhbdp03dz7sbv84vhgdmdx"; sha256 = "1l0864kas9cwpp2d32yxl81g98lx40dhbdp03dz7sbv84vhgdmdx";
}; };
buildInputs = [ SDL2 libpng libjpeg libtiff libungif libwebp libXpm zlib ] buildInputs = [ SDL2 libpng libjpeg libtiff giflib libwebp libXpm zlib ]
++ lib.optional stdenv.isDarwin Foundation; ++ lib.optional stdenv.isDarwin Foundation;

4
pkgs/development/libraries/SDL_image/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchpatch, SDL, libpng, libjpeg, libtiff, libungif, libXpm }: { lib, stdenv, fetchurl, fetchpatch, SDL, libpng, libjpeg, libtiff, giflib, libXpm }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "SDL_image"; pname = "SDL_image";
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
"--disable-tif-shared" "--disable-tif-shared"
] ++ lib.optional stdenv.isDarwin "--disable-sdltest"; ] ++ lib.optional stdenv.isDarwin "--disable-sdltest";
buildInputs = [ SDL libpng libjpeg libtiff libungif libXpm ]; buildInputs = [ SDL libpng libjpeg libtiff giflib libXpm ];
meta = with lib; { meta = with lib; {
description = "SDL image library"; description = "SDL image library";

17
pkgs/development/libraries/giflib/libungif.nix
View File

@ -1,17 +0,0 @@
{lib, stdenv, fetchurl}:
stdenv.mkDerivation {
name = "libungif-4.1.4";
src = fetchurl {
url = "mirror://sourceforge/giflib/libungif-4.1.4.tar.gz";
sha256 = "5e65e1e5deacd0cde489900dbf54c6c2ee2ebc818199e720dbad685d87abda3d";
};
hardeningDisable = [ "format" ];
meta = with lib; {
description = "Library and utilities for processing GIFs";
platforms = platforms.unix;
license = licenses.mit;
};
}

4
pkgs/development/libraries/pslib/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, cmake, pkg-config, zlib, libpng, libjpeg, libungif, libtiff { lib, stdenv, fetchurl, cmake, pkg-config, zlib, libpng, libjpeg, giflib, libtiff
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ zlib libpng libjpeg libungif libtiff ]; buildInputs = [ zlib libpng libjpeg giflib libtiff ];
doCheck = true; doCheck = true;

4
pkgs/tools/misc/fontforge/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchpatch, fetchFromGitHub, lib { stdenv, fetchpatch, fetchFromGitHub, lib
, cmake, perl, uthash, pkg-config, gettext , cmake, perl, uthash, pkg-config, gettext
, python, freetype, zlib, glib, libungif, libpng, libjpeg, libtiff, libxml2, cairo, pango , python, freetype, zlib, glib, giflib, libpng, libjpeg, libtiff, libxml2, cairo, pango
, readline, woff2, zeromq, libuninameslist , readline, woff2, zeromq, libuninameslist
, withSpiro ? false, libspiro , withSpiro ? false, libspiro
, withGTK ? false, gtk3 , withGTK ? false, gtk3
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config cmake ]; nativeBuildInputs = [ pkg-config cmake ];
buildInputs = [ buildInputs = [
readline uthash woff2 zeromq libuninameslist readline uthash woff2 zeromq libuninameslist
python freetype zlib glib libungif libpng libjpeg libtiff libxml2 python freetype zlib glib giflib libpng libjpeg libtiff libxml2
] ]
++ lib.optionals withSpiro [libspiro] ++ lib.optionals withSpiro [libspiro]
++ lib.optionals withGUI [ gtk3 cairo pango ] ++ lib.optionals withGUI [ gtk3 cairo pango ]

4
pkgs/tools/video/swftools/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, freetype, libjpeg, libungif, zlib }: { lib, stdenv, fetchurl, freetype, libjpeg, zlib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "swftools"; pname = "swftools";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
patches = [ ./swftools.patch ]; patches = [ ./swftools.patch ];
buildInputs = [ freetype libjpeg libungif zlib ]; buildInputs = [ freetype libjpeg zlib ];
meta = with lib; { meta = with lib; {
description = "Collection of SWF manipulation and creation utilities"; description = "Collection of SWF manipulation and creation utilities";

1
pkgs/top-level/aliases.nix
View File

@ -380,6 +380,7 @@ mapAliases ({
libtxc_dxtn = throw "libtxc_dxtn was removed 2020-03-16, now integrated in Mesa"; libtxc_dxtn = throw "libtxc_dxtn was removed 2020-03-16, now integrated in Mesa";
libtxc_dxtn_s2tc = throw "libtxc_dxtn_s2tc was removed 2020-03-16, now integrated in Mesa"; libtxc_dxtn_s2tc = throw "libtxc_dxtn_s2tc was removed 2020-03-16, now integrated in Mesa";
libudev = udev; # added 2018-04-25 libudev = udev; # added 2018-04-25
libungif = giflib; # added 2020-02-12
libusb = libusb1; # added 2020-04-28 libusb = libusb1; # added 2020-04-28
libsexy = throw "libsexy has been removed from nixpkgs, as it's abandoned and no package needed it."; # 2019-12-10 libsexy = throw "libsexy has been removed from nixpkgs, as it's abandoned and no package needed it."; # 2019-12-10
libstdcxxHook = throw "libstdcxx hook has been removed because cc-wrapper is now directly aware of the c++ standard library intended to be used."; # 2020-06-22 libstdcxxHook = throw "libstdcxx hook has been removed because cc-wrapper is now directly aware of the c++ standard library intended to be used."; # 2020-06-22

2
pkgs/top-level/all-packages.nix
View File

@ -16163,8 +16163,6 @@ in
libunarr = callPackage ../development/libraries/libunarr { }; libunarr = callPackage ../development/libraries/libunarr { };
libungif = callPackage ../development/libraries/giflib/libungif.nix { };
libunibreak = callPackage ../development/libraries/libunibreak { }; libunibreak = callPackage ../development/libraries/libunibreak { };
libuninameslist = callPackage ../development/libraries/libuninameslist { }; libuninameslist = callPackage ../development/libraries/libuninameslist { };