diff options
| author | Markus Napierkowski <markus.napierkowski@cyberus-technology.de> | 2022-12-21 10:31:59 +0100 |
|---|---|---|
| committer | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2022-12-28 21:00:37 +0100 |
| commit | 50adabdd60d590c951824974356a9ccb9bb73ffc (patch) | |
| tree | 83b882fee3f5ba8e1491818ca2c35d49c17de367 /pkgs/development/libraries/readline | |
| parent | aaaeebad7a823083078771b624fd64e747fa81a1 (diff) | |
| download | nixpkgs-50adabdd60d590c951824974356a9ccb9bb73ffc.tar nixpkgs-50adabdd60d590c951824974356a9ccb9bb73ffc.tar.gz nixpkgs-50adabdd60d590c951824974356a9ccb9bb73ffc.tar.bz2 nixpkgs-50adabdd60d590c951824974356a9ccb9bb73ffc.tar.lz nixpkgs-50adabdd60d590c951824974356a9ccb9bb73ffc.tar.xz nixpkgs-50adabdd60d590c951824974356a9ccb9bb73ffc.tar.zst nixpkgs-50adabdd60d590c951824974356a9ccb9bb73ffc.zip | |
readline: 8.1 -> 8.2
Diffstat (limited to 'pkgs/development/libraries/readline')
| -rw-r--r-- | pkgs/development/libraries/readline/8.2.nix (renamed from pkgs/development/libraries/readline/8.1.nix) | 12 | ||||
| -rw-r--r-- | pkgs/development/libraries/readline/no-arch_only-8.2.patch | 13 | ||||
| -rw-r--r-- | pkgs/development/libraries/readline/readline-8.1-patches.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/libraries/readline/readline-8.2-patches.nix | 5 |
4 files changed, 24 insertions, 12 deletions
diff --git a/pkgs/development/libraries/readline/8.1.nix b/pkgs/development/libraries/readline/8.2.nix index 35835c1a143..0fedcdc9397 100644 --- a/pkgs/development/libraries/readline/8.1.nix +++ b/pkgs/development/libraries/readline/8.2.nix @@ -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"; }; } 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") +] |