aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-04-03 21:15:51 +0200
committerLudovic Courtès <ludo@gnu.org>2014-04-03 23:55:51 +0200
commit50322c847dc28f2a1e2e6efaa0d84d5561bc8d0a (patch)
tree516a0e5d23d4c30ab7e9a3c54428c1ec6fe9e646
parentef0383eeca188f244e92a1e1b72dac9da65c25b9 (diff)
downloadguix-50322c847dc28f2a1e2e6efaa0d84d5561bc8d0a.tar
guix-50322c847dc28f2a1e2e6efaa0d84d5561bc8d0a.tar.gz
gnu: parted: Build against Readline 6.2.
* gnu/packages/readline.scm (readline-6.2): New variable. * gnu/packages/parted.scm (parted): Use it instead of READLINE.
-rw-r--r--gnu/packages/parted.scm6
-rw-r--r--gnu/packages/readline.scm11
2 files changed, 16 insertions, 1 deletions
diff --git a/gnu/packages/parted.scm b/gnu/packages/parted.scm
index 45d6bf1ea4..5d5d38a515 100644
--- a/gnu/packages/parted.scm
+++ b/gnu/packages/parted.scm
@@ -53,7 +53,11 @@
(inputs
;; XXX: add 'lvm2'.
`(("check" ,check)
- ("readline" ,readline)
+
+ ;; With Readline 6.3, parted/ui.c fails to build because it uses the
+ ;; now undefined 'CPPFunction' type.
+ ("readline" ,readline-6.2)
+
("util-linux" ,util-linux)))
(native-inputs
`(("gettext" ,gnu-gettext)))
diff --git a/gnu/packages/readline.scm b/gnu/packages/readline.scm
index f35a52f614..13ce9165f4 100644
--- a/gnu/packages/readline.scm
+++ b/gnu/packages/readline.scm
@@ -74,3 +74,14 @@ features both Emacs-like and vi-like keybindings, making its usage
comfortable for anyone.")
(license gpl3+)
(home-page "http://savannah.gnu.org/projects/readline/"))))
+
+(define-public readline-6.2
+ (package (inherit readline)
+ (version "6.2")
+ (source (origin (inherit (package-source readline))
+ (method url-fetch)
+ (uri (string-append "mirror://gnu/readline/readline-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "10ckm2bd2rkxhvdmj7nmbsylmihw0abwcsnxf8y27305183rd9kr"))))))