summary refs log tree commit diff
path: root/gnu
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2020-03-18 20:10:38 +0100
committerMarius Bakke <mbakke@fastmail.com>2020-03-18 20:10:38 +0100
commit142cd4dc98ed439f32d2a903ff866ae345234c0f (patch)
treef3ba4cac8d69aedf5137c94038212daea4693592 /gnu
parent1b70995498973fe899f8f039586e303c7ec7a3bd (diff)
downloadguix-142cd4dc98ed439f32d2a903ff866ae345234c0f.tar.gz
gnu: guile-readline: Build with Guile 3.
* gnu/packages/guile.scm (guile-readline): Switch to GUILE-3.0.
(guile2.2-readline): New public variable.
(guile3.0-readline): Define in terms of DEPRECATED-GUILE3.0-PACKAGE.  Move
expression below the 'deprecated-guile3.0-package' definition.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/guile.scm8
1 files changed, 5 insertions, 3 deletions
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index e137ab610a..c87728f432 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -358,10 +358,10 @@ GNU@tie{}Guile.  Use the @code{(ice-9 readline)} module and call its
     (license license:gpl3+)))
 
 (define-public guile-readline
-  (make-guile-readline guile-2.2))
+  (make-guile-readline guile-3.0))
 
-(define-public guile3.0-readline
-  (make-guile-readline guile-next "guile3.0-readline"))
+(define-public guile2.2-readline
+  (make-guile-readline guile-2.2 "guile2.2-readline"))
 
 (define (guile-variant-package-name prefix)
   (lambda (name)
@@ -405,6 +405,8 @@ GNU@tie{}Guile.  Use the @code{(ice-9 readline)} module and call its
                  (deprecated-package package-name package))
                (export name))))))))
 
+(define-deprecated-guile3.0-package guile3.0-readline)
+
 (define-public guile-for-guile-emacs
   (package (inherit guile-2.2)
     (name "guile-for-guile-emacs")