Skip to content

readline: default to readline81 instead of readline6 #151090

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SuperSandro2000 merged 1 commit into from
Nov 30, 2022
Merged

readline: default to readline81 instead of readline6 #151090

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkgs/development/libraries/pipewire/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
, vulkan-loader
, webrtc-audio-processing
, ncurses
, readline81 # meson can't find <7 as those versions don't have a .pc file
, readline # meson can't find <7 as those versions don't have a .pc file
, lilv
, makeFontsConf
, callPackage
Expand Down Expand Up @@ -123,7 +123,7 @@ let
libsndfile
lilv
ncurses
readline81
readline
udev
vulkan-headers
vulkan-loader
Expand Down
6 changes: 3 additions & 3 deletions pkgs/shells/bash/5.1.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@

# patch for cygwin requires readline support
, interactive ? stdenv.isCygwin
, readline81 ? null
, readline ? null
, withDocs ? false
, texinfo ? null
, forFHSEnv ? false
}:

with lib;

assert interactive -> readline81 != null;
assert interactive -> readline != null;
assert withDocs -> texinfo != null;
assert stdenv.hostPlatform.isDarwin -> binutils != null;
let
Expand Down Expand Up @@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
++ optional withDocs texinfo
++ optional stdenv.hostPlatform.isDarwin binutils;

buildInputs = optional interactive readline81;
buildInputs = optional interactive readline;

enableParallelBuilding = true;

Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/aliases.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1009,7 +1009,7 @@ mapAliases ({
rdmd = throw "'rdmd' has been renamed to/replaced by 'dtools'"; # Converted to throw 2022-02-22
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
readline80 = throw "readline-8.0 is no longer supported in nixpkgs, please use 'readline' for main supported version"; # Added 2021-04-22
redkite = throw "redkite was archived by upstream"; # Added 2021-04-12
redshift-wlr = throw "redshift-wlr has been replaced by gammastep"; # Added 2021-12-25
renpy = throw "renpy has been removed from nixpkgs, it was unmaintained and the latest packaged version required python2"; # Added 2022-01-12
Expand Down
7 changes: 2 additions & 5 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16044,7 +16044,6 @@ with pkgs;

gdb = callPackage ../development/tools/misc/gdb {
guile = null;
readline = readline81;
};

java-language-server = callPackage ../development/tools/java/java-language-server { };
Expand Down Expand Up @@ -18785,9 +18784,7 @@ with pkgs;
python = python3;
};

libqalculate = callPackage ../development/libraries/libqalculate {
readline = readline81;
};
libqalculate = callPackage ../development/libraries/libqalculate { };

libqt5pas = libsForQt5.callPackage ../development/compilers/fpc/libqt5pas.nix { };

Expand Down Expand Up @@ -19981,7 +19978,7 @@ with pkgs;

raylib = callPackage ../development/libraries/raylib { };

readline = readline6;
readline = readline81;
readline6 = readline63;

readline63 = callPackage ../development/libraries/readline/6.3.nix { };
Expand Down