From ea3bdfcebe8a9f2bc2e1629d0c691e699028d841 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Thu, 7 Jan 2021 20:51:44 +0000 Subject: [PATCH 1/6] readline81: init at 8.1p0 See https://lists.gnu.org/archive/html/info-gnu/2020-12/msg00002.html for release information --- pkgs/development/libraries/readline/8.1.nix | 62 +++++++++++++++++++ .../readline/readline-8.1-patches.nix | 4 ++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 68 insertions(+) create mode 100644 pkgs/development/libraries/readline/8.1.nix create mode 100644 pkgs/development/libraries/readline/readline-8.1-patches.nix diff --git a/pkgs/development/libraries/readline/8.1.nix b/pkgs/development/libraries/readline/8.1.nix new file mode 100644 index 00000000000..35835c1a143 --- /dev/null +++ b/pkgs/development/libraries/readline/8.1.nix @@ -0,0 +1,62 @@ +{ fetchurl, stdenv, lib, ncurses +}: + +stdenv.mkDerivation rec { + pname = "readline"; + version = "8.1p${toString (builtins.length upstreamPatches)}"; + + src = fetchurl { + url = "mirror://gnu/readline/readline-${meta.branch}.tar.gz"; + sha256 = "00ibp0n9crbwx15k9vvckq5wsipw98b1px8pd8i34chy2gpb9kpq"; + }; + + outputs = [ "out" "dev" "man" "doc" "info" ]; + + propagatedBuildInputs = [ncurses]; + + patchFlags = [ "-p0" ]; + + upstreamPatches = + (let + patch = nr: sha256: + fetchurl { + url = "mirror://gnu/readline/readline-${meta.branch}-patches/readline81-${nr}"; + inherit sha256; + }; + in + import ./readline-8.1-patches.nix patch); + + patches = + [ ./link-against-ncurses.patch + ./no-arch_only-6.3.patch + ] + ++ upstreamPatches; + + 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 = with maintainers; [ dtzWill ]; + + platforms = platforms.unix; + branch = "8.1"; + }; +} diff --git a/pkgs/development/libraries/readline/readline-8.1-patches.nix b/pkgs/development/libraries/readline/readline-8.1-patches.nix new file mode 100644 index 00000000000..b8019fb3350 --- /dev/null +++ b/pkgs/development/libraries/readline/readline-8.1-patches.nix @@ -0,0 +1,4 @@ +# Automatically generated by `update-patch-set.sh'; do not edit. + +patch: [ +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aa67263ce6f..2c0d974f248 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17106,6 +17106,8 @@ in readline80 = callPackage ../development/libraries/readline/8.0.nix { }; + readline81 = callPackage ../development/libraries/readline/8.1.nix { }; + readosm = callPackage ../development/libraries/readosm { }; rinutils = callPackage ../development/libraries/rinutils { }; From 090b1804b7b3f63a31e8a8d8225d56aaa06eb3fd Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Thu, 7 Jan 2021 20:52:10 +0000 Subject: [PATCH 2/6] bash_5: upgrade readline dependency to 8.1 Readline 8.1 is required for bash-5.1 to work properly. From bash-5.1 release message[1]: > Bash can be linked against an already-installed Readline library > rather than the private version in lib/readline if desired. Only > readline-8.1 and later versions are able to provide all of the symbols > that bash-5.1 requires; earlier versions of the Readline library will > not work correctly. [1] https://lists.gnu.org/archive/html/info-gnu/2020-12/msg00003.html --- pkgs/shells/bash/5.1.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/bash/5.1.nix b/pkgs/shells/bash/5.1.nix index d234b18e6c9..ddf2edfd1db 100644 --- a/pkgs/shells/bash/5.1.nix +++ b/pkgs/shells/bash/5.1.nix @@ -7,14 +7,14 @@ # patch for cygwin requires readline support , interactive ? stdenv.isCygwin -, readline80 ? null +, readline81 ? null , withDocs ? false , texinfo ? null }: with lib; -assert interactive -> readline80 != null; +assert interactive -> readline81 != null; assert withDocs -> texinfo != null; assert stdenv.hostPlatform.isDarwin -> binutils != null; let @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { ++ optional withDocs texinfo ++ optional stdenv.hostPlatform.isDarwin binutils; - buildInputs = optional interactive readline80; + buildInputs = optional interactive readline81; enableParallelBuilding = true; From 72c9089baeaf01fdb67788f9fa02c9ed8d739ad1 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Thu, 7 Jan 2021 20:58:34 +0000 Subject: [PATCH 3/6] gdb: upgrade readline dependency to 8.1 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2c0d974f248..8f44dc03267 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13505,7 +13505,7 @@ in gdb = callPackage ../development/tools/misc/gdb { guile = null; - readline = readline80; + readline = readline81; }; jhiccup = callPackage ../development/tools/java/jhiccup { }; From 721d1dfb68a72aecbdec443cacae079c60847439 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Wed, 14 Apr 2021 22:44:56 +0100 Subject: [PATCH 4/6] libqalculate: upgrade readline dependency to 8.1 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f44dc03267..9e5e1241ac5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16003,7 +16003,7 @@ in libpwquality = callPackage ../development/libraries/libpwquality { }; libqalculate = callPackage ../development/libraries/libqalculate { - readline = readline80; + readline = readline81; }; libqt5pas = libsForQt5.callPackage ../development/compilers/fpc/libqt5pas.nix { }; From 1671b1f2a9c6b170a76a8cba05d1354c3d2c3c3e Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Wed, 14 Apr 2021 22:45:39 +0100 Subject: [PATCH 5/6] notcurses: upgrade readline dependency to 8.1 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e5e1241ac5..8327d1b8ea6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16534,7 +16534,7 @@ in notify-sharp = callPackage ../development/libraries/notify-sharp { }; notcurses = callPackage ../development/libraries/notcurses { - readline = readline80; + readline = readline81; }; ncurses5 = ncurses.override { From 34a136c71023a44e6a2bfe5d0436981abee4f236 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Thu, 7 Jan 2021 20:58:20 +0000 Subject: [PATCH 6/6] readline80: delete readline-8.0 is not used anywhere in the tree (since introduction of readline-8.1); drop it. --- pkgs/development/libraries/readline/8.0.nix | 62 ------------------- .../readline/readline-8.0-patches.nix | 8 --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 4 files changed, 1 insertion(+), 72 deletions(-) delete mode 100644 pkgs/development/libraries/readline/8.0.nix delete mode 100644 pkgs/development/libraries/readline/readline-8.0-patches.nix diff --git a/pkgs/development/libraries/readline/8.0.nix b/pkgs/development/libraries/readline/8.0.nix deleted file mode 100644 index 9ea0277467e..00000000000 --- a/pkgs/development/libraries/readline/8.0.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ fetchurl, lib, stdenv, ncurses -}: - -stdenv.mkDerivation rec { - pname = "readline"; - version = "8.0p${toString (builtins.length upstreamPatches)}"; - - src = fetchurl { - url = "mirror://gnu/readline/readline-${meta.branch}.tar.gz"; - sha256 = "0qg4924hf4hg0r0wbx2chswsr08734536fh5iagkd3a7f4czafg3"; - }; - - outputs = [ "out" "dev" "man" "doc" "info" ]; - - propagatedBuildInputs = [ncurses]; - - patchFlags = [ "-p0" ]; - - upstreamPatches = - (let - patch = nr: sha256: - fetchurl { - url = "mirror://gnu/readline/readline-${meta.branch}-patches/readline80-${nr}"; - inherit sha256; - }; - in - import ./readline-8.0-patches.nix patch); - - patches = - [ ./link-against-ncurses.patch - ./no-arch_only-6.3.patch - ] - ++ upstreamPatches; - - 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 = with maintainers; [ dtzWill ]; - - platforms = platforms.unix; - branch = "8.0"; - }; -} diff --git a/pkgs/development/libraries/readline/readline-8.0-patches.nix b/pkgs/development/libraries/readline/readline-8.0-patches.nix deleted file mode 100644 index 2fac6a413c7..00000000000 --- a/pkgs/development/libraries/readline/readline-8.0-patches.nix +++ /dev/null @@ -1,8 +0,0 @@ -# Automatically generated by `update-patch-set.sh'; do not edit. - -patch: [ -(patch "001" "0sfh7wn0pr743xspnb1zndxndlv9rc0hcg14cbw5cmyg6f4ykrfq") -(patch "002" "1xy8mv8xm8hsfixwp3ci9kfx3dii3y92cq27wwd0jq75y6zzxc1n") -(patch "003" "1vza7sxjcsr2z295ij12nzgncdil1vb6as3mqy4m7svi1chv5pcl") -(patch "004" "0k1rfx9w32lglxg564yvp0mw6jg6883p8ac2f2lxxqpf80m3vami") -] diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index fe162e3723f..9648df014fb 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -614,6 +614,7 @@ 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 + 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 rhc = throw "rhc was deprecated on 2019-04-09: abandoned by upstream."; rng_tools = rng-tools; # added 2018-10-24 robomongo = robo3t; #added 2017-09-28 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8327d1b8ea6..5f41caa067c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17104,8 +17104,6 @@ in readline70 = callPackage ../development/libraries/readline/7.0.nix { }; - readline80 = callPackage ../development/libraries/readline/8.0.nix { }; - readline81 = callPackage ../development/libraries/readline/8.1.nix { }; readosm = callPackage ../development/libraries/readosm { };