From b9163ab3328b9b7104a0b4870970eee022fecb37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 20 Mar 2014 12:53:20 +0100 Subject: [PATCH] Revert "Updating GNU readline to 6.3." This reverts commit dbaa07b8ef6cae1b726bc3bdbb9cfaca5116a2c3. vcunat reported on IRC that the update breaks python and parted at least. http://hydra.nixos.org/build/9661091/nixlog/1/tail-reload --- .../libraries/readline/readline-6.2-patches.nix | 9 +++++++++ .../libraries/readline/readline-6.3-patches.nix | 4 ---- pkgs/development/libraries/readline/readline6.nix | 8 ++++---- 3 files changed, 13 insertions(+), 8 deletions(-) create mode 100644 pkgs/development/libraries/readline/readline-6.2-patches.nix delete mode 100644 pkgs/development/libraries/readline/readline-6.3-patches.nix diff --git a/pkgs/development/libraries/readline/readline-6.2-patches.nix b/pkgs/development/libraries/readline/readline-6.2-patches.nix new file mode 100644 index 00000000000..9fdcb3743b7 --- /dev/null +++ b/pkgs/development/libraries/readline/readline-6.2-patches.nix @@ -0,0 +1,9 @@ +# Automatically generated by `update-patch-set.sh'; do not edit. + +patch: [ +(patch "001" "1qxl74f4n0hv4a807byrgbk4ixd8m50apj3922q2ss9pfi0nra1q") +(patch "002" "1m670g2xzib6r81315q9r24nh9brmxkpq07acch1fwxmih94jqqy") +(patch "003" "0x13c9wir4r44v2vdg96y0ahn8kl3wcmb5y0xn15yvid6pzk28fb") +(patch "004" "0xjlkxfssfsd6jwbqhfjs4hybcps0b9zgz8v86vbhnzag4j39g89") +(patch "005" "1x61bjl3wgs1gwla9b3y1hh12m1j5qlbis22258mljjl9mg900pg") +] diff --git a/pkgs/development/libraries/readline/readline-6.3-patches.nix b/pkgs/development/libraries/readline/readline-6.3-patches.nix deleted file mode 100644 index b8019fb3350..00000000000 --- a/pkgs/development/libraries/readline/readline-6.3-patches.nix +++ /dev/null @@ -1,4 +0,0 @@ -# Automatically generated by `update-patch-set.sh'; do not edit. - -patch: [ -] diff --git a/pkgs/development/libraries/readline/readline6.nix b/pkgs/development/libraries/readline/readline6.nix index 463d6fba4b2..0826e6c5f7c 100644 --- a/pkgs/development/libraries/readline/readline6.nix +++ b/pkgs/development/libraries/readline/readline6.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, ncurses }: stdenv.mkDerivation (rec { - name = "readline-6.3"; + name = "readline-6.2"; src = fetchurl { url = "mirror://gnu/readline/${name}.tar.gz"; - sha256 = "0hzxr9jxqqx5sxsv9vmlxdnvlr9vi4ih1avjb869hbs6p5qn1fjn"; + sha256 = "10ckm2bd2rkxhvdmj7nmbsylmihw0abwcsnxf8y27305183rd9kr"; }; propagatedBuildInputs = [ncurses]; @@ -17,11 +17,11 @@ stdenv.mkDerivation (rec { (let patch = nr: sha256: fetchurl { - url = "mirror://gnu/readline/${name}-patches/readline63-${nr}"; + url = "mirror://gnu/readline/${name}-patches/readline62-${nr}"; inherit sha256; }; in - import ./readline-6.3-patches.nix patch); + import ./readline-6.2-patches.nix patch); meta = { description = "GNU Readline, a library for interactive line editing";