From 30fef8a3cffbc1586b448f227f8ebfa745bd1e95 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Thu, 21 Aug 2014 14:28:33 +0200
Subject: readline: remove unused old versions 4 and 5

...including an unused patch.
---
 pkgs/development/libraries/readline/readline4.nix      | 10 ----------
 pkgs/development/libraries/readline/readline5.nix      | 14 --------------
 pkgs/development/libraries/readline/shobj-darwin.patch | 11 -----------
 pkgs/top-level/all-packages.nix                        |  4 ----
 4 files changed, 39 deletions(-)
 delete mode 100644 pkgs/development/libraries/readline/readline4.nix
 delete mode 100644 pkgs/development/libraries/readline/readline5.nix
 delete mode 100644 pkgs/development/libraries/readline/shobj-darwin.patch

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/readline/readline4.nix b/pkgs/development/libraries/readline/readline4.nix
deleted file mode 100644
index d9dcdc9f048..00000000000
--- a/pkgs/development/libraries/readline/readline4.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ stdenv, fetchurl, ncurses }:
-
-stdenv.mkDerivation {
-  name = "readline-4.3";
-  src = fetchurl {
-    url = mirror://gnu/readline/readline-4.3.tar.gz;
-    md5 = "f86f7cb717ab321fe15f1bbcb058c11e";
-  };
-  propagatedBuildInputs = [ncurses];
-}
diff --git a/pkgs/development/libraries/readline/readline5.nix b/pkgs/development/libraries/readline/readline5.nix
deleted file mode 100644
index c208d5b9fe6..00000000000
--- a/pkgs/development/libraries/readline/readline5.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ stdenv, fetchurl, ncurses }:
-
-stdenv.mkDerivation {
-  name = "readline-5.2";
-  
-  src = fetchurl {
-    url = mirror://gnu/readline/readline-5.2.tar.gz;
-    sha256 = "0icz4hqqq8mlkwrpczyaha94kns0am9z0mh3a2913kg2msb8vs0j";
-  };
-  
-  propagatedBuildInputs = [ncurses];
-  
-  patches = stdenv.lib.optional stdenv.isDarwin ./shobj-darwin.patch;
-}
diff --git a/pkgs/development/libraries/readline/shobj-darwin.patch b/pkgs/development/libraries/readline/shobj-darwin.patch
deleted file mode 100644
index a9199ca3e89..00000000000
--- a/pkgs/development/libraries/readline/shobj-darwin.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/support/shobj-conf.orig	2006-04-11 06:15:43.000000000 -0700
-+++ b/support/shobj-conf	2007-11-08 01:15:43.000000000 -0800
-@@ -171,7 +171,7 @@
- 	SHLIB_LIBSUFF='dylib'
- 
- 	case "${host_os}" in
--	darwin[78]*)	SHOBJ_LDFLAGS=''
-+	darwin[789]*)	SHOBJ_LDFLAGS=''
- 			SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
- 			;;
- 	*)		SHOBJ_LDFLAGS='-dynamic'
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8a0a02d9c38..02f99c1f969 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6060,10 +6060,6 @@ let
   readline = readline6;
   readline6 = readline63;
 
-  readline4 = callPackage ../development/libraries/readline/readline4.nix { };
-
-  readline5 = callPackage ../development/libraries/readline/readline5.nix { };
-
   readline62 = callPackage ../development/libraries/readline/readline6.nix { };
 
   readline63 = callPackage ../development/libraries/readline/readline6.3.nix { };
-- 
cgit 1.4.1