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

readline: default to readline81 instead of readline6

Browse Source
This commit is contained in:
Andrew Childs 2021-12-17 21:38:07 +09:00
parent e9cfdc6b77
commit dd358e2111
4 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/pipewire/default.nix
View File

@ -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
@ -123,7 +123,7 @@ let
libsndfile
lilv
ncurses
readline81
readline
udev
vulkan-headers
vulkan-loader

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

@ -7,7 +7,7 @@
# patch for cygwin requires readline support
, interactive ? stdenv.isCygwin
, readline81 ? null
, readline ? null
, withDocs ? false
, texinfo ? null
, forFHSEnv ? false
@ -15,7 +15,7 @@
with lib;
assert interactive -> readline81 != null;
assert interactive -> readline != null;
assert withDocs -> texinfo != null;
assert stdenv.hostPlatform.isDarwin -> binutils != null;
let
@ -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;

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

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

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

@ -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 { };
@ -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 { };
@ -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 { };