[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch core-updates updated: packages: Use 'lookup-package-input' and fr
From: |
guix-commits |
Subject: |
branch core-updates updated: packages: Use 'lookup-package-input' and friends instead of 'package-input'. |
Date: |
Fri, 23 Jul 2021 04:52:41 -0400 |
This is an automated email from the git hooks/post-receive script.
civodul pushed a commit to branch core-updates
in repository guix.
The following commit(s) were added to refs/heads/core-updates by this push:
new d7942ac packages: Use 'lookup-package-input' and friends instead of
'package-input'.
d7942ac is described below
commit d7942ac12ad51615cd43d3debb8b561a503e8fc0
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Mon Jul 19 11:08:40 2021 +0200
packages: Use 'lookup-package-input' and friends instead of 'package-input'.
* guix/packages.scm (package-input, package-native-input): Remove.
(this-package-input): Use 'lookup-package-input' and
'lookup-package-propagated-input' instead of 'package-input'.
(this-package-native-input): Use 'lookup-package-native-input'
instead of 'package-input'.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
guix/packages.scm | 20 +++-----------------
1 file changed, 3 insertions(+), 17 deletions(-)
diff --git a/guix/packages.scm b/guix/packages.scm
index d3fa72f..2349bb4 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -550,32 +550,18 @@ object."
#f)))
(_ #f)))
-(define (package-input package name)
- "Return the package input NAME of PACKAGE--i.e., an input
-from the ‘inputs’ or ‘propagated-inputs’ field. Native inputs are not
-considered. If this input does not exist, return #f instead."
- (and=> (or (assoc-ref (package-inputs package) name)
- (assoc-ref (package-propagated-inputs package) name))
- car))
-
-(define (package-native-input package name)
- "Return the native package input NAME of PACKAGE--i.e., an input
-from the ‘native-inputs’ field. If this native input does not exist,
-return #f instead."
- (and=> (assoc-ref (package-native-inputs package) name)
- car))
-
(define-syntax-rule (this-package-input name)
"Return the input NAME of the package being defined--i.e., an input
from the ‘inputs’ or ‘propagated-inputs’ field. Native inputs are not
considered. If this input does not exist, return #f instead."
- (package-input this-package name))
+ (or (lookup-package-input this-package name)
+ (lookup-package-propagated-input this-package name)))
(define-syntax-rule (this-package-native-input name)
"Return the native package input NAME of the package being defined--i.e.,
an input from the ‘native-inputs’ field. If this native input does not
exist, return #f instead."
- (package-native-input this-package name))
+ (lookup-package-native-input this-package name))
;; Error conditions.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch core-updates updated: packages: Use 'lookup-package-input' and friends instead of 'package-input'.,
guix-commits <=