From 6e66cf0f6b4f2ca5c08fc75390f6554e5530208e Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <v@cunat.cz>
Date: Sun, 15 Sep 2019 14:40:47 +0200
Subject: giflib_5_1: remove the alias (appears unused)

In 3605f128 I somehow forgot about the 5.1 names that now don't make
sense anymore.  I can't see any evidence of _5_1 alias ever being used
or (potentially) useful; _5 might make sense, but for now I couldn't
see why add it.
---
 pkgs/development/libraries/giflib/5.1.nix     | 24 ------------------------
 pkgs/development/libraries/giflib/default.nix | 24 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  3 +--
 3 files changed, 25 insertions(+), 26 deletions(-)
 delete mode 100644 pkgs/development/libraries/giflib/5.1.nix
 create mode 100644 pkgs/development/libraries/giflib/default.nix

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/giflib/5.1.nix b/pkgs/development/libraries/giflib/5.1.nix
deleted file mode 100644
index d97477e3f3a..00000000000
--- a/pkgs/development/libraries/giflib/5.1.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{stdenv, fetchurl, xmlto, docbook_xml_dtd_412, docbook_xsl, libxml2 }:
-
-stdenv.mkDerivation rec {
-  name = "giflib-5.2.1";
-  src = fetchurl {
-    url = "mirror://sourceforge/giflib/${name}.tar.gz";
-    sha256 = "1gbrg03z1b6rlrvjyc6d41bc8j1bsr7rm8206gb1apscyii5bnii";
-  };
-
-  postPatch = ''
-    substituteInPlace Makefile \
-      --replace 'PREFIX = /usr/local' 'PREFIX = ${builtins.placeholder "out"}'
-  '';
-
-  buildInputs = [ xmlto docbook_xml_dtd_412 docbook_xsl libxml2 ];
-
-  meta = {
-    description = "A library for reading and writing gif images";
-    platforms = stdenv.lib.platforms.unix;
-    license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
-    branch = "5.2";
-  };
-}
diff --git a/pkgs/development/libraries/giflib/default.nix b/pkgs/development/libraries/giflib/default.nix
new file mode 100644
index 00000000000..d97477e3f3a
--- /dev/null
+++ b/pkgs/development/libraries/giflib/default.nix
@@ -0,0 +1,24 @@
+{stdenv, fetchurl, xmlto, docbook_xml_dtd_412, docbook_xsl, libxml2 }:
+
+stdenv.mkDerivation rec {
+  name = "giflib-5.2.1";
+  src = fetchurl {
+    url = "mirror://sourceforge/giflib/${name}.tar.gz";
+    sha256 = "1gbrg03z1b6rlrvjyc6d41bc8j1bsr7rm8206gb1apscyii5bnii";
+  };
+
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace 'PREFIX = /usr/local' 'PREFIX = ${builtins.placeholder "out"}'
+  '';
+
+  buildInputs = [ xmlto docbook_xml_dtd_412 docbook_xsl libxml2 ];
+
+  meta = {
+    description = "A library for reading and writing gif images";
+    platforms = stdenv.lib.platforms.unix;
+    license = stdenv.lib.licenses.mit;
+    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+    branch = "5.2";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b2d0de4b432..7c1d06e9f76 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12404,9 +12404,8 @@ in
 
   libwhereami = callPackage ../development/libraries/libwhereami { };
 
-  giflib = giflib_5_1;
   giflib_4_1 = callPackage ../development/libraries/giflib/4.1.nix { };
-  giflib_5_1 = callPackage ../development/libraries/giflib/5.1.nix { };
+  giflib     = callPackage ../development/libraries/giflib { };
 
   libunarr = callPackage ../development/libraries/libunarr { };
 
-- 
cgit 1.4.1