lol

readline: 8.1 -> 8.2

authored by

Markus Napierkowski and committed by
Sandro Jäckel
50adabdd aaaeebad

+28 -20
+6 -6
pkgs/development/libraries/readline/8.1.nix pkgs/development/libraries/readline/8.2.nix
··· 3 3 4 4 stdenv.mkDerivation rec { 5 5 pname = "readline"; 6 - version = "8.1p${toString (builtins.length upstreamPatches)}"; 6 + version = "8.2p${toString (builtins.length upstreamPatches)}"; 7 7 8 8 src = fetchurl { 9 9 url = "mirror://gnu/readline/readline-${meta.branch}.tar.gz"; 10 - sha256 = "00ibp0n9crbwx15k9vvckq5wsipw98b1px8pd8i34chy2gpb9kpq"; 10 + sha256 = "sha256-P+txcfFqhO6CyhijbXub4QmlLAT0kqBTMx19EJUAfDU="; 11 11 }; 12 12 13 13 outputs = [ "out" "dev" "man" "doc" "info" ]; ··· 20 20 (let 21 21 patch = nr: sha256: 22 22 fetchurl { 23 - url = "mirror://gnu/readline/readline-${meta.branch}-patches/readline81-${nr}"; 23 + url = "mirror://gnu/readline/readline-${meta.branch}-patches/readline82-${nr}"; 24 24 inherit sha256; 25 25 }; 26 26 in 27 - import ./readline-8.1-patches.nix patch); 27 + import ./readline-8.2-patches.nix patch); 28 28 29 29 patches = 30 30 [ ./link-against-ncurses.patch 31 - ./no-arch_only-6.3.patch 31 + ./no-arch_only-8.2.patch 32 32 ] 33 33 ++ upstreamPatches; 34 34 ··· 57 57 maintainers = with maintainers; [ dtzWill ]; 58 58 59 59 platforms = platforms.unix; 60 - branch = "8.1"; 60 + branch = "8.2"; 61 61 }; 62 62 }
+13
pkgs/development/libraries/readline/no-arch_only-8.2.patch
··· 1 + diff -ru -x '*~' readline-6.3-orig/support/shobj-conf readline-6.3/support/shobj-conf 2 + --- support/shobj-conf 2014-02-24 03:06:29.000000000 +0100 3 + +++ support/shobj-conf 2014-07-22 11:18:52.000000000 +0200 4 + @@ -159,9 +159,6 @@ 5 + # Darwin 8 == Mac OS X 10.4; Mac OS X 10.N == Darwin N+4 6 + *) 7 + case "${host_os}" in 8 + - darwin[89]*|darwin1[012]*) 9 + - SHOBJ_ARCHFLAGS= 10 + - ;; 11 + *) # Mac OS X 10.9 (Mavericks) and later 12 + SHOBJ_ARCHFLAGS= 13 + # for 32 and 64bit universal library
-6
pkgs/development/libraries/readline/readline-8.1-patches.nix
··· 1 - # Automatically generated by `update-patch-set.sh'; do not edit. 2 - 3 - patch: [ 4 - (patch "001" "0i4ikdqgcjnb40y2ss3lm09rq56zih5rzma3bib50dk3d1d4cak8") 5 - (patch "002" "1p15sfx5xg5k4lam12lyd0givk7dfjddqpnb1jdp3c4clray0nz5") 6 - ]
+5
pkgs/development/libraries/readline/readline-8.2-patches.nix
··· 1 + # Automatically generated by `update-patch-set.sh'; do not edit. 2 + 3 + patch: [ 4 + (patch "001" "1xxgfgr6hn3ads8m8xsrdi1kbx1f3s69k0danpd9x4haqhg7zydv") 5 + ]
+4 -8
pkgs/top-level/all-packages.nix
··· 1915 1915 1916 1916 thicket = callPackage ../applications/version-management/thicket { }; 1917 1917 1918 - tig = callPackage ../applications/version-management/tig { 1919 - readline = readline81; 1920 - }; 1918 + tig = callPackage ../applications/version-management/tig { }; 1921 1919 1922 1920 top-git = callPackage ../applications/version-management/topgit { }; 1923 1921 ··· 22536 22534 22537 22535 raylib = callPackage ../development/libraries/raylib { }; 22538 22536 22539 - readline = readline81; 22537 + readline = readline82; 22540 22538 readline6 = readline63; 22541 22539 22542 22540 readline63 = callPackage ../development/libraries/readline/6.3.nix { }; 22543 22541 22544 22542 readline70 = callPackage ../development/libraries/readline/7.0.nix { }; 22545 22543 22546 - readline81 = callPackage ../development/libraries/readline/8.1.nix { }; 22544 + readline82 = callPackage ../development/libraries/readline/8.2.nix { }; 22547 22545 22548 22546 readosm = callPackage ../development/libraries/readosm { }; 22549 22547 ··· 25337 25335 25338 25336 drbd = callPackage ../os-specific/linux/drbd { }; 25339 25337 25340 - dropwatch = callPackage ../os-specific/linux/dropwatch { 25341 - readline = readline81; 25342 - }; 25338 + dropwatch = callPackage ../os-specific/linux/dropwatch { }; 25343 25339 25344 25340 dsd = callPackage ../applications/radio/dsd { }; 25345 25341