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

Merge pull request #108721 from lsix/readline-8.1

This commit is contained in:
Sandro 2021-04-24 11:46:56 +02:00 committed by GitHub
parent c22c6dfc11 34a136c710
commit 9c2920e56e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/readline/8.0.nix → pkgs/development/libraries/readline/8.1.nix
View File

@ -1,13 +1,13 @@
{ fetchurl, lib, stdenv, ncurses { fetchurl, stdenv, lib, ncurses
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "readline"; pname = "readline";
version = "8.0p${toString (builtins.length upstreamPatches)}"; version = "8.1p${toString (builtins.length upstreamPatches)}";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/readline/readline-${meta.branch}.tar.gz"; url = "mirror://gnu/readline/readline-${meta.branch}.tar.gz";
sha256 = "0qg4924hf4hg0r0wbx2chswsr08734536fh5iagkd3a7f4czafg3"; sha256 = "00ibp0n9crbwx15k9vvckq5wsipw98b1px8pd8i34chy2gpb9kpq";
}; };
outputs = [ "out" "dev" "man" "doc" "info" ]; outputs = [ "out" "dev" "man" "doc" "info" ];
@ -20,11 +20,11 @@ stdenv.mkDerivation rec {
(let (let
patch = nr: sha256: patch = nr: sha256:
fetchurl { fetchurl {
url = "mirror://gnu/readline/readline-${meta.branch}-patches/readline80-${nr}"; url = "mirror://gnu/readline/readline-${meta.branch}-patches/readline81-${nr}";
inherit sha256; inherit sha256;
}; };
in in
import ./readline-8.0-patches.nix patch); import ./readline-8.1-patches.nix patch);
patches = patches =
[ ./link-against-ncurses.patch [ ./link-against-ncurses.patch
@ -57,6 +57,6 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ dtzWill ]; maintainers = with maintainers; [ dtzWill ];
platforms = platforms.unix; platforms = platforms.unix;
branch = "8.0"; branch = "8.1";
}; };
} }

8
pkgs/development/libraries/readline/readline-8.0-patches.nix
View File

@ -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")
]

4
pkgs/development/libraries/readline/readline-8.1-patches.nix Normal file
View File

@ -0,0 +1,4 @@
# Automatically generated by `update-patch-set.sh'; do not edit.
patch: [
]

6
pkgs/shells/bash/5.1.nix
View File

@ -7,14 +7,14 @@
# patch for cygwin requires readline support # patch for cygwin requires readline support
, interactive ? stdenv.isCygwin , interactive ? stdenv.isCygwin
, readline80 ? null , readline81 ? null
, withDocs ? false , withDocs ? false
, texinfo ? null , texinfo ? null
}: }:
with lib; with lib;
assert interactive -> readline80 != null; assert interactive -> readline81 != null;
assert withDocs -> texinfo != null; assert withDocs -> texinfo != null;
assert stdenv.hostPlatform.isDarwin -> binutils != null; assert stdenv.hostPlatform.isDarwin -> binutils != null;
let let
@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
++ optional withDocs texinfo ++ optional withDocs texinfo
++ optional stdenv.hostPlatform.isDarwin binutils; ++ optional stdenv.hostPlatform.isDarwin binutils;
buildInputs = optional interactive readline80; buildInputs = optional interactive readline81;
enableParallelBuilding = true; enableParallelBuilding = true;

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

@ -627,6 +627,7 @@ mapAliases ({
rdf4store = throw "rdf4store has been removed from nixpkgs."; # added 2019-12-21 rdf4store = throw "rdf4store has been removed from nixpkgs."; # added 2019-12-21
rdiff_backup = rdiff-backup; # added 2014-11-23 rdiff_backup = rdiff-backup; # added 2014-11-23
rdmd = dtools; # added 2017-08-19 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."; rhc = throw "rhc was deprecated on 2019-04-09: abandoned by upstream.";
rng_tools = rng-tools; # added 2018-10-24 rng_tools = rng-tools; # added 2018-10-24
robomongo = robo3t; #added 2017-09-28 robomongo = robo3t; #added 2017-09-28

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

@ -13615,7 +13615,7 @@ in
gdb = callPackage ../development/tools/misc/gdb { gdb = callPackage ../development/tools/misc/gdb {
guile = null; guile = null;
readline = readline80; readline = readline81;
}; };
jhiccup = callPackage ../development/tools/java/jhiccup { }; jhiccup = callPackage ../development/tools/java/jhiccup { };
@ -16122,7 +16122,7 @@ in
libpwquality = callPackage ../development/libraries/libpwquality { }; libpwquality = callPackage ../development/libraries/libpwquality { };
libqalculate = callPackage ../development/libraries/libqalculate { libqalculate = callPackage ../development/libraries/libqalculate {
readline = readline80; readline = readline81;
}; };
libqt5pas = libsForQt5.callPackage ../development/compilers/fpc/libqt5pas.nix { }; libqt5pas = libsForQt5.callPackage ../development/compilers/fpc/libqt5pas.nix { };
@ -16652,7 +16652,7 @@ in
notify-sharp = callPackage ../development/libraries/notify-sharp { }; notify-sharp = callPackage ../development/libraries/notify-sharp { };
notcurses = callPackage ../development/libraries/notcurses { notcurses = callPackage ../development/libraries/notcurses {
readline = readline80; readline = readline81;
}; };
ncurses5 = ncurses.override { ncurses5 = ncurses.override {
@ -17222,7 +17222,7 @@ in
readline70 = callPackage ../development/libraries/readline/7.0.nix { }; 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 { }; readosm = callPackage ../development/libraries/readosm { };