From 50adabdd60d590c951824974356a9ccb9bb73ffc Mon Sep 17 00:00:00 2001 From: Markus Napierkowski Date: Wed, 21 Dec 2022 10:31:59 +0100 Subject: readline: 8.1 -> 8.2 --- pkgs/development/libraries/readline/8.1.nix | 62 ---------------------- pkgs/development/libraries/readline/8.2.nix | 62 ++++++++++++++++++++++ .../libraries/readline/no-arch_only-8.2.patch | 13 +++++ .../libraries/readline/readline-8.1-patches.nix | 6 --- .../libraries/readline/readline-8.2-patches.nix | 5 ++ 5 files changed, 80 insertions(+), 68 deletions(-) delete mode 100644 pkgs/development/libraries/readline/8.1.nix create mode 100644 pkgs/development/libraries/readline/8.2.nix create mode 100644 pkgs/development/libraries/readline/no-arch_only-8.2.patch delete mode 100644 pkgs/development/libraries/readline/readline-8.1-patches.nix create mode 100644 pkgs/development/libraries/readline/readline-8.2-patches.nix (limited to 'pkgs/development/libraries/readline') diff --git a/pkgs/development/libraries/readline/8.1.nix b/pkgs/development/libraries/readline/8.1.nix deleted file mode 100644 index 35835c1a143..00000000000 --- a/pkgs/development/libraries/readline/8.1.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ 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/8.2.nix b/pkgs/development/libraries/readline/8.2.nix new file mode 100644 index 00000000000..0fedcdc9397 --- /dev/null +++ b/pkgs/development/libraries/readline/8.2.nix @@ -0,0 +1,62 @@ +{ fetchurl, stdenv, lib, ncurses +}: + +stdenv.mkDerivation rec { + pname = "readline"; + version = "8.2p${toString (builtins.length upstreamPatches)}"; + + src = fetchurl { + url = "mirror://gnu/readline/readline-${meta.branch}.tar.gz"; + sha256 = "sha256-P+txcfFqhO6CyhijbXub4QmlLAT0kqBTMx19EJUAfDU="; + }; + + outputs = [ "out" "dev" "man" "doc" "info" ]; + + propagatedBuildInputs = [ncurses]; + + patchFlags = [ "-p0" ]; + + upstreamPatches = + (let + patch = nr: sha256: + fetchurl { + url = "mirror://gnu/readline/readline-${meta.branch}-patches/readline82-${nr}"; + inherit sha256; + }; + in + import ./readline-8.2-patches.nix patch); + + patches = + [ ./link-against-ncurses.patch + ./no-arch_only-8.2.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.2"; + }; +} diff --git a/pkgs/development/libraries/readline/no-arch_only-8.2.patch b/pkgs/development/libraries/readline/no-arch_only-8.2.patch new file mode 100644 index 00000000000..06f01ec0891 --- /dev/null +++ b/pkgs/development/libraries/readline/no-arch_only-8.2.patch @@ -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 diff --git a/pkgs/development/libraries/readline/readline-8.1-patches.nix b/pkgs/development/libraries/readline/readline-8.1-patches.nix deleted file mode 100644 index b2aaadf0e9b..00000000000 --- a/pkgs/development/libraries/readline/readline-8.1-patches.nix +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by `update-patch-set.sh'; do not edit. - -patch: [ -(patch "001" "0i4ikdqgcjnb40y2ss3lm09rq56zih5rzma3bib50dk3d1d4cak8") -(patch "002" "1p15sfx5xg5k4lam12lyd0givk7dfjddqpnb1jdp3c4clray0nz5") -] diff --git a/pkgs/development/libraries/readline/readline-8.2-patches.nix b/pkgs/development/libraries/readline/readline-8.2-patches.nix new file mode 100644 index 00000000000..48d2bd14bad --- /dev/null +++ b/pkgs/development/libraries/readline/readline-8.2-patches.nix @@ -0,0 +1,5 @@ +# Automatically generated by `update-patch-set.sh'; do not edit. + +patch: [ +(patch "001" "1xxgfgr6hn3ads8m8xsrdi1kbx1f3s69k0danpd9x4haqhg7zydv") +] -- cgit 1.4.1