[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/06: packages: Use SRFI-71 instead of SRFI-11.
From: |
guix-commits |
Subject: |
05/06: packages: Use SRFI-71 instead of SRFI-11. |
Date: |
Mon, 6 Jun 2022 16:45:04 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 635d49f97ee233bbb2673f97d7556c3c91b55889
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Mon Jun 6 22:32:29 2022 +0200
packages: Use SRFI-71 instead of SRFI-11.
* gnu/packages.scm (%package-module-path): Use 'let*' instead of
'let*-values'.
(specification->package, specification->location)
(specification->package+output): Use 'let' instead of 'let-values'.
---
gnu/packages.scm | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/gnu/packages.scm b/gnu/packages.scm
index ab722d00d8..61345f75a9 100644
--- a/gnu/packages.scm
+++ b/gnu/packages.scm
@@ -40,11 +40,11 @@
#:use-module (ice-9 binary-ports)
#:autoload (system base compile) (compile)
#:use-module (srfi srfi-1)
- #:use-module (srfi srfi-11)
#:use-module (srfi srfi-26)
#:use-module (srfi srfi-34)
#:use-module (srfi srfi-35)
#:use-module (srfi srfi-39)
+ #:use-module (srfi srfi-71)
#:export (search-patch
search-patches
search-auxiliary-file
@@ -143,13 +143,10 @@ flags."
;; Search path for package modules. Each item must be either a directory
;; name or a pair whose car is a directory and whose cdr is a sub-directory
;; to narrow the search.
- (let*-values (((not-colon)
- (char-set-complement (char-set #\:)))
- ((environment)
- (string-tokenize (or (getenv "GUIX_PACKAGE_PATH") "")
- not-colon))
- ((channels-scm channels-go)
- (package-path-entries)))
+ (let* ((not-colon (char-set-complement (char-set #\:)))
+ (environment (string-tokenize (or (getenv "GUIX_PACKAGE_PATH") "")
+ not-colon))
+ (channels-scm channels-go (package-path-entries)))
;; Automatically add channels and items from $GUIX_PACKAGE_PATH to Guile's
;; search path. For historical reasons, $GUIX_PACKAGE_PATH goes to the
;; front; channels go to the back so that they don't override Guix' own
@@ -502,13 +499,13 @@ return its return value."
"Return a package matching SPEC. SPEC may be a package name, or a package
name followed by an at-sign and a version number. If the version number is not
present, return the preferred newest version."
- (let-values (((name version) (package-name->name+version spec)))
+ (let ((name version (package-name->name+version spec)))
(%find-package spec name version)))
(define (specification->location spec)
"Return the location of the highest-numbered package matching SPEC, a
specification such as \"guile@2\" or \"emacs\"."
- (let-values (((name version) (package-name->name+version spec)))
+ (let ((name version (package-name->name+version spec)))
(match (find-package-locations name version)
(()
(if version
@@ -543,8 +540,8 @@ version; if SPEC does not specify an output, return OUTPUT.
When OUTPUT is false and SPEC does not specify any output, return #f as the
output."
- (let-values (((name version sub-drv)
- (package-specification->name+version+output spec output)))
+ (let ((name version sub-drv
+ (package-specification->name+version+output spec output)))
(match (%find-package spec name version)
(#f
(values #f #f))
- branch master updated (e614cf2907 -> 264ca9452f), guix-commits, 2022/06/06
- 06/06: services: syslogd: Do not fsync at each line., guix-commits, 2022/06/06
- 05/06: packages: Use SRFI-71 instead of SRFI-11.,
guix-commits <=
- 02/06: gnu: Add python-canopen., guix-commits, 2022/06/06
- 01/06: bootloader: grub: Add removable grub-efi bootloader option., guix-commits, 2022/06/06
- 04/06: packages: Add 'specifications->packages'., guix-commits, 2022/06/06
- 03/06: gnu: Add python-progress., guix-commits, 2022/06/06