From 9b65dea806431ec8491184c3e89bab457042a68b Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 10 Jan 2020 11:28:59 +0100 Subject: gnu: Use the two-element 'define-deprecated' form where applicable. * gnu/packages/guile.scm (guile-json): Use the two-element 'define-deprecated' form. * gnu/packages/kde.scm (kdevplatform): Likewise. * gnu/packages/mpi.scm (hwloc-2.0): Likewise. * gnu/packages/qt.scm (qt): Likewise. --- gnu/packages/guile.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'gnu/packages/guile.scm') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 30a72ec62c..bcb8ff1a56 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2014 Cyril Roelandt ;;; Copyright © 2014, 2016, 2018 David Thompson ;;; Copyright © 2014, 2017, 2018 Mark H Weaver @@ -460,9 +460,7 @@ specification. These are the main features: ;; Deprecate the 'guile-json' alias to force the use 'guile-json-1' or ;; 'guile-json-3'. In the future, we may reuse 'guile-json' as an alias for ;; 'guile-json-3'. -(define-deprecated guile-json - guile-json-1 - guile-json-1) +(define-deprecated guile-json guile-json-1) (export guile-json) (define-public guile2.0-json -- cgit v1.2.3 From 7ed9c3124d9fb07e0d389250955cada1e54b03b3 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 13 Jan 2020 10:00:18 +0100 Subject: gnu: guile-bytestructures: Install 'README.md'. * gnu/packages/guile.scm (guile-bytestructures)[arguments]: Add 'install-doc' phase. --- gnu/packages/guile.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'gnu/packages/guile.scm') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index bcb8ff1a56..4b88c41084 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -595,8 +595,16 @@ Guile's foreign function interface.") "0q0habjiy3h9cigb7q1br9kz6z212dn2ab31f6dgd3rrmsfn5rvb")))) (build-system gnu-build-system) (arguments - '(#:make-flags - '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings + `(#:make-flags '("GUILE_AUTO_COMPILE=0") ;to prevent guild warnings + + #:phases (modify-phases %standard-phases + (add-after 'install 'install-doc + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (package ,(package-full-name this-package "-")) + (doc (string-append out "/share/doc/" package))) + (install-file "README.md" doc) + #t)))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) -- cgit v1.2.3 From 4616f5a8405f2e90aa6183e2d40844dcea6598ca Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 13 Jan 2020 18:04:39 +0100 Subject: gnu: guile-next: Update to 2.9.9. * gnu/packages/guile.scm (guile-next): Update to 2.9.9. --- gnu/packages/guile.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/guile.scm') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 4b88c41084..cb22242c53 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -288,14 +288,14 @@ without requiring the source code to be rewritten.") (package (inherit guile-2.2) (name "guile-next") - (version "2.9.8") + (version "2.9.9") (source (origin (inherit (package-source guile-2.2)) (uri (string-append "ftp://alpha.gnu.org/gnu/guile/guile-" version ".tar.xz")) (sha256 (base32 - "09icv9ymdb7hchn34c32s7x8ycilqj74mirmi4b3bm5zp1izd32a")))) + "0s99zzdzj29fb42q5fwn7vqg9k7y9ppq9vkv4p39zr93z8694wdz")))) (native-search-paths (list (search-path-specification (variable "GUILE_LOAD_PATH") -- cgit v1.2.3 From 7c3b6b2e2660b229630601e82410f4f0e24bdee7 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 13 Jan 2020 21:52:01 +0100 Subject: gnu: guile-readline: Add "guile3.0-readline" variant. * gnu/packages/guile.scm (make-guile-readline): Add optional 'name' parameter and honor it. (guile3.0-readline): New variable. --- gnu/packages/guile.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu/packages/guile.scm') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index cb22242c53..8d3f43e3f7 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -307,9 +307,9 @@ without requiring the source code to be rewritten.") (properties '((ftp-server . "alpha.gnu.org") (upstream-name . "guile"))))) -(define (make-guile-readline guile) +(define* (make-guile-readline guile #:optional (name "guile-readline")) (package - (name "guile-readline") + (name name) (version (package-version guile)) (source (package-source guile)) (build-system gnu-build-system) @@ -366,6 +366,9 @@ GNU@tie{}Guile. Use the @code{(ice-9 readline)} module and call its (define-public guile-readline (make-guile-readline guile-2.2)) +(define-public guile3.0-readline + (make-guile-readline guile-next "guile3.0-readline")) + (define (guile-variant-package-name prefix) (lambda (name) "Return NAME with PREFIX instead of \"guile-\", when applicable." -- cgit v1.2.3