mirror/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-29 15:43:00 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

readline: 8.1 -> 8.2

Browse Source
This commit is contained in:
Markus Napierkowski 2022-12-21 10:31:59 +01:00 committed by Sandro Jäckel
parent aaaeebad7a
commit 50adabdd60
No known key found for this signature in database
GPG Key ID: 3AF5A43A3EECC2E5
5 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

13
pkgs/development/libraries/readline/no-arch_only-8.2.patch Normal file
View File

@ -0,0 +1,13 @@
diff -ru -x '*~' readline-6.3-orig/support/shobj-conf readline-6.3/support/shobj-conf
--- support/shobj-conf 2014-02-24 03:06:29.000000000 +0100
+++ support/shobj-conf 2014-07-22 11:18:52.000000000 +0200
@@ -159,9 +159,6 @@
# Darwin 8 == Mac OS X 10.4; Mac OS X 10.N == Darwin N+4
*)
case "${host_os}" in
- darwin[89]*|darwin1[012]*)
- SHOBJ_ARCHFLAGS=
- ;;
*) # Mac OS X 10.9 (Mavericks) and later
SHOBJ_ARCHFLAGS=
# for 32 and 64bit universal library

6
pkgs/development/libraries/readline/readline-8.1-patches.nix
View File

@ -1,6 +0,0 @@
# Automatically generated by `update-patch-set.sh'; do not edit.
patch: [
(patch "001" "0i4ikdqgcjnb40y2ss3lm09rq56zih5rzma3bib50dk3d1d4cak8")
(patch "002" "1p15sfx5xg5k4lam12lyd0givk7dfjddqpnb1jdp3c4clray0nz5")
]

5
pkgs/development/libraries/readline/readline-8.2-patches.nix Normal file
View File

@ -0,0 +1,5 @@
# Automatically generated by `update-patch-set.sh'; do not edit.
patch: [
(patch "001" "1xxgfgr6hn3ads8m8xsrdi1kbx1f3s69k0danpd9x4haqhg7zydv")
]

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

@ -1915,9 +1915,7 @@ with pkgs;
thicket = callPackage ../applications/version-management/thicket { };
tig = callPackage ../applications/version-management/tig {
readline = readline81;
};
tig = callPackage ../applications/version-management/tig { };
top-git = callPackage ../applications/version-management/topgit { };
@ -22536,14 +22534,14 @@ with pkgs;
raylib = callPackage ../development/libraries/raylib { };
readline = readline81;
readline = readline82;
readline6 = readline63;
readline63 = callPackage ../development/libraries/readline/6.3.nix { };
readline70 = callPackage ../development/libraries/readline/7.0.nix { };
readline81 = callPackage ../development/libraries/readline/8.1.nix { };
readline82 = callPackage ../development/libraries/readline/8.2.nix { };
readosm = callPackage ../development/libraries/readosm { };
@ -25337,9 +25335,7 @@ with pkgs;
drbd = callPackage ../os-specific/linux/drbd { };
dropwatch = callPackage ../os-specific/linux/dropwatch {
readline = readline81;
};
dropwatch = callPackage ../os-specific/linux/dropwatch { };
dsd = callPackage ../applications/radio/dsd { };