kreyren/guix-kreyren
1
0
Fork 0
Code Issues 1 Pull Requests 1 Releases Activity

packages: Use 'lookup-package-input' and friends instead of 'package-input'.

Browse Source 
* 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>
This commit is contained in:
Maxime Devos 2021-07-19 11:08:40 +02:00 committed by Ludovic Courtès
parent 93a5e89008
commit d7942ac12a
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
guix/packages.scm
View File

@ -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.