From ff9ecc868d2fa5f12a21eed7739aa6f5ca2b0816 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 10 Feb 2024 20:13:01 +0100 Subject: [PATCH] readline63: drop --- pkgs/development/libraries/readline/6.3.nix | 68 ------------------- .../libraries/readline/android.patch | 16 ----- .../readline/readline-6.3-patches.nix | 12 ---- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 5 files changed, 1 insertion(+), 98 deletions(-) delete mode 100644 pkgs/development/libraries/readline/6.3.nix delete mode 100644 pkgs/development/libraries/readline/android.patch delete mode 100644 pkgs/development/libraries/readline/readline-6.3-patches.nix diff --git a/pkgs/development/libraries/readline/6.3.nix b/pkgs/development/libraries/readline/6.3.nix deleted file mode 100644 index aff16c3e4184..000000000000 --- a/pkgs/development/libraries/readline/6.3.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ fetchurl, lib, stdenv, ncurses }: - -stdenv.mkDerivation { - pname = "readline"; - version = "6.3p08"; - - src = fetchurl { - url = "mirror://gnu/readline/readline-6.3.tar.gz"; - sha256 = "0hzxr9jxqqx5sxsv9vmlxdnvlr9vi4ih1avjb869hbs6p5qn1fjn"; - }; - - outputs = [ "out" "dev" "man" "doc" "info" ]; - - strictDeps = true; - propagatedBuildInputs = [ ncurses ]; - - patchFlags = [ "-p0" ]; - - configureFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) - # This test requires running host code - "bash_cv_wcwidth_broken=no"; - - patches = - [ ./link-against-ncurses.patch - ./no-arch_only-6.3.patch - ] ++ lib.optional stdenv.hostPlatform.useAndroidPrebuilt ./android.patch - ++ - (let - patch = nr: sha256: - fetchurl { - url = "mirror://gnu/readline/readline-6.3-patches/readline63-${nr}"; - inherit sha256; - }; - in - import ./readline-6.3-patches.nix patch); - - env = lib.optionalAttrs stdenv.cc.isClang { - NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; - }; - - meta = with lib; { - description = "Library for interactive line editing"; - - longDescription = '' - The GNU Readline library provides a set of functions for use by - applications that allow users to edit command lines as they are - typed in. Both Emacs and vi editing modes are available. The - Readline library includes additional functions to maintain a - list of previously-entered command lines, to recall and perhaps - reedit those lines, and perform csh-like history expansion on - previous commands. - - The history facilities are also placed into a separate library, - the History library, as part of the build process. The History - library may be used without Readline in applications which - desire its capabilities. - ''; - - homepage = "https://savannah.gnu.org/projects/readline/"; - - license = licenses.gpl3Plus; - - maintainers = [ ]; - - platforms = platforms.unix; - branch = "6.3"; - }; -} diff --git a/pkgs/development/libraries/readline/android.patch b/pkgs/development/libraries/readline/android.patch deleted file mode 100644 index 7e81774be369..000000000000 --- a/pkgs/development/libraries/readline/android.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git histlib.h histlib.h -index c938a10..925ab72 100644 ---- histlib.h -+++ histlib.h -@@ -51,9 +51,9 @@ - #endif - - #ifndef member --# ifndef strchr -+# if !defined (strchr) && !defined (__STDC__) - extern char *strchr (); --# endif -+# endif /* !strchr && !__STDC__ */ - #define member(c, s) ((c) ? ((char *)strchr ((s), (c)) != (char *)NULL) : 0) - #endif - diff --git a/pkgs/development/libraries/readline/readline-6.3-patches.nix b/pkgs/development/libraries/readline/readline-6.3-patches.nix deleted file mode 100644 index d0aaaf38f706..000000000000 --- a/pkgs/development/libraries/readline/readline-6.3-patches.nix +++ /dev/null @@ -1,12 +0,0 @@ -# Automatically generated by `update-patch-set.sh'; do not edit. - -patch: [ -(patch "001" "0vqlj22mkbn3x42qx2iqir7capx462dhagbzdw6hwxgfxavbny8s") -(patch "002" "19g0l6vlfcqzwfwjj1slkmxzndjp4543hwrf26g8z216lp3h9qrr") -(patch "003" "0bx53k876w8vwf4h2s6brr1i46ym87gi71bh8zl89n0gn3cbshgc") -(patch "004" "1k2m8dg1awmjhmivdbx1c25866gfbpg0fy4845n8cw15zc3bjis5") -(patch "005" "0jr7c28bzn882as5i54l53bhi723s1nkvzmwlh3rj6ld4bwqhxw7") -(patch "006" "0mp5zgx50792gigkmjap3d0zpdv5qanii8djab7j6z69qsrpl8sw") -(patch "007" "1sjv9w0mglh395i6hlq3ck7wdxvi2wyddlyb2j0jwg7cmnibayad") -(patch "008" "11rpqhsxd132gc8455v51ma3a5zshznb0mh2p0zc5skcab7r7h1v") -] diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index dc05363a7058..6e43a243facb 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -911,6 +911,7 @@ mapAliases ({ rarian = throw "rarian has been removed as unused"; # Added 2023-07-05 rccl = throw "'rccl' has been replaced with 'rocmPackages.rccl'"; # Added 2023-10-08 rdc = throw "'rdc' has been replaced with 'rocmPackages.rdc'"; # Added 2023-10-08 + readline63 = throw "'readline63' has been replaced with 'readline'"; # Added 2024-02-10 redpanda = redpanda-client; # Added 2023-10-14 retdec-full = throw "'retdec-full' is no longer needed, please use 'retdec'"; # Added 2024-02-05 retroshare06 = retroshare; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e8bb1c036dcd..6ca683522d30 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24591,8 +24591,6 @@ with pkgs; readline = readline82; - readline63 = callPackage ../development/libraries/readline/6.3.nix { }; - readline70 = callPackage ../development/libraries/readline/7.0.nix { }; readline82 = callPackage ../development/libraries/readline/8.2.nix { };