[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/07: DRAFT: packages: Add 'modify-inputs'.
From: |
guix-commits |
Subject: |
06/07: DRAFT: packages: Add 'modify-inputs'. |
Date: |
Fri, 18 Jun 2021 17:28:29 -0400 (EDT) |
civodul pushed a commit to branch wip-simplified-packages
in repository guix.
commit dfe68da7415cb63b0ce582be0ce1ad2a4c89a410
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Wed Jun 16 23:52:42 2021 +0200
DRAFT: packages: Add 'modify-inputs'.
DRAFT: Missing doc.
* guix/packages.scm (inputs-sans-labels, replace-input): New procedures.
(prepend, replace, modify-inputs): New macros.
---
guix/packages.scm | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 68 insertions(+)
diff --git a/guix/packages.scm b/guix/packages.scm
index c845026..4ac1624 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -55,6 +55,7 @@
#:re-export (%current-system
%current-target-system
search-path-specification) ;for convenience
+ #:re-export-and-replace (delete) ;used as syntactic keyword
#:export (content-hash
content-hash?
content-hash-algorithm
@@ -113,6 +114,10 @@
lookup-package-propagated-input
lookup-package-direct-input
+ prepend ;syntactic keyword
+ replace ;syntactic keyword
+ modify-inputs
+
package-direct-sources
package-transitive-sources
package-direct-inputs
@@ -923,6 +928,69 @@ otherwise."
otherwise."
(lookup-input (package-direct-inputs package) name))
+(define (inputs-sans-labels inputs)
+ "Return INPUTS stripped of any input labels."
+ (map (match-lambda
+ ((label obj) obj)
+ ((label obj output) `(,obj ,output)))
+ inputs))
+
+(define (replace-input name replacement inputs)
+ "Replace input NAME by REPLACEMENT within INPUTS."
+ (map (lambda (input)
+ (match input
+ (((? string? label) . _)
+ (if (string=? label name)
+ (match replacement ;does REPLACEMENT specify an output?
+ ((_ _) (cons label replacement))
+ (_ (list label replacement)))
+ input))))
+ inputs))
+
+(define-syntax prepend
+ (lambda (s)
+ (syntax-violation 'prepend
+ "'prepend' may only be used within 'modify-inputs'"
+ s)))
+
+(define-syntax replace
+ (lambda (s)
+ (syntax-violation 'replace
+ "'replace' may only be used within 'modify-inputs'"
+ s)))
+
+(define-syntax modify-inputs
+ (syntax-rules (delete prepend append replace)
+ "Modify the given package inputs, as returned by 'package-inputs' & co.,
+according to the given clauses. The example below removes the GMP and ACL
+inputs of Coreutils and adds libcap:
+
+ (modify-inputs (package-inputs coreutils)
+ (delete \"gmp\" \"acl\")
+ (append libcap))
+
+Other types of clauses include 'prepend' and 'replace'."
+ ;; Note: This macro hides the fact that INPUTS, as returned by
+ ;; 'package-inputs' & co., is actually an alist with labels. Eventually,
+ ;; it will operate on list of inputs without labels.
+ ((_ inputs (delete name) clauses ...)
+ (modify-inputs (alist-delete name inputs)
+ clauses ...))
+ ((_ inputs (delete names ...) clauses ...)
+ (modify-inputs (fold alist-delete inputs (list names ...))
+ clauses ...))
+ ((_ inputs (prepend lst ...) clauses ...)
+ (modify-inputs (append (list lst ...) (inputs-sans-labels inputs))
+ clauses ...))
+ ((_ inputs (append lst ...) clauses ...)
+ (modify-inputs (append (inputs-sans-labels inputs) (list lst ...))
+ clauses ...))
+ ((_ inputs (replace name replacement) clauses ...)
+ (modify-inputs (replace-input name replacement inputs)
+ clauses ...))
+ ((_ inputs)
+ inputs)))
+
(define (package-direct-sources package)
"Return all source origins associated with PACKAGE; including origins in
PACKAGE's inputs."
- branch wip-simplified-packages created (now 0f56703), guix-commits, 2021/06/18
- 01/07: records: Support field sanitizers., guix-commits, 2021/06/18
- 03/07: DRAFT gnu: Change inputs of core packages to plain lists., guix-commits, 2021/06/18
- 02/07: DRAFT packages: Allow inputs to be plain package lists., guix-commits, 2021/06/18
- 07/07: DRAFT Add 'guix style'., guix-commits, 2021/06/18
- 04/07: DRAFT lint: Add 'input-labels' checker., guix-commits, 2021/06/18
- 05/07: packages: Add 'lookup-package-input' & co., guix-commits, 2021/06/18
- 06/07: DRAFT: packages: Add 'modify-inputs'.,
guix-commits <=