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

Merge pull request #161080 from FliegendeWurst/readline-cleanup

Browse Source
This commit is contained in:
Artturi 2022-02-20 21:08:16 +02:00 committed by GitHub
commit 9109084905
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 2 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/development/libraries/readline/5.x.nix
View File

@ -1,21 +0,0 @@
{ lib, stdenv, fetchurl, ncurses }:
stdenv.mkDerivation rec {
pname = "readline";
version = "5.2";
src = fetchurl {
url = "mirror://gnu/readline/readline-${version}.tar.gz";
sha256 = "0icz4hqqq8mlkwrpczyaha94kns0am9z0mh3a2913kg2msb8vs0j";
};
propagatedBuildInputs = [ncurses];
patches = lib.optional stdenv.isDarwin ./shobj-darwin.patch;
meta = with lib; {
branch = "5";
platforms = platforms.unix;
license = licenses.gpl2;
};
}

64
pkgs/development/libraries/readline/6.2.nix
View File

@ -1,64 +0,0 @@
{ fetchurl, lib, stdenv, ncurses
}:
stdenv.mkDerivation (rec {
pname = "readline";
version = "6.2";
src = fetchurl {
url = "mirror://gnu/readline/readline-${version}.tar.gz";
sha256 = "10ckm2bd2rkxhvdmj7nmbsylmihw0abwcsnxf8y27305183rd9kr";
};
propagatedBuildInputs = [ncurses];
patchFlags = [ "-p0" ];
patches =
[ ./link-against-ncurses.patch
./no-arch_only.patch
./clang.patch
]
++
(let
patch = nr: sha256:
fetchurl {
url = "mirror://gnu/readline/readline-${version}-patches/readline62-${nr}";
inherit sha256;
};
in
import ./readline-6.2-patches.nix patch);
meta = {
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 = lib.licenses.gpl3Plus;
maintainers = [ ];
branch = "6.2";
platforms = lib.platforms.unix;
};
}
//
# Don't run the native `strip' when cross-compiling.
(if stdenv.hostPlatform != stdenv.buildPlatform
then { dontStrip = true; }
else { }))

13
pkgs/development/libraries/readline/clang.patch
View File

@ -1,13 +0,0 @@
diff --git a/support/shobj-conf b/support/shobj-conf
index 5a63e80..4b2a741 100644
--- support/shobj-conf
+++ support/shobj-conf
@@ -189,7 +189,7 @@ darwin*|macosx*)
darwin[789]*|darwin10*) 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'
+ *) SHOBJ_LDFLAGS='-dynamiclib'
SHLIB_XLDFLAGS='-arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
;;
esac

14
pkgs/development/libraries/readline/no-arch_only.patch
View File

@ -1,14 +0,0 @@
diff -ru -x '*~' readline-6.2-orig/support/shobj-conf readline-6.2/support/shobj-conf
--- support/shobj-conf 2009-10-28 14:20:21.000000000 +0100
+++ support/shobj-conf 2014-07-01 13:03:28.000000000 +0200
@@ -168,8 +168,8 @@
SHLIB_LIBVERSION='$(SHLIB_MAJOR)$(SHLIB_MINOR).$(SHLIB_LIBSUFF)'
SHLIB_LIBSUFF='dylib'
- SHOBJ_LDFLAGS='-dynamiclib -dynamic -undefined dynamic_lookup -arch_only `/usr/bin/arch`'
- SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
+ SHOBJ_LDFLAGS='-dynamiclib -dynamic -undefined dynamic_lookup'
+ SHLIB_XLDFLAGS='-dynamiclib -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
SHLIB_LIBS='-lncurses' # see if -lcurses works on MacOS X 10.1
;;

9
pkgs/development/libraries/readline/readline-6.2-patches.nix
View File

@ -1,9 +0,0 @@
# Automatically generated by `update-patch-set.sh'; do not edit.
patch: [
(patch "001" "1qxl74f4n0hv4a807byrgbk4ixd8m50apj3922q2ss9pfi0nra1q")
(patch "002" "1m670g2xzib6r81315q9r24nh9brmxkpq07acch1fwxmih94jqqy")
(patch "003" "0x13c9wir4r44v2vdg96y0ahn8kl3wcmb5y0xn15yvid6pzk28fb")
(patch "004" "0xjlkxfssfsd6jwbqhfjs4hybcps0b9zgz8v86vbhnzag4j39g89")
(patch "005" "1x61bjl3wgs1gwla9b3y1hh12m1j5qlbis22258mljjl9mg900pg")
]

11
pkgs/development/libraries/readline/shobj-darwin.patch
View File

@ -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'

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

@ -1009,6 +1009,8 @@ mapAliases ({
rdf4store = throw "rdf4store has been removed from nixpkgs."; # Added 2019-12-21
rdiff_backup = rdiff-backup; # Added 2014-11-23
rdmd = dtools; # Added 2017-08-19
readline5 = throw "readline-5 is no longer supported in nixpkgs, please use 'readline' for main supported version"; # Added 2022-02-20
readline62 = throw "readline-6.2 is no longer supported in nixpkgs, please use 'readline' for main supported version"; # Added 2022-02-20
readline80 = throw "readline-8.0 is no longer supported in nixpkgs, please use 'readline' for main supported version or 'readline81' for most recent version"; # Added 2021-04-22
recordmydesktop = throw "recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # Added 2019-12-10
redkite = throw "redkite was archived by upstream"; # Added 2021-04-12

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

@ -19721,10 +19721,6 @@ with pkgs;
readline = readline6;
readline6 = readline63;
readline5 = callPackage ../development/libraries/readline/5.x.nix { };
readline62 = callPackage ../development/libraries/readline/6.2.nix { };
readline63 = callPackage ../development/libraries/readline/6.3.nix { };
readline70 = callPackage ../development/libraries/readline/7.0.nix { };